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 1125 by gezelter, Mon Apr 19 22:13:01 2004 UTC vs.
Revision 1131 by tim, Thu Apr 22 21:33:55 2004 UTC

# Line 10 | Line 10 | using namespace std;
10   #include "SRI.hpp"
11   #include "Integrator.hpp"
12   #include "simError.h"
13 + #include "MatVec3.h"
14  
15   #ifdef IS_MPI
16   #define __C
# Line 195 | Line 196 | void Thermo::getPressureTensor(double press[3][3]){
196    const double e_convert = 4.184e-4;
197  
198    double molmass, volume;
199 <  double vcom[3];
199 >  double vcom[3], pcom[3], fcom[3], scaled[3];
200    double p_local[9], p_global[9];
201    int i, j, k, nMols;
202    Molecule* molecules;
# Line 210 | Line 211 | void Thermo::getPressureTensor(double press[3][3]){
211      p_global[i] = 0.0;
212    }
213  
214 <  for (i=0; i < nMols; i++) {
214 <    molmass = molecules[i].getCOMvel(vcom);
214 >  for (i=0; i < info->integrableObjects.size(); i++) {
215  
216 <    p_local[0] += molmass * (vcom[0] * vcom[0]);
217 <    p_local[1] += molmass * (vcom[0] * vcom[1]);
218 <    p_local[2] += molmass * (vcom[0] * vcom[2]);
219 <    p_local[3] += molmass * (vcom[1] * vcom[0]);
220 <    p_local[4] += molmass * (vcom[1] * vcom[1]);
221 <    p_local[5] += molmass * (vcom[1] * vcom[2]);
222 <    p_local[6] += molmass * (vcom[2] * vcom[0]);
223 <    p_local[7] += molmass * (vcom[2] * vcom[1]);
224 <    p_local[8] += molmass * (vcom[2] * vcom[2]);
216 >    molmass = info->integrableObjects[i]->getMass();
217 >    
218 >    info->integrableObjects[i]->getVel(vcom);
219 >    info->integrableObjects[i]->getPos(pcom);
220 >    info->integrableObjects[i]->getFrc(fcom);
221 >
222 >    matVecMul3(info->HmatInv, pcom, scaled);
223 >  
224 >    for(j=0; j<3; j++)
225 >      scaled[j] -= roundMe(scaled[j]);
226 >
227 >    // calc the wrapped real coordinates from the wrapped scaled coordinates
228 >  
229 >    matVecMul3(info->Hmat, scaled, pcom);
230 >    
231 >    p_local[0] += molmass * (vcom[0] * vcom[0]) + fcom[0]*pcom[0]*eConvert;
232 >    p_local[1] += molmass * (vcom[0] * vcom[1]) + fcom[0]*pcom[1]*eConvert;
233 >    p_local[2] += molmass * (vcom[0] * vcom[2]) + fcom[0]*pcom[2]*eConvert;
234 >    p_local[3] += molmass * (vcom[1] * vcom[0]) + fcom[1]*pcom[0]*eConvert;
235 >    p_local[4] += molmass * (vcom[1] * vcom[1]) + fcom[1]*pcom[1]*eConvert;
236 >    p_local[5] += molmass * (vcom[1] * vcom[2]) + fcom[1]*pcom[2]*eConvert;
237 >    p_local[6] += molmass * (vcom[2] * vcom[0]) + fcom[2]*pcom[0]*eConvert;
238 >    p_local[7] += molmass * (vcom[2] * vcom[1]) + fcom[2]*pcom[1]*eConvert;
239 >    p_local[8] += molmass * (vcom[2] * vcom[2]) + fcom[2]*pcom[2]*eConvert;
240 >    
241    }
242  
243    // Get total for entire system from MPI.
# Line 239 | Line 255 | void Thermo::getPressureTensor(double press[3][3]){
255    for(i = 0; i < 3; i++) {
256      for (j = 0; j < 3; j++) {
257        k = 3*i + j;
258 <      press[i][j] = (p_global[k] + info->tau[k]*e_convert) / volume;
258 >      press[i][j] = p_global[k] /  volume;
259  
260      }
261    }
# Line 248 | Line 264 | void Thermo::velocitize() {
264   void Thermo::velocitize() {
265    
266    double aVel[3], aJ[3], I[3][3];
267 <  int i, j, vr, vd; // velocity randomizer loop counters
267 >  int i, j, l, m, n, vr, vd; // velocity randomizer loop counters
268    double vdrift[3];
269    double vbar;
270    const double kb = 8.31451e-7; // kb in amu, angstroms, fs, etc.
271    double av2;
272    double kebar;
273 <  int n_atoms;
274 <  Atom** atoms;
259 <  DirectionalAtom* dAtom;
260 <  double temperature;
261 <  int n_oriented;
262 <  int n_constraints;
273 >  double temperature;
274 >  int nobj;
275  
276 <  atoms         = info->atoms;
277 <  n_atoms       = info->n_atoms;
276 >  nobj = info->integrableObjects.size();
277 >  
278    temperature   = info->target_temp;
267 –  n_oriented    = info->n_oriented;
268 –  n_constraints = info->n_constraints;
279    
280    kebar = kb * temperature * (double)info->ndfRaw /
281      ( 2.0 * (double)info->ndf );
282    
283 <  for(vr = 0; vr < n_atoms; vr++){
283 >  for(vr = 0; vr < nobj; vr++){
284      
285      // uses equipartition theory to solve for vbar in angstrom/fs
286  
287 <    av2 = 2.0 * kebar / atoms[vr]->getMass();
287 >    av2 = 2.0 * kebar / info->integrableObjects[vr]->getMass();
288      vbar = sqrt( av2 );
289  
290      // picks random velocities from a gaussian distribution
# Line 283 | Line 293 | void Thermo::velocitize() {
293      for (j=0; j<3; j++)
294        aVel[j] = vbar * gaussStream->getGaussian();
295      
296 <    atoms[vr]->setVel( aVel );
296 >    info->integrableObjects[vr]->setVel( aVel );
297 >    
298 >    if(info->integrableObjects[vr]->isDirectional()){
299  
300 +      info->integrableObjects[vr]->getI( I );
301 +
302 +      if (info->integrableObjects[vr]->isLinear()) {
303 +
304 +        l= info->integrableObjects[vr]->linearAxis();
305 +        m = (l+1)%3;
306 +        n = (l+2)%3;
307 +
308 +        aJ[l] = 0.0;
309 +        vbar = sqrt( 2.0 * kebar * I[m][m] );
310 +        aJ[m] = vbar * gaussStream->getGaussian();
311 +        vbar = sqrt( 2.0 * kebar * I[n][n] );
312 +        aJ[n] = vbar * gaussStream->getGaussian();
313 +        
314 +      } else {
315 +        for (j = 0 ; j < 3; j++) {
316 +          vbar = sqrt( 2.0 * kebar * I[j][j] );
317 +          aJ[j] = vbar * gaussStream->getGaussian();
318 +        }      
319 +      } // else isLinear
320 +
321 +      info->integrableObjects[vr]->setJ( aJ );
322 +      
323 +    }//isDirectional
324 +
325    }
326  
327    // Get the Center of Mass drift velocity.
# Line 294 | Line 331 | void Thermo::velocitize() {
331    //  Corrects for the center of mass drift.
332    // sums all the momentum and divides by total mass.
333  
334 <  for(vd = 0; vd < n_atoms; vd++){
334 >  for(vd = 0; vd < nobj; vd++){
335      
336 <    atoms[vd]->getVel(aVel);
336 >    info->integrableObjects[vd]->getVel(aVel);
337      
338      for (j=0; j < 3; j++)
339        aVel[j] -= vdrift[j];
340          
341 <    atoms[vd]->setVel( aVel );
341 >    info->integrableObjects[vd]->setVel( aVel );
342    }
306 –  if( n_oriented ){
307 –  
308 –    for( i=0; i<n_atoms; i++ ){
309 –      
310 –      if( atoms[i]->isDirectional() ){
311 –        
312 –        dAtom = (DirectionalAtom *)atoms[i];
313 –        dAtom->getI( I );
314 –        
315 –        for (j = 0 ; j < 3; j++) {
343  
317 –          vbar = sqrt( 2.0 * kebar * I[j][j] );
318 –          aJ[j] = vbar * gaussStream->getGaussian();
319 –
320 –        }      
321 –
322 –        dAtom->setJ( aJ );
323 –
324 –      }
325 –    }  
326 –  }
344   }
345  
346   void Thermo::getCOMVel(double vdrift[3]){
# Line 331 | Line 348 | void Thermo::getCOMVel(double vdrift[3]){
348    double mtot, mtot_local;
349    double aVel[3], amass;
350    double vdrift_local[3];
351 <  int vd, n_atoms, j;
352 <  Atom** atoms;
351 >  int vd, j;
352 >  int nobj;
353  
354 <  // We are very careless here with the distinction between n_atoms and n_local
338 <  // We should really fix this before someone pokes an eye out.
354 >  nobj   = info->integrableObjects.size();
355  
340 –  n_atoms = info->n_atoms;  
341 –  atoms   = info->atoms;
342 –
356    mtot_local = 0.0;
357    vdrift_local[0] = 0.0;
358    vdrift_local[1] = 0.0;
359    vdrift_local[2] = 0.0;
360    
361 <  for(vd = 0; vd < n_atoms; vd++){
361 >  for(vd = 0; vd < nobj; vd++){
362      
363 <    amass = atoms[vd]->getMass();
364 <    atoms[vd]->getVel( aVel );
363 >    amass = info->integrableObjects[vd]->getMass();
364 >    info->integrableObjects[vd]->getVel( aVel );
365  
366      for(j = 0; j < 3; j++)
367        vdrift_local[j] += aVel[j] * amass;
# Line 377 | Line 390 | void Thermo::getCOM(double COM[3]){
390    double mtot, mtot_local;
391    double aPos[3], amass;
392    double COM_local[3];
393 <  int i, n_atoms, j;
394 <  Atom** atoms;
393 >  int i, j;
394 >  int nobj;
395  
383 –  // We are very careless here with the distinction between n_atoms and n_local
384 –  // We should really fix this before someone pokes an eye out.
385 –
386 –  n_atoms = info->n_atoms;  
387 –  atoms   = info->atoms;
388 –
396    mtot_local = 0.0;
397    COM_local[0] = 0.0;
398    COM_local[1] = 0.0;
399    COM_local[2] = 0.0;
400 <  
401 <  for(i = 0; i < n_atoms; i++){
400 >
401 >  nobj = info->integrableObjects.size();
402 >  for(i = 0; i < nobj; i++){
403      
404 <    amass = atoms[i]->getMass();
405 <    atoms[i]->getPos( aPos );
404 >    amass = info->integrableObjects[i]->getMass();
405 >    info->integrableObjects[i]->getPos( aPos );
406  
407      for(j = 0; j < 3; j++)
408        COM_local[j] += aPos[j] * amass;
# Line 416 | Line 424 | void Thermo::getCOM(double COM[3]){
424      COM[i] = COM[i] / mtot;
425    }
426   }
427 +
428 + void Thermo::removeCOMdrift() {
429 +  double vdrift[3], aVel[3];
430 +  int vd, j, nobj;
431 +
432 +  nobj = info->integrableObjects.size();
433 +
434 +  // Get the Center of Mass drift velocity.
435 +
436 +  getCOMVel(vdrift);
437 +  
438 +  //  Corrects for the center of mass drift.
439 +  // sums all the momentum and divides by total mass.
440 +
441 +  for(vd = 0; vd < nobj; vd++){
442 +    
443 +    info->integrableObjects[vd]->getVel(aVel);
444 +    
445 +    for (j=0; j < 3; j++)
446 +      aVel[j] -= vdrift[j];
447 +        
448 +    info->integrableObjects[vd]->setVel( aVel );
449 +  }
450 + }

Diff Legend

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