From 17f83e5838202571d339d95f5feb4e968454046d Mon Sep 17 00:00:00 2001 From: Matthieu Schaller <matthieu.schaller@durham.ac.uk> Date: Wed, 6 Jul 2016 10:38:50 +0300 Subject: [PATCH] Post-merge fixes --- src/engine.c | 8 ++++---- src/runner.c | 4 ++-- src/runner_doiact_fft.c | 5 +---- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/engine.c b/src/engine.c index 4c3fd9e2ca..1f3913e16d 100644 --- a/src/engine.c +++ b/src/engine.c @@ -1731,12 +1731,13 @@ void engine_maketasks(struct engine *e) { /* Loop through the proxy's incoming cells and add the recv tasks. */ for (int k = 0; k < p->nr_cells_in; k++) - engine_addtasks_recv(e, p->cells_in[k], NULL, NULL); + engine_addtasks_recv(e, p->cells_in[k], NULL, NULL, NULL); /* Loop through the proxy's outgoing cells and add the send tasks. */ for (int k = 0; k < p->nr_cells_out; k++) - engine_addtasks_send(e, p->cells_out[k], p->cells_in[0]); + engine_addtasks_send(e, p->cells_out[k], p->cells_in[0], NULL, NULL, + NULL); } } #endif @@ -1869,8 +1870,7 @@ int engine_marktasks(struct engine *e) { continue; /* Set the sort flags. */ - if (t->type == task_type_pair && - t->subtype != task_subtype_grav) { + if (t->type == task_type_pair && t->subtype != task_subtype_grav) { if (!(ci->sorted & (1 << t->flags))) { ci->sorts->flags |= (1 << t->flags); ci->sorts->skip = 0; diff --git a/src/runner.c b/src/runner.c index 9ef51240a7..c58e94645c 100644 --- a/src/runner.c +++ b/src/runner.c @@ -88,8 +88,8 @@ const char runner_flip[27] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, #include "runner_doiact.h" /* Import the gravity loop functions. */ -#include "runner_doiact_grav.h" #include "runner_doiact_fft.h" +#include "runner_doiact_grav.h" /** * @brief Calculate gravity acceleration from external potential @@ -1155,7 +1155,7 @@ void *runner_main(void *data) { case task_type_grav_gather_m: break; case task_type_grav_fft: - runner_do_grav_fft(r); + runner_do_grav_fft(r); break; case task_type_grav_external: runner_do_grav_external(r, t->ci, 1); diff --git a/src/runner_doiact_fft.c b/src/runner_doiact_fft.c index 6333ecd71a..e735b2b997 100644 --- a/src/runner_doiact_fft.c +++ b/src/runner_doiact_fft.c @@ -33,7 +33,4 @@ /* Local includes. */ #include "runner.h" -void runner_do_grav_fft(struct runner *r) { - - -} +void runner_do_grav_fft(struct runner *r) {} -- GitLab