Commit 17f83e58 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Post-merge fixes

parent 46d7d0ab
......@@ -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;
......
......@@ -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);
......
......@@ -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) {}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment