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) |
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; |
742 |
|
} |
743 |
|
if (storageLayout & DataStorage::dslForce) { |
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 |
|
|