| 35 |
|
* |
| 36 |
|
* [1] Meineke, et al., J. Comp. Chem. 26, 252-271 (2005). |
| 37 |
|
* [2] Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006). |
| 38 |
< |
* [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008). |
| 39 |
< |
* [4] Vardeman & Gezelter, in progress (2009). |
| 38 |
> |
* [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008). |
| 39 |
> |
* [4] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010). |
| 40 |
> |
* [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). |
| 41 |
|
*/ |
| 42 |
|
|
| 43 |
+ |
#ifdef IS_MPI |
| 44 |
+ |
#include <mpi.h> |
| 45 |
+ |
#endif |
| 46 |
+ |
|
| 47 |
+ |
#include "config.h" |
| 48 |
|
#include <cmath> |
| 49 |
+ |
|
| 50 |
|
#include "restraints/RestraintForceManager.hpp" |
| 51 |
|
#include "restraints/MolecularRestraint.hpp" |
| 52 |
|
#include "restraints/ObjectRestraint.hpp" |
| 56 |
|
#include "utils/StringUtils.hpp" |
| 57 |
|
#include "selection/SelectionEvaluator.hpp" |
| 58 |
|
#include "selection/SelectionManager.hpp" |
| 52 |
– |
#ifdef IS_MPI |
| 53 |
– |
#include <mpi.h> |
| 54 |
– |
#endif |
| 59 |
|
|
| 56 |
– |
|
| 60 |
|
namespace OpenMD { |
| 61 |
|
|
| 62 |
|
RestraintForceManager::RestraintForceManager(SimInfo* info): ForceManager(info) { |
| 101 |
|
if (myType.compare("MOLECULAR")==0){ |
| 102 |
|
|
| 103 |
|
int molIndex; |
| 101 |
– |
std::vector<Vector3d> ref; |
| 104 |
|
Vector3d refCom; |
| 105 |
|
|
| 106 |
|
if (!stamp[i]->haveMolIndex()) { |
| 136 |
|
// this proc doesn't have the molecule. Do a quick check to |
| 137 |
|
// make sure another processor is supposed to have it. |
| 138 |
|
|
| 139 |
< |
int myrank = MPI::COMM_WORLD.Get_rank(); |
| 139 |
> |
int myrank; |
| 140 |
> |
MPI_Comm_rank( MPI_COMM_WORLD, &myrank); |
| 141 |
> |
|
| 142 |
|
if (info_->getMolToProc(molIndex) == myrank) { |
| 143 |
|
|
| 144 |
|
// If we were supposed to have it but got a null, then freak out. |
| 160 |
|
#ifdef IS_MPI |
| 161 |
|
// only handle this molecular restraint if this processor owns the |
| 162 |
|
// molecule |
| 163 |
< |
int myrank = MPI::COMM_WORLD.Get_rank(); |
| 163 |
> |
int myrank; |
| 164 |
> |
MPI_Comm_rank( MPI_COMM_WORLD, &myrank); |
| 165 |
|
if (info_->getMolToProc(molIndex) == myrank) { |
| 166 |
|
|
| 167 |
|
#endif |
| 310 |
|
currRestTime_ = currSnapshot_->getTime(); |
| 311 |
|
} |
| 312 |
|
|
| 313 |
< |
void RestraintForceManager::calcForces(bool needPotential, bool needStress){ |
| 313 |
> |
void RestraintForceManager::calcForces(){ |
| 314 |
|
|
| 315 |
< |
ForceManager::calcForces(needPotential, needStress); |
| 315 |
> |
ForceManager::calcForces(); |
| 316 |
|
RealType restPot_local, restPot; |
| 317 |
|
|
| 318 |
|
restPot_local = doRestraints(1.0); |
| 319 |
|
|
| 320 |
|
#ifdef IS_MPI |
| 321 |
< |
MPI::COMM_WORLD.Allreduce(&restPot_local, &restPot, 1, |
| 322 |
< |
MPI::REALTYPE, MPI::SUM); |
| 321 |
> |
MPI_Allreduce(&restPot_local, &restPot, 1, |
| 322 |
> |
MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD); |
| 323 |
|
#else |
| 324 |
|
restPot = restPot_local; |
| 325 |
|
#endif |
| 326 |
|
currSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot(); |
| 327 |
< |
currSnapshot_->statData[Stats::LONG_RANGE_POTENTIAL] += restPot; |
| 328 |
< |
currSnapshot_->statData[Stats::VHARM] = restPot; |
| 327 |
> |
RealType pot = currSnapshot_->getLongRangePotential(); |
| 328 |
> |
pot += restPot; |
| 329 |
> |
currSnapshot_->setLongRangePotential(pot); |
| 330 |
> |
currSnapshot_->setRestraintPotential(restPot); |
| 331 |
|
|
| 332 |
|
//write out forces and current positions of restrained molecules |
| 333 |
|
if (currSnapshot_->getTime() >= currRestTime_){ |
| 342 |
|
Molecule::IntegrableObjectIterator ioi; |
| 343 |
|
MolecularRestraint* mRest; |
| 344 |
|
StuntDouble* sd; |
| 338 |
– |
RealType pTot; |
| 345 |
|
|
| 346 |
|
std::vector<StuntDouble*>::const_iterator ro; |
| 347 |
|
ObjectRestraint* oRest; |
