Skip to content
Snippets Groups Projects
Commit 0440234a authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Merge branch '888-enable-timers-causes-compilation-error-on-master' into 'master'

Resolve "--enable-timers causes compilation error on master"

Closes #888

See merge request !1909
parents 7b01a76b a373892a
Branches
Tags
9 merge requests!1997Yet another master into zoom buffer branch merge (with formatting all done!),!1994Draft: Testing master -> zoom merge,!1987Update zoom_merge with master updates (after wrangling immense conflicts),!1982Update zoom merge branch with latest master developments,!1956Rename space_getsid to space_getsid_and_swap_cells() to try to prevent...,!1945Another master->zoom_merge update,!1921Mhd canvas,!1910Master -> zoom_merge update,!1909Resolve "--enable-timers causes compilation error on master"
...@@ -89,5 +89,5 @@ void runner_do_neutrino_weighting(struct runner *r, struct cell *c, int timer) { ...@@ -89,5 +89,5 @@ void runner_do_neutrino_weighting(struct runner *r, struct cell *c, int timer) {
} }
} }
if (timer) TIMER_TOC(timer_weight); if (timer) TIMER_TOC(timer_neutrino_weighting);
} }
...@@ -1706,6 +1706,8 @@ void runner_do_rt_advance_cell_time(struct runner *r, struct cell *c, ...@@ -1706,6 +1706,8 @@ void runner_do_rt_advance_cell_time(struct runner *r, struct cell *c,
void runner_do_collect_rt_times(struct runner *r, struct cell *c, void runner_do_collect_rt_times(struct runner *r, struct cell *c,
const int timer) { const int timer) {
TIMER_TIC;
const struct engine *e = r->e; const struct engine *e = r->e;
size_t rt_updated = 0; size_t rt_updated = 0;
......
...@@ -142,6 +142,8 @@ const char* timers_names[timer_count] = { ...@@ -142,6 +142,8 @@ const char* timers_names[timer_count] = {
"rt_tchem", "rt_tchem",
"rt_advance_cell_time", "rt_advance_cell_time",
"rt_collect_times", "rt_collect_times",
"do_sync",
"neutrino_weighting",
}; };
/* File to store the timers */ /* File to store the timers */
......
...@@ -142,6 +142,8 @@ enum { ...@@ -142,6 +142,8 @@ enum {
timer_do_rt_tchem, timer_do_rt_tchem,
timer_do_rt_advance_cell_time, timer_do_rt_advance_cell_time,
timer_do_rt_collect_times, timer_do_rt_collect_times,
timer_do_sync,
timer_neutrino_weighting,
timer_count, timer_count,
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment