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 546 by tim, Sun May 29 00:06:14 2005 UTC vs.
Revision 749 by tim, Wed Nov 16 23:10:02 2005 UTC

# Line 141 | Line 141 | namespace oopse {
141        needPotential = true;
142        needStress = true;  
143      }
144 <  
144 >
145 >    std::cout << currentSnapshot_->getTime()<< ": \n";  
146    }
147  
148    void VelocityVerletIntegrator::postStep() {
149 <  
149 >
150      //save snapshot
151      info_->getSnapshotManager()->advance();
152    
# Line 222 | Line 223 | namespace oopse {
223    }
224  
225    StatWriter* VelocityVerletIntegrator::createStatWriter() {
226 +
227 +    std::string statFileFormatString = simParams->getStatFileFormat();
228 +    StatsBitSet mask = parseStatFileFormat(statFileFormatString);
229 +    
230      // if solidThermInt is true, add extra information to the statfile
231      if (simParams->getUseSolidThermInt()){
227 –      StatsBitSet mask;
228 –      mask.set(Stats::TIME);
229 –      mask.set(Stats::TOTAL_ENERGY);
230 –      mask.set(Stats::POTENTIAL_ENERGY);
231 –      mask.set(Stats::KINETIC_ENERGY);
232 –      mask.set(Stats::TEMPERATURE);
233 –      mask.set(Stats::PRESSURE);
234 –      mask.set(Stats::VOLUME);
235 –      mask.set(Stats::CONSERVED_QUANTITY);
232        mask.set(Stats::VRAW);
233        mask.set(Stats::VHARM);
238 –      return new StatWriter(info_->getStatFileName(), mask);
234      }
235  
236      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);
246 –        mask.set(Stats::KINETIC_ENERGY);
247 –        mask.set(Stats::TEMPERATURE);
248 –        mask.set(Stats::PRESSURE);
249 –        mask.set(Stats::VOLUME);
250 –        mask.set(Stats::CONSERVED_QUANTITY);
237          mask.set(Stats::PRESSURE_TENSOR_X);
238          mask.set(Stats::PRESSURE_TENSOR_Y);
239          mask.set(Stats::PRESSURE_TENSOR_Z);
254 –        return new StatWriter(info_->getStatFileName(), mask);
240      }
241      
242 <    return new StatWriter(info_->getStatFileName());
242 >     return new StatWriter(info_->getStatFileName(), mask);
243    }
244  
245    RestWriter* VelocityVerletIntegrator::createRestWriter(){

Diff Legend

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