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 1874 by gezelter, Wed May 15 15:09:35 2013 UTC

# Line 60 | Line 60 | namespace OpenMD {
60      
61      Globals* simParams = info_->getSimParams();
62      fqParams_ = simParams->getFluctuatingChargeParameters();
63 +    fqConstraints_ = new FluctuatingChargeConstraints(info_);
64    }
65  
66 +  FluctuatingChargePropagator::~FluctuatingChargePropagator() {
67 +    if (fqConstraints_ != NULL) delete fqConstraints_;
68 +  }
69 +
70    void FluctuatingChargePropagator::setForceManager(ForceManager* forceMan) {
71      forceMan_ = forceMan;
72    }
# Line 71 | Line 76 | namespace OpenMD {
76      if (info_->usesFluctuatingCharges()) {
77        if (info_->getNFluctuatingCharges() > 0) {
78          hasFlucQ_ = true;
74 –        fqConstraints_ = new FluctuatingChargeConstraints(info_);        
79        }
80      }
81  
# Line 91 | Line 95 | namespace OpenMD {
95        }
96      }
97      
98 <    fqConstraints_ = new FluctuatingChargeConstraints(info_);
99 <    FluctuatingChargeObjectiveFunction flucQobjf(info_, forceMan_, fqConstraints_);    
98 >    FluctuatingChargeObjectiveFunction flucQobjf(info_, forceMan_,
99 >                                                 fqConstraints_);
100 >
101      DynamicVector<RealType> initCoords = flucQobjf.setInitialCoords();
102 <    Problem problem(flucQobjf, *(new NoConstraint()), *(new NoStatus()), initCoords);
102 >    Problem problem(flucQobjf, *(new NoConstraint()), *(new NoStatus()),
103 >                    initCoords);
104 >
105      EndCriteria endCriteria(1000, 100, 1e-5, 1e-5, 1e-5);      
106 +
107      OptimizationMethod* minim = OptimizationFactory::getInstance()->createOptimization("SD", info_);
108  
109 <    DumpStatusFunction dsf(info_);  // we want a dump file written every iteration
109 >    DumpStatusFunction dsf(info_);  // we want a dump file written
110 >                                    // every iteration
111  
112      minim->minimize(problem, endCriteria);
113    }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines