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 1760 by gezelter, Thu Jun 21 19:26:46 2012 UTC vs.
Revision 1766 by gezelter, Thu Jul 5 17:08:25 2012 UTC

# Line 48 | Line 48
48   #include "optimization/StatusFunction.hpp"
49   #include "optimization/OptimizationFactory.hpp"
50  
51
52
51   #ifdef IS_MPI
52   #include <mpi.h>
53   #endif
# Line 93 | Line 91 | namespace OpenMD {
91          atom->setFlucQVel(0.0);
92        }
93      }
96
97    std::cerr << "doing a minimization\n";
94      
95      fqConstraints_ = new FluctuatingChargeConstraints(info_);
96      FluctuatingChargeObjectiveFunction flucQobjf(info_, forceMan_, fqConstraints_);    
# Line 106 | Line 102 | namespace OpenMD {
102      DumpStatusFunction dsf(info_);  // we want a dump file written every iteration
103  
104      minim->minimize(problem, endCriteria);
105 <    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 <        cerr << atom->getType() << "\tQ Pos: " << atom->getFlucQPos() << "\n";
115 <      }
116 <    }
105 >
106    }
107  
119
108    void FluctuatingChargePropagator::applyConstraints() {
109      if (!hasFlucQ_) return;
110  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines