diff --git a/examples/IsolatedGalaxy/IsolatedGalaxy_feedback/isolated_galaxy.yml b/examples/IsolatedGalaxy/IsolatedGalaxy_feedback/isolated_galaxy.yml
index 2bdf1b9cab8b362426631f9e7aaba93bf6a6fb02..08a79e96d9e10b2b8afbbe543cab6dc6e13ff64b 100644
--- a/examples/IsolatedGalaxy/IsolatedGalaxy_feedback/isolated_galaxy.yml
+++ b/examples/IsolatedGalaxy/IsolatedGalaxy_feedback/isolated_galaxy.yml
@@ -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_gamma_effective: 1. # Slope the of the EAGLE Cool limiter entropy floor
-EagleStellarEvolution:
+EAGLEFeedback:
filename: /cosma5/data/Eagle/BG_Tables/YieldTables/
imf_model: Chabrier
-
-EAGLEFeedback:
- lifetime_flag: 2
+ 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
diff --git a/examples/StellarEvolution/stellar_evolution.yml b/examples/StellarEvolution/stellar_evolution.yml
index dd9a2542ffa4e17b7e7c19e8e4d6aea359cac77e..ace8f5616184cc44a9ee4a84aa50c1123fd59c2d 100644
--- a/examples/StellarEvolution/stellar_evolution.yml
+++ b/examples/StellarEvolution/stellar_evolution.yml
@@ -90,9 +90,11 @@ EAGLEChemistry: # Solar abundances
init_abundance_Silicon: 0.0
init_abundance_Iron: 0.0
-EagleStellarEvolution:
+EAGLEFeedback:
filename: /cosma5/data/Eagle/BG_Tables/YieldTables/
imf_model: Chabrier
-
-EAGLEFeedback:
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
diff --git a/src/engine_marktasks.c b/src/engine_marktasks.c
index 92665ac3adee5846afaab344843bbe78ba955d9a..277c9560318104d7b6d28696d751ee89db26b467 100644
--- a/src/engine_marktasks.c
+++ b/src/engine_marktasks.c
@@ -678,7 +678,6 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
*/
int engine_marktasks(struct engine *e) {
- message("marktask");
struct scheduler *s = &e->sched;
const ticks tic = getticks();
int rebuild_space = 0;
diff --git a/src/stars/EAGLE/imf.h b/src/stars/EAGLE/imf.h
index b901e1596e0b79ff452c92bfc57943a71119af54..e68e7f9cbd1ba60495646da2448eba7003a43ac7 100644
--- a/src/stars/EAGLE/imf.h
+++ b/src/stars/EAGLE/imf.h
@@ -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
- * specified by stellar_lifetime_flag read in from yml file. Approach based on
+ * @brief Calculate lifetime of star poputlation in Gyr. Approach based on
* Portinari et al. 1998
*
* @param mass
diff --git a/src/stars/EAGLE/stars.h b/src/stars/EAGLE/stars.h
index aff6914319cfe441bbc63e1319df4167fc1e765d..8c96c1187d7ca5ef70b48981e981f749c40f049d 100644
--- a/src/stars/EAGLE/stars.h
+++ b/src/stars/EAGLE/stars.h
@@ -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).
/* Yield table filepath */
- parser_get_param_string(params, "EagleStellarEvolution:filename",
+ parser_get_param_string(params, "EAGLEFeedback:filename",
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);
/* Initialise IMF */
diff --git a/src/stars/EAGLE/stars_io.h b/src/stars/EAGLE/stars_io.h
index 3934e77e943cb39685f89b32adf21e57173d5cf8..380e5b9ad4180960aa48e05446d32bc0d675850c 100644
--- a/src/stars/EAGLE/stars_io.h
+++ b/src/stars/EAGLE/stars_io.h
@@ -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));
/* Read SNIa timscale */
- sp->feedback.SNIa_timescale_Gyr = parser_get_opt_param_float(
- params, "EAGLEFeedback:SNIa_timescale_Gyr", 2.f);
+ sp->feedback.SNIa_timescale_Gyr = parser_get_param_float(
+ params, "EAGLEFeedback:SNIa_timescale_Gyr");
/* Read the efficiency of producing SNIa */
- sp->feedback.SNIa_efficiency = parser_get_opt_param_float(
- params, "EAGLEFeedback:SNIa_efficiency", 2.e-3);
+ sp->feedback.SNIa_efficiency = parser_get_param_float(
+ params, "EAGLEFeedback:SNIa_efficiency");
/* Are we doing continuous heating? */
- sp->feedback.continuous_heating = parser_get_opt_param_int(
- params, "EAGLEFeedback:continuous_heating_switch", 0);
+ sp->feedback.continuous_heating = parser_get_param_int(
+ params, "EAGLEFeedback:continuous_heating_switch");
/* Set the delay time before SNII occur */
const float Gyr_in_cgs = 3.154e16;
sp->feedback.SNII_wind_delay =
- parser_get_opt_param_float(params, "EAGLEFeedback:SNII_wind_delay_Gyr",
- 0.03) *
+ parser_get_param_float(params, "EAGLEFeedback:SNII_wind_delay_Gyr") *
Gyr_in_cgs / units_cgs_conversion_factor(us, UNIT_CONV_TIME);
/* Read the temperature change to use in stochastic heating */
- sp->feedback.SNe_deltaT_desired = parser_get_opt_param_float(
- params, "EAGLEFeedback:SNe_heating_temperature_K", 3.16228e7);
+ sp->feedback.SNe_deltaT_desired = parser_get_param_float(
+ params, "EAGLEFeedback:SNe_heating_temperature_K");
sp->feedback.SNe_deltaT_desired /=
units_cgs_conversion_factor(us, UNIT_CONV_TEMPERATURE);
diff --git a/tests/testFeedback.yml b/tests/testFeedback.yml
index 7d3b7d2aeeb3cc9293800332d9d6926aef9a6961..af1b2cb531bef7b02544765553b1337b440f269e 100644
--- a/tests/testFeedback.yml
+++ b/tests/testFeedback.yml
@@ -20,9 +20,11 @@ SPH:
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.
-EagleStellarEvolution:
+EAGLEFeedback:
filename: /cosma5/data/Eagle/BG_Tables/YieldTables/
imf_model: Chabrier
-
-EAGLEFeedback:
- lifetime_flag: 2
+ 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