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

Comparing trunk/src/integrators/Integrator.hpp (file contents):
Revision 1360 by cli2, Mon Sep 7 16:31:51 2009 UTC vs.
Revision 1368 by skuang, Mon Oct 19 13:39:04 2009 UTC

# Line 88 | Line 88 | namespace oopse {
88      }
89  
90      void setVelocitizer(Velocitizer* velocitizer) {
91 <      if (velocitizer_ != velocitizer && velocitizer_  != NULL) {
91 >      if (velocitizer_ != velocitizer && velocitizer_ != NULL) {
92          delete velocitizer_;
93        }
94 <      velocitizer_  = velocitizer;
94 >      velocitizer_ = velocitizer;
95      }
96  
97      void setRNEMD(RNEMD* rnemd) {
98        if (rnemd_ != rnemd && rnemd_  != NULL) {
99          delete rnemd_;
100        }
101 <      rnemd_  = rnemd;
101 >      rnemd_ = rnemd;
102      }
103 <        
103 >    
104    protected:
105  
106      Integrator(SimInfo* info);
# Line 135 | Line 135 | namespace oopse {
135      RealType statusTime;
136      RealType thermalTime;
137      RealType resetTime;
138 <    RealType RNEMD_swapTime;
138 >    RealType RNEMD_exchangeTime;
139      RealType dt;
140  
141      Snapshot* currentSnapshot_; //During the integration, the address of currentSnapshot Will not change

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines