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 763 by tim, Mon Sep 15 16:52:02 2003 UTC vs.
Revision 1113 by tim, Thu Apr 15 16:18:26 2004 UTC

# Line 1 | Line 1
1 < #include <cmath>
1 > #include <math.h>
2   #include <iostream>
3   using namespace std;
4  
# Line 35 | Line 35 | double Thermo::getKinetic(){
35    double aVel[3], aJ[3], I[3][3];
36    int j, kl;
37  
38  DirectionalAtom *dAtom;
39
40  int n_atoms;
38    double kinetic_global;
39 <  Atom** atoms;
43 <
39 >  vector<StuntDouble *> integrableObjects = info->integrableObjects;
40    
45  n_atoms = info->n_atoms;
46  atoms = info->atoms;
47
41    kinetic = 0.0;
42    kinetic_global = 0.0;
50  for( kl=0; kl < n_atoms; kl++ ){
51    
52    atoms[kl]->getVel(aVel);
53    amass = atoms[kl]->getMass();
54    
55    for (j=0; j < 3; j++)
56      kinetic += amass * aVel[j] * aVel[j];
43  
44 <    if( atoms[kl]->isDirectional() ){
45 <            
46 <      dAtom = (DirectionalAtom *)atoms[kl];
44 >  for (kl=0; kl<integrableObjects.size(); kl++) {
45 >    integrableObjects[kl]->getVel(aVel);
46 >    amass = integrableObjects[kl]->getMass();
47  
48 <      dAtom->getJ( aJ );
49 <      dAtom->getI( I );
50 <      
48 >   for(j=0; j<3; j++)
49 >      kinetic += amass*aVel[j]*aVel[j];
50 >
51 >   if (integrableObjects[kl]->isDirectional()){
52 >
53 >      integrableObjects[kl]->getJ( aJ );
54 >      integrableObjects[kl]->getI( I );
55 >
56        for (j=0; j<3; j++)
57          kinetic += aJ[j]*aJ[j] / I[j][j];
58        
# Line 104 | Line 95 | double Thermo::getPotential(){
95    potential = potential_local;
96   #endif // is_mpi
97  
107 #ifdef IS_MPI
108  /*
109  std::cerr << "node " << worldRank << ": after pot = " << potential << "\n";
110  */
111 #endif
112
98    return potential;
99   }
100  
# Line 125 | Line 110 | double Thermo::getTemperature(){
110  
111    const double kb = 1.9872156E-3; // boltzman's constant in kcal/(mol K)
112    double temperature;
113 <  
113 >
114    temperature = ( 2.0 * this->getKinetic() ) / ((double)info->ndf * kb );
115    return temperature;
116   }
117  
133 double Thermo::getEnthalpy() {
134
135  const double e_convert = 4.184E-4; // convert kcal/mol -> (amu A^2)/fs^2
136  double u, p, v;
137  double press[3][3];
138
139  u = this->getTotalE();
140
141  this->getPressureTensor(press);
142  p = (press[0][0] + press[1][1] + press[2][2]) / 3.0;
143
144  v = this->getVolume();
145
146  return (u + (p*v)/e_convert);
147 }
148
118   double Thermo::getVolume() {
119  
120    return info->boxVol;
# Line 272 | Line 241 | void Thermo::velocitize() {
241  
242   void Thermo::velocitize() {
243    
275  double x,y;
244    double aVel[3], aJ[3], I[3][3];
245    int i, j, vr, vd; // velocity randomizer loop counters
246    double vdrift[3];
# Line 302 | Line 270 | void Thermo::velocitize() {
270  
271      av2 = 2.0 * kebar / atoms[vr]->getMass();
272      vbar = sqrt( av2 );
273 <
306 < //     vbar = sqrt( 8.31451e-7 * temperature / atoms[vr]->getMass() );
307 <    
273 >
274      // picks random velocities from a gaussian distribution
275      // centered on vbar
276  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines