Commit 422568ad authored by Alexei Borissov's avatar Alexei Borissov

remove change to mandatory parameters in yml file for feedback

parent d1824f60
...@@ -109,9 +109,11 @@ EAGLEEntropyFloor: ...@@ -109,9 +109,11 @@ EAGLEEntropyFloor:
Cool_temperature_norm_K: 8000 # Temperature of the EAGLE Cool limiter entropy floor at the density threshold expressed in Kelvin. Cool_temperature_norm_K: 8000 # Temperature of the EAGLE Cool limiter entropy floor at the density threshold expressed in Kelvin.
Cool_gamma_effective: 1. # Slope the of the EAGLE Cool limiter entropy floor Cool_gamma_effective: 1. # Slope the of the EAGLE Cool limiter entropy floor
EagleStellarEvolution: EAGLEFeedback:
filename: /cosma5/data/Eagle/BG_Tables/YieldTables/ filename: /cosma5/data/Eagle/BG_Tables/YieldTables/
imf_model: Chabrier imf_model: Chabrier
continuous_heating_switch: 0
EAGLEFeedback: SNIa_timescale_Gyr: 2.0
lifetime_flag: 2 SNIa_efficiency: 2.e-3
SNII_wind_delay_Gyr: 0.03
SNe_heating_temperature_K: 3.16228e7
...@@ -90,9 +90,11 @@ EAGLEChemistry: # Solar abundances ...@@ -90,9 +90,11 @@ EAGLEChemistry: # Solar abundances
init_abundance_Silicon: 0.0 init_abundance_Silicon: 0.0
init_abundance_Iron: 0.0 init_abundance_Iron: 0.0
EagleStellarEvolution: EAGLEFeedback:
filename: /cosma5/data/Eagle/BG_Tables/YieldTables/ filename: /cosma5/data/Eagle/BG_Tables/YieldTables/
imf_model: Chabrier imf_model: Chabrier
EAGLEFeedback:
continuous_heating_switch: 0 continuous_heating_switch: 0
SNIa_timescale_Gyr: 2.0
SNIa_efficiency: 2.e-3
SNII_wind_delay_Gyr: 0.03
SNe_heating_temperature_K: 3.16228e7
...@@ -678,7 +678,6 @@ void engine_marktasks_mapper(void *map_data, int num_elements, ...@@ -678,7 +678,6 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
*/ */
int engine_marktasks(struct engine *e) { int engine_marktasks(struct engine *e) {
message("marktask");
struct scheduler *s = &e->sched; struct scheduler *s = &e->sched;
const ticks tic = getticks(); const ticks tic = getticks();
int rebuild_space = 0; int rebuild_space = 0;
......
...@@ -396,8 +396,7 @@ inline static double dying_mass_msun(double age_Gyr, float metallicity, ...@@ -396,8 +396,7 @@ inline static double dying_mass_msun(double age_Gyr, float metallicity,
} }
/** /**
* @brief Calculate lifetime of star poputlation in Gyr. Lifetime model is * @brief Calculate lifetime of star poputlation in Gyr. Approach based on
* specified by stellar_lifetime_flag read in from yml file. Approach based on
* Portinari et al. 1998 * Portinari et al. 1998
* *
* @param mass * @param mass
......
...@@ -809,9 +809,9 @@ inline static void stars_evolve_init(struct swift_params* params, ...@@ -809,9 +809,9 @@ inline static void stars_evolve_init(struct swift_params* params,
stars->feedback.log10_SNIa_max_mass_msun = 0.90308999f; // log10(8). stars->feedback.log10_SNIa_max_mass_msun = 0.90308999f; // log10(8).
/* Yield table filepath */ /* Yield table filepath */
parser_get_param_string(params, "EagleStellarEvolution:filename", parser_get_param_string(params, "EAGLEFeedback:filename",
stars->feedback.yield_table_path); stars->feedback.yield_table_path);
parser_get_param_string(params, "EagleStellarEvolution:imf_model", parser_get_param_string(params, "EAGLEFeedback:imf_model",
stars->feedback.IMF_Model); stars->feedback.IMF_Model);
/* Initialise IMF */ /* Initialise IMF */
......
...@@ -133,27 +133,26 @@ INLINE static void stars_props_init(struct stars_props *sp, ...@@ -133,27 +133,26 @@ INLINE static void stars_props_init(struct stars_props *sp,
sp->log_max_h_change = logf(powf(max_volume_change, hydro_dimension_inv)); sp->log_max_h_change = logf(powf(max_volume_change, hydro_dimension_inv));
/* Read SNIa timscale */ /* Read SNIa timscale */
sp->feedback.SNIa_timescale_Gyr = parser_get_opt_param_float( sp->feedback.SNIa_timescale_Gyr = parser_get_param_float(
params, "EAGLEFeedback:SNIa_timescale_Gyr", 2.f); params, "EAGLEFeedback:SNIa_timescale_Gyr");
/* Read the efficiency of producing SNIa */ /* Read the efficiency of producing SNIa */
sp->feedback.SNIa_efficiency = parser_get_opt_param_float( sp->feedback.SNIa_efficiency = parser_get_param_float(
params, "EAGLEFeedback:SNIa_efficiency", 2.e-3); params, "EAGLEFeedback:SNIa_efficiency");
/* Are we doing continuous heating? */ /* Are we doing continuous heating? */
sp->feedback.continuous_heating = parser_get_opt_param_int( sp->feedback.continuous_heating = parser_get_param_int(
params, "EAGLEFeedback:continuous_heating_switch", 0); params, "EAGLEFeedback:continuous_heating_switch");
/* Set the delay time before SNII occur */ /* Set the delay time before SNII occur */
const float Gyr_in_cgs = 3.154e16; const float Gyr_in_cgs = 3.154e16;
sp->feedback.SNII_wind_delay = sp->feedback.SNII_wind_delay =
parser_get_opt_param_float(params, "EAGLEFeedback:SNII_wind_delay_Gyr", parser_get_param_float(params, "EAGLEFeedback:SNII_wind_delay_Gyr") *
0.03) *
Gyr_in_cgs / units_cgs_conversion_factor(us, UNIT_CONV_TIME); Gyr_in_cgs / units_cgs_conversion_factor(us, UNIT_CONV_TIME);
/* Read the temperature change to use in stochastic heating */ /* Read the temperature change to use in stochastic heating */
sp->feedback.SNe_deltaT_desired = parser_get_opt_param_float( sp->feedback.SNe_deltaT_desired = parser_get_param_float(
params, "EAGLEFeedback:SNe_heating_temperature_K", 3.16228e7); params, "EAGLEFeedback:SNe_heating_temperature_K");
sp->feedback.SNe_deltaT_desired /= sp->feedback.SNe_deltaT_desired /=
units_cgs_conversion_factor(us, UNIT_CONV_TEMPERATURE); units_cgs_conversion_factor(us, UNIT_CONV_TEMPERATURE);
......
...@@ -20,9 +20,11 @@ SPH: ...@@ -20,9 +20,11 @@ SPH:
resolution_eta: 1.2348 # Target smoothing length in units of the mean inter-particle separation resolution_eta: 1.2348 # Target smoothing length in units of the mean inter-particle separation
CFL_condition: 0.1 # Courant-Friedrich-Levy condition for time integration. CFL_condition: 0.1 # Courant-Friedrich-Levy condition for time integration.
EagleStellarEvolution: EAGLEFeedback:
filename: /cosma5/data/Eagle/BG_Tables/YieldTables/ filename: /cosma5/data/Eagle/BG_Tables/YieldTables/
imf_model: Chabrier imf_model: Chabrier
continuous_heating_switch: 0
EAGLEFeedback: SNIa_timescale_Gyr: 2.0
lifetime_flag: 2 SNIa_efficiency: 2.e-3
SNII_wind_delay_Gyr: 0.03
SNe_heating_temperature_K: 3.16228e7
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment