git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15203 f3b2605a-c512-4ea7-a41b-209d697bcdaa

src/min_fire.cpp

@@ -27,10 +27,6 @@ using namespace LAMMPS_NS;
 
 #define EPS_ENERGY 1.0e-8
 
-// same as in other min classes
-
-enum{MAXITER,MAXEVAL,ETOL,FTOL,DOWNHILL,ZEROALPHA,ZEROFORCE,ZEROQUAD};
-
 #define DELAYSTEP 5
 #define DT_GROW 1.1
 #define DT_SHRINK 0.5
@@ -93,6 +89,9 @@ int MinFire::iterate(int maxiter)
 
   for (int iter = 0; iter < maxiter; iter++) {
 
+    if (timer->check_timeout(niter))
+      return TIMEOUT;
+
     ntimestep = ++update->ntimestep;
     niter++;