diff --git a/examples/main.c b/examples/main.c index 252eaed9dc90a373bab408e2e57b2f72e376c690..558dd0b3b5d485951438d916839cf3a28b0c364e 100644 --- a/examples/main.c +++ b/examples/main.c @@ -1304,7 +1304,7 @@ int main(int argc, char *argv[]) { with_external_gravity, with_baryon_particles, with_DM_particles, with_neutrinos, with_DM_background_particles, periodic, s.dim); - /* Initialize the neutrino mesh if used */ + /* Initialize the neutrino response if used */ bzero(&neutrino_response, sizeof(struct neutrino_response)); if (neutrino_properties.use_linear_response) neutrino_response_init(&neutrino_response, params, &us, s.dim, &cosmo, diff --git a/src/mesh_gravity.c b/src/mesh_gravity.c index 0b85503f752a03b8801b75267627f3ae4cbc3c15..d19c70bebe47e438ed876ce26f069dfd2723e08d 100644 --- a/src/mesh_gravity.c +++ b/src/mesh_gravity.c @@ -172,7 +172,7 @@ INLINE static void gpart_to_mesh_CIC(const struct gpart* gp, double* rho, /* Compute weight (for neutrino delta-f weighting) */ double weight = 1.0; if (gp->type == swift_type_neutrino) - gpart_neutrino_weight_mesh(gp, nu_model, &weight); + gpart_neutrino_weight_mesh_only(gp, nu_model, &weight); const double mass = gp->mass; const double value = mass * weight; diff --git a/src/mesh_gravity_mpi.c b/src/mesh_gravity_mpi.c index ca7db9e51588a0695b83a852aec3898eb13e994a..fb7c5710dcfd4b0d715cc2c97efc0c7142d3ff9d 100644 --- a/src/mesh_gravity_mpi.c +++ b/src/mesh_gravity_mpi.c @@ -105,7 +105,7 @@ void accumulate_cell_to_local_patch(const int N, const double fac, /* Compute weight (for neutrino delta-f weighting) */ double weight = 1.0; if (gp->type == swift_type_neutrino) - gpart_neutrino_weight_mesh(gp, nu_model, &weight); + gpart_neutrino_weight_mesh_only(gp, nu_model, &weight); /* Accumulate contributions to the local mesh patch */ const double mass = gp->mass; diff --git a/src/neutrino/Default/neutrino.c b/src/neutrino/Default/neutrino.c index 42aa801432e6930ad678f7459289d157d3eece9a..b51e2521d3838b2c086bb1686e8456da9a09ee02 100644 --- a/src/neutrino/Default/neutrino.c +++ b/src/neutrino/Default/neutrino.c @@ -64,9 +64,9 @@ void gather_neutrino_consts(const struct space *s, struct neutrino_model *nm) { * @param nm Properties of the neutrino model * @param weight The resulting weight (output) */ -void gpart_neutrino_weight_mesh(const struct gpart *gp, - const struct neutrino_model *nm, - double *weight) { +void gpart_neutrino_weight_mesh_only(const struct gpart *gp, + const struct neutrino_model *nm, + double *weight) { /* Anything to do? */ if (!nm->use_delta_f_mesh_only) return; diff --git a/src/neutrino/Default/neutrino.h b/src/neutrino/Default/neutrino.h index dc8d729f60e9c93dac24cee8272e2567a888fe5a..e728274d6b2af7bd0c187ad93b3d9884c5750cb1 100644 --- a/src/neutrino/Default/neutrino.h +++ b/src/neutrino/Default/neutrino.h @@ -46,9 +46,9 @@ struct neutrino_model { }; void gather_neutrino_consts(const struct space *s, struct neutrino_model *nm); -void gpart_neutrino_weight_mesh(const struct gpart *gp, - const struct neutrino_model *nm, - double *weight); +void gpart_neutrino_weight_mesh_only(const struct gpart *gp, + const struct neutrino_model *nm, + double *weight); void gpart_neutrino_mass_weight(const struct gpart *gp, const struct neutrino_model *nm, double *mass, double *weight); diff --git a/src/neutrino/Default/neutrino_response.c b/src/neutrino/Default/neutrino_response.c index 6beb434fa9ac89415bf60ba724abc8c285ce886f..d44a9a62c17cf92576026884e519cc70d0f0533c 100644 --- a/src/neutrino/Default/neutrino_response.c +++ b/src/neutrino/Default/neutrino_response.c @@ -398,7 +398,7 @@ void neutrino_response_clean(struct neutrino_response *numesh) { } /** - * @brief Shared information about the neutrino mesh used by the threads. + * @brief Shared information about the neutrino response used by the threads. */ struct neutrino_response_tp_data { diff --git a/src/neutrino/none/neutrino.h b/src/neutrino/none/neutrino.h index b76a260f13729b3c91dbae2a790f6169961ebbfc..95c463a13c32b380135603d8aa5d31c264286b94 100644 --- a/src/neutrino/none/neutrino.h +++ b/src/neutrino/none/neutrino.h @@ -31,9 +31,8 @@ struct neutrino_model {}; INLINE static void gather_neutrino_consts(const struct space *s, struct neutrino_model *nm) {} -INLINE static void gpart_neutrino_weight_mesh(const struct gpart *gp, - const struct neutrino_model *nm, - double *weight) {} +INLINE static void gpart_neutrino_weight_mesh_only( + const struct gpart *gp, const struct neutrino_model *nm, double *weight) {} INLINE static void gpart_neutrino_mass_weight(const struct gpart *gp, const struct neutrino_model *nm,