Merge "Merge branch 'release-2019' into master"

[alexxy/gromacs.git] / src / gromacs / mdrun / rerun.cpp

diff --git a/src/gromacs/mdrun/rerun.cpp b/src/gromacs/mdrun/rerun.cpp
index fc6d53e60c2759d20ad3bc842a33aa4521d80e4d..53002609e79eaa13066523d8be3c6f014941684f 100644 (file)
--- a/src/gromacs/mdrun/rerun.cpp
+++ b/src/gromacs/mdrun/rerun.cpp
@@ -54,6 +54,7 @@
 #include "gromacs/awh/awh.h"
 #include "gromacs/commandline/filenm.h"
 #include "gromacs/domdec/collect.h"
+#include "gromacs/domdec/dlbtiming.h"
 #include "gromacs/domdec/domdec.h"
 #include "gromacs/domdec/domdec_network.h"
 #include "gromacs/domdec/domdec_struct.h"
@@ -477,8 +478,7 @@ void gmx::Integrator::do_rerun()
     // we don't do counter resetting in rerun - finish will always be valid
     walltime_accounting_set_valid_finish(walltime_accounting);
 
-    DdOpenBalanceRegionBeforeForceComputation ddOpenBalanceRegion   = (DOMAINDECOMP(cr) ? DdOpenBalanceRegionBeforeForceComputation::yes : DdOpenBalanceRegionBeforeForceComputation::no);
-    DdCloseBalanceRegionAfterForceComputation ddCloseBalanceRegion  = (DOMAINDECOMP(cr) ? DdCloseBalanceRegionAfterForceComputation::yes : DdCloseBalanceRegionAfterForceComputation::no);
+    const DDBalanceRegionHandler ddBalanceRegionHandler(cr);
 
     step     = ir->init_step;
     step_rel = 0;
@@ -563,7 +563,7 @@ void gmx::Integrator::do_rerun()
                                 nrnb, wcycle, graph, groups,
                                 shellfc, fr, ppForceWorkload, t, mu_tot,
                                 vsite,
-                                ddOpenBalanceRegion, ddCloseBalanceRegion);
+                                ddBalanceRegionHandler);
         }
         else
         {
@@ -581,7 +581,7 @@ void gmx::Integrator::do_rerun()
                      state->lambda, graph,
                      fr, ppForceWorkload, vsite, mu_tot, t, ed,
                      GMX_FORCE_NS | force_flags,
-                     ddOpenBalanceRegion, ddCloseBalanceRegion);
+                     ddBalanceRegionHandler);
         }
 
         /* Now we have the energies and forces corresponding to the