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

Comparing branches/development/src/integrators/Integrator.hpp (file contents):
Revision 1715 by gezelter, Tue May 22 21:55:31 2012 UTC vs.
Revision 1760 by gezelter, Thu Jun 21 19:26:46 2012 UTC

# Line 56 | Line 56
56   #include "io/DumpWriter.hpp"
57   #include "io/StatWriter.hpp"
58   #include "integrators/RotationAlgorithm.hpp"
59 < #include "integrators/FluctuatingChargePropagator.hpp"
59 > #include "flucq/FluctuatingChargePropagator.hpp"
60   #include "integrators/Velocitizer.hpp"
61 < #include "integrators/RNEMD.hpp"
61 > #include "rnemd/RNEMD.hpp"
62   #include "constraints/Rattle.hpp"
63  
64   namespace OpenMD {
# Line 90 | Line 90 | namespace OpenMD {
90          delete forceMan_;
91        }
92        forceMan_ = forceMan;
93 +      // forward this on:
94 +      if (flucQ_ != NULL) {
95 +        flucQ_->setForceManager(forceMan_);
96 +      }
97      }
98  
99      void setVelocitizer(Velocitizer* velocitizer) {
# Line 104 | Line 108 | namespace OpenMD {
108          delete flucQ_;
109        }            
110        flucQ_ = prop;
111 +      if (forceMan_ != NULL) {
112 +        flucQ_->setForceManager(forceMan_);
113 +      }
114      }
115  
116      void setRotationAlgorithm(RotationAlgorithm* algo) {

Diff Legend

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