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 853 by mmeineke, Thu Nov 6 19:11:38 2003 UTC vs.
Revision 1113 by tim, Thu Apr 15 16:18:26 2004 UTC

# 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 119 | 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   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines