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

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

Diff Legend

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