diff --git a/src/cell.c b/src/cell.c
index ae76162fcfc36439a634788687c29a78fddc540f..7edee4d9ae1c02311af295bb6eba5c846a94259c 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -1675,10 +1675,7 @@ void cell_activate_subcell_tasks(struct cell *ci, struct cell *cj,
*/
int cell_unskip_tasks(struct cell *c, struct scheduler *s) {
-#ifdef WITH_MPI
struct engine *e = s->space->e;
-#endif
-
int rebuild = 0;
/* Un-skip the density tasks involved with this cell. */
@@ -1686,27 +1683,32 @@ int cell_unskip_tasks(struct cell *c, struct scheduler *s) {
struct task *t = l->t;
struct cell *ci = t->ci;
struct cell *cj = t->cj;
- scheduler_activate(s, t);
-
- /* Set the correct sorting flags */
- if (t->type == task_type_pair) {
- /* Store some values. */
- atomic_or(&ci->requires_sorts, 1 << t->flags);
- atomic_or(&cj->requires_sorts, 1 << t->flags);
- ci->dx_max_sort_old = ci->dx_max_sort;
- cj->dx_max_sort_old = cj->dx_max_sort;
-
- /* Activate the drift tasks. */
- if (ci->nodeID == engine_rank) cell_activate_drift_part(ci, s);
- if (cj->nodeID == engine_rank) cell_activate_drift_part(cj, s);
-
- /* Check the sorts and activate them if needed. */
- cell_activate_sorts(ci, t->flags, s);
- cell_activate_sorts(cj, t->flags, s);
- }
- /* Store current values of dx_max and h_max. */
- else if (t->type == task_type_sub_pair || t->type == task_type_sub_self) {
- cell_activate_subcell_tasks(t->ci, t->cj, s);
+
+ /* Only activate tasks that involve a local active cell. */
+ if ((cell_is_active(ci, e) && ci->nodeID == engine_rank) ||
+ (cj != NULL && cell_is_active(cj, e) && cj->nodeID == engine_rank)) {
+ scheduler_activate(s, t);
+
+ /* Set the correct sorting flags */
+ if (t->type == task_type_pair) {
+ /* Store some values. */
+ atomic_or(&ci->requires_sorts, 1 << t->flags);
+ atomic_or(&cj->requires_sorts, 1 << t->flags);
+ ci->dx_max_sort_old = ci->dx_max_sort;
+ cj->dx_max_sort_old = cj->dx_max_sort;
+
+ /* Activate the drift tasks. */
+ if (ci->nodeID == engine_rank) cell_activate_drift_part(ci, s);
+ if (cj->nodeID == engine_rank) cell_activate_drift_part(cj, s);
+
+ /* Check the sorts and activate them if needed. */
+ cell_activate_sorts(ci, t->flags, s);
+ cell_activate_sorts(cj, t->flags, s);
+ }
+ /* Store current values of dx_max and h_max. */
+ else if (t->type == task_type_sub_pair || t->type == task_type_sub_self) {
+ cell_activate_subcell_tasks(t->ci, t->cj, s);
+ }
}
/* Only interested in pair interactions as of here. */
@@ -1720,44 +1722,54 @@ int cell_unskip_tasks(struct cell *c, struct scheduler *s) {
/* Activate the send/recv tasks. */
if (ci->nodeID != engine_rank) {
- /* Activate the tasks to recv foreign cell ci's data. */
- scheduler_activate(s, ci->recv_xv);
- if (cell_is_active(ci, e)) {
- scheduler_activate(s, ci->recv_rho);
+ /* If the local cell is active, receive data from the foreign cell. */
+ if (cell_is_active(cj, e)) {
+ scheduler_activate(s, ci->recv_xv);
+ if (cell_is_active(ci, e)) {
+ scheduler_activate(s, ci->recv_rho);
#ifdef EXTRA_HYDRO_LOOP
- scheduler_activate(s, ci->recv_gradient);
+ scheduler_activate(s, ci->recv_gradient);
#endif
- scheduler_activate(s, ci->recv_ti);
+ }
}
- /* Look for the local cell cj's send tasks. */
- struct link *l = NULL;
- for (l = cj->send_xv; l != NULL && l->t->cj->nodeID != ci->nodeID;
- l = l->next)
- ;
- if (l == NULL) error("Missing link to send_xv task.");
- scheduler_activate(s, l->t);
+ /* If the foreign cell is active, we want its ti_end values. */
+ if (cell_is_active(ci, e)) scheduler_activate(s, ci->recv_ti);
- /* Drift the cell which will be sent at the level at which it is sent,
- i.e. drift the cell specified in the send task (l->t) itself. */
- cell_activate_drift_part(l->t->ci, s);
-
- if (cell_is_active(cj, e)) {
-
- for (l = cj->send_rho; l != NULL && l->t->cj->nodeID != ci->nodeID;
+ /* Look for the local cell cj's send tasks. */
+ if (cell_is_active(ci, e)) {
+ struct link *l = NULL;
+ for (l = cj->send_xv; l != NULL && l->t->cj->nodeID != ci->nodeID;
l = l->next)
;
- if (l == NULL) error("Missing link to send_rho task.");
+ if (l == NULL) error("Missing link to send_xv task.");
scheduler_activate(s, l->t);
+ /* Drift the cell which will be sent at the level at which it is sent,
+ i.e. drift the cell specified in the send task (l->t) itself. */
+ cell_activate_drift_part(l->t->ci, s);
+
+ if (cell_is_active(cj, e)) {
+ struct link *l = NULL;
+ for (l = cj->send_rho; l != NULL && l->t->cj->nodeID != ci->nodeID;
+ l = l->next)
+ ;
+ if (l == NULL) error("Missing link to send_rho task.");
+ scheduler_activate(s, l->t);
+
#ifdef EXTRA_HYDRO_LOOP
- for (l = cj->send_gradient;
- l != NULL && l->t->cj->nodeID != ci->nodeID; l = l->next)
- ;
- if (l == NULL) error("Missing link to send_gradient task.");
- scheduler_activate(s, l->t);
+ for (l = cj->send_gradient;
+ l != NULL && l->t->cj->nodeID != ci->nodeID; l = l->next)
+ ;
+ if (l == NULL) error("Missing link to send_gradient task.");
+ scheduler_activate(s, l->t);
#endif
+ }
+ }
+ /* If the local cell is active, send its ti_end values. */
+ if (cell_is_active(cj, e)) {
+ struct link *l = NULL;
for (l = cj->send_ti; l != NULL && l->t->cj->nodeID != ci->nodeID;
l = l->next)
;
@@ -1767,44 +1779,55 @@ int cell_unskip_tasks(struct cell *c, struct scheduler *s) {
} else if (cj->nodeID != engine_rank) {
- /* Activate the tasks to recv foreign cell cj's data. */
- scheduler_activate(s, cj->recv_xv);
- if (cell_is_active(cj, e)) {
- scheduler_activate(s, cj->recv_rho);
+ /* If the local cell is active, receive data from the foreign cell. */
+ if (cell_is_active(ci, e)) {
+ scheduler_activate(s, cj->recv_xv);
+ if (cell_is_active(cj, e)) {
+ scheduler_activate(s, cj->recv_rho);
#ifdef EXTRA_HYDRO_LOOP
- scheduler_activate(s, cj->recv_gradient);
+ scheduler_activate(s, cj->recv_gradient);
#endif
- scheduler_activate(s, cj->recv_ti);
+ }
}
- /* Look for the local cell ci's send tasks. */
- struct link *l = NULL;
- for (l = ci->send_xv; l != NULL && l->t->cj->nodeID != cj->nodeID;
- l = l->next)
- ;
- if (l == NULL) error("Missing link to send_xv task.");
- scheduler_activate(s, l->t);
-
- /* Drift the cell which will be sent at the level at which it is sent,
- i.e. drift the cell specified in the send task (l->t) itself. */
- cell_activate_drift_part(l->t->ci, s);
+ /* If the foreign cell is active, we want its ti_end values. */
+ if (cell_is_active(cj, e)) scheduler_activate(s, cj->recv_ti);
- if (cell_is_active(ci, e)) {
-
- for (l = ci->send_rho; l != NULL && l->t->cj->nodeID != cj->nodeID;
+ /* Look for the local cell ci's send tasks. */
+ if (cell_is_active(cj, e)) {
+ struct link *l = NULL;
+ for (l = ci->send_xv; l != NULL && l->t->cj->nodeID != cj->nodeID;
l = l->next)
;
- if (l == NULL) error("Missing link to send_rho task.");
+ if (l == NULL) error("Missing link to send_xv task.");
scheduler_activate(s, l->t);
+ /* Drift the cell which will be sent at the level at which it is sent,
+ i.e. drift the cell specified in the send task (l->t) itself. */
+ cell_activate_drift_part(l->t->ci, s);
+
+ if (cell_is_active(ci, e)) {
+
+ struct link *l = NULL;
+ for (l = ci->send_rho; l != NULL && l->t->cj->nodeID != cj->nodeID;
+ l = l->next)
+ ;
+ if (l == NULL) error("Missing link to send_rho task.");
+ scheduler_activate(s, l->t);
+
#ifdef EXTRA_HYDRO_LOOP
- for (l = ci->send_gradient;
- l != NULL && l->t->cj->nodeID != cj->nodeID; l = l->next)
- ;
- if (l == NULL) error("Missing link to send_gradient task.");
- scheduler_activate(s, l->t);
+ for (l = ci->send_gradient;
+ l != NULL && l->t->cj->nodeID != cj->nodeID; l = l->next)
+ ;
+ if (l == NULL) error("Missing link to send_gradient task.");
+ scheduler_activate(s, l->t);
#endif
+ }
+ }
+ /* If the local cell is active, send its ti_end values. */
+ if (cell_is_active(ci, e)) {
+ struct link *l = NULL;
for (l = ci->send_ti; l != NULL && l->t->cj->nodeID != cj->nodeID;
l = l->next)
;
@@ -1817,27 +1840,31 @@ int cell_unskip_tasks(struct cell *c, struct scheduler *s) {
}
/* Unskip all the other task types. */
- for (struct link *l = c->gradient; l != NULL; l = l->next)
- scheduler_activate(s, l->t);
- for (struct link *l = c->force; l != NULL; l = l->next)
- scheduler_activate(s, l->t);
- for (struct link *l = c->grav; l != NULL; l = l->next)
- scheduler_activate(s, l->t);
- if (c->extra_ghost != NULL) scheduler_activate(s, c->extra_ghost);
- if (c->ghost_in != NULL) scheduler_activate(s, c->ghost_in);
- if (c->ghost_out != NULL) scheduler_activate(s, c->ghost_out);
- if (c->ghost != NULL) scheduler_activate(s, c->ghost);
- if (c->init_grav != NULL) scheduler_activate(s, c->init_grav);
- if (c->drift_gpart != NULL) scheduler_activate(s, c->drift_gpart);
- if (c->kick1 != NULL) scheduler_activate(s, c->kick1);
- if (c->kick2 != NULL) scheduler_activate(s, c->kick2);
- if (c->timestep != NULL) scheduler_activate(s, c->timestep);
- if (c->grav_ghost[0] != NULL) scheduler_activate(s, c->grav_ghost[0]);
- if (c->grav_ghost[1] != NULL) scheduler_activate(s, c->grav_ghost[1]);
- if (c->grav_down != NULL) scheduler_activate(s, c->grav_down);
- if (c->grav_long_range != NULL) scheduler_activate(s, c->grav_long_range);
- if (c->cooling != NULL) scheduler_activate(s, c->cooling);
- if (c->sourceterms != NULL) scheduler_activate(s, c->sourceterms);
+ if (c->nodeID == engine_rank && cell_is_active(c, e)) {
+
+ for (struct link *l = c->gradient; l != NULL; l = l->next)
+ scheduler_activate(s, l->t);
+ for (struct link *l = c->force; l != NULL; l = l->next)
+ scheduler_activate(s, l->t);
+ for (struct link *l = c->grav; l != NULL; l = l->next)
+ scheduler_activate(s, l->t);
+
+ if (c->extra_ghost != NULL) scheduler_activate(s, c->extra_ghost);
+ if (c->ghost_in != NULL) scheduler_activate(s, c->ghost_in);
+ if (c->ghost_out != NULL) scheduler_activate(s, c->ghost_out);
+ if (c->ghost != NULL) scheduler_activate(s, c->ghost);
+ if (c->init_grav != NULL) scheduler_activate(s, c->init_grav);
+ if (c->drift_gpart != NULL) scheduler_activate(s, c->drift_gpart);
+ if (c->kick1 != NULL) scheduler_activate(s, c->kick1);
+ if (c->kick2 != NULL) scheduler_activate(s, c->kick2);
+ if (c->timestep != NULL) scheduler_activate(s, c->timestep);
+ if (c->grav_ghost[0] != NULL) scheduler_activate(s, c->grav_ghost[0]);
+ if (c->grav_ghost[1] != NULL) scheduler_activate(s, c->grav_ghost[1]);
+ if (c->grav_down != NULL) scheduler_activate(s, c->grav_down);
+ if (c->grav_long_range != NULL) scheduler_activate(s, c->grav_long_range);
+ if (c->cooling != NULL) scheduler_activate(s, c->cooling);
+ if (c->sourceterms != NULL) scheduler_activate(s, c->sourceterms);
+ }
return rebuild;
}
diff --git a/src/cell.h b/src/cell.h
index 93a59545bbed36fdd639bd7305443e4f6770e465..ef887d10e6867ec3db58b694e0c62949d19e9e7e 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -239,9 +239,6 @@ struct cell {
/*! Maximum beginning of (integer) time step in this cell. */
integertime_t ti_beg_max;
- /*! Last (integer) time the cell's sort arrays were updated. */
- integertime_t ti_sort;
-
/*! Last (integer) time the cell's part were drifted forward in time. */
integertime_t ti_old_part;
@@ -347,6 +344,9 @@ struct cell {
char do_sub_sort;
#ifdef SWIFT_DEBUG_CHECKS
+ /*! Last (integer) time the cell's sort arrays were updated. */
+ integertime_t ti_sort;
+
/*! The list of tasks that have been executed on this cell */
char tasks_executed[64];
diff --git a/src/engine.c b/src/engine.c
index 032fd3638e8d7a3ce470075db7bce4a09131cfa2..ee48d6565dc62f725b0159dc44e8d9d92d7a4adf 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -2589,134 +2589,164 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
struct cell *ci = t->ci;
struct cell *cj = t->cj;
- /* Set this task's skip, otherwise nothing to do. */
- if (cell_is_active(t->ci, e) || cell_is_active(t->cj, e))
- scheduler_activate(s, t);
- else
- continue;
-
- /* If this is not a density task, we don't have to do any of the below. */
- if (t->subtype != task_subtype_density) continue;
+ /* If this task does not involve any active cells, skip it. */
+ if (!cell_is_active(t->ci, e) && !cell_is_active(t->cj, e)) continue;
/* Too much particle movement? */
if (cell_need_rebuild_for_pair(ci, cj)) *rebuild_space = 1;
- /* Set the correct sorting flags */
- if (t->type == task_type_pair) {
- /* Store some values. */
- atomic_or(&ci->requires_sorts, 1 << t->flags);
- atomic_or(&cj->requires_sorts, 1 << t->flags);
- ci->dx_max_sort_old = ci->dx_max_sort;
- cj->dx_max_sort_old = cj->dx_max_sort;
-
- /* Activate the drift tasks. */
- if (ci->nodeID == engine_rank) cell_activate_drift_part(ci, s);
- if (cj->nodeID == engine_rank) cell_activate_drift_part(cj, s);
-
- /* Activate the sorts where needed. */
- cell_activate_sorts(ci, t->flags, s);
- cell_activate_sorts(cj, t->flags, s);
- }
- /* Store current values of dx_max and h_max. */
- else if (t->type == task_type_sub_pair) {
- cell_activate_subcell_tasks(t->ci, t->cj, s);
+ /* Only activate tasks that involve a local active cell. */
+ if ((cell_is_active(ci, e) && ci->nodeID == engine_rank) ||
+ (cj != NULL && cell_is_active(cj, e) && cj->nodeID == engine_rank)) {
+ scheduler_activate(s, t);
+
+ /* Set the correct sorting flags */
+ if (t->type == task_type_pair && t->subtype == task_subtype_density) {
+ /* Store some values. */
+ atomic_or(&ci->requires_sorts, 1 << t->flags);
+ atomic_or(&cj->requires_sorts, 1 << t->flags);
+ ci->dx_max_sort_old = ci->dx_max_sort;
+ cj->dx_max_sort_old = cj->dx_max_sort;
+
+ /* Activate the drift tasks. */
+ if (ci->nodeID == engine_rank) cell_activate_drift_part(ci, s);
+ if (cj->nodeID == engine_rank) cell_activate_drift_part(cj, s);
+
+ /* Check the sorts and activate them if needed. */
+ cell_activate_sorts(ci, t->flags, s);
+ cell_activate_sorts(cj, t->flags, s);
+ }
+ /* Store current values of dx_max and h_max. */
+ else if (t->type == task_type_sub_pair &&
+ t->subtype == task_subtype_density) {
+ cell_activate_subcell_tasks(t->ci, t->cj, s);
+ }
}
-#ifdef WITH_MPI
- /* Activate the send/recv flags. */
- if (ci->nodeID != engine_rank) {
+ /* Only interested in density tasks as of here. */
+ if (t->subtype == task_subtype_density) {
- /* Activate the tasks to recv foreign cell ci's data. */
- scheduler_activate(s, ci->recv_xv);
- if (cell_is_active(ci, e)) {
- scheduler_activate(s, ci->recv_rho);
+#ifdef WITH_MPI
+ /* Activate the send/recv tasks. */
+ if (ci->nodeID != engine_rank) {
+
+ /* If the local cell is active, receive data from the foreign cell. */
+ if (cell_is_active(cj, e)) {
+ scheduler_activate(s, ci->recv_xv);
+ if (cell_is_active(ci, e)) {
+ scheduler_activate(s, ci->recv_rho);
#ifdef EXTRA_HYDRO_LOOP
- scheduler_activate(s, ci->recv_gradient);
+ scheduler_activate(s, ci->recv_gradient);
#endif
- scheduler_activate(s, ci->recv_ti);
- }
+ }
+ }
- /* Look for the local cell cj's send tasks. */
- struct link *l = NULL;
- for (l = cj->send_xv; l != NULL && l->t->cj->nodeID != ci->nodeID;
- l = l->next)
- ;
- if (l == NULL) error("Missing link to send_xv task.");
- scheduler_activate(s, l->t);
-
- /* Drift the cell which will be sent at the level at which it is sent,
- i.e. drift the cell specified in the send task (l->t) itself. */
- cell_activate_drift_part(l->t->ci, s);
-
- if (cell_is_active(cj, e)) {
- for (l = cj->send_rho; l != NULL && l->t->cj->nodeID != ci->nodeID;
- l = l->next)
- ;
- if (l == NULL) error("Missing link to send_rho task.");
- scheduler_activate(s, l->t);
+ /* If the foreign cell is active, we want its ti_end values. */
+ if (cell_is_active(ci, e)) scheduler_activate(s, ci->recv_ti);
+
+ /* Look for the local cell cj's send tasks. */
+ if (cell_is_active(ci, e)) {
+ struct link *l = NULL;
+ for (l = cj->send_xv; l != NULL && l->t->cj->nodeID != ci->nodeID;
+ l = l->next)
+ ;
+ if (l == NULL) error("Missing link to send_xv task.");
+ scheduler_activate(s, l->t);
+
+ /* Drift the cell which will be sent at the level at which it is
+ sent,
+ i.e. drift the cell specified in the send task (l->t) itself. */
+ cell_activate_drift_part(l->t->ci, s);
+
+ if (cell_is_active(cj, e)) {
+ struct link *l = NULL;
+ for (l = cj->send_rho;
+ l != NULL && l->t->cj->nodeID != ci->nodeID; l = l->next)
+ ;
+ if (l == NULL) error("Missing link to send_rho task.");
+ scheduler_activate(s, l->t);
#ifdef EXTRA_HYDRO_LOOP
- for (l = cj->send_gradient;
- l != NULL && l->t->cj->nodeID != ci->nodeID; l = l->next)
- ;
- if (l == NULL) error("Missing link to send_gradient task.");
- scheduler_activate(s, l->t);
+ for (l = cj->send_gradient;
+ l != NULL && l->t->cj->nodeID != ci->nodeID; l = l->next)
+ ;
+ if (l == NULL) error("Missing link to send_gradient task.");
+ scheduler_activate(s, l->t);
#endif
+ }
+ }
- for (l = cj->send_ti; l != NULL && l->t->cj->nodeID != ci->nodeID;
- l = l->next)
- ;
- if (l == NULL) error("Missing link to send_ti task.");
- scheduler_activate(s, l->t);
- }
+ /* If the local cell is active, send its ti_end values. */
+ if (cell_is_active(cj, e)) {
+ struct link *l = NULL;
+ for (l = cj->send_ti; l != NULL && l->t->cj->nodeID != ci->nodeID;
+ l = l->next)
+ ;
+ if (l == NULL) error("Missing link to send_ti task.");
+ scheduler_activate(s, l->t);
+ }
- } else if (cj->nodeID != engine_rank) {
+ } else if (cj->nodeID != engine_rank) {
- /* Activate the tasks to recv foreign cell cj's data. */
- scheduler_activate(s, cj->recv_xv);
- if (cell_is_active(cj, e)) {
- scheduler_activate(s, cj->recv_rho);
+ /* If the local cell is active, receive data from the foreign cell. */
+ if (cell_is_active(ci, e)) {
+ scheduler_activate(s, cj->recv_xv);
+ if (cell_is_active(cj, e)) {
+ scheduler_activate(s, cj->recv_rho);
#ifdef EXTRA_HYDRO_LOOP
- scheduler_activate(s, cj->recv_gradient);
+ scheduler_activate(s, cj->recv_gradient);
#endif
- scheduler_activate(s, cj->recv_ti);
- }
+ }
+ }
+
+ /* If the foreign cell is active, we want its ti_end values. */
+ if (cell_is_active(cj, e)) scheduler_activate(s, cj->recv_ti);
+
+ /* Look for the local cell ci's send tasks. */
+ if (cell_is_active(cj, e)) {
+ struct link *l = NULL;
+ for (l = ci->send_xv; l != NULL && l->t->cj->nodeID != cj->nodeID;
+ l = l->next)
+ ;
+ if (l == NULL) error("Missing link to send_xv task.");
+ scheduler_activate(s, l->t);
- /* Look for the local cell ci's send tasks. */
- struct link *l = NULL;
- for (l = ci->send_xv; l != NULL && l->t->cj->nodeID != cj->nodeID;
- l = l->next)
- ;
- if (l == NULL) error("Missing link to send_xv task.");
- scheduler_activate(s, l->t);
-
- /* Drift the cell which will be sent at the level at which it is sent,
- i.e. drift the cell specified in the send task (l->t) itself. */
- cell_activate_drift_part(l->t->ci, s);
-
- if (cell_is_active(ci, e)) {
- for (l = ci->send_rho; l != NULL && l->t->cj->nodeID != cj->nodeID;
- l = l->next)
- ;
- if (l == NULL) error("Missing link to send_rho task.");
- scheduler_activate(s, l->t);
+ /* Drift the cell which will be sent at the level at which it is
+ sent,
+ i.e. drift the cell specified in the send task (l->t) itself. */
+ cell_activate_drift_part(l->t->ci, s);
+
+ if (cell_is_active(ci, e)) {
+
+ struct link *l = NULL;
+ for (l = ci->send_rho;
+ l != NULL && l->t->cj->nodeID != cj->nodeID; l = l->next)
+ ;
+ if (l == NULL) error("Missing link to send_rho task.");
+ scheduler_activate(s, l->t);
#ifdef EXTRA_HYDRO_LOOP
- for (l = ci->send_gradient;
- l != NULL && l->t->cj->nodeID != cj->nodeID; l = l->next)
- ;
- if (l == NULL) error("Missing link to send_gradient task.");
- scheduler_activate(s, l->t);
+ for (l = ci->send_gradient;
+ l != NULL && l->t->cj->nodeID != cj->nodeID; l = l->next)
+ ;
+ if (l == NULL) error("Missing link to send_gradient task.");
+ scheduler_activate(s, l->t);
#endif
+ }
+ }
- for (l = ci->send_ti; l != NULL && l->t->cj->nodeID != cj->nodeID;
- l = l->next)
- ;
- if (l == NULL) error("Missing link to send_ti task.");
- scheduler_activate(s, l->t);
+ /* If the local cell is active, send its ti_end values. */
+ if (cell_is_active(ci, e)) {
+ struct link *l = NULL;
+ for (l = ci->send_ti; l != NULL && l->t->cj->nodeID != cj->nodeID;
+ l = l->next)
+ ;
+ if (l == NULL) error("Missing link to send_ti task.");
+ scheduler_activate(s, l->t);
+ }
}
- }
#endif
+ }
}
/* Kick/Drift/init ? */
@@ -3368,19 +3398,20 @@ void engine_init_particles(struct engine *e, int flag_entropy_ICs,
int failed = 0;
double *prev_x = s->parts[0].x;
for (size_t k = 1; k < s->nr_parts; k++) {
- if (prev_x[0] == s->parts[k].x[0] &&
- prev_x[1] == s->parts[k].x[1] &&
+ if (prev_x[0] == s->parts[k].x[0] && prev_x[1] == s->parts[k].x[1] &&
prev_x[2] == s->parts[k].x[2]) {
if (e->verbose)
- message("Two particles occupy location: %f %f %f",
- prev_x[0], prev_x[1], prev_x[2]);
+ message("Two particles occupy location: %f %f %f", prev_x[0],
+ prev_x[1], prev_x[2]);
failed++;
}
prev_x = s->parts[k].x;
}
if (failed > 0)
- error("Have %d particle pairs with the same locations.\n"
- "Cannot continue", failed);
+ error(
+ "Have %d particle pairs with the same locations.\n"
+ "Cannot continue",
+ failed);
}
/* Also check any gparts. This is not supposed to be fatal so only warn. */
@@ -3388,20 +3419,21 @@ void engine_init_particles(struct engine *e, int flag_entropy_ICs,
int failed = 0;
double *prev_x = s->gparts[0].x;
for (size_t k = 1; k < s->nr_gparts; k++) {
- if (prev_x[0] == s->gparts[k].x[0] &&
- prev_x[1] == s->gparts[k].x[1] &&
+ if (prev_x[0] == s->gparts[k].x[0] && prev_x[1] == s->gparts[k].x[1] &&
prev_x[2] == s->gparts[k].x[2]) {
if (e->verbose)
- message("Two gparts occupy location: %f %f %f / %f %f %f",
- prev_x[0], prev_x[1], prev_x[2],
- s->gparts[k].x[0], s->gparts[k].x[1], s->gparts[k].x[2] );
+ message("Two gparts occupy location: %f %f %f / %f %f %f", prev_x[0],
+ prev_x[1], prev_x[2], s->gparts[k].x[0], s->gparts[k].x[1],
+ s->gparts[k].x[2]);
failed++;
}
prev_x = s->gparts[k].x;
}
if (failed > 0)
- message("WARNING: found %d gpart pairs at the same location. "
- "That is not optimal", failed);
+ message(
+ "WARNING: found %d gpart pairs at the same location. "
+ "That is not optimal",
+ failed);
}
/* Check the top-level cell h_max matches the particles as these can be
diff --git a/src/runner.c b/src/runner.c
index 5af652d8a70053110f2d7b65426995b21ad93279..04d230209a27d9c16d5ffbc0fffc9d5519e025d4 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -355,11 +355,11 @@ void runner_do_sort(struct runner *r, struct cell *c, int flags, int cleanup,
finger = finger->parent) {
if (finger->sorted & ~c->sorted) error("Inconsistent sort flags (upward).");
}
-#endif
/* Update the sort timer which represents the last time the sorts
were re-set. */
if (c->sorted == 0) c->ti_sort = r->e->ti_current;
+#endif
/* start by allocating the entry arrays. */
if (c->sort == NULL) {
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b356086b54b6f4f07c8bedafe1fccb543121871e..2eec538ea50440cf5589882af52d3a0c5ca04b92 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -37,6 +37,9 @@ check_PROGRAMS = testGreetings testReading testSingle testTimeIntegration \
testRiemannHLLC testMatrixInversion testDump testLogger \
testVoronoi1D testVoronoi2D testVoronoi3D testPeriodicBC
+# Rebuild tests when SWIFT is updated.
+$(check_PROGRAMS): ../src/.libs/libswiftsim.a
+
# Sources for the individual programs
testGreetings_SOURCES = testGreetings.c
diff --git a/tests/test125cells.c b/tests/test125cells.c
index 29e661b28c833da46c21fe44bce99a607207b0e7..a34bc00e843f793f17ffe20dad1f1b32055f494d 100644
--- a/tests/test125cells.c
+++ b/tests/test125cells.c
@@ -336,7 +336,6 @@ struct cell *make_cell(size_t n, const double offset[3], double size, double h,
cell->ti_old_part = 8;
cell->ti_end_min = 8;
cell->ti_end_max = 8;
- cell->ti_sort = 0;
// shuffle_particles(cell->parts, cell->count);
diff --git a/tests/test27cells.c b/tests/test27cells.c
index fe0b15bfe7671ddbf7c9f66a19407d1d74d5b380..458129edd3b92d78a45102c118fb3e6f44ff604d 100644
--- a/tests/test27cells.c
+++ b/tests/test27cells.c
@@ -174,7 +174,6 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
cell->ti_old_part = 8;
cell->ti_end_min = 8;
cell->ti_end_max = 8;
- cell->ti_sort = 8;
shuffle_particles(cell->parts, cell->count);
@@ -205,6 +204,10 @@ void zero_particle_fields(struct cell *c) {
void end_calculation(struct cell *c) {
for (int pid = 0; pid < c->count; pid++) {
hydro_end_density(&c->parts[pid]);
+
+ /* Recover the common "Neighbour number" definition */
+ c->parts[pid].density.wcount *= pow_dimension(c->parts[pid].h);
+ c->parts[pid].density.wcount *= kernel_norm;
}
}
diff --git a/tests/testPeriodicBC.c b/tests/testPeriodicBC.c
index 6dbe27a64908e232cb9478dfd2e2cf41d908d463..469ca9b15bab3b28978bdadb12a07846ac30551b 100644
--- a/tests/testPeriodicBC.c
+++ b/tests/testPeriodicBC.c
@@ -173,7 +173,6 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
cell->ti_old_part = 8;
cell->ti_end_min = 8;
cell->ti_end_max = 8;
- cell->ti_sort = 8;
shuffle_particles(cell->parts, cell->count);