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/integrators/FluctuatingChargePropagator.cpp (file contents), Revision 1718 by gezelter, Thu May 24 01:29:59 2012 UTC vs.
branches/development/src/flucq/FluctuatingChargePropagator.cpp (file contents), Revision 1768 by gezelter, Sat Jul 7 03:59:27 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 >  void FluctuatingChargePropagator::setForceManager(ForceManager* forceMan) {
66 >    forceMan_ = forceMan;
67 >  }
68 >
69 >  void FluctuatingChargePropagator::initialize() {
70 >
71 >    if (info_->usesFluctuatingCharges()) {
72 >      if (info_->getNFluctuatingCharges() > 0) {
73 >        hasFlucQ_ = true;
74 >        fqConstraints_ = new FluctuatingChargeConstraints(info_);        
75 >      }
76 >    }
77 >
78      if (!hasFlucQ_) return;
79  
80      SimInfo::MoleculeIterator i;
# Line 58 | Line 82 | namespace OpenMD {
82      Molecule* mol;
83      Atom* atom;
84      
61    RealType totalFrc, totalMolFrc, constrainedFrc;
62
63    // accumulate the total system fluctuating charge forces
64    totalFrc = 0.0;
65
85      for (mol = info_->beginMolecule(i); mol != NULL;
86           mol = info_->nextMolecule(i)) {
68
87        for (atom = mol->beginFluctuatingCharge(j); atom != NULL;
88             atom = mol->nextFluctuatingCharge(j)) {
89 <        totalFrc += atom->getFlucQFrc();
89 >        atom->setFlucQPos(0.0);
90 >        atom->setFlucQVel(0.0);
91        }
73
92      }
93 +    
94 +    fqConstraints_ = new FluctuatingChargeConstraints(info_);
95 +    FluctuatingChargeObjectiveFunction flucQobjf(info_, forceMan_, fqConstraints_);    
96 +    DynamicVector<RealType> initCoords = flucQobjf.setInitialCoords();
97 +    Problem problem(flucQobjf, *(new NoConstraint()), *(new NoStatus()), initCoords);
98 +    EndCriteria endCriteria(1000, 100, 1e-5, 1e-5, 1e-5);      
99 +    OptimizationMethod* minim = OptimizationFactory::getInstance()->createOptimization("SD", info_);
100  
101 < #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();
101 >    DumpStatusFunction dsf(info_);  // we want a dump file written every iteration
102  
103 <    for (mol = info_->beginMolecule(i); mol != NULL;
104 <         mol = info_->nextMolecule(i)) {    
88 <      
89 <      totalMolFrc = 0.0;
103 >    minim->minimize(problem, endCriteria);
104 >  }
105  
106 <      // molecular constraints can be done with a second loop.
107 <      if (mol->constrainTotalCharge()) {
108 <        for (atom = mol->beginFluctuatingCharge(j); atom != NULL;
94 <             atom = mol->nextFluctuatingCharge(j)) {
95 <          totalMolFrc += atom->getFlucQFrc();
96 <        }
97 <        totalMolFrc /= mol->getNFluctuatingCharges();
98 <      }
99 <
100 <      for (atom = mol->beginFluctuatingCharge(j); atom != NULL;
101 <           atom = mol->nextFluctuatingCharge(j)) {
102 <        constrainedFrc = atom->getFlucQFrc() - totalFrc - totalMolFrc;
103 <        atom->setFlucQFrc(constrainedFrc);
104 <      }      
105 <    }
106 >  void FluctuatingChargePropagator::applyConstraints() {
107 >    if (!hasFlucQ_) return;
108 >    fqConstraints_->applyConstraints();
109    }
110   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines