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 1711 by gezelter, Sat May 19 02:58:35 2012 UTC vs.
Revision 1723 by gezelter, Thu May 24 20:59:54 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 746 | 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 +
755 +    if (simParams->havePrintHeatFlux()) {
756 +      if (simParams->getPrintHeatFlux()) {
757 +        storageLayout |= DataStorage::dslParticlePot;
758 +      }
759      }
760  
761 +    if (simParams->getOutputElectricField()) {
762 +      storageLayout |= DataStorage::dslElectricField;
763 +    }
764 +    if (simParams->getOutputFluctuatingCharges()) {
765 +      storageLayout |= DataStorage::dslFlucQPosition;
766 +      storageLayout |= DataStorage::dslFlucQVelocity;
767 +      storageLayout |= DataStorage::dslFlucQForce;
768 +    }
769 +
770      return storageLayout;
771    }
772  

Diff Legend

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