--- trunk/OOPSE/libmdtools/SimSetup.cpp 2004/06/03 20:02:18 1228 +++ trunk/OOPSE/libmdtools/SimSetup.cpp 2004/06/03 20:02:25 1229 @@ -516,9 +516,9 @@ void SimSetup::makeMolecules(void){ myCutoffGroup = new CutoffGroup(); #ifdef IS_MPI - myCutoffGroup->setGlobalIndex(globalGroupIndex[j + groupOffset]); + myCutoffGroup->setGlobalIndex(globalGroupIndex[groupOffset]); #else - myCutoffGroup->setGlobalIndex(j + groupOffset); + myCutoffGroup->setGlobalIndex(groupOffset); #endif for (int cg = 0; cg < nMembers; cg++) { @@ -531,16 +531,12 @@ void SimSetup::makeMolecules(void){ #ifdef IS_MPI globalID = info[k].atoms[tempI]->getGlobalIndex(); - info[k].globalGroupMembership[globalID] = globalGroupIndex[j+groupOffset]; + info[k].globalGroupMembership[globalID] = globalGroupIndex[groupOffset]; #else globalID = info[k].atoms[tempI]->getIndex(); - info[k].globalGroupMembership[globalID] = j + groupOffset; -#endif - - - - myCutoffGroup->addAtom(info[k].atoms[tempI]); - + info[k].globalGroupMembership[globalID] = groupOffset; +#endif + myCutoffGroup->addAtom(info[k].atoms[tempI]); cutoffAtomSet.insert(tempI); } @@ -549,27 +545,28 @@ void SimSetup::makeMolecules(void){ }//end for (j = 0; j < molInfo.nCutoffGroups; j++) - //creat a cutoff group for every atom in current molecule which does not belong to cutoffgroup defined at mdl file + // create a cutoff group for every atom in current molecule which + // does not belong to cutoffgroup defined at mdl file + for(j = 0; j < molInfo.nAtoms; j++){ if(cutoffAtomSet.find(molInfo.myAtoms[j]->getIndex()) == cutoffAtomSet.end()){ myCutoffGroup = new CutoffGroup(); myCutoffGroup->addAtom(molInfo.myAtoms[j]); - + #ifdef IS_MPI - myCutoffGroup->setGlobalIndex(globalGroupIndex[j + groupOffset]); + myCutoffGroup->setGlobalIndex(globalGroupIndex[groupOffset]); globalID = info[k].atoms[atomOffset + j]->getGlobalIndex(); - info[k].globalGroupMembership[globalID] = globalGroupIndex[j+groupOffset]; + info[k].globalGroupMembership[globalID] = globalGroupIndex[groupOffset]; #else - myCutoffGroup->setGlobalIndex(j + groupOffset); + myCutoffGroup->setGlobalIndex(groupOffset); globalID = info[k].atoms[atomOffset + j]->getIndex(); - info[k].globalGroupMembership[globalID] = j+groupOffset; + info[k].globalGroupMembership[globalID] = groupOffset; #endif molInfo.myCutoffGroups.push_back(myCutoffGroup); groupOffset++; - } - + } } // After this is all set up, scan through the atoms to