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

Comparing branches/development/src/integrators/Integrator.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 143 | Line 143 | namespace OpenMD {
143      
144      rotAlgo_ = new DLM();
145      rattle_ = new Rattle(info);
146 <    flucQ_ = new FluctuatingChargeLangevin(info);
146 >    if (simParams->getFluctuatingChargeParameters()->havePropagator()) {
147 >      std::string prop = toUpperCopy(simParams->getFluctuatingChargeParameters()->getPropagator());
148 >      if (prop.compare("NVT")==0){
149 >         flucQ_ = new FluctuatingChargeNVT(info);
150 >      } else if (prop.compare("LANGEVIN")==0) {
151 >         flucQ_ = new FluctuatingChargeLangevin(info);
152 >      } else {
153 >        sprintf(painCave.errMsg,
154 >                "Integrator Error: Unknown Fluctuating Charge propagator (%s) requested\n",
155 >                simParams->getFluctuatingChargeParameters()->getPropagator().c_str());
156 >        painCave.isFatal = 1;
157 >      }
158 >    }
159      flucQ_->setForceManager(forceMan_);
160    }
161    

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines