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 486 by mmeineke, Thu Apr 10 16:22:00 2003 UTC vs.
Revision 582 by mmeineke, Wed Jul 9 15:33:46 2003 UTC

# Line 151 | Line 151 | double Thermo::getVolume() {
151   }
152  
153   double Thermo::getVolume() {
154  double theBox[3];
154  
155 <  entry_plug->getBox(theBox);
157 <  return (theBox[0] * theBox[1] * theBox[2]);
155 >  return entry_plug->boxVol;
156   }
157  
158   double Thermo::getPressure() {
159 <  // returns the pressure in units of atm
159 >
160    // Relies on the calculation of the full molecular pressure tensor
161    
162    const double p_convert = 1.63882576e8;
# Line 222 | Line 220 | void Thermo::getPressureTensor(double press[9]){
220    }
221   #endif // is_mpi
222  
223 <  entry_plug->getBox(theBox);
223 >  volume = entry_plug->boxVol;
224  
227  volume = theBox[0] * theBox[1] * theBox[2];
228
225    for(i=0; i<9; i++) {
226      press[i] = (p_global[i] - entry_plug->tau[i]*e_convert) / volume;
227    }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines