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

Comparing trunk/OOPSE-2.0/src/integrators/VelocityVerletIntegrator.cpp (file contents):
Revision 2238 by tim, Sun May 22 21:05:15 2005 UTC vs.
Revision 2243 by tim, Sun May 29 00:06:14 2005 UTC

# Line 105 | Line 105 | namespace oopse {
105      
106      currSample = sampleTime + currentSnapshot_->getTime();
107      currStatus =  statusTime + currentSnapshot_->getTime();;
108 <    currThermal = thermalTime +  + currentSnapshot_->getTime();
108 >    currThermal = thermalTime + currentSnapshot_->getTime();
109 >    if (needReset) {
110 >      currReset = resetTime + currentSnapshot_->getTime();
111 >    }
112      needPotential = false;
113      needStress = false;      
114      
# Line 175 | Line 178 | namespace oopse {
178        needStress = false;
179        currStatus += statusTime;
180      }
181 <  
181 >
182 >      if (needReset && currentSnapshot_->getTime() >= currReset) {    
183 >        resetIntegrator();
184 >        currReset += resetTime;
185 >      }
186    
187    }
188  
# Line 231 | Line 238 | namespace oopse {
238        return new StatWriter(info_->getStatFileName(), mask);
239      }
240  
241 <    if (simParams->havePrintPresureTensor() && simParams->getPrintPressureTensor()){
241 >    if (simParams->havePrintPressureTensor() && simParams->getPrintPressureTensor()){
242 >       StatsBitSet mask;
243          mask.set(Stats::TIME);
244          mask.set(Stats::TOTAL_ENERGY);
245          mask.set(Stats::POTENTIAL_ENERGY);

Diff Legend

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