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

Comparing branches/development/src/brains/SimCreator.cpp (file contents):
Revision 1710 by gezelter, Fri May 18 21:44:02 2012 UTC vs.
Revision 1714 by gezelter, Sat May 19 18:12:46 2012 UTC

# Line 669 | Line 669 | namespace OpenMD {
669      
670    int SimCreator::computeStorageLayout(SimInfo* info) {
671  
672 +    Globals* simParams = info->getSimParams();
673      int nRigidBodies = info->getNGlobalRigidBodies();
674      set<AtomType*> atomTypes = info->getSimulatedAtomTypes();
675      set<AtomType*>::iterator i;
# Line 744 | Line 745 | namespace OpenMD {
745        if (storageLayout & DataStorage::dslForce) {
746          storageLayout |= DataStorage::dslFlucQForce;
747        }
748 +    }
749 +    
750 +    // if the user has asked for them, make sure we've got the memory for the
751 +    // objects defined.
752 +
753 +    if (simParams->getOutputParticlePotential()) {
754 +      storageLayout |= DataStorage::dslParticlePot;
755      }
756 +    if (simParams->getOutputElectricField()) {
757 +      storageLayout |= DataStorage::dslElectricField;
758 +    }
759 +    if (simParams->getOutputFluctuatingCharges()) {
760 +      storageLayout |= DataStorage::dslFlucQPosition;
761 +      storageLayout |= DataStorage::dslFlucQVelocity;
762 +      storageLayout |= DataStorage::dslFlucQForce;
763 +    }
764 +
765      return storageLayout;
766    }
767  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines