diff --git a/src/cooling/Compton/cooling_io.h b/src/cooling/Compton/cooling_io.h index 1f137e18ca3c62c1083a8139cbb636b0b934d81d..ea3997d9c5ee837f22395ee2043faae2b334922f 100644 --- a/src/cooling/Compton/cooling_io.h +++ b/src/cooling/Compton/cooling_io.h @@ -30,11 +30,14 @@ /** * @brief Writes the current model of cooling to the file + * * @param h_grp The HDF5 group in which to write - * @param cooling the parameters of the cooling function. + * @param h_grp_columns The HDF5 group containing named columns + * @param cooling The #cooling_function_data */ __attribute__((always_inline)) INLINE static void cooling_write_flavour( - hid_t h_grp, const struct cooling_function_data* cooling) { + hid_t h_grp, hid_t h_grp_columns, + const struct cooling_function_data* cooling) { io_write_attribute_s(h_grp, "Cooling Model", "Compton cooling"); io_write_attribute_d(h_grp, "Compton rate [erg s^-1 K^-1]", diff --git a/src/cooling/EAGLE/cooling_io.h b/src/cooling/EAGLE/cooling_io.h index a57e4451d8e350e1f16a64318b510495ed77e811..e64218588293720a5caa164a2f9b456b8ab02a8b 100644 --- a/src/cooling/EAGLE/cooling_io.h +++ b/src/cooling/EAGLE/cooling_io.h @@ -32,10 +32,12 @@ * @brief Writes the current model of cooling to the file. * * @param h_grp The HDF5 group in which to write + * @param h_grp_columns The HDF5 group containing named columns * @param cooling The #cooling_function_data */ __attribute__((always_inline)) INLINE static void cooling_write_flavour( - hid_t h_grp, const struct cooling_function_data* cooling) { + hid_t h_grp, hid_t h_grp_columns, + const struct cooling_function_data* cooling) { io_write_attribute_s(h_grp, "Cooling Model", "EAGLE"); } diff --git a/src/cooling/QLA/cooling_io.h b/src/cooling/QLA/cooling_io.h index 71303e5e4277159afd69037ac11954dbc7f7d0c9..5407b53787b570a8981ee58e3d5d2e62d6ecdb8f 100644 --- a/src/cooling/QLA/cooling_io.h +++ b/src/cooling/QLA/cooling_io.h @@ -32,10 +32,12 @@ * @brief Writes the current model of cooling to the file. * * @param h_grp The HDF5 group in which to write + * @param h_grp_columns The HDF5 group containing named columns * @param cooling The #cooling_function_data */ __attribute__((always_inline)) INLINE static void cooling_write_flavour( - hid_t h_grp, const struct cooling_function_data* cooling) { + hid_t h_grp, hid_t h_grp_columns, + const struct cooling_function_data* cooling) { io_write_attribute_s(h_grp, "Cooling Model", "Quick Lyman-alpha (EAGLE with primordial Z only)"); diff --git a/src/cooling/const_du/cooling_io.h b/src/cooling/const_du/cooling_io.h index 8c82d0e3f7b134fc1fa1ee12f81474e1223912cb..0ecb2ebe517f322f32ee4701d63d2153cfd2900d 100644 --- a/src/cooling/const_du/cooling_io.h +++ b/src/cooling/const_du/cooling_io.h @@ -41,11 +41,14 @@ /** * @brief Writes the current model of SPH to the file + * * @param h_grp The HDF5 group in which to write - * @param cooling the parameters of the cooling function. + * @param h_grp_columns The HDF5 group containing named columns + * @param cooling The #cooling_function_data */ __attribute__((always_inline)) INLINE static void cooling_write_flavour( - hid_t h_grp, const struct cooling_function_data* cooling) { + hid_t h_grp, hid_t h_grp_columns, + const struct cooling_function_data* cooling) { io_write_attribute_s(h_grp, "Cooling Model", "Constant du/dt"); } diff --git a/src/cooling/const_lambda/cooling_io.h b/src/cooling/const_lambda/cooling_io.h index 5a8c2e8241e1ffea9a936df59e8f42f954a724b1..091d567066a9f490050d77ce27f96d4140ecb39d 100644 --- a/src/cooling/const_lambda/cooling_io.h +++ b/src/cooling/const_lambda/cooling_io.h @@ -39,11 +39,14 @@ /** * @brief Writes the current model of cooling to the file + * * @param h_grp The HDF5 group in which to write - * @param cooling the parameters of the cooling function. + * @param h_grp_columns The HDF5 group containing named columns + * @param cooling The #cooling_function_data */ __attribute__((always_inline)) INLINE static void cooling_write_flavour( - hid_t h_grp, const struct cooling_function_data* cooling) { + hid_t h_grp, hid_t h_grp_columns, + const struct cooling_function_data* cooling) { io_write_attribute_s(h_grp, "Cooling Model", "Constant Lambda"); io_write_attribute_d(h_grp, "Lambda/n_H^2 [cgs]", cooling->lambda_nH2_cgs); diff --git a/src/cooling/grackle/cooling_io.h b/src/cooling/grackle/cooling_io.h index 613f50786891a237c04011114fff41696530f242..223f0db2f678fd7912edb7cb869e2acc9f63338c 100644 --- a/src/cooling/grackle/cooling_io.h +++ b/src/cooling/grackle/cooling_io.h @@ -27,10 +27,14 @@ /** * @brief Writes the current model of cooling to the file + * * @param h_grp The HDF5 group in which to write + * @param h_grp_columns The HDF5 group containing named columns + * @param cooling The #cooling_function_data */ __attribute__((always_inline)) INLINE static void cooling_write_flavour( - hid_t h_grp, const struct cooling_function_data* cooling) { + hid_t h_grp, hid_t h_grp_columns, + const struct cooling_function_data* cooling) { #if COOLING_GRACKLE_MODE == 0 io_write_attribute_s(h_grp, "Cooling Model", "Grackle"); diff --git a/src/cooling/none/cooling_io.h b/src/cooling/none/cooling_io.h index 0c551f0f6617a57b85672654dd633e4f90afc8dd..848a90dd5edf36c845cde02b14b1cc6996c40405 100644 --- a/src/cooling/none/cooling_io.h +++ b/src/cooling/none/cooling_io.h @@ -30,11 +30,14 @@ /** * @brief Writes the current model of SPH to the file + * * @param h_grp The HDF5 group in which to write + * @param h_grp_columns The HDF5 group containing named columns * @param cooling the parameters of the cooling function. */ __attribute__((always_inline)) INLINE static void cooling_write_flavour( - hid_t h_grp, const struct cooling_function_data* cooling) { + hid_t h_grp, hid_t h_grp_columns, + const struct cooling_function_data* cooling) { io_write_attribute_s(h_grp, "Cooling Model", "None"); } diff --git a/src/parallel_io.c b/src/parallel_io.c index 208fa3872d682a16c3c4acc709c72317da1674ed..9d3b1416437aa2d0f7d1277cd733ae9613e46559 100644 --- a/src/parallel_io.c +++ b/src/parallel_io.c @@ -1178,7 +1178,7 @@ void prepare_file(struct engine* e, const char* baseName, long long N_total[6], H5Gcreate(h_grp, "NamedColumns", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (h_grp_columns < 0) error("Error while creating named columns group"); entropy_floor_write_flavour(h_grp); - cooling_write_flavour(h_grp, e->cooling_func); + cooling_write_flavour(h_grp, h_grp_columns, e->cooling_func); chemistry_write_flavour(h_grp, h_grp_columns); tracers_write_flavour(h_grp); feedback_write_flavour(e->feedback_props, h_grp); diff --git a/src/serial_io.c b/src/serial_io.c index f4ee75a813933b3b801df4da329026df223b0d15..3ff429e275f04024325796713e6a4509fdeacc54 100644 --- a/src/serial_io.c +++ b/src/serial_io.c @@ -1043,7 +1043,7 @@ void write_output_serial(struct engine* e, const char* baseName, H5Gcreate(h_grp, "NamedColumns", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (h_grp_columns < 0) error("Error while creating named columns group"); entropy_floor_write_flavour(h_grp); - cooling_write_flavour(h_grp, e->cooling_func); + cooling_write_flavour(h_grp, h_grp_columns, e->cooling_func); chemistry_write_flavour(h_grp, h_grp_columns); tracers_write_flavour(h_grp); feedback_write_flavour(e->feedback_props, h_grp); diff --git a/src/single_io.c b/src/single_io.c index 9a3a9e7ec37f8af06192ec20e71bab52cdf0057c..52e13a0c1d047aacd4dbd8f23b1d0295f2b6706e 100644 --- a/src/single_io.c +++ b/src/single_io.c @@ -888,7 +888,7 @@ void write_output_single(struct engine* e, const char* baseName, H5Gcreate(h_grp, "NamedColumns", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (h_grp_columns < 0) error("Error while creating named columns group"); entropy_floor_write_flavour(h_grp); - cooling_write_flavour(h_grp, e->cooling_func); + cooling_write_flavour(h_grp, h_grp_columns, e->cooling_func); chemistry_write_flavour(h_grp, h_grp_columns); tracers_write_flavour(h_grp); feedback_write_flavour(e->feedback_props, h_grp);