--- trunk/OOPSE/libmdtools/Integrator.cpp	2004/06/04 03:15:31	1234
+++ trunk/OOPSE/libmdtools/Integrator.cpp	2004/06/11 17:16:21	1268
@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include "Rattle.hpp"
+#include "Roll.hpp"
 #ifdef IS_MPI
 #include "mpiSimulation.hpp"
 #include <unistd.h>
@@ -33,9 +34,9 @@ template<typename T> Integrator<T>::Integrator(SimInfo
   nAtoms = info->n_atoms;
   integrableObjects = info->integrableObjects;
 
-  rattle = new RattleFramework(info);
+  consFramework = new RattleFramework(info);
 
-  if(rattle == NULL){
+  if(consFramework == NULL){
     sprintf(painCave.errMsg,
       "Integrator::Intergrator() Error: Memory allocation error for RattleFramework" );
     painCave.isFatal = 1;
@@ -59,8 +60,8 @@ template<typename T> Integrator<T>::~Integrator(){
 }
 
 template<typename T> Integrator<T>::~Integrator(){
-  if (rattle != NULL)
-    delete rattle;
+  if (consFramework != NULL)
+    delete consFramework;
 /*
   if (nConstrained){
     delete[] constrainedA;
@@ -108,7 +109,7 @@ template<typename T> void Integrator<T>::checkConstrai
       if (constrained){
         dummy_plug = theArray[j]->get_constraint();
         temp_con[nConstrained].set_a(dummy_plug->get_a());
-        temp_con[nConstrained].set_b(dummy_plug->get_b());
+        temp_con[nConstrained].set_b(Dummy_plug->get_b());
         temp_con[nConstrained].set_dsqr(dummy_plug->get_dsqr());
 
         nConstrained++;
@@ -209,10 +210,10 @@ template<typename T> void Integrator<T>::integrate(voi
   calcForce(1, 1);
 
   //execute constraint algorithm to make sure at the very beginning the system is constrained  
-  rattle->doPreConstraint();
-  rattle->doRattleA();
+  consFramework->doPreConstraint();
+  consFramework->doConstrainA();
   calcForce(1, 1);
-  rattle->doRattleB();
+  consFramework->doConstrainB();
   
   if (info->setTemp){
     thermalize();
@@ -309,7 +310,7 @@ template<typename T> void Integrator<T>::integrateStep
 #endif //profile
 
   //save old state (position, velocity etc)
-  rattle->doPreConstraint();
+  consFramework->doPreConstraint();
 
 #ifdef PROFILE
   endProfile(pro3);
@@ -405,7 +406,7 @@ template<typename T> void Integrator<T>::moveA(void){
     }
   }
 
-  rattle->doRattleA();
+  consFramework->doConstrainA();
 }
 
 
@@ -446,7 +447,7 @@ template<typename T> void Integrator<T>::moveB(void){
     }
   }
 
-  rattle->doRattleB();
+  consFramework->doConstrainB();
 }
 
 /*