patch 31Mar17 for stable release

2017-03-30 10:07:27 -06:00
parent 4466d9fb4a
commit ae56b9ad89
6 changed files with 9 additions and 10 deletions
--- a/src/fix_halt.cpp
+++ b/src/fix_halt.cpp
@ -254,10 +254,9 @@ double FixHalt::tlimit()
    bigint final = update->firststep + 
      static_cast<bigint> (tratio*value/cpu * elapsed);
    nextstep = (final/nevery)*nevery + nevery;
+    if (nextstep == update->ntimestep) nextstep += nevery;
    tratio = 1.0;
  }

-  //printf("EVAL %ld %g %d\n",update->ntimestep,cpu,nevery);
-
  return cpu;
 }