--- trunk/OOPSE/libmdtools/Integrator.hpp	2004/05/27 00:48:12	1198
+++ trunk/OOPSE/libmdtools/Integrator.hpp	2004/06/04 03:15:31	1234
@@ -22,6 +22,7 @@ template<typename T = BaseIntegrator> class Integrator
 const int maxIteration = 300;
 const double tol = 1.0e-6;
 
+class RattleFramework;
 template<typename T = BaseIntegrator> class Integrator : public T {
 
 public:
@@ -34,11 +35,11 @@ template<typename T = BaseIntegrator> class Integrator
 protected:
 
   virtual void integrateStep( int calcPot, int calcStress );
-  virtual void preMove( void );
+  //virtual void preMove( void );
   virtual void moveA( void );
   virtual void moveB( void );
-  virtual void constrainA( void );
-  virtual void constrainB( void );
+  //virtual void constrainA( void );
+  //virtual void constrainB( void );
   virtual int  readyCheck( void ) { return 1; }
 
   virtual void resetIntegrator( void ) { }
@@ -50,7 +51,7 @@ template<typename T = BaseIntegrator> class Integrator
 
   virtual void rotationPropagation( StuntDouble* sd, double ji[3] );
 
-  void checkConstraints( void );
+  //void checkConstraints( void );
   void rotate( int axes1, int axes2, double angle, double j[3],
          double A[3][3] );
 
@@ -64,17 +65,18 @@ template<typename T = BaseIntegrator> class Integrator
   Molecule* molecules;
   int nMols;
 
-  int isConstrained; // boolean to know whether the systems contains
-         // constraints.
-  int nConstrained;  // counter for number of constraints
-  int *constrainedA; // the i of a constraint pair
-  int *constrainedB; // the j of a constraint pair
-  double *constrainedDsqr; // the square of the constraint distance
+  RattleFramework* rattle;
 
-  int* moving; // tells whether we are moving atom i
-  int* moved;  // tells whether we have moved atom i
-  double* oldPos; // pre constrained positions
+  //int isConstrained; // boolean to know whether the systems contains constraints.
+  //int nConstrained;  // counter for number of constraints
+  //int *constrainedA; // the i of a constraint pair
+  //int *constrainedB; // the j of a constraint pair
+  //double *constrainedDsqr; // the square of the constraint distance
 
+  //int* moving; // tells whether we are moving atom i
+  //int* moved;  // tells whether we have moved atom i
+  //double* oldPos; // pre constrained positions
+
   short isFirst; /*boolean for the first time integrate is called */
 
   double dt;