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 483 by gezelter, Wed Apr 9 04:06:43 2003 UTC vs.
Revision 486 by mmeineke, Thu Apr 10 16:22:00 2003 UTC

# Line 134 | Line 134 | double Thermo::getPressure() {
134    return temperature;
135   }
136  
137 + double Thermo::getEnthalpy() {
138 +
139 +  const double e_convert = 4.184E-4; // convert kcal/mol -> (amu A^2)/fs^2
140 +  double u, p, v;
141 +  double press[9];
142 +
143 +  u = this->getTotalE();
144 +
145 +  this->getPressureTensor(press);
146 +  p = (press[0] + press[4] + press[8]) / 3.0;
147 +
148 +  v = this->getVolume();
149 +
150 +  return (u + (p*v)/e_convert);
151 + }
152 +
153 + double Thermo::getVolume() {
154 +  double theBox[3];
155 +
156 +  entry_plug->getBox(theBox);
157 +  return (theBox[0] * theBox[1] * theBox[2]);
158 + }
159 +
160   double Thermo::getPressure() {
161    // returns the pressure in units of atm
162    // Relies on the calculation of the full molecular pressure tensor
# Line 161 | Line 184 | void Thermo::getPressureTensor(double press[9]){
184    double vcom[3];
185    double p_local[9], p_global[9];
186    double theBox[3];
187 <  double* tau;
187 >  //double* tau;
188    int i, nMols;
189    Molecule* molecules;
190  
191    nMols = entry_plug->n_mol;
192    molecules = entry_plug->molecules;
193 <  tau = entry_plug->tau;
193 >  //tau = entry_plug->tau;
194  
195    // use velocities of molecular centers of mass and molecular masses:
196    for (i=0; i < 9; i++) {    
# Line 204 | Line 227 | void Thermo::getPressureTensor(double press[9]){
227    volume = theBox[0] * theBox[1] * theBox[2];
228  
229    for(i=0; i<9; i++) {
230 <    press[i] = (p_global[i] - tau[i]*e_convert) / volume;
230 >    press[i] = (p_global[i] - entry_plug->tau[i]*e_convert) / volume;
231    }
232   }
233  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines