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

Comparing trunk/src/integrators/VelocityVerletIntegrator.cpp (file contents):
Revision 1396 by gezelter, Sat Dec 5 02:57:05 2009 UTC vs.
Revision 1413 by gezelter, Mon Mar 22 19:21:22 2010 UTC

# Line 50 | Line 50
50   #include "integrators/VelocityVerletIntegrator.hpp"
51   #include "integrators/DLM.hpp"
52   #include "utils/StringUtils.hpp"
53 + #include "utils/ProgressBar.hpp"
54  
55   namespace OpenMD {
56    VelocityVerletIntegrator::VelocityVerletIntegrator(SimInfo *info) : Integrator(info), rotAlgo(NULL) {
# Line 94 | Line 95 | namespace OpenMD {
95  
96      dumpWriter->writeDumpAndEor();
97  
98 +    progressBar = new ProgressBar();
99 +
100      //save statistics, before writeStat,  we must save statistics
101      thermo.saveStat();
102      saveConservedQuantity();
# Line 115 | Line 118 | namespace OpenMD {
118      needStress = false;      
119      
120    }
121 <
121 >
122    void VelocityVerletIntegrator::doIntegrate() {
123    
124    
# Line 128 | Line 131 | namespace OpenMD {
131        integrateStep();
132      
133        postStep();
134 <    
134 >      
135      }
136    
137      finalize();
# Line 183 | Line 186 | namespace OpenMD {
186        }
187  
188        statWriter->writeStat(currentSnapshot_->statData);
189 <      
189 >
190 >      progressBar->setStatus(currentSnapshot_->getTime(), runTime);
191 >      progressBar->update();
192 >
193        needPotential = false;
194        needStress = false;
195        currStatus += statusTime;

Diff Legend

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