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

Comparing trunk/src/integrators/NgammaT.cpp (file contents):
Revision 2068 by gezelter, Sun Jun 16 15:15:42 2013 UTC vs.
Revision 2069 by gezelter, Thu Mar 5 16:30:23 2015 UTC

# Line 171 | Line 171 | namespace OpenMD {
171      RealType barostat_potential = (targetPressure * thermo.getVolume() / PhysicalConstants::pressureConvert) /PhysicalConstants::energyConvert;
172  
173      Mat3x3d hmat = snap->getHmat();
174 –    RealType hz = hmat(2, 2);
174      RealType area = hmat(0,0) * hmat(1, 1);
175  
176 <    RealType conservedQuantity = totalEnergy + thermostat_kinetic + thermostat_potential +
177 <      barostat_kinetic + barostat_potential - surfaceTension * area/ PhysicalConstants::energyConvert;
176 >    RealType conservedQuantity = totalEnergy + thermostat_kinetic
177 >      + thermostat_potential + barostat_kinetic + barostat_potential
178 >      - surfaceTension * area/ PhysicalConstants::energyConvert;
179  
180      return conservedQuantity;
181  

Diff Legend

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