Commit d398442a authored by Peter W. Draper's avatar Peter W. Draper
Browse files

Make sure that a repartition type of none does nothing, including triggering...

Make sure that a repartition type of none does nothing, including triggering side effects like drift-all each step
parent 4098909c
...@@ -909,6 +909,9 @@ void engine_repartition(struct engine *e) { ...@@ -909,6 +909,9 @@ void engine_repartition(struct engine *e) {
#else #else
if (e->reparttype->type != REPART_NONE) if (e->reparttype->type != REPART_NONE)
error("SWIFT was not compiled with MPI and METIS support."); error("SWIFT was not compiled with MPI and METIS support.");
/* Clear the repartition flag. */
e->forcerepart = 0;
#endif #endif
} }
...@@ -923,8 +926,9 @@ void engine_repartition_trigger(struct engine *e) { ...@@ -923,8 +926,9 @@ void engine_repartition_trigger(struct engine *e) {
/* Do nothing if there have not been enough steps since the last /* Do nothing if there have not been enough steps since the last
* repartition, don't want to repeat this too often or immediately after * repartition, don't want to repeat this too often or immediately after
* a repartition step. */ * a repartition step. Also nothing to do when requested. */
if (e->step - e->last_repartition >= 2) { if (e->step - e->last_repartition >= 2 &&
e->reparttype->type != REPART_NONE) {
/* Old style if trigger is >1 or this is the second step (want an early /* Old style if trigger is >1 or this is the second step (want an early
* repartition following the initial repartition). */ * repartition following the initial repartition). */
...@@ -985,8 +989,9 @@ void engine_repartition_trigger(struct engine *e) { ...@@ -985,8 +989,9 @@ void engine_repartition_trigger(struct engine *e) {
if (e->forcerepart) e->last_repartition = e->step; if (e->forcerepart) e->last_repartition = e->step;
} }
/* We always reset CPU time for next check. */ /* We always reset CPU time for next check, unless it will not be used. */
e->cputime_last_step = clocks_get_cputime_used(); if (e->reparttype->type != REPART_NONE)
e->cputime_last_step = clocks_get_cputime_used();
#endif #endif
} }
......
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