diff --git a/examples/parameter_example.yml b/examples/parameter_example.yml
index 71c0a8e3d4e27f076937d0b397a780e000cf0741..03b2b1ac52e083ac4ec7ad852dc9a95d5320b61f 100644
--- a/examples/parameter_example.yml
+++ b/examples/parameter_example.yml
@@ -287,16 +287,21 @@ EAGLEChemistry:
# Schaye and Dalla Vecchia 2008 star formation
SchayeSF:
- thresh_MinOverDens: 60 # 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
- 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.
- 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_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
+ 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
# Structure finding options (requires velociraptor)
StructureFinding:
diff --git a/src/starformation/schaye08/starformation.h b/src/starformation/schaye08/starformation.h
index 8722485d59158de1ed5274bbb5bafb781233b02d..7ed2916dca83d7a7e69c85113e5334498a5f79e0 100644
--- a/src/starformation/schaye08/starformation.h
+++ b/src/starformation/schaye08/starformation.h
@@ -36,10 +36,16 @@
struct star_formation {
/*! Normalization of the KS star formation law */
- double A;
+ double KS_normalization;
/*! Slope of the KS law */
- double nks;
+ double KS_power_law;
+
+ /*! Slope of the high density KS law */
+ double KS_power_law_high_den;
+
+ /*! KS law High density threshold */
+ double KS_high_den_thresh;
/*! Critical overdensity */
double Delta_crit;
@@ -51,10 +57,10 @@ struct star_formation {
double gamma;
/*! gas fraction */
- double fg;
+ double fgas;
/*! Star formation law slope */
- double nstar;
+ double SF_power_law;
/*! star formation normalization of schaye+08 */
double Astar;
@@ -182,6 +188,8 @@ INLINE static void starformation_init_backend(
/* Default values for the normalization and the power law */
static const double normalization_default = 2.5e-4;
static const double KS_power_law_default = 1.4;
+ static const double KS_power_law_high_den_default = 2.0;
+ static const double KS_high_den_thresh_default = 1e3;
/* Default value for the heat capacity ratio gamma */
static const double gamma_default = 5.f/3.f;
@@ -195,7 +203,7 @@ INLINE static void starformation_init_backend(
"SchayeSF:thresh_temp");
/* Read the gas fraction from the file */
- starform->fg = parser_get_param_double(parameter_file,
+ starform->fgas = parser_get_param_double(parameter_file,
"SchayeSF:fg");
/* Read the normalization */
@@ -203,17 +211,30 @@ INLINE static void starformation_init_backend(
parameter_file, "SchayeSF:SchmidtLawCoeff_MSUNpYRpKPC2", normalization_default);
/* Read the Kennicutt-Schmidt power law exponent */
- starform->nks = parser_get_opt_param_double(
+ starform->KS_power_law = parser_get_opt_param_double(
parameter_file, "SchayeSF:SchmidtLawExponent", KS_power_law_default);
+ /* Read the high density Kennicutt-Schmidt power law exponent */
+ starform->KS_power_law_high_den = parser_get_opt_param_double(
+ parameter_file, "SchayeSF:SchmidtLawHighDensExponent",
+ KS_power_law_high_den_default);
+
+ /* Read the high density criteria for the KS law in number density per cm^3 */
+ const double KS_high_den_thresh_HpCM3 = parser_get_opt_param_double(
+ parameter_file, "SchayeSF:SchmidtLawHighDens_thresh_HpCM3",
+ KS_high_den_thresh_default);
+
+ /* Transform the KS high density criteria to simulation units */
+ starform->KS_high_den_thresh = KS_high_den_thresh_HpCM3 * UNIT_CONV_NUMBER_DENSITY;
+
/* Read the heat capacity ratio gamma */
starform->gamma = parser_get_opt_param_double(
parameter_file, "SchayeSF:gamma", gamma_default);
/* Calculate the power law of the star formation */
- starform->nstar = (starform->nks - 1.f)/2.f;
+ starform->SF_power_law = (starform->KS_power_law - 1.f)/2.f;
- /* Calculate inverse of RAND_MAX */
+ /* Calculate inverse of RAND_MAX for the random numbers */
starform->inv_RAND_MAX = 1.f / RAND_MAX;
/* Get the appropriate constant to calculate the
@@ -260,15 +281,16 @@ INLINE static void starformation_init_backend(
const double M_per_pc2 = phys_const->const_solar_mass_per_parsec2;
/* Give the Kennicutt-Schmidt law the same units as internal units */
- starform->A = normalization * KS_const;
+ starform->KS_normalization = normalization * KS_const;
/* Calculate the starformation prefactor with most terms */
- starform->Astar = starform->A * pow(M_per_pc2, -starform->nks) *
- pow( starform->gamma * starform->fg / G_newton, starform->nstar);
+ starform->Astar = starform->KS_normalization * pow(M_per_pc2, -starform->KS_power_law) *
+ pow( starform->gamma * starform->fgas / G_newton, starform->SF_power_law);
/* critical star formation number density parameters */
+ /* Standard we will use a constant critical density threshold*/
/* standard variables based on the EAGLE values */
- static const int schaye2004_default = 1;
+ static const int schaye2004_default = 0;
static const double norm_ncrit_default = 0.1;
static const double norm_ncrit_no04_default = 10.;
static const double Z0_default = 0.002;
@@ -323,8 +345,8 @@ INLINE static void starformation_print_backend(
message("Star formation law is Schaye and Dalla Vecchia (2008)"
" with properties, normalization = %e, slope of the Kennicutt"
"-Schmidt law = %e, gamma = %e, gas fraction = %e, critical "
- "density = %e and critical temperature = %e", starform->A,
- starform->nks, starform->gamma, starform->fg, starform->den_crit,
+ "density = %e and critical temperature = %e", starform->KS_normalization,
+ starform->KS_power_law, starform->gamma, starform->fgas, starform->den_crit,
starform->T_crit);
}