ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/brains/SimInfo.cpp
(Generate patch)

Comparing trunk/src/brains/SimInfo.cpp (file contents):
Revision 2021 by gezelter, Thu Apr 17 19:07:31 2014 UTC vs.
Revision 2022 by gezelter, Fri Sep 26 22:22:28 2014 UTC

# Line 78 | Line 78 | namespace OpenMD {
78      nAtoms_(0), nBonds_(0), nBends_(0), nTorsions_(0), nInversions_(0),
79      nRigidBodies_(0), nIntegrableObjects_(0), nCutoffGroups_(0),
80      nConstraints_(0), nFluctuatingCharges_(0), sman_(NULL),
81 <    topologyDone_(false), calcBoxDipole_(false), useAtomicVirial_(true),
82 <    hasNGlobalConstraints_(false) {    
81 >    topologyDone_(false), calcBoxDipole_(false), calcBoxQuadrupole_(false),
82 >    useAtomicVirial_(true), hasNGlobalConstraints_(false) {    
83      
84      MoleculeStamp* molStamp;
85      int nMolWithSameStamp;
# Line 822 | Line 822 | namespace OpenMD {
822        if ( simParams_->getAccumulateBoxDipole() ) {
823          calcBoxDipole_ = true;      
824        }
825 +    // we only call setAccumulateBoxQuadrupole if the accumulateBoxQuadrupole
826 +    // parameter is true
827 +    calcBoxQuadrupole_ = false;
828 +    if ( simParams_->haveAccumulateBoxQuadrupole() )
829 +      if ( simParams_->getAccumulateBoxQuadrupole() ) {
830 +        calcBoxQuadrupole_ = true;      
831 +      }
832      
833      set<AtomType*>::iterator i;
834      set<AtomType*> atomTypes;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines