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 993 by chrisfen, Thu Jun 22 15:21:01 2006 UTC vs.
Revision 1126 by gezelter, Fri Apr 6 21:53:43 2007 UTC

# Line 191 | Line 191 | namespace oopse {
191      dumpWriter->writeEor();
192    
193      if (simParams->getUseSolidThermInt()) {
194 < //       restWriter->writeZAngFile();
194 >      restWriter->writeZAngFile();
195        delete restWriter;
196        restWriter = NULL;
197      }
# Line 234 | Line 234 | namespace oopse {
234  
235      if (simParams->havePrintPressureTensor() &&
236          simParams->getPrintPressureTensor()){
237 <        mask.set(Stats::PRESSURE_TENSOR_X);
238 <        mask.set(Stats::PRESSURE_TENSOR_Y);
239 <        mask.set(Stats::PRESSURE_TENSOR_Z);
237 >        mask.set(Stats::PRESSURE_TENSOR_XX);
238 >        mask.set(Stats::PRESSURE_TENSOR_XY);
239 >        mask.set(Stats::PRESSURE_TENSOR_XZ);
240 >        mask.set(Stats::PRESSURE_TENSOR_YX);
241 >        mask.set(Stats::PRESSURE_TENSOR_YY);
242 >        mask.set(Stats::PRESSURE_TENSOR_YZ);
243 >        mask.set(Stats::PRESSURE_TENSOR_ZX);
244 >        mask.set(Stats::PRESSURE_TENSOR_ZY);
245 >        mask.set(Stats::PRESSURE_TENSOR_ZZ);
246      }
247      
248 +    if (simParams->getAccumulateBoxDipole()) {
249 +      mask.set(Stats::BOX_DIPOLE_X);
250 +      mask.set(Stats::BOX_DIPOLE_Y);
251 +      mask.set(Stats::BOX_DIPOLE_Z);
252 +    }
253 +
254       return new StatWriter(info_->getStatFileName(), mask);
255    }
256  

Diff Legend

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