--- trunk/OOPSE-4/src/integrators/VelocityVerletIntegrator.cpp 2005/05/22 21:36:21 2239 +++ trunk/OOPSE-4/src/integrators/VelocityVerletIntegrator.cpp 2005/05/29 00:06:14 2243 @@ -105,7 +105,10 @@ namespace oopse { currSample = sampleTime + currentSnapshot_->getTime(); currStatus = statusTime + currentSnapshot_->getTime();; - currThermal = thermalTime + + currentSnapshot_->getTime(); + currThermal = thermalTime + currentSnapshot_->getTime(); + if (needReset) { + currReset = resetTime + currentSnapshot_->getTime(); + } needPotential = false; needStress = false; @@ -175,7 +178,11 @@ namespace oopse { needStress = false; currStatus += statusTime; } - + + if (needReset && currentSnapshot_->getTime() >= currReset) { + resetIntegrator(); + currReset += resetTime; + } }