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

Comparing branches/development/src/flucq/FluctuatingChargePropagator.cpp (file contents):
Revision 1850 by gezelter, Wed Feb 20 15:39:39 2013 UTC vs.
Revision 1870 by gezelter, Tue May 7 19:09:54 2013 UTC

# Line 92 | Line 92 | namespace OpenMD {
92      }
93      
94      fqConstraints_ = new FluctuatingChargeConstraints(info_);
95 <    FluctuatingChargeObjectiveFunction flucQobjf(info_, forceMan_, fqConstraints_);    
95 >    FluctuatingChargeObjectiveFunction flucQobjf(info_, forceMan_,
96 >                                                 fqConstraints_);
97 >
98      DynamicVector<RealType> initCoords = flucQobjf.setInitialCoords();
99 <    Problem problem(flucQobjf, *(new NoConstraint()), *(new NoStatus()), initCoords);
99 >    Problem problem(flucQobjf, *(new NoConstraint()), *(new NoStatus()),
100 >                    initCoords);
101 >
102      EndCriteria endCriteria(1000, 100, 1e-5, 1e-5, 1e-5);      
103 +
104      OptimizationMethod* minim = OptimizationFactory::getInstance()->createOptimization("SD", info_);
105  
106 <    DumpStatusFunction dsf(info_);  // we want a dump file written every iteration
106 >    DumpStatusFunction dsf(info_);  // we want a dump file written
107 >                                    // every iteration
108  
109      minim->minimize(problem, endCriteria);
110    }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines