62 |
|
useReactionField = 0; |
63 |
|
useGB = 0; |
64 |
|
useEAM = 0; |
65 |
< |
|
65 |
> |
useSolidThermInt = 0; |
66 |
> |
useLiquidThermInt = 0; |
67 |
> |
|
68 |
|
haveCutoffGroups = false; |
69 |
|
|
70 |
|
excludes = Exclude::Instance(); |
446 |
|
excl = excludes->getFortranArray(); |
447 |
|
|
448 |
|
#ifdef IS_MPI |
449 |
< |
n_global = mpiSim->getTotAtoms(); |
449 |
> |
n_global = mpiSim->getNAtomsGlobal(); |
450 |
|
#else |
451 |
|
n_global = n_atoms; |
452 |
|
#endif |
455 |
|
|
456 |
|
getFortranGroupArray(this, mfact, ngroup, groupList, groupStart); |
457 |
|
//it may not be a good idea to pass the address of first element in vector |
458 |
< |
//since c++ standard does not require vector to be stored continously in meomory |
459 |
< |
//Most of the compilers will organize the memory of vector continously |
458 |
> |
//since c++ standard does not require vector to be stored continuously in meomory |
459 |
> |
//Most of the compilers will organize the memory of vector continuously |
460 |
|
setFsimulation( &fInfo, &n_global, &n_atoms, identArray, &n_exclude, excl, |
461 |
|
&nGlobalExcludes, globalExcludes, molMembershipArray, |
462 |
|
&mfact[0], &ngroup, &groupList[0], &groupStart[0], &isError); |
593 |
|
myMols = info->molecules; |
594 |
|
numMol = info->n_mol; |
595 |
|
for(int i = 0; i < numMol; i++){ |
594 |
– |
numAtom = myMols[i].getNAtoms(); |
595 |
– |
myAtoms = myMols[i].getMyAtoms(); |
596 |
– |
|
597 |
– |
|
598 |
– |
for(int j = 0; j < numAtom; j++){ |
599 |
– |
|
600 |
– |
|
601 |
– |
#ifdef IS_MPI |
602 |
– |
atomIndex = myAtoms[j]->getGlobalIndex(); |
603 |
– |
#else |
604 |
– |
atomIndex = myAtoms[j]->getIndex(); |
605 |
– |
#endif |
606 |
– |
|
607 |
– |
if(myMols[i].belongToCutoffGroup(atomIndex)) |
608 |
– |
continue; |
609 |
– |
else{ |
610 |
– |
// this is a fraction of the cutoff group's mass, not the mass itself! |
611 |
– |
mfact.push_back(1.0); |
612 |
– |
groupList.push_back(myAtoms[j]->getIndex() + 1); |
613 |
– |
groupStart.push_back(curIndex++); |
614 |
– |
} |
615 |
– |
} |
616 |
– |
|
596 |
|
numCutoffGroups = myMols[i].getNCutoffGroups(); |
597 |
|
for(myCutoffGroup =myMols[i].beginCutoffGroup(iterCutoff); myCutoffGroup != NULL; |
598 |
|
myCutoffGroup =myMols[i].nextCutoffGroup(iterCutoff)){ |
602 |
|
for(cutoffAtom = myCutoffGroup->beginAtom(iterAtom); cutoffAtom != NULL; |
603 |
|
cutoffAtom = myCutoffGroup->nextAtom(iterAtom)){ |
604 |
|
mfact.push_back(cutoffAtom->getMass()/totalMass); |
605 |
+ |
#ifdef IS_MPI |
606 |
+ |
groupList.push_back(cutoffAtom->getGlobalIndex() + 1); |
607 |
+ |
#else |
608 |
|
groupList.push_back(cutoffAtom->getIndex() + 1); |
609 |
+ |
#endif |
610 |
|
} |
611 |
|
|
612 |
|
groupStart.push_back(curIndex); |
615 |
|
}//end for(myCutoffGroup =myMols[i].beginCutoffGroup(iterCutoff)) |
616 |
|
|
617 |
|
}//end for(int i = 0; i < numMol; i++) |
618 |
< |
|
618 |
> |
|
619 |
> |
|
620 |
> |
//The last cutoff group need more element to indicate the end of the cutoff |
621 |
|
ngroup = groupStart.size(); |
622 |
|
} |