Commit 51ea5f44 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Not need to clear sort flag on reception fo particles before density. This...

Not need to clear sort flag on reception fo particles before density. This done in the cell_unskip_tasks() routine.
parent 4a90c6c6
...@@ -1498,11 +1498,9 @@ void runner_do_end_force(struct runner *r, struct cell *c, int timer) { ...@@ -1498,11 +1498,9 @@ void runner_do_end_force(struct runner *r, struct cell *c, int timer) {
* *
* @param r The runner thread. * @param r The runner thread.
* @param c The cell. * @param c The cell.
* @param clear_sorts Should we clear the sort flag and hence trigger a sort ?
* @param timer Are we timing this ? * @param timer Are we timing this ?
*/ */
void runner_do_recv_part(struct runner *r, struct cell *c, int clear_sorts, void runner_do_recv_part(struct runner *r, struct cell *c, int timer) {
int timer) {
#ifdef WITH_MPI #ifdef WITH_MPI
...@@ -1523,9 +1521,6 @@ void runner_do_recv_part(struct runner *r, struct cell *c, int clear_sorts, ...@@ -1523,9 +1521,6 @@ void runner_do_recv_part(struct runner *r, struct cell *c, int clear_sorts,
error("Updating a local cell!"); error("Updating a local cell!");
#endif #endif
/* Clear this cell's sorted mask. */
if (clear_sorts) c->sorted = 0;
/* If this cell is a leaf, collect the particle data. */ /* If this cell is a leaf, collect the particle data. */
if (!c->split) { if (!c->split) {
...@@ -1551,7 +1546,7 @@ void runner_do_recv_part(struct runner *r, struct cell *c, int clear_sorts, ...@@ -1551,7 +1546,7 @@ void runner_do_recv_part(struct runner *r, struct cell *c, int clear_sorts,
else { else {
for (int k = 0; k < 8; k++) { for (int k = 0; k < 8; k++) {
if (c->progeny[k] != NULL) { if (c->progeny[k] != NULL) {
runner_do_recv_part(r, c->progeny[k], clear_sorts, 0); runner_do_recv_part(r, c->progeny[k], 0);
ti_end_min = min(ti_end_min, c->progeny[k]->ti_end_min); ti_end_min = min(ti_end_min, c->progeny[k]->ti_end_min);
ti_end_max = max(ti_end_max, c->progeny[k]->ti_end_max); ti_end_max = max(ti_end_max, c->progeny[k]->ti_end_max);
h_max = max(h_max, c->progeny[k]->h_max); h_max = max(h_max, c->progeny[k]->h_max);
...@@ -1951,11 +1946,11 @@ void *runner_main(void *data) { ...@@ -1951,11 +1946,11 @@ void *runner_main(void *data) {
cell_unpack_ti_ends(ci, t->buff); cell_unpack_ti_ends(ci, t->buff);
free(t->buff); free(t->buff);
} else if (t->subtype == task_subtype_xv) { } else if (t->subtype == task_subtype_xv) {
runner_do_recv_part(r, ci, 1, 1); runner_do_recv_part(r, ci, 1);
} else if (t->subtype == task_subtype_rho) { } else if (t->subtype == task_subtype_rho) {
runner_do_recv_part(r, ci, 0, 1); runner_do_recv_part(r, ci, 1);
} else if (t->subtype == task_subtype_gradient) { } else if (t->subtype == task_subtype_gradient) {
runner_do_recv_part(r, ci, 0, 1); runner_do_recv_part(r, ci, 1);
} else if (t->subtype == task_subtype_gpart) { } else if (t->subtype == task_subtype_gpart) {
runner_do_recv_gpart(r, ci, 1); runner_do_recv_gpart(r, ci, 1);
} else if (t->subtype == task_subtype_spart) { } else if (t->subtype == task_subtype_spart) {
......
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