Merge branch release-2016

[alexxy/gromacs.git] / src / programs / mdrun / md.cpp

diff --git a/src/programs/mdrun/md.cpp b/src/programs/mdrun/md.cpp
index 3dccf983aa2d4eedc3d697ef737442e90204a679..7fc77b592cd43f0fac67f7ae2a2e898b91d1b7c0 100644 (file)
--- a/src/programs/mdrun/md.cpp
+++ b/src/programs/mdrun/md.cpp
@@ -1839,6 +1839,12 @@ double gmx::do_md(FILE *fplog, t_commrec *cr, const gmx::MDLogger &mdlog,
     IMD_finalize(ir->bIMD, ir->imd);
 
     walltime_accounting_set_nsteps_done(walltime_accounting, step_rel);
+    if (step_rel >= wcycle_get_reset_counters(wcycle) &&
+        signals[eglsRESETCOUNTERS].set == 0 &&
+        !bResetCountersHalfMaxH)
+    {
+        walltime_accounting_set_valid_finish(walltime_accounting);
+    }
 
     return 0;
 }