ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/flucq/FluctuatingChargePropagator.cpp
(Generate patch)

Comparing branches/development/src/flucq/FluctuatingChargePropagator.cpp (file contents):
Revision 1731 by gezelter, Thu May 31 12:25:30 2012 UTC vs.
Revision 1766 by gezelter, Thu Jul 5 17:08:25 2012 UTC

# Line 40 | Line 40
40   * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43 < #include "FluctuatingChargePropagator.hpp"
44 < #include "primitives/Molecule.hpp"
45 < #include "utils/simError.h"
46 < #include "utils/PhysicalConstants.hpp"
43 > #include "flucq/FluctuatingChargePropagator.hpp"
44 > #include "flucq/FluctuatingChargeObjectiveFunction.hpp"
45 > #include "optimization/Constraint.hpp"
46 > #include "optimization/Problem.hpp"
47 > #include "optimization/EndCriteria.hpp"
48 > #include "optimization/StatusFunction.hpp"
49 > #include "optimization/OptimizationFactory.hpp"
50 >
51   #ifdef IS_MPI
52   #include <mpi.h>
53   #endif
54  
55 + using namespace QuantLib;
56   namespace OpenMD {
57  
58 <  void FluctuatingChargePropagator::applyConstraints() {
58 >  FluctuatingChargePropagator::FluctuatingChargePropagator(SimInfo* info) :
59 >    info_(info), hasFlucQ_(false), forceMan_(NULL) {
60 >    
61 >    Globals* simParams = info_->getSimParams();
62 >    fqParams_ = simParams->getFluctuatingChargeParameters();
63 >
64 >  }
65 >
66 >  void FluctuatingChargePropagator::setForceManager(ForceManager* forceMan) {
67 >    forceMan_ = forceMan;
68 >  }
69 >
70 >  void FluctuatingChargePropagator::initialize() {
71 >
72 >    if (info_->usesFluctuatingCharges()) {
73 >      if (info_->getNFluctuatingCharges() > 0) {
74 >        hasFlucQ_ = true;
75 >        fqConstraints_ = new FluctuatingChargeConstraints(info_);        
76 >      }
77 >    }
78 >
79      if (!hasFlucQ_) return;
80  
81      SimInfo::MoleculeIterator i;
# Line 58 | Line 83 | namespace OpenMD {
83      Molecule* mol;
84      Atom* atom;
85      
61    RealType totalFrc, totalMolFrc, constrainedFrc;
62
63    // accumulate the total system fluctuating charge forces
64    totalFrc = 0.0;
65
86      for (mol = info_->beginMolecule(i); mol != NULL;
87           mol = info_->nextMolecule(i)) {
68
88        for (atom = mol->beginFluctuatingCharge(j); atom != NULL;
89             atom = mol->nextFluctuatingCharge(j)) {
90 <        totalFrc += atom->getFlucQFrc();
90 >        atom->setFlucQPos(0.0);
91 >        atom->setFlucQVel(0.0);
92        }
73
93      }
94 +    
95 +    fqConstraints_ = new FluctuatingChargeConstraints(info_);
96 +    FluctuatingChargeObjectiveFunction flucQobjf(info_, forceMan_, fqConstraints_);    
97 +    DynamicVector<RealType> initCoords = flucQobjf.setInitialCoords();
98 +    Problem problem(flucQobjf, *(new NoConstraint()), *(new NoStatus()), initCoords);
99 +    EndCriteria endCriteria(1000, 100, 1e-5, 1e-5, 1e-5);      
100 +    OptimizationMethod* minim = OptimizationFactory::getInstance()->createOptimization("SD", info_);
101  
102 < #ifdef IS_MPI
77 <    // in parallel, we need to add up the contributions from all
78 <    // processors:
79 <    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &totalFrc, 1, MPI::REALTYPE,
80 <                              MPI::SUM);
81 < #endif
82 <
83 <    // divide by the total number of fluctuating charges:
84 <    totalFrc /= info_->getNFluctuatingCharges();
102 >    DumpStatusFunction dsf(info_);  // we want a dump file written every iteration
103  
104 <    for (mol = info_->beginMolecule(i); mol != NULL;
87 <         mol = info_->nextMolecule(i)) {    
88 <      
89 <      totalMolFrc = 0.0;
104 >    minim->minimize(problem, endCriteria);
105  
106 <      // molecular constraints can be done with a second loop.
92 <      if (mol->constrainTotalCharge()) {
93 <        for (atom = mol->beginFluctuatingCharge(j); atom != NULL;
94 <             atom = mol->nextFluctuatingCharge(j)) {
95 <          totalMolFrc += atom->getFlucQFrc();
96 <        }
97 <        totalMolFrc /= mol->getNFluctuatingCharges();
98 <      }
106 >  }
107  
108 <      for (atom = mol->beginFluctuatingCharge(j); atom != NULL;
109 <           atom = mol->nextFluctuatingCharge(j)) {
110 <        constrainedFrc = atom->getFlucQFrc() - totalFrc - totalMolFrc;
111 <        atom->setFlucQFrc(constrainedFrc);
104 <      }      
105 <    }
108 >  void FluctuatingChargePropagator::applyConstraints() {
109 >    if (!hasFlucQ_) return;
110 >
111 >    fqConstraints_->applyConstraints();
112    }
113   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines