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 1760 by gezelter, Thu Jun 21 19:26:46 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 >
52 >
53   #ifdef IS_MPI
54   #include <mpi.h>
55   #endif
56  
57 + using namespace QuantLib;
58   namespace OpenMD {
59  
60 <  void FluctuatingChargePropagator::applyConstraints() {
60 >  FluctuatingChargePropagator::FluctuatingChargePropagator(SimInfo* info) :
61 >    info_(info), hasFlucQ_(false), forceMan_(NULL) {
62 >    
63 >    Globals* simParams = info_->getSimParams();
64 >    fqParams_ = simParams->getFluctuatingChargeParameters();
65 >
66 >  }
67 >
68 >  void FluctuatingChargePropagator::setForceManager(ForceManager* forceMan) {
69 >    forceMan_ = forceMan;
70 >  }
71 >
72 >  void FluctuatingChargePropagator::initialize() {
73 >
74 >    if (info_->usesFluctuatingCharges()) {
75 >      if (info_->getNFluctuatingCharges() > 0) {
76 >        hasFlucQ_ = true;
77 >        fqConstraints_ = new FluctuatingChargeConstraints(info_);        
78 >      }
79 >    }
80 >
81      if (!hasFlucQ_) return;
82  
83      SimInfo::MoleculeIterator i;
# Line 58 | Line 85 | namespace OpenMD {
85      Molecule* mol;
86      Atom* atom;
87      
61    RealType totalFrc, totalMolFrc, constrainedFrc;
62
63    // accumulate the total system fluctuating charge forces
64    totalFrc = 0.0;
65
88      for (mol = info_->beginMolecule(i); mol != NULL;
89           mol = info_->nextMolecule(i)) {
68
90        for (atom = mol->beginFluctuatingCharge(j); atom != NULL;
91             atom = mol->nextFluctuatingCharge(j)) {
92 <        totalFrc += atom->getFlucQFrc();
92 >        atom->setFlucQPos(0.0);
93 >        atom->setFlucQVel(0.0);
94        }
73
95      }
96  
97 < #ifdef IS_MPI
98 <    // in parallel, we need to add up the contributions from all
99 <    // processors:
100 <    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &totalFrc, 1, MPI::REALTYPE,
101 <                              MPI::SUM);
102 < #endif
103 <
104 <    // divide by the total number of fluctuating charges:
84 <    totalFrc /= info_->getNFluctuatingCharges();
97 >    std::cerr << "doing a minimization\n";
98 >    
99 >    fqConstraints_ = new FluctuatingChargeConstraints(info_);
100 >    FluctuatingChargeObjectiveFunction flucQobjf(info_, forceMan_, fqConstraints_);    
101 >    DynamicVector<RealType> initCoords = flucQobjf.setInitialCoords();
102 >    Problem problem(flucQobjf, *(new NoConstraint()), *(new NoStatus()), initCoords);
103 >    EndCriteria endCriteria(1000, 100, 1e-5, 1e-5, 1e-5);      
104 >    OptimizationMethod* minim = OptimizationFactory::getInstance()->createOptimization("SD", info_);
105  
106 <    for (mol = info_->beginMolecule(i); mol != NULL;
87 <         mol = info_->nextMolecule(i)) {    
88 <      
89 <      totalMolFrc = 0.0;
106 >    DumpStatusFunction dsf(info_);  // we want a dump file written every iteration
107  
108 <      // molecular constraints can be done with a second loop.
109 <      if (mol->constrainTotalCharge()) {
110 <        for (atom = mol->beginFluctuatingCharge(j); atom != NULL;
111 <             atom = mol->nextFluctuatingCharge(j)) {
95 <          totalMolFrc += atom->getFlucQFrc();
96 <        }
97 <        totalMolFrc /= mol->getNFluctuatingCharges();
98 <      }
99 <
108 >    minim->minimize(problem, endCriteria);
109 >    cerr << "Finished minimization\n";
110 >    for (mol = info_->beginMolecule(i); mol != NULL;
111 >         mol = info_->nextMolecule(i)) {
112        for (atom = mol->beginFluctuatingCharge(j); atom != NULL;
113             atom = mol->nextFluctuatingCharge(j)) {
114 <        constrainedFrc = atom->getFlucQFrc() - totalFrc - totalMolFrc;
115 <        atom->setFlucQFrc(constrainedFrc);
104 <      }      
114 >        cerr << atom->getType() << "\tQ Pos: " << atom->getFlucQPos() << "\n";
115 >      }
116      }
117    }
118 +
119 +
120 +  void FluctuatingChargePropagator::applyConstraints() {
121 +    if (!hasFlucQ_) return;
122 +
123 +    fqConstraints_->applyConstraints();
124 +  }
125   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines