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 1715 by gezelter, Tue May 22 21:55:31 2012 UTC vs.
Revision 1731 by gezelter, Thu May 31 12:25:30 2012 UTC

# Line 43 | Line 43
43   #include "brains/Snapshot.hpp"
44   #include "integrators/Integrator.hpp"
45   #include "integrators/DLM.hpp"
46 < #include "integrators/FluctuatingChargeNVT.hpp"
46 > #include "flucq/FluctuatingChargeNVT.hpp"
47   #include "utils/simError.h"
48  
49   namespace OpenMD {
# Line 126 | Line 126 | namespace OpenMD {
126      // a different velocitizer, use setVelocitizer
127      velocitizer_ = new Velocitizer(info);
128  
129 <    if (simParams->haveUseRNEMD()) {
130 <      if (simParams->getUseRNEMD()) {
129 >    if (simParams->getRNEMDParameters()->haveUseRNEMD()) {
130 >      if (simParams->getRNEMDParameters()->getUseRNEMD()) {
131          // Create a default a RNEMD.
132          rnemd_ = new RNEMD(info);
133 <        useRNEMD = simParams->getUseRNEMD();
134 <        if (simParams->haveRNEMD_exchangeTime()) {
135 <          RNEMD_exchangeTime = simParams->getRNEMD_exchangeTime();
133 >        useRNEMD = simParams->getRNEMDParameters()->getUseRNEMD();
134 >        if (simParams->getRNEMDParameters()->haveExchangeTime()) {
135 >          RNEMD_exchangeTime = simParams->getRNEMDParameters()->getExchangeTime();
136          }
137        }
138      }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines