More uniform convention for the EAGLE cooling function in the YAML files.

examples/CoolingBox/coolingBox.yml

@@ -52,8 +52,8 @@ GrackleCooling:
   MaxSteps: 1000
   ConvergenceLimit: 1e-2
   
-EagleCooling:
-  filename:                /cosma5/data/Eagle/BG_Tables/CoolingTables/
+EAGLECooling:
+  dirname:                 /cosma5/data/Eagle/BG_Tables/CoolingTables/
   reionisation_redshift:   8.989
   he_reion_z_center:       3.5
   he_reion_z_sigma:        0.5

examples/CoolingRates/cooling_rates.yml

@@ -27,8 +27,8 @@ EAGLEChemistry:
   InitAbundance_Silicon:   6.825874e-4
   InitAbundance_Iron:      1.1032152e-3
 
-EagleCooling:
-  filename:                ./coolingtables/
+EAGLECooling:
+  dirname:                 ./coolingtables/
   reionisation_redshift:   9.5
   He_reion_z_centre:       3.5
   He_reion_z_sigma:        0.5

examples/EAGLE_12/eagle_12.yml

@@ -69,8 +69,8 @@ EAGLEChemistry: 	    # Solar abundances
   InitAbundance_Silicon:    6.825874e-4
   InitAbundance_Iron:       1.1032152e-3
 
-EagleCooling:
-  filename:                ./coolingtables/
+EAGLECooling:
+  dirname:                 ./coolingtables/
   reionisation_redshift:   11.5
   He_reion_z_centre:       3.5
   He_reion_z_sigma:        0.5

examples/EAGLE_25/eagle_25.yml

@@ -78,8 +78,8 @@ EAGLEChemistry: 	    # Solar abundances
   InitAbundance_Silicon:    6.825874e-4
   InitAbundance_Iron:       1.1032152e-3
 
-EagleCooling:
-  filename:                ./coolingtables/
+EAGLECooling:
+  dirname:                 ./coolingtables/
   reionisation_redshift:   11.5
   He_reion_z_centre:       3.5
   He_reion_z_sigma:        0.5

examples/EAGLE_50/eagle_50.yml

@@ -71,8 +71,8 @@ EAGLEChemistry: 	    # Solar abundances
   InitAbundance_Silicon:    6.825874e-4
   InitAbundance_Iron:       1.1032152e-3
 
-EagleCooling:
-  filename:                ./coolingtables/
+EAGLECooling:
+  dirname:                 ./coolingtables/
   reionisation_redshift:   11.5
   He_reion_z_centre:       3.5
   He_reion_z_sigma:        0.5

examples/EAGLE_6/eagle_6.yml

@@ -82,8 +82,8 @@ EAGLEChemistry: 	    # Solar abundances
   InitAbundance_Silicon:    6.825874e-4
   InitAbundance_Iron:       1.1032152e-3
 
-EagleCooling:
-  filename:                ./coolingtables/
+EAGLECooling:
+  dirname:                 ./coolingtables/
   reionisation_redshift:   11.5
   He_reion_z_centre:       3.5
   He_reion_z_sigma:        0.5

examples/SantaBarbara/santa_barbara.yml

@@ -71,8 +71,8 @@ EAGLEChemistry:
   InitAbundance_Silicon:   0.0
   InitAbundance_Iron:      0.0
 
-EagleCooling:
-  filename:                /cosma5/data/Eagle/BG_Tables/CoolingTables/
+EAGLECooling:
+  dirname:                 /cosma5/data/Eagle/BG_Tables/CoolingTables/
   reionisation_redshift:   8.898
   he_reion_z_center:       3.5
   he_reion_z_sigma:        0.5

examples/SmallCosmoVolume_cooling/small_cosmo_volume.yml

@@ -63,8 +63,8 @@ LambdaCooling:
   lambda_nH2_cgs:              1e-26 # Cooling rate divided by square Hydrogen number density (in cgs units [erg * s^-1 * cm^3])
 
 # EAGLE cooling function
-EagleCooling:
-  filename:                ./coolingtables/
+EAGLECooling:
+  dirname:                 ./coolingtables/
   reionisation_redshift:   8.5
   He_reion_z_centre:       3.5
   He_reion_z_sigma:        0.5

examples/parameter_example.yml

@@ -249,8 +249,8 @@ LambdaCooling:
   cooling_tstep_mult:          1.0   # (Optional) Dimensionless pre-factor for the time-step condition.
 
 # Parameters of the EAGLE cooling model (Wiersma+08 cooling tables).
-EagleCooling:
-  filename:                  ./coolingtables/  # Location of the Wiersma+08 cooling tables
+EAGLECooling:
+  dirname:                   ./coolingtables/  # Location of the Wiersma+08 cooling tables
   reionisation_redshift:     8.5               # Redshift of Hydrogen re-ionization
   He_reion_z_centre:         3.5               # Redshift of the centre of the Helium re-ionization Gaussian
   He_reion_z_sigma:          0.5               # Spread in redshift of the  Helium re-ionization Gaussian

src/cooling/EAGLE/cooling.c

@@ -738,20 +738,20 @@ void cooling_init_backend(struct swift_params *parameter_file,
                           struct cooling_function_data *cooling) {
 
   /* read some parameters */
-  parser_get_param_string(parameter_file, "EagleCooling:filename",
+  parser_get_param_string(parameter_file, "EAGLECooling:dirname",
                           cooling->cooling_table_path);
   cooling->H_reion_z = parser_get_param_float(
-      parameter_file, "EagleCooling:reionisation_redshift");
+      parameter_file, "EAGLECooling:reionisation_redshift");
   cooling->Ca_over_Si_ratio_in_solar = parser_get_opt_param_float(
-      parameter_file, "EAGLECooling:CalciumOverSiliconInSolar", 1.f);
+      parameter_file, "EAGLECooling::CalciumOverSiliconInSolar", 1.f);
   cooling->S_over_Si_ratio_in_solar = parser_get_opt_param_float(
-      parameter_file, "EAGLECooling:SulphurOverSiliconInSolar", 1.f);
+      parameter_file, "EAGLECooling::SulphurOverSiliconInSolar", 1.f);
   cooling->He_reion_z_centre =
-      parser_get_param_float(parameter_file, "EagleCooling:He_reion_z_centre");
+      parser_get_param_float(parameter_file, "EAGLECooling:He_reion_z_centre");
   cooling->He_reion_z_sigma =
-      parser_get_param_float(parameter_file, "EagleCooling:He_reion_z_sigma");
+      parser_get_param_float(parameter_file, "EAGLECooling:He_reion_z_sigma");
   cooling->He_reion_heat_cgs =
-      parser_get_param_float(parameter_file, "EagleCooling:He_reion_ev_pH");
+      parser_get_param_float(parameter_file, "EAGLECooling:He_reion_ev_pH");
 
   /* convert to cgs */
   cooling->He_reion_heat_cgs *=
@@ -816,7 +816,7 @@ void cooling_init_backend(struct swift_params *parameter_file,
 
   /* Check if we are running with the newton scheme */
   cooling->newton_flag = parser_get_opt_param_int(
-      parameter_file, "EagleCooling:newton_integration", 0);
+      parameter_file, "EAGLECooling:newton_integration", 0);
 }
 
 /**