ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/integrators/Integrator.cpp
(Generate patch)

Comparing trunk/OOPSE-4/src/integrators/Integrator.cpp (file contents):
Revision 2204 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
Revision 2243 by tim, Sun May 29 00:06:14 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 89 | Line 89 | namespace oopse {
89        if (!simParams->getUseInitTime()) {
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