diff --git a/doc/RTD/source/SubgridModels/EAGLE/index.rst b/doc/RTD/source/SubgridModels/EAGLE/index.rst index 8ce5f09de4e7ed0d576ad9d9a3a37c7b3b6e6333..56736cc4cca4bd9042a2c84d07dcf535f48c566c 100644 --- a/doc/RTD/source/SubgridModels/EAGLE/index.rst +++ b/doc/RTD/source/SubgridModels/EAGLE/index.rst @@ -508,10 +508,10 @@ For a normal EAGLE run, that section of the parameter file reads: EOS_gamma_effective: 1.3333333 # Slope the of the polytropic EOS assumed for the star-forming gas. KS_normalisation: 1.515e-4 # The normalization of the Kennicutt-Schmidt law in Msun / kpc^2 / yr. KS_exponent: 1.4 # The exponent of the Kennicutt-Schmidt law. - KS_min_over_density: 57.7 # The over-density above which star-formation is allowed. + min_over_density: 57.7 # The over-density above which star-formation is allowed. KS_high_density_threshold_H_p_cm3: 1e3 # Hydrogen number density above which the Kennicut-Schmidt law changes slope in Hydrogen atoms per cm^3. KS_high_density_exponent: 2.0 # Slope of the Kennicut-Schmidt law above the high-density threshold. - KS_temperature_margin_dex: 0.5 # (Optional) Logarithm base 10 of the maximal temperature difference above the EOS allowed to form stars. + EOS_temperature_margin_dex: 0.5 # (Optional) Logarithm base 10 of the maximal temperature difference above the EOS allowed to form stars. KS_max_density_threshold_H_p_cm3: 1e5 # (Optional) Hydrogen number density above which a particle gets automatically turned into a star in Hydrogen atoms per cm^3. threshold_norm_H_p_cm3: 0.1 # Normalisation of the metal-dependant density threshold for star formation in Hydrogen atoms per cm^3. threshold_Z0: 0.002 # Reference metallicity (metal mass fraction) for the metal-dependant threshold for star formation. diff --git a/examples/EAGLE_ICs/EAGLE_12/eagle_12.yml b/examples/EAGLE_ICs/EAGLE_12/eagle_12.yml index a7362bf88a3898f687667ea110153ece4a8ade08..eccf8529098eea1e157619d07d3c588bb30ef289 100644 --- a/examples/EAGLE_ICs/EAGLE_12/eagle_12.yml +++ b/examples/EAGLE_ICs/EAGLE_12/eagle_12.yml @@ -105,10 +105,10 @@ EAGLEStarFormation: EOS_gamma_effective: 1.3333333 # Slope the of the polytropic EOS assumed for the star-forming gas. KS_normalisation: 1.515e-4 # The normalization of the Kennicutt-Schmidt law in Msun / kpc^2 / yr. KS_exponent: 1.4 # The exponent of the Kennicutt-Schmidt law. - KS_min_over_density: 57.7 # The over-density above which star-formation is allowed. + min_over_density: 57.7 # The over-density above which star-formation is allowed. KS_high_density_threshold_H_p_cm3: 1e3 # Hydrogen number density above which the Kennicut-Schmidt law changes slope in Hydrogen atoms per cm^3. KS_high_density_exponent: 2.0 # Slope of the Kennicut-Schmidt law above the high-density threshold. - KS_temperature_margin_dex: 0.5 # Logarithm base 10 of the maximal temperature difference above the EOS allowed to form stars. + EOS_temperature_margin_dex: 0.5 # Logarithm base 10 of the maximal temperature difference above the EOS allowed to form stars. threshold_norm_H_p_cm3: 0.1 # Normalisation of the metal-dependant density threshold for star formation in Hydrogen atoms per cm^3. threshold_Z0: 0.002 # Reference metallicity (metal mass fraction) for the metal-dependant threshold for star formation. threshold_slope: -0.64 # Slope of the metal-dependant star formation threshold diff --git a/examples/EAGLE_ICs/EAGLE_25/eagle_25.yml b/examples/EAGLE_ICs/EAGLE_25/eagle_25.yml index ed1782127f7d80ba6d6802c256eeb9db9724d04f..a960af6dd9ff949053c5a053ae29a7bd97e19d9c 100644 --- a/examples/EAGLE_ICs/EAGLE_25/eagle_25.yml +++ b/examples/EAGLE_ICs/EAGLE_25/eagle_25.yml @@ -106,10 +106,10 @@ EAGLEStarFormation: EOS_gamma_effective: 1.3333333 # Slope the of the polytropic EOS assumed for the star-forming gas. KS_normalisation: 1.515e-4 # The normalization of the Kennicutt-Schmidt law in Msun / kpc^2 / yr. KS_exponent: 1.4 # The exponent of the Kennicutt-Schmidt law. - KS_min_over_density: 57.7 # The over-density above which star-formation is allowed. + min_over_density: 57.7 # The over-density above which star-formation is allowed. KS_high_density_threshold_H_p_cm3: 1e3 # Hydrogen number density above which the Kennicut-Schmidt law changes slope in Hydrogen atoms per cm^3. KS_high_density_exponent: 2.0 # Slope of the Kennicut-Schmidt law above the high-density threshold. - KS_temperature_margin_dex: 0.5 # Logarithm base 10 of the maximal temperature difference above the EOS allowed to form stars. + EOS_temperature_margin_dex: 0.5 # Logarithm base 10 of the maximal temperature difference above the EOS allowed to form stars. threshold_norm_H_p_cm3: 0.1 # Normalisation of the metal-dependant density threshold for star formation in Hydrogen atoms per cm^3. threshold_Z0: 0.002 # Reference metallicity (metal mass fraction) for the metal-dependant threshold for star formation. threshold_slope: -0.64 # Slope of the metal-dependant star formation threshold diff --git a/examples/EAGLE_ICs/EAGLE_50/eagle_50.yml b/examples/EAGLE_ICs/EAGLE_50/eagle_50.yml index ca8eec7246bc0d3a0d6b10f8f75f0db6741f4f5b..b31a77d87669d5786ab1fdb904e1f6683b9dece9 100644 --- a/examples/EAGLE_ICs/EAGLE_50/eagle_50.yml +++ b/examples/EAGLE_ICs/EAGLE_50/eagle_50.yml @@ -106,10 +106,10 @@ EAGLEStarFormation: EOS_gamma_effective: 1.3333333 # Slope the of the polytropic EOS assumed for the star-forming gas. KS_normalisation: 1.515e-4 # The normalization of the Kennicutt-Schmidt law in Msun / kpc^2 / yr. KS_exponent: 1.4 # The exponent of the Kennicutt-Schmidt law. - KS_min_over_density: 57.7 # The over-density above which star-formation is allowed. + min_over_density: 57.7 # The over-density above which star-formation is allowed. KS_high_density_threshold_H_p_cm3: 1e3 # Hydrogen number density above which the Kennicut-Schmidt law changes slope in Hydrogen atoms per cm^3. KS_high_density_exponent: 2.0 # Slope of the Kennicut-Schmidt law above the high-density threshold. - KS_temperature_margin_dex: 0.5 # Logarithm base 10 of the maximal temperature difference above the EOS allowed to form stars. + EOS_temperature_margin_dex: 0.5 # Logarithm base 10 of the maximal temperature difference above the EOS allowed to form stars. threshold_norm_H_p_cm3: 0.1 # Normalisation of the metal-dependant density threshold for star formation in Hydrogen atoms per cm^3. threshold_Z0: 0.002 # Reference metallicity (metal mass fraction) for the metal-dependant threshold for star formation. threshold_slope: -0.64 # Slope of the metal-dependant star formation threshold @@ -171,4 +171,4 @@ EAGLEAGN: AGN_delta_T_K: 3.16228e8 # Change in temperature to apply to the gas particle in an AGN feedback event in Kelvin. AGN_num_ngb_to_heat: 1. # Target number of gas neighbours to heat in an AGN feedback event. - \ No newline at end of file + diff --git a/examples/EAGLE_low_z/EAGLE_12/eagle_12.yml b/examples/EAGLE_low_z/EAGLE_12/eagle_12.yml index 434840636aceca6f6372cecfc5529a743a5cdc57..24e66cd999b7380f11a201b35ea2f929c5ae7a93 100644 --- a/examples/EAGLE_low_z/EAGLE_12/eagle_12.yml +++ b/examples/EAGLE_low_z/EAGLE_12/eagle_12.yml @@ -94,10 +94,10 @@ EAGLEStarFormation: EOS_gamma_effective: 1.3333333 # Slope the of the polytropic EOS assumed for the star-forming gas. KS_normalisation: 1.515e-4 # The normalization of the Kennicutt-Schmidt law in Msun / kpc^2 / yr. KS_exponent: 1.4 # The exponent of the Kennicutt-Schmidt law. - KS_min_over_density: 57.7 # The over-density above which star-formation is allowed. + min_over_density: 57.7 # The over-density above which star-formation is allowed. KS_high_density_threshold_H_p_cm3: 1e3 # Hydrogen number density above which the Kennicut-Schmidt law changes slope in Hydrogen atoms per cm^3. KS_high_density_exponent: 2.0 # Slope of the Kennicut-Schmidt law above the high-density threshold. - KS_temperature_margin_dex: 0.5 # Logarithm base 10 of the maximal temperature difference above the EOS allowed to form stars. + EOS_temperature_margin_dex: 0.5 # Logarithm base 10 of the maximal temperature difference above the EOS allowed to form stars. threshold_norm_H_p_cm3: 0.1 # Normalisation of the metal-dependant density threshold for star formation in Hydrogen atoms per cm^3. threshold_Z0: 0.002 # Reference metallicity (metal mass fraction) for the metal-dependant threshold for star formation. threshold_slope: -0.64 # Slope of the metal-dependant star formation threshold diff --git a/examples/EAGLE_low_z/EAGLE_25/eagle_25.yml b/examples/EAGLE_low_z/EAGLE_25/eagle_25.yml index 484eb885c4a47d92ebc82a978b1fe0d3973a00ff..7d47d39481e2f2794e83660ac0868d624e6b38ad 100644 --- a/examples/EAGLE_low_z/EAGLE_25/eagle_25.yml +++ b/examples/EAGLE_low_z/EAGLE_25/eagle_25.yml @@ -101,10 +101,10 @@ EAGLEStarFormation: EOS_gamma_effective: 1.3333333 # Slope the of the polytropic EOS assumed for the star-forming gas. KS_normalisation: 1.515e-4 # The normalization of the Kennicutt-Schmidt law in Msun / kpc^2 / yr. KS_exponent: 1.4 # The exponent of the Kennicutt-Schmidt law. - KS_min_over_density: 57.7 # The over-density above which star-formation is allowed. + min_over_density: 57.7 # The over-density above which star-formation is allowed. KS_high_density_threshold_H_p_cm3: 1e3 # Hydrogen number density above which the Kennicut-Schmidt law changes slope in Hydrogen atoms per cm^3. KS_high_density_exponent: 2.0 # Slope of the Kennicut-Schmidt law above the high-density threshold. - KS_temperature_margin_dex: 0.5 # Logarithm base 10 of the maximal temperature difference above the EOS allowed to form stars. + EOS_temperature_margin_dex: 0.5 # Logarithm base 10 of the maximal temperature difference above the EOS allowed to form stars. threshold_norm_H_p_cm3: 0.1 # Normalisation of the metal-dependant density threshold for star formation in Hydrogen atoms per cm^3. threshold_Z0: 0.002 # Reference metallicity (metal mass fraction) for the metal-dependant threshold for star formation. threshold_slope: -0.64 # Slope of the metal-dependant star formation threshold diff --git a/examples/EAGLE_low_z/EAGLE_50/eagle_50.yml b/examples/EAGLE_low_z/EAGLE_50/eagle_50.yml index 66df7929b9432eaad153dcd1a9b55da396f2e8be..e36eb4ad8d814b7d37006578a2c2796f3ec934b9 100644 --- a/examples/EAGLE_low_z/EAGLE_50/eagle_50.yml +++ b/examples/EAGLE_low_z/EAGLE_50/eagle_50.yml @@ -96,10 +96,10 @@ EAGLEStarFormation: EOS_gamma_effective: 1.3333333 # Slope the of the polytropic EOS assumed for the star-forming gas. KS_normalisation: 1.515e-4 # The normalization of the Kennicutt-Schmidt law in Msun / kpc^2 / yr. KS_exponent: 1.4 # The exponent of the Kennicutt-Schmidt law. - KS_min_over_density: 57.7 # The over-density above which star-formation is allowed. + min_over_density: 57.7 # The over-density above which star-formation is allowed. KS_high_density_threshold_H_p_cm3: 1e3 # Hydrogen number density above which the Kennicut-Schmidt law changes slope in Hydrogen atoms per cm^3. KS_high_density_exponent: 2.0 # Slope of the Kennicut-Schmidt law above the high-density threshold. - KS_temperature_margin_dex: 0.5 # Logarithm base 10 of the maximal temperature difference above the EOS allowed to form stars. + EOS_temperature_margin_dex: 0.5 # Logarithm base 10 of the maximal temperature difference above the EOS allowed to form stars. threshold_norm_H_p_cm3: 0.1 # Normalisation of the metal-dependant density threshold for star formation in Hydrogen atoms per cm^3. threshold_Z0: 0.002 # Reference metallicity (metal mass fraction) for the metal-dependant threshold for star formation. threshold_slope: -0.64 # Slope of the metal-dependant star formation threshold diff --git a/examples/EAGLE_low_z/EAGLE_6/eagle_6.yml b/examples/EAGLE_low_z/EAGLE_6/eagle_6.yml index 5506ad242bff579ac4f6ec6ef23dbb8597eb65a9..caaebdb7c4876b0f70459a817f3ab4758d833216 100644 --- a/examples/EAGLE_low_z/EAGLE_6/eagle_6.yml +++ b/examples/EAGLE_low_z/EAGLE_6/eagle_6.yml @@ -105,10 +105,10 @@ EAGLEStarFormation: EOS_gamma_effective: 1.3333333 # Slope the of the polytropic EOS assumed for the star-forming gas. KS_normalisation: 1.515e-4 # The normalization of the Kennicutt-Schmidt law in Msun / kpc^2 / yr. KS_exponent: 1.4 # The exponent of the Kennicutt-Schmidt law. - KS_min_over_density: 57.7 # The over-density above which star-formation is allowed. + min_over_density: 57.7 # The over-density above which star-formation is allowed. KS_high_density_threshold_H_p_cm3: 1e3 # Hydrogen number density above which the Kennicut-Schmidt law changes slope in Hydrogen atoms per cm^3. KS_high_density_exponent: 2.0 # Slope of the Kennicut-Schmidt law above the high-density threshold. - KS_temperature_margin_dex: 0.5 # Logarithm base 10 of the maximal temperature difference above the EOS allowed to form stars. + EOS_temperature_margin_dex: 0.5 # Logarithm base 10 of the maximal temperature difference above the EOS allowed to form stars. threshold_norm_H_p_cm3: 0.1 # Normalisation of the metal-dependant density threshold for star formation in Hydrogen atoms per cm^3. threshold_Z0: 0.002 # Reference metallicity (metal mass fraction) for the metal-dependant threshold for star formation. threshold_slope: -0.64 # Slope of the metal-dependant star formation threshold diff --git a/examples/IsolatedGalaxy/IsolatedGalaxy_feedback/isolated_galaxy.yml b/examples/IsolatedGalaxy/IsolatedGalaxy_feedback/isolated_galaxy.yml index e2aa942d424f401d0b12ddafd32c4e2d4b188bc1..4d3485d838f56067cbb8493c79d06dff8a3dceba 100644 --- a/examples/IsolatedGalaxy/IsolatedGalaxy_feedback/isolated_galaxy.yml +++ b/examples/IsolatedGalaxy/IsolatedGalaxy_feedback/isolated_galaxy.yml @@ -88,10 +88,10 @@ EAGLEStarFormation: gas_fraction: 0.3 # The gas fraction used internally by the model. KS_normalisation: 1.515e-4 # The normalization of the Kennicutt-Schmidt law in Msun / kpc^2 / yr. KS_exponent: 1.4 # The exponent of the Kennicutt-Schmidt law. - KS_min_over_density: 57.7 # The over-density above which star-formation is allowed. + min_over_density: 57.7 # The over-density above which star-formation is allowed. KS_high_density_threshold_H_p_cm3: 1e3 # Hydrogen number density above which the Kennicut-Schmidt law changes slope in Hydrogen atoms per cm^3. KS_high_density_exponent: 2.0 # Slope of the Kennicut-Schmidt law above the high-density threshold. - KS_temperature_margin_dex: 0.5 # Logarithm base 10 of the maximal temperature difference above the EOS allowed to form stars. + EOS_temperature_margin_dex: 0.5 # Logarithm base 10 of the maximal temperature difference above the EOS allowed to form stars. threshold_norm_H_p_cm3: 0.1 # Normalisation of the metal-dependant density threshold for star formation in Hydrogen atoms per cm^3. threshold_Z0: 0.002 # Reference metallicity (metal mass fraction) for the metal-dependant threshold for star formation. threshold_slope: -0.64 # Slope of the metal-dependant star formation threshold diff --git a/examples/IsolatedGalaxy/IsolatedGalaxy_starformation/isolated_galaxy.yml b/examples/IsolatedGalaxy/IsolatedGalaxy_starformation/isolated_galaxy.yml index 078d5bb48a5b57856fe1d28e8d0890f05152a380..d347e1ad5bd8ddf6c132fade07e5d50688a451b0 100644 --- a/examples/IsolatedGalaxy/IsolatedGalaxy_starformation/isolated_galaxy.yml +++ b/examples/IsolatedGalaxy/IsolatedGalaxy_starformation/isolated_galaxy.yml @@ -89,10 +89,10 @@ EAGLEStarFormation: gas_fraction: 0.3 # The gas fraction used internally by the model. KS_normalisation: 1.515e-4 # The normalization of the Kennicutt-Schmidt law in Msun / kpc^2 / yr. KS_exponent: 1.4 # The exponent of the Kennicutt-Schmidt law. - KS_min_over_density: 57.7 # The over-density above which star-formation is allowed. + min_over_density: 57.7 # The over-density above which star-formation is allowed. KS_high_density_threshold_H_p_cm3: 1e3 # Hydrogen number density above which the Kennicut-Schmidt law changes slope in Hydrogen atoms per cm^3. KS_high_density_exponent: 2.0 # Slope of the Kennicut-Schmidt law above the high-density threshold. - KS_temperature_margin_dex: 0.5 # Logarithm base 10 of the maximal temperature difference above the EOS allowed to form stars. + EOS_temperature_margin_dex: 0.5 # Logarithm base 10 of the maximal temperature difference above the EOS allowed to form stars. threshold_norm_H_p_cm3: 0.1 # Normalisation of the metal-dependant density threshold for star formation in Hydrogen atoms per cm^3. threshold_Z0: 0.002 # Reference metallicity (metal mass fraction) for the metal-dependant threshold for star formation. threshold_slope: -0.64 # Slope of the metal-dependant star formation threshold diff --git a/examples/parameter_example.yml b/examples/parameter_example.yml index 176508f5c514b79515f3955679414ec99043b653..eec64eb7e7c03640e344ec37419b06e3b3c1b663 100644 --- a/examples/parameter_example.yml +++ b/examples/parameter_example.yml @@ -344,11 +344,11 @@ EAGLEStarFormation: gas_fraction: 0.25 # (Optional) The gas fraction used internally by the model (Defaults to 1). KS_normalisation: 1.515e-4 # The normalization of the Kennicutt-Schmidt law in Msun / kpc^2 / yr. KS_exponent: 1.4 # The exponent of the Kennicutt-Schmidt law. - KS_min_over_density: 57.7 # The over-density above which star-formation is allowed. + min_over_density: 57.7 # The over-density above which star-formation is allowed. KS_high_density_threshold_H_p_cm3: 1e3 # Hydrogen number density above which the Kennicut-Schmidt law changes slope in Hydrogen atoms per cm^3. KS_high_density_exponent: 2.0 # Slope of the Kennicut-Schmidt law above the high-density threshold. KS_max_density_threshold_H_p_cm3: 1e5 # (Optional) Density above which a gas particle gets automatically turned into a star in Hydrogen atoms per cm^3 (Defaults to FLT_MAX). - KS_temperature_margin_dex: 0.5 # (Optional) Logarithm base 10 of the maximal temperature difference above the EOS allowed to form stars (Defaults to FLT_MAX). + EOS_temperature_margin_dex: 0.5 # (Optional) Logarithm base 10 of the maximal temperature difference above the EOS allowed to form stars (Defaults to FLT_MAX). threshold_norm_H_p_cm3: 0.1 # Normalisation of the metal-dependant density threshold for star formation in Hydrogen atoms per cm^3. threshold_Z0: 0.002 # Reference metallicity (metal mass fraction) for the metal-dependant threshold for star formation. threshold_slope: -0.64 # Slope of the metal-dependant star formation threshold diff --git a/src/star_formation/EAGLE/star_formation.h b/src/star_formation/EAGLE/star_formation.h index c8cc5c279f3ba3d6377f8d3692091f53f86f2602..1fc6531656c94c566e1ffac502b5023e09094872 100644 --- a/src/star_formation/EAGLE/star_formation.h +++ b/src/star_formation/EAGLE/star_formation.h @@ -485,7 +485,7 @@ INLINE static void starformation_init_backend( /* Read the critical density contrast from the parameter file*/ starform->min_over_den = parser_get_param_double( - parameter_file, "EAGLEStarFormation:KS_min_over_density"); + parameter_file, "EAGLEStarFormation:min_over_density"); /* Read the gas fraction from the file */ starform->fgas = parser_get_opt_param_double( @@ -559,7 +559,7 @@ INLINE static void starformation_init_backend( starform->max_gas_density_HpCM3 * number_density_from_cgs; starform->temperature_margin_threshold_dex = parser_get_opt_param_double( - parameter_file, "EAGLEStarFormation:KS_temperature_margin_dex", FLT_MAX); + parameter_file, "EAGLEStarFormation:EOS_temperature_margin_dex", FLT_MAX); starform->ten_to_temperature_margin_threshold_dex = exp10(starform->temperature_margin_threshold_dex);