From 670f8b6e78766663a62c3669f4fed0714cc37111 Mon Sep 17 00:00:00 2001 From: Matthieu Schaller <matthieu.schaller@durham.ac.uk> Date: Thu, 23 Nov 2017 17:42:42 +0000 Subject: [PATCH] Restore the splitting of tasks --- examples/EAGLE_6/eagle_6.yml | 2 +- src/engine.c | 4 ++-- src/runner_doiact_fft.c | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/examples/EAGLE_6/eagle_6.yml b/examples/EAGLE_6/eagle_6.yml index f7e9a07c40..0308442571 100644 --- a/examples/EAGLE_6/eagle_6.yml +++ b/examples/EAGLE_6/eagle_6.yml @@ -30,7 +30,7 @@ Statistics: # Parameters for the self-gravity scheme Gravity: eta: 0.025 # Constant dimensionless multiplier for time integration. - theta: 0.85 # Opening angle (Multipole acceptance criterion) + theta: 2.5 # Opening angle (Multipole acceptance criterion) epsilon: 0.001 # Softening length (in internal units). # Parameters for the hydrodynamics scheme diff --git a/src/engine.c b/src/engine.c index c07e1094a4..46eee0c980 100644 --- a/src/engine.c +++ b/src/engine.c @@ -2887,7 +2887,7 @@ void engine_maketasks(struct engine *e) { error("We have particles but no hydro or gravity tasks were created."); /* Split the tasks. */ - // scheduler_splittasks(sched); + scheduler_splittasks(sched); /* Free the old list of cell-task links. */ if (e->links != NULL) free(e->links); @@ -3574,7 +3574,7 @@ void engine_prepare(struct engine *e) { engine_unskip(e); // engine_marktasks(e); - space_print_cells(e->s); + //space_print_cells(e->s); // engine_print_task_counts(e); diff --git a/src/runner_doiact_fft.c b/src/runner_doiact_fft.c index ab5a35d92d..945bbb9d89 100644 --- a/src/runner_doiact_fft.c +++ b/src/runner_doiact_fft.c @@ -163,8 +163,6 @@ void runner_do_grav_fft(struct runner* r, int timer) { #ifdef HAVE_FFTW - message("doing FFT"); - const struct engine* e = r->e; const struct space* s = e->s; const integertime_t ti_current = e->ti_current; -- GitLab