| 66 |
|
|
| 67 |
|
void ForceManager::calcForces() { |
| 68 |
|
|
| 69 |
+ |
|
| 70 |
|
if (!info_->isFortranInitialized()) { |
| 71 |
|
info_->update(); |
| 72 |
+ |
nbiMan_->setSimInfo(info_); |
| 73 |
+ |
nbiMan_->initialize(); |
| 74 |
+ |
info_->setupFortran(); |
| 75 |
|
} |
| 76 |
|
|
| 77 |
|
preCalculation(); |
| 91 |
|
Atom* atom; |
| 92 |
|
Molecule::RigidBodyIterator rbIter; |
| 93 |
|
RigidBody* rb; |
| 94 |
+ |
Molecule::CutoffGroupIterator ci; |
| 95 |
+ |
CutoffGroup* cg; |
| 96 |
|
|
| 97 |
|
// forces are zeroed here, before any are accumulated. |
| 98 |
|
// NOTE: do not rezero the forces in Fortran. |
| 108 |
|
rb = mol->nextRigidBody(rbIter)) { |
| 109 |
|
rb->zeroForcesAndTorques(); |
| 110 |
|
} |
| 111 |
< |
|
| 111 |
> |
|
| 112 |
> |
if(info_->getNGlobalCutoffGroups() != info_->getNGlobalAtoms()){ |
| 113 |
> |
std::cerr << "should not see me \n"; |
| 114 |
> |
for(cg = mol->beginCutoffGroup(ci); cg != NULL; |
| 115 |
> |
cg = mol->nextCutoffGroup(ci)) { |
| 116 |
> |
//calculate the center of mass of cutoff group |
| 117 |
> |
cg->updateCOM(); |
| 118 |
> |
} |
| 119 |
> |
} |
| 120 |
|
} |
| 121 |
< |
|
| 121 |
> |
|
| 122 |
|
// Zero out the stress tensor |
| 123 |
|
tau *= 0.0; |
| 124 |
|
|
| 245 |
|
void ForceManager::calcLongRangeInteraction() { |
| 246 |
|
Snapshot* curSnapshot; |
| 247 |
|
DataStorage* config; |
| 248 |
+ |
DataStorage* cgConfig; |
| 249 |
|
RealType* frc; |
| 250 |
|
RealType* pos; |
| 251 |
|
RealType* trq; |
| 259 |
|
|
| 260 |
|
//get array pointers |
| 261 |
|
config = &(curSnapshot->atomData); |
| 262 |
+ |
cgConfig = &(curSnapshot->cgData); |
| 263 |
|
frc = config->getArrayPointer(DataStorage::dslForce); |
| 264 |
|
pos = config->getArrayPointer(DataStorage::dslPosition); |
| 265 |
|
trq = config->getArrayPointer(DataStorage::dslTorque); |
| 267 |
|
electroFrame = config->getArrayPointer(DataStorage::dslElectroFrame); |
| 268 |
|
particlePot = config->getArrayPointer(DataStorage::dslParticlePot); |
| 269 |
|
|
| 270 |
< |
//calculate the center of mass of cutoff group |
| 271 |
< |
SimInfo::MoleculeIterator mi; |
| 272 |
< |
Molecule* mol; |
| 257 |
< |
Molecule::CutoffGroupIterator ci; |
| 258 |
< |
CutoffGroup* cg; |
| 259 |
< |
Vector3d com; |
| 260 |
< |
std::vector<Vector3d> rcGroup; |
| 261 |
< |
|
| 262 |
< |
if(info_->getNCutoffGroups() > 0){ |
| 263 |
< |
|
| 264 |
< |
for (mol = info_->beginMolecule(mi); mol != NULL; |
| 265 |
< |
mol = info_->nextMolecule(mi)) { |
| 266 |
< |
for(cg = mol->beginCutoffGroup(ci); cg != NULL; |
| 267 |
< |
cg = mol->nextCutoffGroup(ci)) { |
| 268 |
< |
cg->getCOM(com); |
| 269 |
< |
rcGroup.push_back(com); |
| 270 |
< |
} |
| 271 |
< |
}// end for (mol) |
| 272 |
< |
|
| 273 |
< |
rc = rcGroup[0].getArrayPointer(); |
| 270 |
> |
if(info_->getNGlobalCutoffGroups() != info_->getNGlobalAtoms()){ |
| 271 |
> |
std::cerr << "should not see me \n"; |
| 272 |
> |
rc = cgConfig->getArrayPointer(DataStorage::dslPosition); |
| 273 |
|
} else { |
| 274 |
|
// center of mass of the group is the same as position of the atom |
| 275 |
|
// if cutoff group does not exist |
