--- trunk/OOPSE/libmdtools/Integrator.cpp	2004/04/19 03:52:27	1118
+++ trunk/OOPSE/libmdtools/Integrator.cpp	2004/06/02 14:56:18	1221
@@ -32,7 +32,7 @@ template<typename T> Integrator<T>::Integrator(SimInfo
 
   nAtoms = info->n_atoms;
   integrableObjects = info->integrableObjects;
-
+ 
   // check for constraints
 
   constrainedA = NULL;
@@ -45,6 +45,7 @@ template<typename T> Integrator<T>::Integrator(SimInfo
   nConstrained = 0;
 
   checkConstraints();
+
 }
 
 template<typename T> Integrator<T>::~Integrator(){
@@ -160,7 +161,7 @@ template<typename T> void Integrator<T>::integrate(voi
   double thermalTime = info->thermalTime;
   double resetTime = info->resetTime;
 
-
+  double difference;
   double currSample;
   double currThermal;
   double currStatus;
@@ -179,6 +180,15 @@ template<typename T> void Integrator<T>::integrate(voi
 
   readyCheck();
 
+  // remove center of mass drift velocity (in case we passed in a configuration
+  // that was drifting
+  tStats->removeCOMdrift();
+
+  // initialize the retraints if necessary
+  if (info->useSolidThermInt && !info->useLiquidThermInt) {
+    myFF->initRestraints();
+  }
+
   // initialize the forces before the first step
 
   calcForce(1, 1);
@@ -211,7 +221,8 @@ template<typename T> void Integrator<T>::integrate(voi
 #endif // is_mpi
 
   while (info->getTime() < runTime && !stopIntegrator()){
-    if ((info->getTime() + dt) >= currStatus){
+    difference = info->getTime() + dt - currStatus;
+    if (difference > 0 || fabs(difference) < 1e-4 ){
       calcPot = 1;
       calcStress = 1;
     }
@@ -266,6 +277,11 @@ template<typename T> void Integrator<T>::integrate(voi
 #endif // is_mpi
   }
 
+  // dump out a file containing the omega values for the final configuration
+  if (info->useSolidThermInt && !info->useLiquidThermInt)
+    myFF->dumpzAngle();
+  
+
   delete dumpOut;
   delete statOut;
 }
@@ -300,9 +316,7 @@ template<typename T> void Integrator<T>::integrateStep
   MPIcheckPoint();
 #endif // is_mpi
 
-
   // calc forces
-
   calcForce(calcPot, calcStress);
 
 #ifdef IS_MPI
@@ -337,6 +351,7 @@ template<typename T> void Integrator<T>::moveA(void){
   double Tb[3], ji[3];
   double vel[3], pos[3], frc[3];
   double mass;
+  double omega;
  
   for (i = 0; i < integrableObjects.size() ; i++){
     integrableObjects[i]->getVel(vel);
@@ -710,26 +725,27 @@ template<typename T> void Integrator<T>::rotationPropa
     this->rotate( k, i, angle, ji, A );
 
   } else {
-  // rotate about the x-axis
-  angle = dt2 * ji[0] / I[0][0];
-  this->rotate( 1, 2, angle, ji, A );
-
-  // rotate about the y-axis
-  angle = dt2 * ji[1] / I[1][1];
-  this->rotate( 2, 0, angle, ji, A );
-
-  // rotate about the z-axis
-  angle = dt * ji[2] / I[2][2];
-  this->rotate( 0, 1, angle, ji, A);
-
-  // rotate about the y-axis
-  angle = dt2 * ji[1] / I[1][1];
-  this->rotate( 2, 0, angle, ji, A );
-
-  // rotate about the x-axis
-  angle = dt2 * ji[0] / I[0][0];
-  this->rotate( 1, 2, angle, ji, A );
-
+    // rotate about the x-axis
+    angle = dt2 * ji[0] / I[0][0];
+    this->rotate( 1, 2, angle, ji, A );
+    
+    // rotate about the y-axis
+    angle = dt2 * ji[1] / I[1][1];
+    this->rotate( 2, 0, angle, ji, A );
+    
+    // rotate about the z-axis
+    angle = dt * ji[2] / I[2][2];
+    sd->addZangle(angle);
+    this->rotate( 0, 1, angle, ji, A);
+    
+    // rotate about the y-axis
+    angle = dt2 * ji[1] / I[1][1];
+    this->rotate( 2, 0, angle, ji, A );
+    
+    // rotate about the x-axis
+    angle = dt2 * ji[0] / I[0][0];
+    this->rotate( 1, 2, angle, ji, A );
+    
   }
   sd->setA( A  );
 }