Commit fba0dd79 authored by Pedro Gonnet's avatar Pedro Gonnet
Browse files

formatting.

parent 5bb19409
...@@ -290,12 +290,10 @@ void runner_do_sort_ascending(struct entry *sort, int N) { ...@@ -290,12 +290,10 @@ void runner_do_sort_ascending(struct entry *sort, int N) {
} }
void runner_check_sorts(struct cell *c, int flags) { void runner_check_sorts(struct cell *c, int flags) {
if (flags & ~c->sorted) if (flags & ~c->sorted) error("Inconsistent sort flags (downward)!");
error("Inconsistent sort flags (downward)!");
if (c->split) if (c->split)
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_check_sorts(c->progeny[k], c->sorted);
runner_check_sorts(c->progeny[k], c->sorted);
} }
/** /**
...@@ -321,15 +319,15 @@ void runner_do_sort(struct runner *r, struct cell *c, int flags, int clock) { ...@@ -321,15 +319,15 @@ void runner_do_sort(struct runner *r, struct cell *c, int flags, int clock) {
/* Check that the particles have been moved to the current time */ /* Check that the particles have been moved to the current time */
if (!cell_is_drifted(c, r->e)) error("Sorting un-drifted cell"); if (!cell_is_drifted(c, r->e)) error("Sorting un-drifted cell");
#ifdef SWIFT_DEBUG_CHECKS #ifdef SWIFT_DEBUG_CHECKS
/* Make sure the sort flags are consistent (downward). */ /* Make sure the sort flags are consistent (downward). */
runner_check_sorts(c, c->sorted); runner_check_sorts(c, c->sorted);
/* Make sure the sort flags are consistent (upard). */ /* Make sure the sort flags are consistent (upard). */
for (struct cell *finger = c->parent; finger != NULL; finger = finger->parent) { for (struct cell *finger = c->parent; finger != NULL;
if (finger->sorted & ~c->sorted) finger = finger->parent) {
error("Inconsistent sort flags (upward)."); if (finger->sorted & ~c->sorted) error("Inconsistent sort flags (upward).");
} }
#endif #endif
...@@ -344,7 +342,7 @@ void runner_do_sort(struct runner *r, struct cell *c, int flags, int clock) { ...@@ -344,7 +342,7 @@ void runner_do_sort(struct runner *r, struct cell *c, int flags, int clock) {
c->sorted = 0; c->sorted = 0;
} }
if (flags == 0) return; if (flags == 0) return;
/* start by allocating the entry arrays. */ /* start by allocating the entry arrays. */
if (c->sort == NULL || c->sortsize < count) { if (c->sort == NULL || c->sortsize < count) {
if (c->sort != NULL) free(c->sort); if (c->sort != NULL) free(c->sort);
...@@ -357,7 +355,7 @@ void runner_do_sort(struct runner *r, struct cell *c, int flags, int clock) { ...@@ -357,7 +355,7 @@ void runner_do_sort(struct runner *r, struct cell *c, int flags, int clock) {
/* Does this cell have any progeny? */ /* Does this cell have any progeny? */
if (c->split) { if (c->split) {
/* Fill in the gaps within the progeny. */ /* Fill in the gaps within the progeny. */
float dx_max_sort = 0.0f; float dx_max_sort = 0.0f;
for (int k = 0; k < 8; k++) { for (int k = 0; k < 8; k++) {
...@@ -495,14 +493,14 @@ void runner_do_sort(struct runner *r, struct cell *c, int flags, int clock) { ...@@ -495,14 +493,14 @@ void runner_do_sort(struct runner *r, struct cell *c, int flags, int clock) {
if (finger[k].i >= count) error("Sorting failed, indices borked."); if (finger[k].i >= count) error("Sorting failed, indices borked.");
} }
} }
/* Make sure the sort flags are consistent (downward). */ /* Make sure the sort flags are consistent (downward). */
runner_check_sorts(c, flags); runner_check_sorts(c, flags);
/* Make sure the sort flags are consistent (upward). */ /* Make sure the sort flags are consistent (upward). */
for (struct cell *finger = c->parent; finger != NULL; finger = finger->parent) { for (struct cell *finger = c->parent; finger != NULL;
if (finger->sorted & ~c->sorted) finger = finger->parent) {
error("Inconsistent sort flags."); if (finger->sorted & ~c->sorted) error("Inconsistent sort flags.");
} }
#endif #endif
......
...@@ -605,11 +605,12 @@ void DOPAIR_SUBSET(struct runner *r, struct cell *restrict ci, ...@@ -605,11 +605,12 @@ void DOPAIR_SUBSET(struct runner *r, struct cell *restrict ci,
sid = sortlistID[sid]; sid = sortlistID[sid];
/* Have the cells been sorted? */ /* Have the cells been sorted? */
if (!(cj->sorted & (1 << sid)) || cj->dx_max_sort > space_maxreldx * cj->dmin) { if (!(cj->sorted & (1 << sid)) ||
cj->dx_max_sort > space_maxreldx * cj->dmin) {
DOPAIR_SUBSET_NAIVE(r, ci, parts_i, ind, count, cj); DOPAIR_SUBSET_NAIVE(r, ci, parts_i, ind, count, cj);
return; return;
} }
/* Pick-out the sorted lists. */ /* Pick-out the sorted lists. */
const struct entry *restrict sort_j = &cj->sort[sid * (cj->count + 1)]; const struct entry *restrict sort_j = &cj->sort[sid * (cj->count + 1)];
const float dxj = cj->dx_max_sort; const float dxj = cj->dx_max_sort;
......
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