From ac91143d22fcdc110fa770216d63022e0476b952 Mon Sep 17 00:00:00 2001
From: "Peter W. Draper" <p.w.draper@durham.ac.uk>
Date: Fri, 15 Jun 2018 12:45:32 +0100
Subject: [PATCH] More const changes for use of struct swift_params

---
 src/chemistry.c                                      | 2 +-
 src/chemistry.h                                      | 2 +-
 src/chemistry/EAGLE/chemistry.h                      | 2 +-
 src/chemistry/GEAR/chemistry.h                       | 2 +-
 src/chemistry/none/chemistry.h                       | 2 +-
 src/cooling.c                                        | 2 +-
 src/cooling.h                                        | 2 +-
 src/cooling/EAGLE/cooling.h                          | 2 +-
 src/cooling/const_du/cooling.h                       | 2 +-
 src/cooling/const_lambda/cooling.h                   | 2 +-
 src/cooling/grackle/cooling.h                        | 2 +-
 src/cooling/grackle/cooling_io.h                     | 2 +-
 src/cooling/none/cooling.h                           | 2 +-
 src/equation_of_state/ideal_gas/equation_of_state.h  | 2 +-
 src/equation_of_state/isothermal/equation_of_state.h | 2 +-
 src/equation_of_state/planetary/equation_of_state.h  | 2 +-
 src/parallel_io.c                                    | 6 +++---
 src/potential.c                                      | 2 +-
 src/potential.h                                      | 2 +-
 src/potential/disc_patch/potential.h                 | 2 +-
 src/potential/isothermal/potential.h                 | 2 +-
 src/potential/none/potential.h                       | 2 +-
 src/potential/point_mass/potential.h                 | 2 +-
 src/potential/point_mass_ring/potential.h            | 2 +-
 src/potential/point_mass_softened/potential.h        | 2 +-
 src/potential/sine_wave/potential.h                  | 2 +-
 src/serial_io.c                                      | 4 ++--
 src/single_io.c                                      | 4 ++--
 src/sourceterms.c                                    | 2 +-
 src/sourceterms.h                                    | 2 +-
 src/sourceterms/sn_feedback/sn_feedback.h            | 2 +-
 tests/testEOS.c                                      | 2 +-
 32 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/chemistry.c b/src/chemistry.c
index 44cbea1361..4afa199258 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 bacc15c483..f9daa41db2 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 f438425b54..8b007b40fa 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 b138e66a84..abed5b9136 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 6c2e7a21a8..2114b1c85f 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 57d1928a5d..154b859f74 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 9d1001d360..0fb04b9e48 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 bdf3801887..6227dd2426 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 ba82111749..f436e1e283 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 43ca7ab75b..e54071204c 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 dd59e9af14..cb77b63294 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 5a6edb8f1c..faf84cf97d 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 5081c7cbe6..bf096ff84e 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 36b3511558..0d57f6a5ce 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 c7afac6caa..540bf073ce 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 d7a7f64f87..2a0fe66b49 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 039cb85bae..8720a6ce6e 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 1fda6fc875..a313598dae 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 680d4e235f..814b83c691 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 ab229d009c..290f4847e8 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 c974618d7b..a9d3c7d6c3 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 a8550cad70..c96b5e80f1 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 adea9d9120..0939adcb07 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 ebf047ea7c..5c38380a23 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 83a79ea3cd..92f0ba1451 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 1a4ee8aae8..9b72d36c1e 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 a87495c935..136097f0e7 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 58ae7b97b9..31aa40b399 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 994658740a..993045e615 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 a5d0c3c727..407d2f1936 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 f2f224ce87..411673c37e 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 e14b8d5565..595dd0726a 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
-- 
GitLab