ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/Thermo.cpp
(Generate patch)

Comparing trunk/OOPSE/libmdtools/Thermo.cpp (file contents):
Revision 572 by mmeineke, Wed Jul 2 21:26:55 2003 UTC vs.
Revision 574 by gezelter, Tue Jul 8 20:56:10 2003 UTC

# Line 151 | Line 151 | double Thermo::getVolume() {
151   }
152  
153   double Thermo::getVolume() {
154 <  return entry_plug->boxVol;
154 >
155 >  double volume;
156 >  double Hmat[9];
157 >
158 >  entry_plug->getBoxM(Hmat);
159 >
160 >  // volume = h1 (dot) h2 (cross) h3
161 >
162 >  volume = Hmat[0] * ( (Hmat[4]*Hmat[8]) - (Hmat[7]*Hmat[5]) )
163 >         + Hmat[1] * ( (Hmat[5]*Hmat[6]) - (Hmat[8]*Hmat[3]) )
164 >         + Hmat[2] * ( (Hmat[3]*Hmat[7]) - (Hmat[6]*Hmat[4]) );
165 >
166 >  return volume;
167   }
168  
169   double Thermo::getPressure() {
170 <  // returns the pressure in units of atm
170 >
171    // Relies on the calculation of the full molecular pressure tensor
172    
173    const double p_convert = 1.63882576e8;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines