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 1715 by gezelter, Tue May 22 21:55:31 2012 UTC

# Line 425 | Line 425 | namespace OpenMD {
425      //find the storage layout
426  
427      int storageLayout = computeStorageLayout(info);
428
429    cerr << "computed Storage Layout = " << storageLayout << "\n";
428  
429      //allocate memory for DataStorage(circular reference, need to
430      //break it)
# Line 669 | Line 667 | namespace OpenMD {
667      
668    int SimCreator::computeStorageLayout(SimInfo* info) {
669  
670 +    Globals* simParams = info->getSimParams();
671      int nRigidBodies = info->getNGlobalRigidBodies();
672      set<AtomType*> atomTypes = info->getSimulatedAtomTypes();
673      set<AtomType*>::iterator i;
# Line 745 | Line 744 | namespace OpenMD {
744          storageLayout |= DataStorage::dslFlucQForce;
745        }
746      }
747 +    
748 +    // if the user has asked for them, make sure we've got the memory for the
749 +    // objects defined.
750 +
751 +    if (simParams->getOutputParticlePotential()) {
752 +      storageLayout |= DataStorage::dslParticlePot;
753 +    }
754 +    if (simParams->getOutputElectricField()) {
755 +      storageLayout |= DataStorage::dslElectricField;
756 +    }
757 +    if (simParams->getOutputFluctuatingCharges()) {
758 +      storageLayout |= DataStorage::dslFlucQPosition;
759 +      storageLayout |= DataStorage::dslFlucQVelocity;
760 +      storageLayout |= DataStorage::dslFlucQForce;
761 +    }
762 +
763      return storageLayout;
764    }
765  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines