ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/brains/Thermo.cpp
(Generate patch)

Comparing trunk/src/brains/Thermo.cpp (file contents):
Revision 506 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# Line 53 | Line 53 | namespace oopse {
53  
54   namespace oopse {
55  
56 < double Thermo::getKinetic() {
56 >  double Thermo::getKinetic() {
57      SimInfo::MoleculeIterator miter;
58      std::vector<StuntDouble*>::iterator iiter;
59      Molecule* mol;
# Line 68 | Line 68 | double Thermo::getKinetic() {
68      double kinetic_global = 0.0;
69      
70      for (mol = info_->beginMolecule(miter); mol != NULL; mol = info_->nextMolecule(miter)) {
71 <        for (integrableObject = mol->beginIntegrableObject(iiter); integrableObject != NULL;
72 <               integrableObject = mol->nextIntegrableObject(iiter)) {
71 >      for (integrableObject = mol->beginIntegrableObject(iiter); integrableObject != NULL;
72 >           integrableObject = mol->nextIntegrableObject(iiter)) {
73  
74 <            double mass = integrableObject->getMass();
75 <            Vector3d vel = integrableObject->getVel();
74 >        double mass = integrableObject->getMass();
75 >        Vector3d vel = integrableObject->getVel();
76  
77 <            kinetic += mass * (vel[0]*vel[0] + vel[1]*vel[1] + vel[2]*vel[2]);
77 >        kinetic += mass * (vel[0]*vel[0] + vel[1]*vel[1] + vel[2]*vel[2]);
78  
79 <            if (integrableObject->isDirectional()) {
80 <                angMom = integrableObject->getJ();
81 <                I = integrableObject->getI();
79 >        if (integrableObject->isDirectional()) {
80 >          angMom = integrableObject->getJ();
81 >          I = integrableObject->getI();
82  
83 <                if (integrableObject->isLinear()) {
84 <                    i = integrableObject->linearAxis();
85 <                    j = (i + 1) % 3;
86 <                    k = (i + 2) % 3;
87 <                    kinetic += angMom[j] * angMom[j] / I(j, j) + angMom[k] * angMom[k] / I(k, k);
88 <                } else {                        
89 <                    kinetic += angMom[0]*angMom[0]/I(0, 0) + angMom[1]*angMom[1]/I(1, 1)
90 <                                    + angMom[2]*angMom[2]/I(2, 2);
91 <                }
92 <            }
83 >          if (integrableObject->isLinear()) {
84 >            i = integrableObject->linearAxis();
85 >            j = (i + 1) % 3;
86 >            k = (i + 2) % 3;
87 >            kinetic += angMom[j] * angMom[j] / I(j, j) + angMom[k] * angMom[k] / I(k, k);
88 >          } else {                        
89 >            kinetic += angMom[0]*angMom[0]/I(0, 0) + angMom[1]*angMom[1]/I(1, 1)
90 >              + angMom[2]*angMom[2]/I(2, 2);
91 >          }
92 >        }
93              
94 <        }
94 >      }
95      }
96      
97   #ifdef IS_MPI
# Line 105 | Line 105 | double Thermo::getKinetic() {
105      kinetic = kinetic * 0.5 / OOPSEConstant::energyConvert;
106  
107      return kinetic;
108 < }
108 >  }
109  
110 < double Thermo::getPotential() {
110 >  double Thermo::getPotential() {
111      double potential = 0.0;
112      Snapshot* curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
113      double potential_local = curSnapshot->statData[Stats::LONG_RANGE_POTENTIAL] +
114 <                                             curSnapshot->statData[Stats::SHORT_RANGE_POTENTIAL] ;
114 >      curSnapshot->statData[Stats::SHORT_RANGE_POTENTIAL] ;
115  
116      // Get total potential for entire system from MPI.
117  
# Line 127 | Line 127 | double Thermo::getPotential() {
127   #endif // is_mpi
128  
129      return potential;
130 < }
130 >  }
131  
132 < double Thermo::getTotalE() {
132 >  double Thermo::getTotalE() {
133      double total;
134  
135      total = this->getKinetic() + this->getPotential();
136      return total;
137 < }
137 >  }
138  
139 < double Thermo::getTemperature() {
139 >  double Thermo::getTemperature() {
140      
141      double temperature = ( 2.0 * this->getKinetic() ) / (info_->getNdf()* OOPSEConstant::kb );
142      return temperature;
143 < }
143 >  }
144  
145 < double Thermo::getVolume() {
145 >  double Thermo::getVolume() {
146      Snapshot* curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
147      return curSnapshot->getVolume();
148 < }
148 >  }
149  
150 < double Thermo::getPressure() {
150 >  double Thermo::getPressure() {
151  
152      // Relies on the calculation of the full molecular pressure tensor
153  
# Line 160 | Line 160 | double Thermo::getPressure() {
160      pressure = OOPSEConstant::pressureConvert * (tensor(0, 0) + tensor(1, 1) + tensor(2, 2)) / 3.0;
161  
162      return pressure;
163 < }
163 >  }
164  
165 < Mat3x3d Thermo::getPressureTensor() {
165 >  Mat3x3d Thermo::getPressureTensor() {
166      // returns pressure tensor in units amu*fs^-2*Ang^-1
167      // routine derived via viral theorem description in:
168      // Paci, E. and Marchi, M. J.Phys.Chem. 1996, 100, 4314-4322
# Line 175 | Line 175 | Mat3x3d Thermo::getPressureTensor() {
175      Molecule* mol;
176      StuntDouble* integrableObject;    
177      for (mol = info_->beginMolecule(i); mol != NULL; mol = info_->nextMolecule(i)) {
178 <        for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
179 <               integrableObject = mol->nextIntegrableObject(j)) {
178 >      for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
179 >           integrableObject = mol->nextIntegrableObject(j)) {
180  
181 <            double mass = integrableObject->getMass();
182 <            Vector3d vcom = integrableObject->getVel();
183 <            p_local += mass * outProduct(vcom, vcom);        
184 <        }
181 >        double mass = integrableObject->getMass();
182 >        Vector3d vcom = integrableObject->getVel();
183 >        p_local += mass * outProduct(vcom, vcom);        
184 >      }
185      }
186      
187   #ifdef IS_MPI
# Line 197 | Line 197 | Mat3x3d Thermo::getPressureTensor() {
197      pressureTensor =  (p_global + OOPSEConstant::energyConvert* tau)/volume;
198  
199      return pressureTensor;
200 < }
200 >  }
201  
202 < void Thermo::saveStat(){
202 >  void Thermo::saveStat(){
203      Snapshot* currSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
204      Stats& stat = currSnapshot->statData;
205      
# Line 213 | Line 213 | void Thermo::saveStat(){
213      /**@todo need refactorying*/
214      //Conserved Quantity is set by integrator and time is set by setTime
215      
216 < }
216 >  }
217  
218   } //end namespace oopse

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines