ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/Integrator.cpp
(Generate patch)

Comparing trunk/OOPSE/libmdtools/Integrator.cpp (file contents):
Revision 1035 by tim, Fri Feb 6 21:37:59 2004 UTC vs.
Revision 1178 by gezelter, Thu May 13 21:08:05 2004 UTC

# Line 31 | Line 31 | template<typename T> Integrator<T>::Integrator(SimInfo
31    }
32  
33    nAtoms = info->n_atoms;
34 +  integrableObjects = info->integrableObjects;
35  
36    // check for constraints
37  
# Line 68 | Line 69 | template<typename T> void Integrator<T>::checkConstrai
69  
70    SRI** theArray;
71    for (int i = 0; i < nMols; i++){
72 <    theArray = (SRI * *) molecules[i].getMyBonds();
72 >
73 >          theArray = (SRI * *) molecules[i].getMyBonds();
74      for (int j = 0; j < molecules[i].getNBonds(); j++){
75        constrained = theArray[j]->is_constrained();
76  
# Line 114 | Line 116 | template<typename T> void Integrator<T>::checkConstrai
116      }
117    }
118  
119 +
120    if (nConstrained > 0){
121      isConstrained = 1;
122  
# Line 157 | Line 160 | template<typename T> void Integrator<T>::integrate(voi
160    double thermalTime = info->thermalTime;
161    double resetTime = info->resetTime;
162  
163 <
163 >  double difference;
164    double currSample;
165    double currThermal;
166    double currStatus;
# Line 176 | Line 179 | template<typename T> void Integrator<T>::integrate(voi
179  
180    readyCheck();
181  
182 +  // remove center of mass drift velocity (in case we passed in a configuration
183 +  // that was drifting
184 +  tStats->removeCOMdrift();
185 +
186    // initialize the forces before the first step
187  
188    calcForce(1, 1);
182 –
183 –  //temp test
184 –  tStats->getPotential();
189    
190    if (nConstrained){
191      preMove();
# Line 210 | Line 214 | template<typename T> void Integrator<T>::integrate(voi
214    MPIcheckPoint();
215   #endif // is_mpi
216  
217 <  while (info->getTime() < runTime){
218 <    if ((info->getTime() + dt) >= currStatus){
217 >  while (info->getTime() < runTime && !stopIntegrator()){
218 >    difference = info->getTime() + dt - currStatus;
219 >    if (difference > 0 || fabs(difference) < 1e-4 ){
220        calcPot = 1;
221        calcStress = 1;
222      }
# Line 332 | Line 337 | template<typename T> void Integrator<T>::moveA(void){
337  
338  
339   template<typename T> void Integrator<T>::moveA(void){
340 <  int i, j;
340 >  size_t i, j;
341    DirectionalAtom* dAtom;
342    double Tb[3], ji[3];
343    double vel[3], pos[3], frc[3];
344    double mass;
345 +
346 +  for (i = 0; i < integrableObjects.size() ; i++){
347 +    integrableObjects[i]->getVel(vel);
348 +    integrableObjects[i]->getPos(pos);
349 +    integrableObjects[i]->getFrc(frc);
350 +    
351 +    mass = integrableObjects[i]->getMass();
352  
341 –  for (i = 0; i < nAtoms; i++){
342 –    atoms[i]->getVel(vel);
343 –    atoms[i]->getPos(pos);
344 –    atoms[i]->getFrc(frc);
345 –
346 –    mass = atoms[i]->getMass();
347 –
353      for (j = 0; j < 3; j++){
354        // velocity half step
355        vel[j] += (dt2 * frc[j] / mass) * eConvert;
# Line 352 | Line 357 | template<typename T> void Integrator<T>::moveA(void){
357        pos[j] += dt * vel[j];
358      }
359  
360 <    atoms[i]->setVel(vel);
361 <    atoms[i]->setPos(pos);
360 >    integrableObjects[i]->setVel(vel);
361 >    integrableObjects[i]->setPos(pos);
362  
363 <    if (atoms[i]->isDirectional()){
359 <      dAtom = (DirectionalAtom *) atoms[i];
363 >    if (integrableObjects[i]->isDirectional()){
364  
365        // get and convert the torque to body frame
366  
367 <      dAtom->getTrq(Tb);
368 <      dAtom->lab2Body(Tb);
367 >      integrableObjects[i]->getTrq(Tb);
368 >      integrableObjects[i]->lab2Body(Tb);
369  
370        // get the angular momentum, and propagate a half step
371  
372 <      dAtom->getJ(ji);
372 >      integrableObjects[i]->getJ(ji);
373  
374        for (j = 0; j < 3; j++)
375          ji[j] += (dt2 * Tb[j]) * eConvert;
376  
377 <      this->rotationPropagation( dAtom, ji );
377 >      this->rotationPropagation( integrableObjects[i], ji );
378  
379 <      dAtom->setJ(ji);
379 >      integrableObjects[i]->setJ(ji);
380      }
381    }
382  
# Line 384 | Line 388 | template<typename T> void Integrator<T>::moveB(void){
388  
389   template<typename T> void Integrator<T>::moveB(void){
390    int i, j;
387 –  DirectionalAtom* dAtom;
391    double Tb[3], ji[3];
392    double vel[3], frc[3];
393    double mass;
394  
395 <  for (i = 0; i < nAtoms; i++){
396 <    atoms[i]->getVel(vel);
397 <    atoms[i]->getFrc(frc);
395 >  for (i = 0; i < integrableObjects.size(); i++){
396 >    integrableObjects[i]->getVel(vel);
397 >    integrableObjects[i]->getFrc(frc);
398  
399 <    mass = atoms[i]->getMass();
399 >    mass = integrableObjects[i]->getMass();
400  
401      // velocity half step
402      for (j = 0; j < 3; j++)
403        vel[j] += (dt2 * frc[j] / mass) * eConvert;
404  
405 <    atoms[i]->setVel(vel);
405 >    integrableObjects[i]->setVel(vel);
406  
407 <    if (atoms[i]->isDirectional()){
405 <      dAtom = (DirectionalAtom *) atoms[i];
407 >    if (integrableObjects[i]->isDirectional()){
408  
409        // get and convert the torque to body frame
410  
411 <      dAtom->getTrq(Tb);
412 <      dAtom->lab2Body(Tb);
411 >      integrableObjects[i]->getTrq(Tb);
412 >      integrableObjects[i]->lab2Body(Tb);
413  
414        // get the angular momentum, and propagate a half step
415  
416 <      dAtom->getJ(ji);
416 >      integrableObjects[i]->getJ(ji);
417  
418        for (j = 0; j < 3; j++)
419          ji[j] += (dt2 * Tb[j]) * eConvert;
420  
421  
422 <      dAtom->setJ(ji);
422 >      integrableObjects[i]->setJ(ji);
423      }
424    }
425  
# Line 686 | Line 688 | template<typename T> void Integrator<T>::rotationPropa
688   }
689  
690   template<typename T> void Integrator<T>::rotationPropagation
691 < ( DirectionalAtom* dAtom, double ji[3] ){
691 > ( StuntDouble* sd, double ji[3] ){
692  
693    double angle;
694    double A[3][3], I[3][3];
695 +  int i, j, k;
696  
697    // use the angular velocities to propagate the rotation matrix a
698    // full time step
699  
700 <  dAtom->getA(A);
701 <  dAtom->getI(I);
700 >  sd->getA(A);
701 >  sd->getI(I);
702  
703 <  // rotate about the x-axis
704 <  angle = dt2 * ji[0] / I[0][0];
705 <  this->rotate( 1, 2, angle, ji, A );
706 <
707 <  // rotate about the y-axis
708 <  angle = dt2 * ji[1] / I[1][1];
709 <  this->rotate( 2, 0, angle, ji, A );
703 >  if (sd->isLinear()) {
704 >    i = sd->linearAxis();
705 >    j = (i+1)%3;
706 >    k = (i+2)%3;
707 >    
708 >    angle = dt2 * ji[j] / I[j][j];
709 >    this->rotate( k, i, angle, ji, A );
710  
711 <  // rotate about the z-axis
712 <  angle = dt * ji[2] / I[2][2];
710 <  this->rotate( 0, 1, angle, ji, A);
711 >    angle = dt * ji[k] / I[k][k];
712 >    this->rotate( i, j, angle, ji, A);
713  
714 <  // rotate about the y-axis
715 <  angle = dt2 * ji[1] / I[1][1];
716 <  this->rotate( 2, 0, angle, ji, A );
717 <
718 <  // rotate about the x-axis
719 <  angle = dt2 * ji[0] / I[0][0];
720 <  this->rotate( 1, 2, angle, ji, A );
721 <
722 <  dAtom->setA( A  );
714 >    angle = dt2 * ji[j] / I[j][j];
715 >    this->rotate( k, i, angle, ji, A );
716 >
717 >  } else {
718 >    // rotate about the x-axis
719 >    angle = dt2 * ji[0] / I[0][0];
720 >    this->rotate( 1, 2, angle, ji, A );
721 >    
722 >    // rotate about the y-axis
723 >    angle = dt2 * ji[1] / I[1][1];
724 >    this->rotate( 2, 0, angle, ji, A );
725 >    
726 >    // rotate about the z-axis
727 >    angle = dt * ji[2] / I[2][2];
728 >    this->rotate( 0, 1, angle, ji, A);
729 >    
730 >    // rotate about the y-axis
731 >    angle = dt2 * ji[1] / I[1][1];
732 >    this->rotate( 2, 0, angle, ji, A );
733 >    
734 >    // rotate about the x-axis
735 >    angle = dt2 * ji[0] / I[0][0];
736 >    this->rotate( 1, 2, angle, ji, A );
737 >    
738 >  }
739 >  sd->setA( A  );
740   }
741  
742   template<typename T> void Integrator<T>::rotate(int axes1, int axes2,

Diff Legend

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