diff --git a/src/chemistry.c b/src/chemistry.c index 44cbea1361d96c4cf1d4d3d21c3c91e5225640a5..4afa199258f56d4fc01d67c9335e87a86ead09bc 100644 --- a/src/chemistry.c +++ b/src/chemistry.c @@ -33,7 +33,7 @@ * @param phys_const The physical constants in internal units. * @param data The properties to initialise. */ -void chemistry_init(const struct swift_params* parameter_file, +void chemistry_init(struct swift_params* parameter_file, const struct unit_system* us, const struct phys_const* phys_const, struct chemistry_global_data* data) { diff --git a/src/chemistry.h b/src/chemistry.h index bacc15c483c168dbf86bd34dc2af92a3eefb9e02..f9daa41db22a69a09f06be3fb560a68edac2f078 100644 --- a/src/chemistry.h +++ b/src/chemistry.h @@ -43,7 +43,7 @@ #endif /* Common functions */ -void chemistry_init(const struct swift_params* parameter_file, +void chemistry_init(struct swift_params* parameter_file, const struct unit_system* us, const struct phys_const* phys_const, struct chemistry_global_data* data); diff --git a/src/chemistry/EAGLE/chemistry.h b/src/chemistry/EAGLE/chemistry.h index f438425b540b13a9d637a942b4c12bdcf4cd8c08..8b007b40fa858237fc589af0f11e6ada6af0d1cf 100644 --- a/src/chemistry/EAGLE/chemistry.h +++ b/src/chemistry/EAGLE/chemistry.h @@ -125,7 +125,7 @@ __attribute__((always_inline)) INLINE static void chemistry_first_init_part( * @param data The properties to initialise. */ static INLINE void chemistry_init_backend( - const struct swift_params* parameter_file, const struct unit_system* us, + struct swift_params* parameter_file, const struct unit_system* us, const struct phys_const* phys_const, struct chemistry_global_data* data) { /* Read the total metallicity */ diff --git a/src/chemistry/GEAR/chemistry.h b/src/chemistry/GEAR/chemistry.h index b138e66a844b4dca98ba5bd7d46643f0683385b5..abed5b913683fe72c5c1f197e5506b14100a0ab5 100644 --- a/src/chemistry/GEAR/chemistry.h +++ b/src/chemistry/GEAR/chemistry.h @@ -73,7 +73,7 @@ static INLINE void chemistry_print_backend( * @param data The properties to initialise. */ static INLINE void chemistry_init_backend( - const struct swift_params* parameter_file, const struct unit_system* us, + struct swift_params* parameter_file, const struct unit_system* us, const struct phys_const* phys_const, struct chemistry_global_data* data) { /* read parameters */ diff --git a/src/chemistry/none/chemistry.h b/src/chemistry/none/chemistry.h index 6c2e7a21a81ce7b96723904f299378a2e5348a81..2114b1c85f161e309ddfb4304df2ce23506d041a 100644 --- a/src/chemistry/none/chemistry.h +++ b/src/chemistry/none/chemistry.h @@ -60,7 +60,7 @@ chemistry_get_element_name(enum chemistry_element elem) { * @param data The global chemistry information (to be filled). */ static INLINE void chemistry_init_backend( - const struct swift_params* parameter_file, const struct unit_system* us, + struct swift_params* parameter_file, const struct unit_system* us, const struct phys_const* phys_const, struct chemistry_global_data* data) {} /** diff --git a/src/cooling.c b/src/cooling.c index 57d1928a5d59ac2ff46c6cd20a45d69dec25ec60..154b859f74402d9e9a8adf1fb6c796b5195b8cd1 100644 --- a/src/cooling.c +++ b/src/cooling.c @@ -34,7 +34,7 @@ * @param phys_const The physical constants in internal units. * @param cooling The cooling properties to initialize */ -void cooling_init(const struct swift_params* parameter_file, +void cooling_init(struct swift_params* parameter_file, const struct unit_system* us, const struct phys_const* phys_const, struct cooling_function_data* cooling) { diff --git a/src/cooling.h b/src/cooling.h index 9d1001d360a1816837381e9aa52b17ba47f50fce..0fb04b9e484d989e746a254fc1934dc20033fb09 100644 --- a/src/cooling.h +++ b/src/cooling.h @@ -43,7 +43,7 @@ #endif /* Common functions */ -void cooling_init(const struct swift_params* parameter_file, +void cooling_init(struct swift_params* parameter_file, const struct unit_system* us, const struct phys_const* phys_const, struct cooling_function_data* cooling); diff --git a/src/cooling/EAGLE/cooling.h b/src/cooling/EAGLE/cooling.h index bdf3801887256cb97ae1d5b6a3095250764aa822..6227dd24267f2d1789ada94a9ac686c65ebaf380 100644 --- a/src/cooling/EAGLE/cooling.h +++ b/src/cooling/EAGLE/cooling.h @@ -110,7 +110,7 @@ __attribute__((always_inline)) INLINE static float cooling_get_radiated_energy( * @param cooling The cooling properties to initialize */ static INLINE void cooling_init_backend( - const struct swift_params* parameter_file, const struct unit_system* us, + struct swift_params* parameter_file, const struct unit_system* us, const struct phys_const* phys_const, struct cooling_function_data* cooling) {} diff --git a/src/cooling/const_du/cooling.h b/src/cooling/const_du/cooling.h index ba8211174919419c37856dc1fcbdaa73b23e319e..f436e1e28360532c2bee1300369577b2376676f2 100644 --- a/src/cooling/const_du/cooling.h +++ b/src/cooling/const_du/cooling.h @@ -164,7 +164,7 @@ __attribute__((always_inline)) INLINE static float cooling_get_radiated_energy( * @param cooling The cooling properties to initialize */ static INLINE void cooling_init_backend( - const struct swift_params* parameter_file, const struct unit_system* us, + struct swift_params* parameter_file, const struct unit_system* us, const struct phys_const* phys_const, struct cooling_function_data* cooling) { diff --git a/src/cooling/const_lambda/cooling.h b/src/cooling/const_lambda/cooling.h index 43ca7ab75b0bce370d7405e52cea9b54335ae73c..e54071204c9634a28bf57a2293d9d37bbc2593a8 100644 --- a/src/cooling/const_lambda/cooling.h +++ b/src/cooling/const_lambda/cooling.h @@ -172,7 +172,7 @@ __attribute__((always_inline)) INLINE static float cooling_get_radiated_energy( * @param cooling The cooling properties to initialize */ static INLINE void cooling_init_backend( - const struct swift_params* parameter_file, const struct unit_system* us, + struct swift_params* parameter_file, const struct unit_system* us, const struct phys_const* phys_const, struct cooling_function_data* cooling) { diff --git a/src/cooling/grackle/cooling.h b/src/cooling/grackle/cooling.h index dd59e9af1431681a8c5bdc1e5cb0c22053063651..cb77b63294aacee425b917c1900eefd7ebfa5f34 100644 --- a/src/cooling/grackle/cooling.h +++ b/src/cooling/grackle/cooling.h @@ -771,7 +771,7 @@ __attribute__((always_inline)) INLINE static void cooling_init_grackle( * @param cooling The cooling properties to initialize */ __attribute__((always_inline)) INLINE static void cooling_init_backend( - const struct swift_params* parameter_file, const struct unit_system* us, + struct swift_params* parameter_file, const struct unit_system* us, const struct phys_const* phys_const, struct cooling_function_data* cooling) { diff --git a/src/cooling/grackle/cooling_io.h b/src/cooling/grackle/cooling_io.h index 5a6edb8f1c559a7b495351e256559f251b97c1cf..faf84cf97d8449d54f2727ec26b16a9d81d117c6 100644 --- a/src/cooling/grackle/cooling_io.h +++ b/src/cooling/grackle/cooling_io.h @@ -133,7 +133,7 @@ __attribute__((always_inline)) INLINE static int cooling_write_particles( * @param cooling The cooling properties to initialize */ __attribute__((always_inline)) INLINE static void cooling_read_parameters( - const struct swift_params* parameter_file, + struct swift_params* parameter_file, struct cooling_function_data* cooling) { parser_get_param_string(parameter_file, "GrackleCooling:CloudyTable", diff --git a/src/cooling/none/cooling.h b/src/cooling/none/cooling.h index 5081c7cbe6c4b5168da082ead80687226f9d0c16..bf096ff84ecf58c9c37cc23bb3e843d1b75934ee 100644 --- a/src/cooling/none/cooling.h +++ b/src/cooling/none/cooling.h @@ -120,7 +120,7 @@ __attribute__((always_inline)) INLINE static float cooling_get_radiated_energy( * @param cooling The cooling properties to initialize */ static INLINE void cooling_init_backend( - const struct swift_params* parameter_file, const struct unit_system* us, + struct swift_params* parameter_file, const struct unit_system* us, const struct phys_const* phys_const, struct cooling_function_data* cooling) {} diff --git a/src/equation_of_state/ideal_gas/equation_of_state.h b/src/equation_of_state/ideal_gas/equation_of_state.h index 36b3511558e1c38c9135c689f45eea17220be053..0d57f6a5ce51091f82e79b009b0e85f1368d51cf 100644 --- a/src/equation_of_state/ideal_gas/equation_of_state.h +++ b/src/equation_of_state/ideal_gas/equation_of_state.h @@ -178,7 +178,7 @@ __attribute__((always_inline)) INLINE static float gas_soundspeed_from_pressure( */ __attribute__((always_inline)) INLINE static void eos_init( struct eos_parameters *e, const struct phys_const *phys_const, - const struct unit_system *us, const struct swift_params *params) {} + const struct unit_system *us, struct swift_params *params) {} /** * @brief Print the equation of state * diff --git a/src/equation_of_state/isothermal/equation_of_state.h b/src/equation_of_state/isothermal/equation_of_state.h index c7afac6caaacf354f8067218fbe2013b9287309a..540bf073cee106b91e2a9f4ecedb1b20238856fd 100644 --- a/src/equation_of_state/isothermal/equation_of_state.h +++ b/src/equation_of_state/isothermal/equation_of_state.h @@ -195,7 +195,7 @@ __attribute__((always_inline)) INLINE static float gas_soundspeed_from_pressure( */ __attribute__((always_inline)) INLINE static void eos_init( struct eos_parameters *e, const struct phys_const *phys_const, - const struct unit_system *us, const struct swift_params *params) { + const struct unit_system *us, struct swift_params *params) { e->isothermal_internal_energy = parser_get_param_float(params, "EoS:isothermal_internal_energy"); diff --git a/src/equation_of_state/planetary/equation_of_state.h b/src/equation_of_state/planetary/equation_of_state.h index d7a7f64f87bb126094163ada16dbd05e48d8cf8d..2a0fe66b49c4ca3aa2135dc773f4c9aae58d3b3f 100644 --- a/src/equation_of_state/planetary/equation_of_state.h +++ b/src/equation_of_state/planetary/equation_of_state.h @@ -1075,7 +1075,7 @@ __attribute__((always_inline)) INLINE static float gas_soundspeed_from_pressure( */ __attribute__((always_inline)) INLINE static void eos_init( struct eos_parameters *e, const struct phys_const *phys_const, - const struct unit_system *us, const struct swift_params *params) { + const struct unit_system *us, struct swift_params *params) { // Table file names char HM80_HHe_table_file[PARSER_MAX_LINE_SIZE]; diff --git a/src/parallel_io.c b/src/parallel_io.c index 039cb85bae56481988b4243c0390fb73536141a0..8720a6ce6e00d6ca1e0c63410264ca5c96d71877 100644 --- a/src/parallel_io.c +++ b/src/parallel_io.c @@ -1021,13 +1021,13 @@ void prepare_file(struct engine* e, const char* baseName, long long N_total[6], parser_write_params_to_hdf5(e->parameter_file, h_grp, 1); H5Gclose(h_grp); - /* Print the runtime non used parameters */ + /* Print the runtime unused parameters */ h_grp = - H5Gcreate(h_file, "/NonUsedParameters", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + H5Gcreate(h_file, "/UnusedParameters", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (h_grp < 0) error("Error while creating parameters group"); parser_write_params_to_hdf5(e->parameter_file, h_grp, 0); H5Gclose(h_grp); - + /* Print the system of Units used in the spashot */ io_write_unit_system(h_file, snapshot_units, "Units"); diff --git a/src/potential.c b/src/potential.c index 1fda6fc8752ff626a5262d7824ea68fd3bc16d46..a313598dae36569f8de9bf15078719886805a2a3 100644 --- a/src/potential.c +++ b/src/potential.c @@ -35,7 +35,7 @@ * @param s The #space we run in. * @param potential The external potential properties to initialize */ -void potential_init(const struct swift_params* parameter_file, +void potential_init(struct swift_params* parameter_file, const struct phys_const* phys_const, const struct unit_system* us, const struct space* s, struct external_potential* potential) { diff --git a/src/potential.h b/src/potential.h index 680d4e235fdf7a7666901f34a82f62feda4ae9bb..814b83c69180631db21e392704c0279808a6f03e 100644 --- a/src/potential.h +++ b/src/potential.h @@ -47,7 +47,7 @@ #endif /* Now, some generic functions, defined in the source file */ -void potential_init(const struct swift_params* parameter_file, +void potential_init(struct swift_params* parameter_file, const struct phys_const* phys_const, const struct unit_system* us, const struct space* s, struct external_potential* potential); diff --git a/src/potential/disc_patch/potential.h b/src/potential/disc_patch/potential.h index ab229d009c692db727e8f2341c3c49813f74f2b8..290f4847e838a2252ebbc19fc7c6ce2d342710fb 100644 --- a/src/potential/disc_patch/potential.h +++ b/src/potential/disc_patch/potential.h @@ -269,7 +269,7 @@ external_gravity_get_potential_energy( * @param potential The external potential properties to initialize */ static INLINE void potential_init_backend( - const struct swift_params* parameter_file, + struct swift_params* parameter_file, const struct phys_const* phys_const, const struct unit_system* us, const struct space* s, struct external_potential* potential) { diff --git a/src/potential/isothermal/potential.h b/src/potential/isothermal/potential.h index c974618d7b581884f871863bb83200b8cecee7a5..a9d3c7d6c3a2a6e4f9da9891e8bdc091a32cda68 100644 --- a/src/potential/isothermal/potential.h +++ b/src/potential/isothermal/potential.h @@ -162,7 +162,7 @@ external_gravity_get_potential_energy( * @param potential The external potential properties to initialize */ static INLINE void potential_init_backend( - const struct swift_params* parameter_file, + struct swift_params* parameter_file, const struct phys_const* phys_const, const struct unit_system* us, const struct space* s, struct external_potential* potential) { diff --git a/src/potential/none/potential.h b/src/potential/none/potential.h index a8550cad702891ff211539c95c42eca57418c464..c96b5e80f1435945dd58ff64539eae9c106202ac 100644 --- a/src/potential/none/potential.h +++ b/src/potential/none/potential.h @@ -98,7 +98,7 @@ external_gravity_get_potential_energy( * @param potential The external potential properties to initialize */ static INLINE void potential_init_backend( - const struct swift_params* parameter_file, + struct swift_params* parameter_file, const struct phys_const* phys_const, const struct unit_system* us, const struct space* s, struct external_potential* potential) {} diff --git a/src/potential/point_mass/potential.h b/src/potential/point_mass/potential.h index adea9d912056fd07e134fb98a7603030e897ec7a..0939adcb07700695d19b21f9bf6f813e2e8687e7 100644 --- a/src/potential/point_mass/potential.h +++ b/src/potential/point_mass/potential.h @@ -152,7 +152,7 @@ external_gravity_get_potential_energy( * @param potential The external potential properties to initialize */ static INLINE void potential_init_backend( - const struct swift_params* parameter_file, + struct swift_params* parameter_file, const struct phys_const* phys_const, const struct unit_system* us, const struct space* s, struct external_potential* potential) { diff --git a/src/potential/point_mass_ring/potential.h b/src/potential/point_mass_ring/potential.h index ebf047ea7c1f946536300f976713893e66295c59..5c38380a23e988bf33e9f71cad21d59956be66cb 100644 --- a/src/potential/point_mass_ring/potential.h +++ b/src/potential/point_mass_ring/potential.h @@ -192,7 +192,7 @@ external_gravity_get_potential_energy( * @param potential The external potential properties to initialize */ static INLINE void potential_init_backend( - const struct swift_params* parameter_file, + struct swift_params* parameter_file, const struct phys_const* phys_const, const struct unit_system* us, const struct space* s, struct external_potential* potential) { diff --git a/src/potential/point_mass_softened/potential.h b/src/potential/point_mass_softened/potential.h index 83a79ea3cddbff37fdd70d58d70afcaf46f7bc0e..92f0ba145184f2033615c6b8967443c34c3cb440 100644 --- a/src/potential/point_mass_softened/potential.h +++ b/src/potential/point_mass_softened/potential.h @@ -179,7 +179,7 @@ external_gravity_get_potential_energy( * @param potential The external potential properties to initialize */ static INLINE void potential_init_backend( - const struct swift_params* parameter_file, + struct swift_params* parameter_file, const struct phys_const* phys_const, const struct unit_system* us, const struct space* s, struct external_potential* potential) { diff --git a/src/potential/sine_wave/potential.h b/src/potential/sine_wave/potential.h index 1a4ee8aae8238c5db4c99eacb9e96bd967bcc7c4..9b72d36c1eb6af4f3d13382a87248233660b79fb 100644 --- a/src/potential/sine_wave/potential.h +++ b/src/potential/sine_wave/potential.h @@ -117,7 +117,7 @@ external_gravity_get_potential_energy( * @param potential The external potential properties to initialize */ static INLINE void potential_init_backend( - const struct swift_params* parameter_file, + struct swift_params* parameter_file, const struct phys_const* phys_const, const struct unit_system* us, const struct space* s, struct external_potential* potential) { diff --git a/src/serial_io.c b/src/serial_io.c index a87495c9358f1dd40b9c67dd70425318df7e298a..136097f0e7ddd87c1e8b2f265c8d374af2ec84fe 100644 --- a/src/serial_io.c +++ b/src/serial_io.c @@ -882,9 +882,9 @@ void write_output_serial(struct engine* e, const char* baseName, parser_write_params_to_hdf5(e->parameter_file, h_grp, 1); H5Gclose(h_grp); - /* Print the runtime non used parameters */ + /* Print the runtime unused parameters */ h_grp = - H5Gcreate(h_file, "/NonUsedParameters", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + H5Gcreate(h_file, "/UnusedParameters", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (h_grp < 0) error("Error while creating parameters group"); parser_write_params_to_hdf5(e->parameter_file, h_grp, 0); H5Gclose(h_grp); diff --git a/src/single_io.c b/src/single_io.c index 58ae7b97b965bc52a56ba3f15735d948cfc61c82..31aa40b3999aa6a46a1b0f22339070b24860fe57 100644 --- a/src/single_io.c +++ b/src/single_io.c @@ -735,9 +735,9 @@ void write_output_single(struct engine* e, const char* baseName, parser_write_params_to_hdf5(e->parameter_file, h_grp, 1); H5Gclose(h_grp); - /* Print the runtime non used parameters */ + /* Print the runtime unused parameters */ h_grp = - H5Gcreate(h_file, "/NonUsedParameters", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + H5Gcreate(h_file, "/UnusedParameters", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (h_grp < 0) error("Error while creating parameters group"); parser_write_params_to_hdf5(e->parameter_file, h_grp, 0); H5Gclose(h_grp); diff --git a/src/sourceterms.c b/src/sourceterms.c index 994658740a50a764edd3988ef7d6b78e00546f8f..993045e61503e4e78b855816921bc057706b76d1 100644 --- a/src/sourceterms.c +++ b/src/sourceterms.c @@ -36,7 +36,7 @@ * @param us The current internal system of units * @param source the structure that has all the source term properties */ -void sourceterms_init(const struct swift_params *parameter_file, +void sourceterms_init(struct swift_params *parameter_file, struct unit_system *us, struct sourceterms *source) { #ifdef SOURCETERMS_SN_FEEDBACK supernova_init(parameter_file, us, source); diff --git a/src/sourceterms.h b/src/sourceterms.h index a5d0c3c727d70d50fb3388d5e5e3cc3d6362276f..407d2f19362531a3fd3537889593c484319919b5 100644 --- a/src/sourceterms.h +++ b/src/sourceterms.h @@ -41,7 +41,7 @@ struct sourceterms { #include "sourceterms/sn_feedback/sn_feedback.h" #endif -void sourceterms_init(const struct swift_params* parameter_file, +void sourceterms_init(struct swift_params* parameter_file, struct unit_system* us, struct sourceterms* source); void sourceterms_print(struct sourceterms* source); diff --git a/src/sourceterms/sn_feedback/sn_feedback.h b/src/sourceterms/sn_feedback/sn_feedback.h index f2f224ce871ebb768c318aef42a690861dd974df..411673c37e82ff89d906425d1cadaa135c46a38d 100644 --- a/src/sourceterms/sn_feedback/sn_feedback.h +++ b/src/sourceterms/sn_feedback/sn_feedback.h @@ -171,7 +171,7 @@ __attribute__((always_inline)) INLINE static void supernova_feedback_apply( */ __attribute__((always_inline)) INLINE static void supernova_init( - const struct swift_params* parameter_file, struct unit_system* us, + struct swift_params* parameter_file, struct unit_system* us, struct sourceterms* source) { source->supernova.time = parser_get_param_double(parameter_file, "SN:time"); source->supernova.energy = diff --git a/tests/testEOS.c b/tests/testEOS.c index e14b8d55656af0e4810f47afb9c38570053f2a74..595dd0726a0a4a1606390cd38eb06c71399acb78 100644 --- a/tests/testEOS.c +++ b/tests/testEOS.c @@ -86,7 +86,7 @@ int main(int argc, char *argv[]) { float rho, log_rho, log_u, P; struct unit_system us; const struct phys_const *phys_const = 0; // Unused placeholder - const struct swift_params *params = 0; // Unused placeholder + struct swift_params *params = 0; // Unused placeholder const float J_kg_to_erg_g = 1e4; // Convert J/kg to erg/g char filename[64]; // Output table params