| 110 |
|
Globals* simParams_ = info_->getSimParams(); |
| 111 |
|
ForceFieldOptions& forceFieldOptions_ = forceField_->getForceFieldOptions(); |
| 112 |
|
int mdFileVersion; |
| 113 |
+ |
rCut_ = 0.0; //Needs a value for a later max() call; |
| 114 |
|
|
| 115 |
|
if (simParams_->haveMDfileVersion()) |
| 116 |
|
mdFileVersion = simParams_->getMDfileVersion(); |
| 449 |
|
Molecule::CutoffGroupIterator ci; |
| 450 |
|
CutoffGroup* cg; |
| 451 |
|
|
| 452 |
< |
// forces are zeroed here, before any are accumulated. |
| 452 |
> |
// forces and potentials are zeroed here, before any are |
| 453 |
> |
// accumulated. |
| 454 |
|
|
| 455 |
+ |
Snapshot* snap = info_->getSnapshotManager()->getCurrentSnapshot(); |
| 456 |
+ |
|
| 457 |
+ |
snap->setBondPotential(0.0); |
| 458 |
+ |
snap->setBendPotential(0.0); |
| 459 |
+ |
snap->setTorsionPotential(0.0); |
| 460 |
+ |
snap->setInversionPotential(0.0); |
| 461 |
+ |
|
| 462 |
+ |
potVec zeroPot(0.0); |
| 463 |
+ |
snap->setLongRangePotential(zeroPot); |
| 464 |
+ |
snap->setExcludedPotentials(zeroPot); |
| 465 |
+ |
|
| 466 |
+ |
snap->setRestraintPotential(0.0); |
| 467 |
+ |
snap->setRawPotential(0.0); |
| 468 |
+ |
|
| 469 |
|
for (mol = info_->beginMolecule(mi); mol != NULL; |
| 470 |
|
mol = info_->nextMolecule(mi)) { |
| 471 |
|
for(atom = mol->beginAtom(ai); atom != NULL; |
| 491 |
|
// Zero out the stress tensor |
| 492 |
|
stressTensor *= 0.0; |
| 493 |
|
// Zero out the heatFlux |
| 494 |
< |
fDecomp_->setHeatFlux( V3Zero ); |
| 494 |
> |
fDecomp_->setHeatFlux( Vector3d(0.0) ); |
| 495 |
|
} |
| 496 |
|
|
| 497 |
|
void ForceManager::shortRangeInteractions() { |
| 601 |
|
} |
| 602 |
|
} |
| 603 |
|
} |
| 604 |
< |
|
| 605 |
< |
RealType shortRangePotential = bondPotential + bendPotential + |
| 606 |
< |
torsionPotential + inversionPotential; |
| 604 |
> |
|
| 605 |
> |
#ifdef IS_MPI |
| 606 |
> |
// Collect from all nodes. This should eventually be moved into a |
| 607 |
> |
// SystemDecomposition, but this is a better place than in |
| 608 |
> |
// Thermo to do the collection. |
| 609 |
> |
MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &bondPotential, 1, MPI::REALTYPE, |
| 610 |
> |
MPI::SUM); |
| 611 |
> |
MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &bendPotential, 1, MPI::REALTYPE, |
| 612 |
> |
MPI::SUM); |
| 613 |
> |
MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &torsionPotential, 1, |
| 614 |
> |
MPI::REALTYPE, MPI::SUM); |
| 615 |
> |
MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &inversionPotential, 1, |
| 616 |
> |
MPI::REALTYPE, MPI::SUM); |
| 617 |
> |
#endif |
| 618 |
> |
|
| 619 |
|
Snapshot* curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot(); |
| 620 |
< |
curSnapshot->statData[Stats::SHORT_RANGE_POTENTIAL] = shortRangePotential; |
| 621 |
< |
curSnapshot->statData[Stats::BOND_POTENTIAL] = bondPotential; |
| 622 |
< |
curSnapshot->statData[Stats::BEND_POTENTIAL] = bendPotential; |
| 623 |
< |
curSnapshot->statData[Stats::DIHEDRAL_POTENTIAL] = torsionPotential; |
| 624 |
< |
curSnapshot->statData[Stats::INVERSION_POTENTIAL] = inversionPotential; |
| 620 |
> |
|
| 621 |
> |
curSnapshot->setBondPotential(bondPotential); |
| 622 |
> |
curSnapshot->setBendPotential(bendPotential); |
| 623 |
> |
curSnapshot->setTorsionPotential(torsionPotential); |
| 624 |
> |
curSnapshot->setInversionPotential(inversionPotential); |
| 625 |
> |
|
| 626 |
> |
// RealType shortRangePotential = bondPotential + bendPotential + |
| 627 |
> |
// torsionPotential + inversionPotential; |
| 628 |
> |
|
| 629 |
> |
// curSnapshot->setShortRangePotential(shortRangePotential); |
| 630 |
|
} |
| 631 |
|
|
| 632 |
|
void ForceManager::longRangeInteractions() { |
| 681 |
|
RealType dVdFQ2(0.0); |
| 682 |
|
potVec longRangePotential(0.0); |
| 683 |
|
potVec workPot(0.0); |
| 684 |
+ |
potVec exPot(0.0); |
| 685 |
|
vector<int>::iterator ia, jb; |
| 686 |
|
|
| 687 |
|
int loopStart, loopEnd; |
| 689 |
|
idat.vdwMult = &vdwMult; |
| 690 |
|
idat.electroMult = &electroMult; |
| 691 |
|
idat.pot = &workPot; |
| 692 |
+ |
idat.excludedPot = &exPot; |
| 693 |
|
sdat.pot = fDecomp_->getEmbeddingPotential(); |
| 694 |
+ |
sdat.excludedPot = fDecomp_->getExcludedSelfPotential(); |
| 695 |
|
idat.vpair = &vpair; |
| 696 |
|
idat.dVdFQ1 = &dVdFQ1; |
| 697 |
|
idat.dVdFQ2 = &dVdFQ2; |
| 708 |
|
} else { |
| 709 |
|
loopStart = PAIR_LOOP; |
| 710 |
|
} |
| 675 |
– |
|
| 711 |
|
for (int iLoop = loopStart; iLoop <= loopEnd; iLoop++) { |
| 712 |
|
|
| 713 |
|
if (iLoop == loopStart) { |
| 739 |
|
|
| 740 |
|
in_switching_region = switcher_->getSwitch(rgrpsq, sw, dswdr, |
| 741 |
|
rgrp); |
| 742 |
< |
|
| 742 |
> |
|
| 743 |
|
atomListRow = fDecomp_->getAtomsInGroupRow(cg1); |
| 744 |
|
atomListColumn = fDecomp_->getAtomsInGroupColumn(cg2); |
| 745 |
|
|
| 746 |
|
if (doHeatFlux_) |
| 747 |
|
gvel2 = fDecomp_->getGroupVelocityColumn(cg2); |
| 748 |
< |
|
| 748 |
> |
|
| 749 |
|
for (ia = atomListRow.begin(); |
| 750 |
|
ia != atomListRow.end(); ++ia) { |
| 751 |
|
atom1 = (*ia); |
| 752 |
< |
|
| 752 |
> |
|
| 753 |
|
for (jb = atomListColumn.begin(); |
| 754 |
|
jb != atomListColumn.end(); ++jb) { |
| 755 |
|
atom2 = (*jb); |
| 756 |
|
|
| 757 |
< |
if (!fDecomp_->skipAtomPair(atom1, atom2)) { |
| 757 |
> |
if (!fDecomp_->skipAtomPair(atom1, atom2, cg1, cg2)) { |
| 758 |
> |
|
| 759 |
|
vpair = 0.0; |
| 760 |
|
workPot = 0.0; |
| 761 |
+ |
exPot = 0.0; |
| 762 |
|
f1 = V3Zero; |
| 763 |
|
dVdFQ1 = 0.0; |
| 764 |
|
dVdFQ2 = 0.0; |
| 765 |
|
|
| 766 |
|
fDecomp_->fillInteractionData(idat, atom1, atom2); |
| 767 |
< |
|
| 767 |
> |
|
| 768 |
|
topoDist = fDecomp_->getTopologicalDistance(atom1, atom2); |
| 769 |
|
vdwMult = vdwScale_[topoDist]; |
| 770 |
|
electroMult = electrostaticScale_[topoDist]; |
| 880 |
|
} |
| 881 |
|
} |
| 882 |
|
|
| 883 |
+ |
// collects pairwise information |
| 884 |
|
fDecomp_->collectData(); |
| 885 |
|
|
| 886 |
|
if (info_->requiresSelfCorrection()) { |
| 887 |
< |
|
| 850 |
< |
for (int atom1 = 0; atom1 < info_->getNAtoms(); atom1++) { |
| 887 |
> |
for (int atom1 = 0; atom1 < info_->getNAtoms(); atom1++) { |
| 888 |
|
fDecomp_->fillSelfData(sdat, atom1); |
| 889 |
|
interactionMan_->doSelfCorrection(sdat); |
| 890 |
|
} |
| 854 |
– |
|
| 891 |
|
} |
| 892 |
|
|
| 893 |
+ |
// collects single-atom information |
| 894 |
+ |
fDecomp_->collectSelfData(); |
| 895 |
+ |
|
| 896 |
|
longRangePotential = *(fDecomp_->getEmbeddingPotential()) + |
| 897 |
|
*(fDecomp_->getPairwisePotential()); |
| 898 |
|
|
| 899 |
< |
lrPot = longRangePotential.sum(); |
| 899 |
> |
curSnapshot->setLongRangePotential(longRangePotential); |
| 900 |
|
|
| 901 |
< |
//store the stressTensor and long range potential |
| 902 |
< |
curSnapshot->statData[Stats::LONG_RANGE_POTENTIAL] = lrPot; |
| 903 |
< |
curSnapshot->statData[Stats::VANDERWAALS_POTENTIAL] = longRangePotential[VANDERWAALS_FAMILY]; |
| 904 |
< |
curSnapshot->statData[Stats::ELECTROSTATIC_POTENTIAL] = longRangePotential[ELECTROSTATIC_FAMILY]; |
| 901 |
> |
// lrPot = longRangePotential.sum(); |
| 902 |
> |
|
| 903 |
> |
// //store the long range potential |
| 904 |
> |
// curSnapshot->setLongRangePotential(lrPot); |
| 905 |
> |
|
| 906 |
> |
curSnapshot->setExcludedPotentials(*(fDecomp_->getExcludedSelfPotential()) + |
| 907 |
> |
*(fDecomp_->getExcludedPotential())); |
| 908 |
> |
|
| 909 |
|
} |
| 910 |
|
|
| 911 |
|
|
| 915 |
|
Molecule::RigidBodyIterator rbIter; |
| 916 |
|
RigidBody* rb; |
| 917 |
|
Snapshot* curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot(); |
| 918 |
< |
|
| 918 |
> |
|
| 919 |
|
// collect the atomic forces onto rigid bodies |
| 920 |
|
|
| 921 |
|
for (mol = info_->beginMolecule(mi); mol != NULL; |
| 928 |
|
} |
| 929 |
|
|
| 930 |
|
#ifdef IS_MPI |
| 888 |
– |
|
| 931 |
|
MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, stressTensor.getArrayPointer(), 9, |
| 932 |
|
MPI::REALTYPE, MPI::SUM); |
| 933 |
|
#endif |
