diff --git a/src/feedback/EAGLE/feedback.c b/src/feedback/EAGLE/feedback.c index 6f536d665f6ba6711cf64bd9aa6cfa7bb8bf7c5e..06e433b1bfc0f2cd2b40710fab370224bd95f68e 100644 --- a/src/feedback/EAGLE/feedback.c +++ b/src/feedback/EAGLE/feedback.c @@ -25,6 +25,7 @@ #include "imf.h" #include "inline.h" #include "interpolate.h" +#include "timers.h" #include "yield_tables.h" /** @@ -679,6 +680,8 @@ void compute_stellar_evolution(const struct feedback_props* feedback_props, const struct unit_system* us, const float age, const float dt) { + TIMER_TIC; + /* Allocate temporary array for calculating imf weights */ float stellar_yields[eagle_feedback_N_imf_bins]; @@ -772,6 +775,8 @@ void compute_stellar_evolution(const struct feedback_props* feedback_props, sp->feedback_data.to_distribute.mass * 0.5f * (sp->v[0] * sp->v[0] + sp->v[1] * sp->v[1] + sp->v[2] * sp->v[2]) * cosmo->a2_inv; + + TIMER_TOC(timer_do_star_evol); } /** diff --git a/src/timers.c b/src/timers.c index 9ede0320e49c70b2488cd5ceb3e4b6965659aa74..a33d5635b54798dacded7c2a7a50537b621a5a27 100644 --- a/src/timers.c +++ b/src/timers.c @@ -42,18 +42,23 @@ const char* timers_names[timer_count] = { "init_grav", "drift_part", "drift_gpart", + "drift_spart", + "drift_bpart", "kick1", "kick2", "timestep", - "endforce", + "end_hydro_force", + "end_grav_force", "dosort", "doself_density", "doself_gradient", "doself_force", + "doself_limiter", "doself_grav_pp", "dopair_density", "dopair_gradient", "dopair_force", + "dopair_limiter", "dopair_grav_mm", "dopair_grav_pp", "dograv_external", @@ -64,10 +69,12 @@ const char* timers_names[timer_count] = { "dosub_self_density", "dosub_self_gradient", "dosub_self_force", + "dosub_self_limiter", "dosub_self_grav", "dosub_pair_density", "dosub_pair_gradient", "dosub_pair_force", + "dosub_pair_limiter", "dosub_pair_grav", "doself_subset", "dopair_subset", @@ -78,8 +85,10 @@ const char* timers_names[timer_count] = { "dorecv_part", "dorecv_gpart", "dorecv_spart", + "do_limiter", "do_cooling", "do_star_formation", + "do_star_evol", "gettask", "qget", "qsteal", diff --git a/src/timers.h b/src/timers.h index 3a2a939339e6d08b43836d4f5ca213af0822c2b2..1489dfb5fc05917cfe0eb74610e91bde7bb2d2a9 100644 --- a/src/timers.h +++ b/src/timers.h @@ -43,18 +43,23 @@ enum { timer_init_grav, timer_drift_part, timer_drift_gpart, + timer_drift_spart, + timer_drift_bpart, timer_kick1, timer_kick2, timer_timestep, - timer_endforce, + timer_end_hydro_force, + timer_end_grav_force, timer_dosort, timer_doself_density, timer_doself_gradient, timer_doself_force, + timer_doself_limiter, timer_doself_grav_pp, timer_dopair_density, timer_dopair_gradient, timer_dopair_force, + timer_dopair_limiter, timer_dopair_grav_mm, timer_dopair_grav_pp, timer_dograv_external, @@ -65,10 +70,12 @@ enum { timer_dosub_self_density, timer_dosub_self_gradient, timer_dosub_self_force, + timer_dosub_self_limiter, timer_dosub_self_grav, timer_dosub_pair_density, timer_dosub_pair_gradient, timer_dosub_pair_force, + timer_dosub_pair_limiter, timer_dosub_pair_grav, timer_doself_subset, timer_dopair_subset, @@ -79,8 +86,10 @@ enum { timer_dorecv_part, timer_dorecv_gpart, timer_dorecv_spart, + timer_do_limiter, timer_do_cooling, timer_do_star_formation, + timer_do_star_evol, timer_gettask, timer_qget, timer_qsteal,