Commit 1e991ac7 authored by Pedro Gonnet's avatar Pedro Gonnet
Browse files

simplify the logic a bit.

parent 6d40d485
......@@ -1672,6 +1672,10 @@ int cell_unskip_tasks(struct cell *c, struct scheduler *s) {
ci->dx_max_sort_old = ci->dx_max_sort;
cj->dx_max_sort_old = cj->dx_max_sort;
/* Activate the drift tasks. */
cell_activate_drift_part(ci, s);
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);
......@@ -1784,16 +1788,6 @@ int cell_unskip_tasks(struct cell *c, struct scheduler *s) {
scheduler_activate(s, l->t);
}
}
else if (t->type == task_type_pair) { /* ci and cj on same node */
cell_activate_drift_part(ci, s);
cell_activate_drift_part(cj, s);
}
#else
if (t->type == task_type_pair) {
cell_activate_drift_part(ci, s);
cell_activate_drift_part(cj, s);
}
#endif
}
}
......@@ -1955,6 +1949,7 @@ void cell_drift_part(struct cell *c, const struct engine *e, int force) {
/* Clear the drift flags. */
c->do_drift = 0;
c->do_sub_drift = 0;
}
}
......
......@@ -2577,6 +2577,10 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
ci->dx_max_sort_old = ci->dx_max_sort;
cj->dx_max_sort_old = cj->dx_max_sort;
/* Activate the drift tasks. */
cell_activate_drift_part(ci, s);
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);
......@@ -2679,21 +2683,12 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
if (l == NULL) error("Missing link to send_ti task.");
scheduler_activate(s, l->t);
}
} else if (t->type == task_type_pair) { /* ci and cj on same node */
cell_activate_drift_part(ci, s);
cell_activate_drift_part(cj, s);
}
#else
if (t->type == task_type_pair) {
cell_activate_drift_part(ci, s);
cell_activate_drift_part(cj, s);
}
#endif
}
/* Kick/Drift/init ? */
else if (t->type == task_type_kick1 || t->type == task_type_kick2 ||
if (t->type == task_type_kick1 || t->type == task_type_kick2 ||
t->type == task_type_drift_part ||
t->type == task_type_drift_gpart ||
t->type == task_type_init_grav) {
......
Supports Markdown
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