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 755 by mmeineke, Tue Sep 9 20:35:25 2003 UTC vs.
Revision 853 by mmeineke, Thu Nov 6 19:11:38 2003 UTC

# Line 1 | Line 1
1 < #include <cmath>
1 > #include <math.h>
2   #include <iostream>
3   using namespace std;
4  
# Line 104 | Line 104 | double Thermo::getPotential(){
104    potential = potential_local;
105   #endif // is_mpi
106  
107 #ifdef IS_MPI
108  /*
109  std::cerr << "node " << worldRank << ": after pot = " << potential << "\n";
110  */
111 #endif
112
107    return potential;
108   }
109  
# Line 123 | Line 117 | double Thermo::getTemperature(){
117  
118   double Thermo::getTemperature(){
119  
120 <  const double kb = 1.9872179E-3; // boltzman's constant in kcal/(mol K)
120 >  const double kb = 1.9872156E-3; // boltzman's constant in kcal/(mol K)
121    double temperature;
122    
123    temperature = ( 2.0 * this->getKinetic() ) / ((double)info->ndf * kb );
124    return temperature;
125   }
126  
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
127   double Thermo::getVolume() {
128  
129    return info->boxVol;
# Line 272 | Line 250 | void Thermo::velocitize() {
250  
251   void Thermo::velocitize() {
252    
275  double x,y;
253    double aVel[3], aJ[3], I[3][3];
254    int i, j, vr, vd; // velocity randomizer loop counters
255    double vdrift[3];
# Line 293 | Line 270 | void Thermo::velocitize() {
270    n_oriented    = info->n_oriented;
271    n_constraints = info->n_constraints;
272    
273 <  kebar = kb * temperature * (double)info->ndf /
274 <    ( 2.0 * (double)info->ndfRaw );
273 >  kebar = kb * temperature * (double)info->ndfRaw /
274 >    ( 2.0 * (double)info->ndf );
275    
276    for(vr = 0; vr < n_atoms; vr++){
277      
# Line 302 | Line 279 | void Thermo::velocitize() {
279  
280      av2 = 2.0 * kebar / atoms[vr]->getMass();
281      vbar = sqrt( av2 );
282 <
306 < //     vbar = sqrt( 8.31451e-7 * temperature / atoms[vr]->getMass() );
307 <    
282 >
283      // picks random velocities from a gaussian distribution
284      // centered on vbar
285  
# Line 400 | Line 375 | void Thermo::getCOMVel(double vdrift[3]){
375    
376   }
377  
378 + void Thermo::getCOM(double COM[3]){
379 +
380 +  double mtot, mtot_local;
381 +  double aPos[3], amass;
382 +  double COM_local[3];
383 +  int i, n_atoms, j;
384 +  Atom** atoms;
385 +
386 +  // We are very careless here with the distinction between n_atoms and n_local
387 +  // We should really fix this before someone pokes an eye out.
388 +
389 +  n_atoms = info->n_atoms;  
390 +  atoms   = info->atoms;
391 +
392 +  mtot_local = 0.0;
393 +  COM_local[0] = 0.0;
394 +  COM_local[1] = 0.0;
395 +  COM_local[2] = 0.0;
396 +  
397 +  for(i = 0; i < n_atoms; i++){
398 +    
399 +    amass = atoms[i]->getMass();
400 +    atoms[i]->getPos( aPos );
401 +
402 +    for(j = 0; j < 3; j++)
403 +      COM_local[j] += aPos[j] * amass;
404 +    
405 +    mtot_local += amass;
406 +  }
407 +
408 + #ifdef IS_MPI
409 +  MPI_Allreduce(&mtot_local,&mtot,1,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
410 +  MPI_Allreduce(COM_local,COM,3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
411 + #else
412 +  mtot = mtot_local;
413 +  for(i = 0; i < 3; i++) {
414 +    COM[i] = COM_local[i];
415 +  }
416 + #endif
417 +    
418 +  for (i = 0; i < 3; i++) {
419 +    COM[i] = COM[i] / mtot;
420 +  }
421 + }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines