diff --git a/examples/parameter_example.yml b/examples/parameter_example.yml
index efbd105bdea21c2dfd88d7a6bce7a97099e37f44..c5d4c1b20cf598ba6722a781dcf17434b79e7de9 100644
--- a/examples/parameter_example.yml
+++ b/examples/parameter_example.yml
@@ -290,21 +290,20 @@ SchayeSF:
thresh_MinOverDens: 57.7 # The critical density contrast to form stars
thresh_temp: 1e5 # The critical temperature to form stars
fg: 0.25 # The mass fraction in gas
- SchmidtLawCoeff_MSUNpYRpKPC2: 2.5e-4 # (optional) The normalization of the Kennicutt-Schmidt law
- SchmidtLawExponent: 1.4 # (optional) The power law of the Kennicutt-Schmidt law
- SchmidtLawHighDensExponent: 2.0 # (optional) The high density exponent for the Kennicutt-Schmidt law
+ SchmidtLawCoeff_MSUNpYRpKPC2: 1.515e-4 # The normalization of the Kennicutt-Schmidt law
+ SchmidtLawExponent: 1.4 # The power law of the Kennicutt-Schmidt law
+ SchmidtLawHighDensExponent: 2.0 # The high density exponent for the Kennicutt-Schmidt law
SchmidtLawHighDens_thresh_HpCM3: 1e3
- gamma: 1.6667 # (optional) The heat capacity ratio (gamma)
- Schaye2004: 1 # (optional) whether to use the metallicity dependent critical star formation of Schaye (2004) (1) or not (0).
- thresh_norm_HpCM3: .1 # (optional) Critical sf normalization to use (is not a normalization when Schaye2004=0, than it is the value.
- thresh_max_norm_HpCM3: 10.0 # (optional) Maximum norm of the critical sf density
- MetDep_Z0: 0.002 # (optional) Scale metallicity to use for the equation (not used for Schaye2004=0)
- MetDep_SFthresh_Slope: -0.64 # (optional) Scaling of the critical density with the metallicity (not used for Schaye2004=0)
- thresh_MaxPhysDensOn: 0 # (optional) Default is 0.
- thresh_MaxOverDens_HpCM3: 1e5 # (optional) Density at which the SF law changes
- EOS_Jeans_GammaEffective: 1.33333 # (optional) The polytropic index
- EOS_Jeans_PressureNorm: 1e3 # (optional) No idea how this works
- EOS_JEANS_den0: .1 # (optional) No idea what the value is.
+ Schaye2004: 1 # whether to use the metallicity dependent critical star formation of Schaye (2004) (1) or not (0).
+ thresh_norm_HpCM3: .1 # Critical sf normalization to use (is not a normalization when Schaye2004=0, than it is the value.
+ thresh_max_norm_HpCM3: 10.0 # Maximum norm of the critical sf density
+ MetDep_Z0: 0.002 # Scale metallicity to use for the equation (not used for Schaye2004=0)
+ MetDep_SFthresh_Slope: -0.64 # Scaling of the critical density with the metallicity (not used for Schaye2004=0)
+ thresh_MaxPhysDensOn: 0 # Default is 0.
+ thresh_MaxOverDens_HpCM3: 1e5 # Density at which the SF law changes
+ EOS_Jeans_GammaEffective: 1.33333 # The polytropic index
+ EOS_Jeans_TemperatureNorm_K: 1e3 # No idea how this works
+ EOS_JEANS_DensityNorm_HpCM3: .1 # No idea what the value is.
# Structure finding options (requires velociraptor)
StructureFinding:
diff --git a/src/starformation/schaye08/starformation.h b/src/starformation/schaye08/starformation.h
index 2ec8b3bfcf3ba0984ee6d94b63dcfaaada63c0c6..3aa2f784711e4e2cc69585de3dc737231901e158 100644
--- a/src/starformation/schaye08/starformation.h
+++ b/src/starformation/schaye08/starformation.h
@@ -106,8 +106,11 @@ struct star_formation {
/*! EOS pressure norm */
double EOS_pressure_norm;
+ /*! EOS Temperature norm */
+ double EOS_temperature_norm;
+
/*! EOS density norm */
- double EOS_den0;
+ double EOS_density_norm;
};
/*
@@ -201,7 +204,7 @@ INLINE static int star_formation_convert_to_star(
if (star_formation_potential_to_become_star(starform, p, xp, phys_const, cosmo, hydro_props, us, cooling)){
/* Get the pressure */
const double pressure = starform->EOS_pressure_norm
- * pow(p->rho/starform->EOS_den0, starform->polytropic_index);
+ * pow(p->rho/starform->EOS_density_norm, starform->polytropic_index);
/* Calculate the propability of forming a star */
const double prop = starform->SF_normalization * pow(pressure,
@@ -284,6 +287,11 @@ INLINE static void starformation_init_backend(
/* Calculate inverse of RAND_MAX for the random numbers */
starform->inv_RAND_MAX = 1.f / RAND_MAX;
+ /* Conversion of number density from cgs */
+ static const float dimension_numb_den[5] = {0, -3, 0, 0, 0};
+ const double conversion_numb_density = 1.f/
+ units_general_cgs_conversion_factor(us, dimension_numb_den);
+
/* Quantities that have to do with the Normal Kennicutt-
* Schmidt law will be read in this part of the code*/
@@ -326,15 +334,30 @@ INLINE static void starformation_init_backend(
parameter_file, "SchayeSF:SchmidtLawHighDens_thresh_HpCM3");
/* Transform the KS high density criteria to simulation units */
- starform->KS_high_den_thresh = KS_high_den_thresh_HpCM3 * UNIT_CONV_NUMBER_DENSITY;
+ starform->KS_high_den_thresh = KS_high_den_thresh_HpCM3 * conversion_numb_density;
/* Calculate the SF high density power law */
starform->SF_high_den_power_law = (starform->KS_high_den_power_law - 1.f)/2.f;
+ /* Load the equation of state for this model */
+ starform->polytropic_index = parser_get_param_double(
+ parameter_file, "SchayeSF:EOS_Jeans_GammaEffective");
+ starform->EOS_temperature_norm = parser_get_param_double(
+ parameter_file, "SchayeSF:EOS_Jeans_TemperatureNorm_K");
+ starform->EOS_density_norm = parser_get_param_double(
+ parameter_file, "SchayeSF:EOS_JEANS_DensityNorm_HpCM3") * conversion_numb_density;
+
+ /* Calculate the EOS pressure normalization */
+ starform->EOS_pressure_norm = starform->EOS_density_norm * starform->EOS_temperature_norm
+ * phys_const->const_boltzmann_k;
+
+ const double EOS_high_den_pressure = starform->EOS_pressure_norm * pow(
+ starform->KS_high_den_thresh / starform->EOS_density_norm, starform->polytropic_index);
+
/* Calculate the KS high density normalization */
starform->KS_high_den_normalization = starform->KS_normalization * pow( M_per_pc2,
starform->KS_high_den_power_law - starform->KS_power_law) * pow( hydro_gamma *
- starform->fgas / G_newton * 1337.f, (starform->KS_power_law
+ starform->fgas / G_newton * EOS_high_den_pressure, (starform->KS_power_law
- starform->KS_high_den_power_law)/2.f);
/* Calculate the SF high density normalization */
@@ -361,7 +384,7 @@ INLINE static void starformation_init_backend(
* density*/
starform->den_crit = parser_get_param_double(
parameter_file, "SchayeSF:thresh_norm_HpCM3") *
- UNIT_CONV_NUMBER_DENSITY;
+ conversion_numb_density;
/* Read the scale metallicity Z0 */
starform->Z0 = parser_get_param_double(
@@ -376,10 +399,6 @@ INLINE static void starformation_init_backend(
parameter_file, "SchayeSF:thresh_max_norm_HpCM3");
}
- /* Conversion of number density from cgs */
- static const float dimension_numb_den[5] = {0, -3, 0, 0, 0};
- const double conversion_numb_density = 1.f/
- units_general_cgs_conversion_factor(us, dimension_numb_den);
/* Claculate 1 over the metallicity for speed up */
starform->Z0_inv = 1/starform->Z0;
@@ -389,13 +408,6 @@ INLINE static void starformation_init_backend(
starform->den_crit_star = starform->den_crit / pow(starform->Z0,
starform->n_Z0) * conversion_numb_density;
- /* Load the equation of state for this model */
- starform->polytropic_index = parser_get_param_double(
- parameter_file, "SchayeSF:EOS_Jeans_GammaEffective");
- starform->EOS_pressure_norm = parser_get_param_double(
- parameter_file, "SchayeSF:EOS_Jeans_PressureNorm");
- starform->EOS_den0 = parser_get_param_double(
- parameter_file, "SchayeSF:EOS_JEANS_den0");
}