Skip to content
Snippets Groups Projects
Commit 7fc78ad2 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

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

parent 36f69c1b
Branches
Tags
No related merge requests found
...@@ -52,8 +52,8 @@ GrackleCooling: ...@@ -52,8 +52,8 @@ GrackleCooling:
MaxSteps: 1000 MaxSteps: 1000
ConvergenceLimit: 1e-2 ConvergenceLimit: 1e-2
EagleCooling: EAGLECooling:
filename: /cosma5/data/Eagle/BG_Tables/CoolingTables/ dirname: /cosma5/data/Eagle/BG_Tables/CoolingTables/
reionisation_redshift: 8.989 reionisation_redshift: 8.989
he_reion_z_center: 3.5 he_reion_z_center: 3.5
he_reion_z_sigma: 0.5 he_reion_z_sigma: 0.5
......
...@@ -27,8 +27,8 @@ EAGLEChemistry: ...@@ -27,8 +27,8 @@ EAGLEChemistry:
InitAbundance_Silicon: 6.825874e-4 InitAbundance_Silicon: 6.825874e-4
InitAbundance_Iron: 1.1032152e-3 InitAbundance_Iron: 1.1032152e-3
EagleCooling: EAGLECooling:
filename: ./coolingtables/ dirname: ./coolingtables/
reionisation_redshift: 9.5 reionisation_redshift: 9.5
He_reion_z_centre: 3.5 He_reion_z_centre: 3.5
He_reion_z_sigma: 0.5 He_reion_z_sigma: 0.5
......
...@@ -69,8 +69,8 @@ EAGLEChemistry: # Solar abundances ...@@ -69,8 +69,8 @@ EAGLEChemistry: # Solar abundances
InitAbundance_Silicon: 6.825874e-4 InitAbundance_Silicon: 6.825874e-4
InitAbundance_Iron: 1.1032152e-3 InitAbundance_Iron: 1.1032152e-3
EagleCooling: EAGLECooling:
filename: ./coolingtables/ dirname: ./coolingtables/
reionisation_redshift: 11.5 reionisation_redshift: 11.5
He_reion_z_centre: 3.5 He_reion_z_centre: 3.5
He_reion_z_sigma: 0.5 He_reion_z_sigma: 0.5
......
...@@ -78,8 +78,8 @@ EAGLEChemistry: # Solar abundances ...@@ -78,8 +78,8 @@ EAGLEChemistry: # Solar abundances
InitAbundance_Silicon: 6.825874e-4 InitAbundance_Silicon: 6.825874e-4
InitAbundance_Iron: 1.1032152e-3 InitAbundance_Iron: 1.1032152e-3
EagleCooling: EAGLECooling:
filename: ./coolingtables/ dirname: ./coolingtables/
reionisation_redshift: 11.5 reionisation_redshift: 11.5
He_reion_z_centre: 3.5 He_reion_z_centre: 3.5
He_reion_z_sigma: 0.5 He_reion_z_sigma: 0.5
......
...@@ -71,8 +71,8 @@ EAGLEChemistry: # Solar abundances ...@@ -71,8 +71,8 @@ EAGLEChemistry: # Solar abundances
InitAbundance_Silicon: 6.825874e-4 InitAbundance_Silicon: 6.825874e-4
InitAbundance_Iron: 1.1032152e-3 InitAbundance_Iron: 1.1032152e-3
EagleCooling: EAGLECooling:
filename: ./coolingtables/ dirname: ./coolingtables/
reionisation_redshift: 11.5 reionisation_redshift: 11.5
He_reion_z_centre: 3.5 He_reion_z_centre: 3.5
He_reion_z_sigma: 0.5 He_reion_z_sigma: 0.5
......
...@@ -82,8 +82,8 @@ EAGLEChemistry: # Solar abundances ...@@ -82,8 +82,8 @@ EAGLEChemistry: # Solar abundances
InitAbundance_Silicon: 6.825874e-4 InitAbundance_Silicon: 6.825874e-4
InitAbundance_Iron: 1.1032152e-3 InitAbundance_Iron: 1.1032152e-3
EagleCooling: EAGLECooling:
filename: ./coolingtables/ dirname: ./coolingtables/
reionisation_redshift: 11.5 reionisation_redshift: 11.5
He_reion_z_centre: 3.5 He_reion_z_centre: 3.5
He_reion_z_sigma: 0.5 He_reion_z_sigma: 0.5
......
...@@ -71,8 +71,8 @@ EAGLEChemistry: ...@@ -71,8 +71,8 @@ EAGLEChemistry:
InitAbundance_Silicon: 0.0 InitAbundance_Silicon: 0.0
InitAbundance_Iron: 0.0 InitAbundance_Iron: 0.0
EagleCooling: EAGLECooling:
filename: /cosma5/data/Eagle/BG_Tables/CoolingTables/ dirname: /cosma5/data/Eagle/BG_Tables/CoolingTables/
reionisation_redshift: 8.898 reionisation_redshift: 8.898
he_reion_z_center: 3.5 he_reion_z_center: 3.5
he_reion_z_sigma: 0.5 he_reion_z_sigma: 0.5
......
...@@ -63,8 +63,8 @@ LambdaCooling: ...@@ -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]) lambda_nH2_cgs: 1e-26 # Cooling rate divided by square Hydrogen number density (in cgs units [erg * s^-1 * cm^3])
# EAGLE cooling function # EAGLE cooling function
EagleCooling: EAGLECooling:
filename: ./coolingtables/ dirname: ./coolingtables/
reionisation_redshift: 8.5 reionisation_redshift: 8.5
He_reion_z_centre: 3.5 He_reion_z_centre: 3.5
He_reion_z_sigma: 0.5 He_reion_z_sigma: 0.5
......
...@@ -249,8 +249,8 @@ LambdaCooling: ...@@ -249,8 +249,8 @@ LambdaCooling:
cooling_tstep_mult: 1.0 # (Optional) Dimensionless pre-factor for the time-step condition. cooling_tstep_mult: 1.0 # (Optional) Dimensionless pre-factor for the time-step condition.
# Parameters of the EAGLE cooling model (Wiersma+08 cooling tables). # Parameters of the EAGLE cooling model (Wiersma+08 cooling tables).
EagleCooling: EAGLECooling:
filename: ./coolingtables/ # Location of the Wiersma+08 cooling tables dirname: ./coolingtables/ # Location of the Wiersma+08 cooling tables
reionisation_redshift: 8.5 # Redshift of Hydrogen re-ionization 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_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 He_reion_z_sigma: 0.5 # Spread in redshift of the Helium re-ionization Gaussian
......
...@@ -738,20 +738,20 @@ void cooling_init_backend(struct swift_params *parameter_file, ...@@ -738,20 +738,20 @@ void cooling_init_backend(struct swift_params *parameter_file,
struct cooling_function_data *cooling) { struct cooling_function_data *cooling) {
/* read some parameters */ /* read some parameters */
parser_get_param_string(parameter_file, "EagleCooling:filename", parser_get_param_string(parameter_file, "EAGLECooling:dirname",
cooling->cooling_table_path); cooling->cooling_table_path);
cooling->H_reion_z = parser_get_param_float( 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( 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( 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 = 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 = 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 = 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 */ /* convert to cgs */
cooling->He_reion_heat_cgs *= cooling->He_reion_heat_cgs *=
...@@ -816,7 +816,7 @@ void cooling_init_backend(struct swift_params *parameter_file, ...@@ -816,7 +816,7 @@ void cooling_init_backend(struct swift_params *parameter_file,
/* Check if we are running with the newton scheme */ /* Check if we are running with the newton scheme */
cooling->newton_flag = parser_get_opt_param_int( cooling->newton_flag = parser_get_opt_param_int(
parameter_file, "EagleCooling:newton_integration", 0); parameter_file, "EAGLECooling:newton_integration", 0);
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment