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

Comparing branches/development/src/integrators/NVE.cpp (file contents):
Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC vs.
Revision 1737 by jmichalk, Tue Jun 5 17:54:42 2012 UTC

# Line 101 | Line 101 | namespace OpenMD {
101  
102            ji += (dt2  * PhysicalConstants::energyConvert) * Tb;
103  
104 <          rotAlgo->rotate(integrableObject, ji, dt);
104 >          rotAlgo_->rotate(integrableObject, ji, dt);
105  
106            integrableObject->setJ(ji);
107          }
# Line 109 | Line 109 | namespace OpenMD {
109              
110        }
111      } //end for(mol = info_->beginMolecule(i))
112 <    
113 <    rattle->constraintA();
114 <    
112 >    flucQ_->moveA();
113 >    rattle_->constraintA();    
114    }    
115  
116    void NVE::moveB(){
# Line 157 | Line 156 | namespace OpenMD {
156        }
157      } //end for(mol = info_->beginMolecule(i))
158    
159 <
160 <    rattle->constraintB();
162 <
159 >    flucQ_->moveB();
160 >    rattle_->constraintB();
161    }
162  
163  
164    RealType NVE::calcConservedQuantity() {
165 <    return thermo.getTotalE() ;
165 >    return thermo.getTotalE();
166    }
167  
168   } //end namespace OpenMD

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines