Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SWIFT
SWIFTsim
Commits
7fc78ad2
Commit
7fc78ad2
authored
Jan 03, 2019
by
Matthieu Schaller
Browse files
More uniform convention for the EAGLE cooling function in the YAML files.
parent
36f69c1b
Changes
10
Hide whitespace changes
Inline
Side-by-side
examples/CoolingBox/coolingBox.yml
View file @
7fc78ad2
...
...
@@ -52,8 +52,8 @@ GrackleCooling:
MaxSteps
:
1000
ConvergenceLimit
:
1e-2
E
agle
Cooling
:
file
name
:
/cosma5/data/Eagle/BG_Tables/CoolingTables/
E
AGLE
Cooling
:
dir
name
:
/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
View file @
7fc78ad2
...
...
@@ -27,8 +27,8 @@ EAGLEChemistry:
InitAbundance_Silicon
:
6.825874e-4
InitAbundance_Iron
:
1.1032152e-3
E
agle
Cooling
:
file
name
:
./coolingtables/
E
AGLE
Cooling
:
dir
name
:
./coolingtables/
reionisation_redshift
:
9.5
He_reion_z_centre
:
3.5
He_reion_z_sigma
:
0.5
...
...
examples/EAGLE_12/eagle_12.yml
View file @
7fc78ad2
...
...
@@ -69,8 +69,8 @@ EAGLEChemistry: # Solar abundances
InitAbundance_Silicon
:
6.825874e-4
InitAbundance_Iron
:
1.1032152e-3
E
agle
Cooling
:
file
name
:
./coolingtables/
E
AGLE
Cooling
:
dir
name
:
./coolingtables/
reionisation_redshift
:
11.5
He_reion_z_centre
:
3.5
He_reion_z_sigma
:
0.5
...
...
examples/EAGLE_25/eagle_25.yml
View file @
7fc78ad2
...
...
@@ -78,8 +78,8 @@ EAGLEChemistry: # Solar abundances
InitAbundance_Silicon
:
6.825874e-4
InitAbundance_Iron
:
1.1032152e-3
E
agle
Cooling
:
file
name
:
./coolingtables/
E
AGLE
Cooling
:
dir
name
:
./coolingtables/
reionisation_redshift
:
11.5
He_reion_z_centre
:
3.5
He_reion_z_sigma
:
0.5
...
...
examples/EAGLE_50/eagle_50.yml
View file @
7fc78ad2
...
...
@@ -71,8 +71,8 @@ EAGLEChemistry: # Solar abundances
InitAbundance_Silicon
:
6.825874e-4
InitAbundance_Iron
:
1.1032152e-3
E
agle
Cooling
:
file
name
:
./coolingtables/
E
AGLE
Cooling
:
dir
name
:
./coolingtables/
reionisation_redshift
:
11.5
He_reion_z_centre
:
3.5
He_reion_z_sigma
:
0.5
...
...
examples/EAGLE_6/eagle_6.yml
View file @
7fc78ad2
...
...
@@ -82,8 +82,8 @@ EAGLEChemistry: # Solar abundances
InitAbundance_Silicon
:
6.825874e-4
InitAbundance_Iron
:
1.1032152e-3
E
agle
Cooling
:
file
name
:
./coolingtables/
E
AGLE
Cooling
:
dir
name
:
./coolingtables/
reionisation_redshift
:
11.5
He_reion_z_centre
:
3.5
He_reion_z_sigma
:
0.5
...
...
examples/SantaBarbara/santa_barbara.yml
View file @
7fc78ad2
...
...
@@ -71,8 +71,8 @@ EAGLEChemistry:
InitAbundance_Silicon
:
0.0
InitAbundance_Iron
:
0.0
E
agle
Cooling
:
file
name
:
/cosma5/data/Eagle/BG_Tables/CoolingTables/
E
AGLE
Cooling
:
dir
name
:
/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
View file @
7fc78ad2
...
...
@@ -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
E
agle
Cooling
:
file
name
:
./coolingtables/
E
AGLE
Cooling
:
dir
name
:
./coolingtables/
reionisation_redshift
:
8.5
He_reion_z_centre
:
3.5
He_reion_z_sigma
:
0.5
...
...
examples/parameter_example.yml
View file @
7fc78ad2
...
...
@@ -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).
E
agle
Cooling
:
file
name
:
./coolingtables/
# Location of the Wiersma+08 cooling tables
E
AGLE
Cooling
:
dir
name
:
./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
View file @
7fc78ad2
...
...
@@ -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
,
"E
agle
Cooling:
file
name"
,
parser_get_param_string
(
parameter_file
,
"E
AGLE
Cooling:
dir
name"
,
cooling
->
cooling_table_path
);
cooling
->
H_reion_z
=
parser_get_param_float
(
parameter_file
,
"E
agle
Cooling:reionisation_redshift"
);
parameter_file
,
"E
AGLE
Cooling: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
,
"E
agle
Cooling:He_reion_z_centre"
);
parser_get_param_float
(
parameter_file
,
"E
AGLE
Cooling:He_reion_z_centre"
);
cooling
->
He_reion_z_sigma
=
parser_get_param_float
(
parameter_file
,
"E
agle
Cooling:He_reion_z_sigma"
);
parser_get_param_float
(
parameter_file
,
"E
AGLE
Cooling:He_reion_z_sigma"
);
cooling
->
He_reion_heat_cgs
=
parser_get_param_float
(
parameter_file
,
"E
agle
Cooling:He_reion_ev_pH"
);
parser_get_param_float
(
parameter_file
,
"E
AGLE
Cooling: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
,
"E
agle
Cooling:newton_integration"
,
0
);
parameter_file
,
"E
AGLE
Cooling:newton_integration"
,
0
);
}
/**
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment