Commit a09b7e2a authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Merge branch 'random_fixes' into 'master'

Random fixes

We only need `ti_sort` in debug mode.

See merge request !374
parents a0106530 24e1164b
...@@ -239,9 +239,6 @@ struct cell { ...@@ -239,9 +239,6 @@ struct cell {
/*! Maximum beginning of (integer) time step in this cell. */ /*! Maximum beginning of (integer) time step in this cell. */
integertime_t ti_beg_max; 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. */ /*! Last (integer) time the cell's part were drifted forward in time. */
integertime_t ti_old_part; integertime_t ti_old_part;
...@@ -347,6 +344,9 @@ struct cell { ...@@ -347,6 +344,9 @@ struct cell {
char do_sub_sort; char do_sub_sort;
#ifdef SWIFT_DEBUG_CHECKS #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 */ /*! The list of tasks that have been executed on this cell */
char tasks_executed[64]; char tasks_executed[64];
......
...@@ -355,11 +355,11 @@ void runner_do_sort(struct runner *r, struct cell *c, int flags, int cleanup, ...@@ -355,11 +355,11 @@ void runner_do_sort(struct runner *r, struct cell *c, int flags, int cleanup,
finger = finger->parent) { finger = finger->parent) {
if (finger->sorted & ~c->sorted) error("Inconsistent sort flags (upward)."); if (finger->sorted & ~c->sorted) error("Inconsistent sort flags (upward).");
} }
#endif
/* Update the sort timer which represents the last time the sorts /* Update the sort timer which represents the last time the sorts
were re-set. */ were re-set. */
if (c->sorted == 0) c->ti_sort = r->e->ti_current; if (c->sorted == 0) c->ti_sort = r->e->ti_current;
#endif
/* start by allocating the entry arrays. */ /* start by allocating the entry arrays. */
if (c->sort == NULL) { if (c->sort == NULL) {
......
...@@ -336,7 +336,6 @@ struct cell *make_cell(size_t n, const double offset[3], double size, double h, ...@@ -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_old_part = 8;
cell->ti_end_min = 8; cell->ti_end_min = 8;
cell->ti_end_max = 8; cell->ti_end_max = 8;
cell->ti_sort = 0;
// shuffle_particles(cell->parts, cell->count); // shuffle_particles(cell->parts, cell->count);
......
...@@ -174,7 +174,6 @@ struct cell *make_cell(size_t n, double *offset, double size, double h, ...@@ -174,7 +174,6 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
cell->ti_old_part = 8; cell->ti_old_part = 8;
cell->ti_end_min = 8; cell->ti_end_min = 8;
cell->ti_end_max = 8; cell->ti_end_max = 8;
cell->ti_sort = 8;
shuffle_particles(cell->parts, cell->count); shuffle_particles(cell->parts, cell->count);
......
...@@ -173,7 +173,6 @@ struct cell *make_cell(size_t n, double *offset, double size, double h, ...@@ -173,7 +173,6 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
cell->ti_old_part = 8; cell->ti_old_part = 8;
cell->ti_end_min = 8; cell->ti_end_min = 8;
cell->ti_end_max = 8; cell->ti_end_max = 8;
cell->ti_sort = 8;
shuffle_particles(cell->parts, cell->count); shuffle_particles(cell->parts, cell->count);
......
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