ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/integrators/Integrator.cpp
(Generate patch)

Comparing trunk/src/integrators/Integrator.cpp (file contents):
Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
Revision 665 by tim, Thu Oct 13 22:26:47 2005 UTC

# Line 44 | Line 44 | namespace oopse {
44   #include "utils/simError.h"
45   namespace oopse {
46    Integrator::Integrator(SimInfo* info)
47 <    : info_(info), forceMan_(NULL) , needPotential(false), needStress(false), velocitizer_(NULL),
48 <      needVelocityScaling(false), dumpWriter(NULL), statWriter(NULL), thermo(info),
47 >    : info_(info), forceMan_(NULL) , needPotential(false), needStress(false), needReset(false), velocitizer_(NULL),
48 >      needVelocityScaling(false), dumpWriter(NULL), statWriter(NULL), thermo(info),
49        currentSnapshot_(info->getSnapshotManager()->getCurrentSnapshot()) {
50  
51        simParams = info->getSimParams();
# Line 86 | Line 86 | namespace oopse {
86          thermalTime = simParams->getRunTime();
87        }
88  
89 <      if (!simParams->getUseInitTime()) {
89 >      if (!simParams->getUseInitalTime()) {
90          currentSnapshot_->setTime(0.0);
91        }
92 <    
92 >
93 >      if (simParams->haveResetTime()) {
94 >        needReset = true;
95 >        resetTime = simParams->getResetTime();
96 >      }
97 >      
98        //create a default ForceManager
99        //if the subclass wants to use a different ForceManager, use setForceManager
100        forceMan_ = new ForceManager(info);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines