| 54 |
|
#include "math/Vector3.hpp" |
| 55 |
|
#include "primitives/Molecule.hpp" |
| 56 |
|
#include "primitives/StuntDouble.hpp" |
| 57 |
– |
#include "UseTheForce/fCutoffPolicy.h" |
| 58 |
– |
#include "UseTheForce/DarkSide/fSwitchingFunctionType.h" |
| 59 |
– |
#include "UseTheForce/doForces_interface.h" |
| 57 |
|
#include "UseTheForce/DarkSide/neighborLists_interface.h" |
| 58 |
< |
#include "UseTheForce/DarkSide/switcheroo_interface.h" |
| 58 |
> |
#include "UseTheForce/doForces_interface.h" |
| 59 |
|
#include "utils/MemoryUtils.hpp" |
| 60 |
|
#include "utils/simError.h" |
| 61 |
|
#include "selection/SelectionManager.hpp" |
| 62 |
|
#include "io/ForceFieldOptions.hpp" |
| 63 |
|
#include "UseTheForce/ForceField.hpp" |
| 64 |
< |
#include "nonbonded/InteractionManager.hpp" |
| 64 |
> |
#include "nonbonded/SwitchingFunction.hpp" |
| 65 |
|
|
| 69 |
– |
|
| 66 |
|
#ifdef IS_MPI |
| 67 |
|
#include "UseTheForce/mpiComponentPlan.h" |
| 68 |
|
#include "UseTheForce/DarkSide/simParallel_interface.h" |
| 132 |
|
//equal to the total number of atoms minus number of atoms belong to |
| 133 |
|
//cutoff group defined in meta-data file plus the number of cutoff |
| 134 |
|
//groups defined in meta-data file |
| 135 |
+ |
std::cerr << "nGA = " << nGlobalAtoms_ << "\n"; |
| 136 |
+ |
std::cerr << "nCA = " << nCutoffAtoms << "\n"; |
| 137 |
+ |
std::cerr << "nG = " << nGroups << "\n"; |
| 138 |
+ |
|
| 139 |
|
nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups; |
| 140 |
+ |
|
| 141 |
+ |
std::cerr << "nGCG = " << nGlobalCutoffGroups_ << "\n"; |
| 142 |
|
|
| 143 |
|
//every free atom (atom does not belong to rigid bodies) is an |
| 144 |
|
//integrable object therefore the total number of integrable objects |
| 658 |
|
molStampIds_.insert(molStampIds_.end(), nmol, curStampId); |
| 659 |
|
} |
| 660 |
|
|
| 659 |
– |
void SimInfo::update() { |
| 661 |
|
|
| 662 |
< |
setupSimType(); |
| 663 |
< |
setupCutoffRadius(); |
| 664 |
< |
setupSwitchingRadius(); |
| 665 |
< |
setupCutoffMethod(); |
| 666 |
< |
setupSkinThickness(); |
| 667 |
< |
setupSwitchingFunction(); |
| 668 |
< |
setupAccumulateBoxDipole(); |
| 669 |
< |
|
| 670 |
< |
#ifdef IS_MPI |
| 670 |
< |
setupFortranParallel(); |
| 671 |
< |
#endif |
| 672 |
< |
setupFortranSim(); |
| 673 |
< |
fortranInitialized_ = true; |
| 674 |
< |
|
| 662 |
> |
/** |
| 663 |
> |
* update |
| 664 |
> |
* |
| 665 |
> |
* Performs the global checks and variable settings after the |
| 666 |
> |
* objects have been created. |
| 667 |
> |
* |
| 668 |
> |
*/ |
| 669 |
> |
void SimInfo::update() { |
| 670 |
> |
setupSimVariables(); |
| 671 |
|
calcNdf(); |
| 672 |
|
calcNdfRaw(); |
| 673 |
|
calcNdfTrans(); |
| 674 |
|
} |
| 675 |
|
|
| 676 |
+ |
/** |
| 677 |
+ |
* getSimulatedAtomTypes |
| 678 |
+ |
* |
| 679 |
+ |
* Returns an STL set of AtomType* that are actually present in this |
| 680 |
+ |
* simulation. Must query all processors to assemble this information. |
| 681 |
+ |
* |
| 682 |
+ |
*/ |
| 683 |
|
set<AtomType*> SimInfo::getSimulatedAtomTypes() { |
| 684 |
|
SimInfo::MoleculeIterator mi; |
| 685 |
|
Molecule* mol; |
| 692 |
|
atomTypes.insert(atom->getAtomType()); |
| 693 |
|
} |
| 694 |
|
} |
| 692 |
– |
return atomTypes; |
| 693 |
– |
} |
| 695 |
|
|
| 696 |
< |
/** |
| 696 |
< |
* setupCutoffRadius |
| 697 |
< |
* |
| 698 |
< |
* If the cutoffRadius was explicitly set, use that value. |
| 699 |
< |
* If the cutoffRadius was not explicitly set: |
| 700 |
< |
* Are there electrostatic atoms? Use 12.0 Angstroms. |
| 701 |
< |
* No electrostatic atoms? Poll the atom types present in the |
| 702 |
< |
* simulation for suggested cutoff values (e.g. 2.5 * sigma). |
| 703 |
< |
* Use the maximum suggested value that was found. |
| 704 |
< |
*/ |
| 705 |
< |
void SimInfo::setupCutoffRadius() { |
| 706 |
< |
|
| 707 |
< |
if (simParams_->haveCutoffRadius()) { |
| 708 |
< |
cutoffRadius_ = simParams_->getCutoffRadius(); |
| 709 |
< |
} else { |
| 710 |
< |
if (usesElectrostaticAtoms_) { |
| 711 |
< |
sprintf(painCave.errMsg, |
| 712 |
< |
"SimInfo Warning: No value was set for the cutoffRadius.\n" |
| 713 |
< |
"\tOpenMD will use a default value of 12.0 angstroms" |
| 714 |
< |
"\tfor the cutoffRadius.\n"); |
| 715 |
< |
painCave.isFatal = 0; |
| 716 |
< |
simError(); |
| 717 |
< |
cutoffRadius_ = 12.0; |
| 718 |
< |
} else { |
| 719 |
< |
RealType thisCut; |
| 720 |
< |
set<AtomType*>::iterator i; |
| 721 |
< |
set<AtomType*> atomTypes; |
| 722 |
< |
atomTypes = getSimulatedAtomTypes(); |
| 723 |
< |
for (i = atomTypes.begin(); i != atomTypes.end(); ++i) { |
| 724 |
< |
thisCut = InteractionManager::Instance()->getSuggestedCutoffRadius((*i)); |
| 725 |
< |
cutoffRadius_ = max(thisCut, cutoffRadius_); |
| 726 |
< |
} |
| 727 |
< |
sprintf(painCave.errMsg, |
| 728 |
< |
"SimInfo Warning: No value was set for the cutoffRadius.\n" |
| 729 |
< |
"\tOpenMD will use %lf angstroms.\n", |
| 730 |
< |
cutoffRadius_); |
| 731 |
< |
painCave.isFatal = 0; |
| 732 |
< |
simError(); |
| 733 |
< |
} |
| 734 |
< |
} |
| 696 |
> |
#ifdef IS_MPI |
| 697 |
|
|
| 698 |
< |
InteractionManager::Instance()->setCutoffRadius(cutoffRadius_); |
| 699 |
< |
} |
| 700 |
< |
|
| 701 |
< |
/** |
| 702 |
< |
* setupSwitchingRadius |
| 703 |
< |
* |
| 704 |
< |
* If the switchingRadius was explicitly set, use that value (but check it) |
| 705 |
< |
* If the switchingRadius was not explicitly set: use 0.85 * cutoffRadius_ |
| 706 |
< |
*/ |
| 707 |
< |
void SimInfo::setupSwitchingRadius() { |
| 698 |
> |
// loop over the found atom types on this processor, and add their |
| 699 |
> |
// numerical idents to a vector: |
| 700 |
> |
|
| 701 |
> |
vector<int> foundTypes; |
| 702 |
> |
set<AtomType*>::iterator i; |
| 703 |
> |
for (i = atomTypes.begin(); i != atomTypes.end(); ++i) |
| 704 |
> |
foundTypes.push_back( (*i)->getIdent() ); |
| 705 |
> |
|
| 706 |
> |
// count_local holds the number of found types on this processor |
| 707 |
> |
int count_local = foundTypes.size(); |
| 708 |
> |
|
| 709 |
> |
// count holds the total number of found types on all processors |
| 710 |
> |
// (some will be redundant with the ones found locally): |
| 711 |
> |
int count; |
| 712 |
> |
MPI::COMM_WORLD.Allreduce(&count_local, &count, 1, MPI::INT, MPI::SUM); |
| 713 |
> |
|
| 714 |
> |
// create a vector to hold the globally found types, and resize it: |
| 715 |
> |
vector<int> ftGlobal; |
| 716 |
> |
ftGlobal.resize(count); |
| 717 |
> |
vector<int> counts; |
| 718 |
> |
|
| 719 |
> |
int nproc = MPI::COMM_WORLD.Get_size(); |
| 720 |
> |
counts.resize(nproc); |
| 721 |
> |
vector<int> disps; |
| 722 |
> |
disps.resize(nproc); |
| 723 |
> |
|
| 724 |
> |
// now spray out the foundTypes to all the other processors: |
| 725 |
|
|
| 726 |
< |
if (simParams_->haveSwitchingRadius()) { |
| 727 |
< |
switchingRadius_ = simParams_->getSwitchingRadius(); |
| 749 |
< |
if (switchingRadius_ > cutoffRadius_) { |
| 750 |
< |
sprintf(painCave.errMsg, |
| 751 |
< |
"SimInfo Error: switchingRadius (%f) is larger than cutoffRadius(%f)\n", |
| 752 |
< |
switchingRadius_, cutoffRadius_); |
| 753 |
< |
painCave.isFatal = 1; |
| 754 |
< |
simError(); |
| 726 |
> |
MPI::COMM_WORLD.Allgatherv(&foundTypes[0], count_local, MPI::INT, |
| 727 |
> |
&ftGlobal[0], &counts[0], &disps[0], MPI::INT); |
| 728 |
|
|
| 729 |
< |
} |
| 730 |
< |
} else { |
| 731 |
< |
switchingRadius_ = 0.85 * cutoffRadius_; |
| 732 |
< |
sprintf(painCave.errMsg, |
| 733 |
< |
"SimInfo Warning: No value was set for the switchingRadius.\n" |
| 734 |
< |
"\tOpenMD will use a default value of 85 percent of the cutoffRadius.\n" |
| 735 |
< |
"\tswitchingRadius = %f. for this simulation\n", switchingRadius_); |
| 736 |
< |
painCave.isFatal = 0; |
| 737 |
< |
simError(); |
| 738 |
< |
} |
| 739 |
< |
InteractionManager::Instance()->setSwitchingRadius(switchingRadius_); |
| 729 |
> |
// foundIdents is a stl set, so inserting an already found ident |
| 730 |
> |
// will have no effect. |
| 731 |
> |
set<int> foundIdents; |
| 732 |
> |
vector<int>::iterator j; |
| 733 |
> |
for (j = ftGlobal.begin(); j != ftGlobal.end(); ++j) |
| 734 |
> |
foundIdents.insert((*j)); |
| 735 |
> |
|
| 736 |
> |
// now iterate over the foundIdents and get the actual atom types |
| 737 |
> |
// that correspond to these: |
| 738 |
> |
set<int>::iterator it; |
| 739 |
> |
for (it = foundIdents.begin(); it != foundIdents.end(); ++it) |
| 740 |
> |
atomTypes.insert( forceField_->getAtomType((*it)) ); |
| 741 |
> |
|
| 742 |
> |
#endif |
| 743 |
> |
|
| 744 |
> |
return atomTypes; |
| 745 |
|
} |
| 746 |
|
|
| 747 |
< |
/** |
| 748 |
< |
* setupSkinThickness |
| 749 |
< |
* |
| 750 |
< |
* If the skinThickness was explicitly set, use that value (but check it) |
| 751 |
< |
* If the skinThickness was not explicitly set: use 1.0 angstroms |
| 752 |
< |
*/ |
| 753 |
< |
void SimInfo::setupSkinThickness() { |
| 754 |
< |
if (simParams_->haveSkinThickness()) { |
| 777 |
< |
skinThickness_ = simParams_->getSkinThickness(); |
| 778 |
< |
} else { |
| 779 |
< |
skinThickness_ = 1.0; |
| 780 |
< |
sprintf(painCave.errMsg, |
| 781 |
< |
"SimInfo Warning: No value was set for the skinThickness.\n" |
| 782 |
< |
"\tOpenMD will use a default value of %f Angstroms\n" |
| 783 |
< |
"\tfor this simulation\n", skinThickness_); |
| 784 |
< |
painCave.isFatal = 0; |
| 785 |
< |
simError(); |
| 786 |
< |
} |
| 787 |
< |
} |
| 747 |
> |
void SimInfo::setupSimVariables() { |
| 748 |
> |
useAtomicVirial_ = simParams_->getUseAtomicVirial(); |
| 749 |
> |
// we only call setAccumulateBoxDipole if the accumulateBoxDipole parameter is true |
| 750 |
> |
calcBoxDipole_ = false; |
| 751 |
> |
if ( simParams_->haveAccumulateBoxDipole() ) |
| 752 |
> |
if ( simParams_->getAccumulateBoxDipole() ) { |
| 753 |
> |
calcBoxDipole_ = true; |
| 754 |
> |
} |
| 755 |
|
|
| 789 |
– |
void SimInfo::setupSimType() { |
| 756 |
|
set<AtomType*>::iterator i; |
| 757 |
|
set<AtomType*> atomTypes; |
| 758 |
< |
atomTypes = getSimulatedAtomTypes(); |
| 793 |
< |
|
| 794 |
< |
useAtomicVirial_ = simParams_->getUseAtomicVirial(); |
| 795 |
< |
|
| 758 |
> |
atomTypes = getSimulatedAtomTypes(); |
| 759 |
|
int usesElectrostatic = 0; |
| 760 |
|
int usesMetallic = 0; |
| 761 |
|
int usesDirectional = 0; |
| 785 |
|
fInfo_.SIM_uses_AtomicVirial = usesAtomicVirial_; |
| 786 |
|
} |
| 787 |
|
|
| 788 |
< |
void SimInfo::setupFortranSim() { |
| 788 |
> |
|
| 789 |
> |
vector<int> SimInfo::getGlobalAtomIndices() { |
| 790 |
> |
SimInfo::MoleculeIterator mi; |
| 791 |
> |
Molecule* mol; |
| 792 |
> |
Molecule::AtomIterator ai; |
| 793 |
> |
Atom* atom; |
| 794 |
> |
|
| 795 |
> |
vector<int> GlobalAtomIndices(getNAtoms(), 0); |
| 796 |
> |
|
| 797 |
> |
for (mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) { |
| 798 |
> |
|
| 799 |
> |
for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) { |
| 800 |
> |
GlobalAtomIndices[atom->getLocalIndex()] = atom->getGlobalIndex(); |
| 801 |
> |
} |
| 802 |
> |
} |
| 803 |
> |
return GlobalAtomIndices; |
| 804 |
> |
} |
| 805 |
> |
|
| 806 |
> |
|
| 807 |
> |
vector<int> SimInfo::getGlobalGroupIndices() { |
| 808 |
> |
SimInfo::MoleculeIterator mi; |
| 809 |
> |
Molecule* mol; |
| 810 |
> |
Molecule::CutoffGroupIterator ci; |
| 811 |
> |
CutoffGroup* cg; |
| 812 |
> |
|
| 813 |
> |
vector<int> GlobalGroupIndices; |
| 814 |
> |
|
| 815 |
> |
for (mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) { |
| 816 |
> |
|
| 817 |
> |
//local index of cutoff group is trivial, it only depends on the |
| 818 |
> |
//order of travesing |
| 819 |
> |
for (cg = mol->beginCutoffGroup(ci); cg != NULL; |
| 820 |
> |
cg = mol->nextCutoffGroup(ci)) { |
| 821 |
> |
GlobalGroupIndices.push_back(cg->getGlobalIndex()); |
| 822 |
> |
} |
| 823 |
> |
} |
| 824 |
> |
return GlobalGroupIndices; |
| 825 |
> |
} |
| 826 |
> |
|
| 827 |
> |
|
| 828 |
> |
void SimInfo::setupFortran() { |
| 829 |
|
int isError; |
| 830 |
|
int nExclude, nOneTwo, nOneThree, nOneFour; |
| 831 |
|
vector<int> fortranGlobalGroupMembership; |
| 832 |
|
|
| 830 |
– |
notifyFortranSkinThickness(&skinThickness_); |
| 831 |
– |
|
| 832 |
– |
int ljsp = cutoffMethod_ == SHIFTED_POTENTIAL ? 1 : 0; |
| 833 |
– |
int ljsf = cutoffMethod_ == SHIFTED_FORCE ? 1 : 0; |
| 834 |
– |
notifyFortranCutoffs(&cutoffRadius_, &switchingRadius_, &ljsp, &ljsf); |
| 835 |
– |
|
| 833 |
|
isError = 0; |
| 834 |
|
|
| 835 |
|
//globalGroupMembership_ is filled by SimCreator |
| 864 |
|
} |
| 865 |
|
} |
| 866 |
|
|
| 867 |
< |
//fill ident array of local atoms (it is actually ident of AtomType, it is so confusing !!!) |
| 871 |
< |
vector<int> identArray; |
| 867 |
> |
// Build the identArray_ |
| 868 |
|
|
| 869 |
< |
//to avoid memory reallocation, reserve enough space identArray |
| 870 |
< |
identArray.reserve(getNAtoms()); |
| 875 |
< |
|
| 869 |
> |
identArray_.clear(); |
| 870 |
> |
identArray_.reserve(getNAtoms()); |
| 871 |
|
for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) { |
| 872 |
|
for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) { |
| 873 |
< |
identArray.push_back(atom->getIdent()); |
| 873 |
> |
identArray_.push_back(atom->getIdent()); |
| 874 |
|
} |
| 875 |
|
} |
| 876 |
|
|
| 893 |
|
int* oneThreeList = oneThreeInteractions_.getPairList(); |
| 894 |
|
int* oneFourList = oneFourInteractions_.getPairList(); |
| 895 |
|
|
| 896 |
< |
setFortranSim( &fInfo_, &nGlobalAtoms_, &nAtoms_, &identArray[0], |
| 896 |
> |
setFortranSim( &fInfo_, &nGlobalAtoms_, &nAtoms_, &identArray_[0], |
| 897 |
|
&nExclude, excludeList, |
| 898 |
|
&nOneTwo, oneTwoList, |
| 899 |
|
&nOneThree, oneThreeList, |
| 922 |
|
setNeighbors(&nlistNeighbors); |
| 923 |
|
} |
| 924 |
|
|
| 930 |
– |
|
| 931 |
– |
} |
| 932 |
– |
|
| 933 |
– |
|
| 934 |
– |
void SimInfo::setupFortranParallel() { |
| 925 |
|
#ifdef IS_MPI |
| 936 |
– |
//SimInfo is responsible for creating localToGlobalAtomIndex and localToGlobalGroupIndex |
| 937 |
– |
vector<int> localToGlobalAtomIndex(getNAtoms(), 0); |
| 938 |
– |
vector<int> localToGlobalCutoffGroupIndex; |
| 939 |
– |
SimInfo::MoleculeIterator mi; |
| 940 |
– |
Molecule::AtomIterator ai; |
| 941 |
– |
Molecule::CutoffGroupIterator ci; |
| 942 |
– |
Molecule* mol; |
| 943 |
– |
Atom* atom; |
| 944 |
– |
CutoffGroup* cg; |
| 926 |
|
mpiSimData parallelData; |
| 946 |
– |
int isError; |
| 927 |
|
|
| 948 |
– |
for (mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) { |
| 949 |
– |
|
| 950 |
– |
//local index(index in DataStorge) of atom is important |
| 951 |
– |
for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) { |
| 952 |
– |
localToGlobalAtomIndex[atom->getLocalIndex()] = atom->getGlobalIndex() + 1; |
| 953 |
– |
} |
| 954 |
– |
|
| 955 |
– |
//local index of cutoff group is trivial, it only depends on the order of travesing |
| 956 |
– |
for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) { |
| 957 |
– |
localToGlobalCutoffGroupIndex.push_back(cg->getGlobalIndex() + 1); |
| 958 |
– |
} |
| 959 |
– |
|
| 960 |
– |
} |
| 961 |
– |
|
| 928 |
|
//fill up mpiSimData struct |
| 929 |
|
parallelData.nMolGlobal = getNGlobalMolecules(); |
| 930 |
|
parallelData.nMolLocal = getNMolecules(); |
| 936 |
|
MPI_Comm_size(MPI_COMM_WORLD, &(parallelData.nProcessors)); |
| 937 |
|
|
| 938 |
|
//pass mpiSimData struct and index arrays to fortran |
| 939 |
< |
setFsimParallel(¶llelData, &(parallelData.nAtomsLocal), |
| 940 |
< |
&localToGlobalAtomIndex[0], &(parallelData.nGroupsLocal), |
| 941 |
< |
&localToGlobalCutoffGroupIndex[0], &isError); |
| 939 |
> |
//setFsimParallel(¶llelData, &(parallelData.nAtomsLocal), |
| 940 |
> |
// &localToGlobalAtomIndex[0], &(parallelData.nGroupsLocal), |
| 941 |
> |
// &localToGlobalCutoffGroupIndex[0], &isError); |
| 942 |
|
|
| 943 |
|
if (isError) { |
| 944 |
|
sprintf(painCave.errMsg, |
| 949 |
|
|
| 950 |
|
sprintf(checkPointMsg, " mpiRefresh successful.\n"); |
| 951 |
|
errorCheckPoint(); |
| 986 |
– |
|
| 952 |
|
#endif |
| 988 |
– |
} |
| 953 |
|
|
| 954 |
< |
|
| 955 |
< |
void SimInfo::setupSwitchingFunction() { |
| 956 |
< |
int ft = CUBIC; |
| 957 |
< |
|
| 958 |
< |
if (simParams_->haveSwitchingFunctionType()) { |
| 959 |
< |
string funcType = simParams_->getSwitchingFunctionType(); |
| 996 |
< |
toUpper(funcType); |
| 997 |
< |
if (funcType == "CUBIC") { |
| 998 |
< |
ft = CUBIC; |
| 999 |
< |
} else { |
| 1000 |
< |
if (funcType == "FIFTH_ORDER_POLYNOMIAL") { |
| 1001 |
< |
ft = FIFTH_ORDER_POLY; |
| 1002 |
< |
} else { |
| 1003 |
< |
// throw error |
| 1004 |
< |
sprintf( painCave.errMsg, |
| 1005 |
< |
"SimInfo error: Unknown switchingFunctionType. (Input file specified %s .)\n" |
| 1006 |
< |
"\tswitchingFunctionType must be one of: \"cubic\" or \"fifth_order_polynomial\".", |
| 1007 |
< |
funcType.c_str() ); |
| 1008 |
< |
painCave.isFatal = 1; |
| 1009 |
< |
simError(); |
| 1010 |
< |
} |
| 1011 |
< |
} |
| 954 |
> |
initFortranFF(&isError); |
| 955 |
> |
if (isError) { |
| 956 |
> |
sprintf(painCave.errMsg, |
| 957 |
> |
"initFortranFF errror: fortran didn't like something we gave it.\n"); |
| 958 |
> |
painCave.isFatal = 1; |
| 959 |
> |
simError(); |
| 960 |
|
} |
| 961 |
< |
|
| 1014 |
< |
// send switching function notification to switcheroo |
| 1015 |
< |
setFunctionType(&ft); |
| 1016 |
< |
|
| 1017 |
< |
} |
| 1018 |
< |
|
| 1019 |
< |
void SimInfo::setupAccumulateBoxDipole() { |
| 1020 |
< |
|
| 1021 |
< |
// we only call setAccumulateBoxDipole if the accumulateBoxDipole parameter is true |
| 1022 |
< |
if ( simParams_->haveAccumulateBoxDipole() ) |
| 1023 |
< |
if ( simParams_->getAccumulateBoxDipole() ) { |
| 1024 |
< |
calcBoxDipole_ = true; |
| 1025 |
< |
} |
| 1026 |
< |
|
| 961 |
> |
fortranInitialized_ = true; |
| 962 |
|
} |
| 963 |
|
|
| 964 |
|
void SimInfo::addProperty(GenericData* genData) { |
| 995 |
|
Molecule* mol; |
| 996 |
|
RigidBody* rb; |
| 997 |
|
Atom* atom; |
| 998 |
+ |
CutoffGroup* cg; |
| 999 |
|
SimInfo::MoleculeIterator mi; |
| 1000 |
|
Molecule::RigidBodyIterator rbIter; |
| 1001 |
< |
Molecule::AtomIterator atomIter;; |
| 1001 |
> |
Molecule::AtomIterator atomIter; |
| 1002 |
> |
Molecule::CutoffGroupIterator cgIter; |
| 1003 |
|
|
| 1004 |
|
for (mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) { |
| 1005 |
|
|
| 1010 |
|
for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) { |
| 1011 |
|
rb->setSnapshotManager(sman_); |
| 1012 |
|
} |
| 1013 |
+ |
|
| 1014 |
+ |
for (cg = mol->beginCutoffGroup(cgIter); cg != NULL; cg = mol->nextCutoffGroup(cgIter)) { |
| 1015 |
+ |
cg->setSnapshotManager(sman_); |
| 1016 |
+ |
} |
| 1017 |
|
} |
| 1018 |
|
|
| 1019 |
|
} |
