diff --git a/src/cell.c b/src/cell.c
index 5e2605c139a901c1782b7c302dd356421e86fbe2..af4edc6a92dd8ed84dd4cd8cc869b8c32c4f81e8 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -3497,7 +3497,7 @@ int cell_unskip_stars_tasks(struct cell *c, struct scheduler *s) {
if (cj_active) {
scheduler_activate(s, ci->mpi.hydro.recv_xv);
- scheduler_activate(s, ci->mpi.hydro.recv_force);
+ scheduler_activate(s, ci->mpi.hydro.recv_rho);
/* If the local cell is active, more stuff will be needed. */
scheduler_activate_send(s, cj->mpi.stars.send, ci_nodeID);
@@ -3515,7 +3515,7 @@ int cell_unskip_stars_tasks(struct cell *c, struct scheduler *s) {
/* Is the foreign cell active and will need stuff from us? */
scheduler_activate_send(s, cj->mpi.hydro.send_xv, ci_nodeID);
- scheduler_activate_send(s, cj->mpi.hydro.send_force, ci_nodeID);
+ scheduler_activate_send(s, cj->mpi.hydro.send_rho, ci_nodeID);
/* Drift the cell which will be sent; note that not all sent
particles will be drifted, only those that are needed. */
@@ -3527,7 +3527,7 @@ int cell_unskip_stars_tasks(struct cell *c, struct scheduler *s) {
/* If the local cell is active, receive data from the foreign cell. */
if (ci_active) {
scheduler_activate(s, cj->mpi.hydro.recv_xv);
- scheduler_activate(s, cj->mpi.hydro.recv_force);
+ scheduler_activate(s, cj->mpi.hydro.recv_rho);
/* If the local cell is active, more stuff will be needed. */
scheduler_activate_send(s, ci->mpi.stars.send, cj_nodeID);
@@ -3545,7 +3545,7 @@ int cell_unskip_stars_tasks(struct cell *c, struct scheduler *s) {
/* Is the foreign cell active and will need stuff from us? */
scheduler_activate_send(s, ci->mpi.hydro.send_xv, cj_nodeID);
- scheduler_activate_send(s, ci->mpi.hydro.send_force, cj_nodeID);
+ scheduler_activate_send(s, ci->mpi.hydro.send_rho, cj_nodeID);
/* Drift the cell which will be sent; note that not all sent
particles will be drifted, only those that are needed. */
diff --git a/src/engine_maketasks.c b/src/engine_maketasks.c
index ac76d9deddc49b9d8ee0d04d87b383c854c9edd9..26c60e4bfe7df0afa0fcea72be91034ab48acb4b 100644
--- a/src/engine_maketasks.c
+++ b/src/engine_maketasks.c
@@ -153,8 +153,8 @@ void engine_addtasks_send_hydro(struct engine *e, struct cell *ci,
ci->mpi.tag, 0, ci, cj);
#endif
- t_force = scheduler_addtask(s, task_type_send, task_subtype_force,
- ci->mpi.tag, 0, ci, cj);
+ /* t_force = scheduler_addtask(s, task_type_send, task_subtype_force, */
+ /* ci->mpi.tag, 0, ci, cj); */
#ifdef EXTRA_HYDRO_LOOP
@@ -184,8 +184,9 @@ void engine_addtasks_send_hydro(struct engine *e, struct cell *ci,
#endif
- scheduler_addunlock(s, ci->hydro.super->hydro.end_force, t_force);
- scheduler_addunlock(s, ci->hydro.super->hydro.drift, t_force);
+ //scheduler_addunlock(s, ci->hydro.super->hydro.end_force, t_force);
+ //scheduler_addunlock(s, ci->hydro.super->hydro.drift, t_force);
+ scheduler_addunlock(s, ci->hydro.super->hydro.drift, t_rho);
/* Drift before you send */
scheduler_addunlock(s, ci->hydro.super->hydro.drift, t_xv);
@@ -197,7 +198,7 @@ void engine_addtasks_send_hydro(struct engine *e, struct cell *ci,
#ifdef EXTRA_HYDRO_LOOP
engine_addlink(e, &ci->mpi.hydro.send_gradient, t_gradient);
#endif
- engine_addlink(e, &ci->mpi.hydro.send_force, t_force);
+ //engine_addlink(e, &ci->mpi.hydro.send_force, t_force);
}
/* Recurse? */
@@ -387,19 +388,20 @@ void engine_addtasks_recv_hydro(struct engine *e, struct cell *c,
c->mpi.tag, 0, c, NULL);
#endif
- t_force = scheduler_addtask(s, task_type_recv, task_subtype_force,
- c->mpi.tag, 0, c, NULL);
+ /* t_force = scheduler_addtask(s, task_type_recv, task_subtype_force, */
+ /* c->mpi.tag, 0, c, NULL); */
}
c->mpi.hydro.recv_xv = t_xv;
c->mpi.hydro.recv_rho = t_rho;
c->mpi.hydro.recv_gradient = t_gradient;
- c->mpi.hydro.recv_force = t_force;
+ //c->mpi.hydro.recv_force = t_force;
/* Add dependencies. */
if (c->hydro.sorts != NULL) {
scheduler_addunlock(s, t_xv, c->hydro.sorts);
- scheduler_addunlock(s, c->hydro.sorts, t_force);
+ scheduler_addunlock(s, c->hydro.sorts, t_rho);
+ //scheduler_addunlock(s, c->hydro.sorts, t_force);
}
for (struct link *l = c->hydro.density; l != NULL; l = l->next) {
@@ -420,12 +422,12 @@ void engine_addtasks_recv_hydro(struct engine *e, struct cell *c,
}
#endif
- for (struct link *l = c->hydro.force; l != NULL; l = l->next) {
- scheduler_addunlock(s, l->t, t_force);
- }
+ /* for (struct link *l = c->hydro.force; l != NULL; l = l->next) { */
+ /* scheduler_addunlock(s, l->t, t_force); */
+ /* } */
for (struct link *l = c->stars.density; l != NULL; l = l->next) {
- scheduler_addunlock(s, t_force, l->t);
+ scheduler_addunlock(s, t_rho, l->t);
}
/* Recurse? */
diff --git a/src/engine_marktasks.c b/src/engine_marktasks.c
index 6923b6565f70478aaa61921ec04d0e6f83bb7c53..c02eb5d2bd272111808701269faed07cef505449 100644
--- a/src/engine_marktasks.c
+++ b/src/engine_marktasks.c
@@ -445,7 +445,7 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
if (cj_active_stars) {
scheduler_activate(s, ci->mpi.hydro.recv_xv);
- scheduler_activate(s, ci->mpi.hydro.recv_force);
+ scheduler_activate(s, ci->mpi.hydro.recv_rho);
/* If the local cell is active, more stuff will be needed. */
scheduler_activate_send(s, cj->mpi.stars.send, ci_nodeID);
@@ -463,7 +463,7 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
/* Is the foreign cell active and will need stuff from us? */
scheduler_activate_send(s, cj->mpi.hydro.send_xv, ci_nodeID);
- scheduler_activate_send(s, cj->mpi.hydro.send_force, ci_nodeID);
+ scheduler_activate_send(s, cj->mpi.hydro.send_rho, ci_nodeID);
/* Drift the cell which will be sent; note that not all sent
particles will be drifted, only those that are needed. */
@@ -475,7 +475,7 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
/* If the local cell is active, receive data from the foreign cell. */
if (ci_active_stars) {
scheduler_activate(s, cj->mpi.hydro.recv_xv);
- scheduler_activate(s, cj->mpi.hydro.recv_force);
+ scheduler_activate(s, cj->mpi.hydro.recv_rho);
/* If the local cell is active, more stuff will be needed. */
scheduler_activate_send(s, ci->mpi.stars.send, cj_nodeID);
@@ -493,7 +493,7 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
/* Is the foreign cell active and will need stuff from us? */
scheduler_activate_send(s, ci->mpi.hydro.send_xv, cj_nodeID);
- scheduler_activate_send(s, ci->mpi.hydro.send_force, cj_nodeID);
+ scheduler_activate_send(s, ci->mpi.hydro.send_rho, cj_nodeID);
/* Drift the cell which will be sent; note that not all sent
particles will be drifted, only those that are needed. */
diff --git a/src/runner.c b/src/runner.c
index 1584f2df90678ac4fd6e245a80a39c00deaad101..60b06eefd04aee4549a71861c98b8ecccc528d89 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -3322,7 +3322,7 @@ void *runner_main(void *data) {
} else if (t->subtype == task_subtype_gradient) {
runner_do_recv_part(r, ci, 0, 1);
} else if (t->subtype == task_subtype_force) {
- runner_do_recv_part(r, ci, 0, 1);
+ error("oo");runner_do_recv_part(r, ci, 0, 1);
} else if (t->subtype == task_subtype_limiter) {
runner_do_recv_part(r, ci, 0, 1);
} else if (t->subtype == task_subtype_gpart) {