--- trunk/OOPSE/libmdtools/Integrator.hpp	2003/09/23 20:34:31	782
+++ trunk/OOPSE/libmdtools/Integrator.hpp	2003/09/29 21:16:11	790
@@ -395,7 +395,7 @@ template<typename T> class ZConstraint : public T {
       virtual double getHFOfUnconsMols(Atom* atom, double totalForce) = 0;
     
    protected:
-     ZConstraint<T>* zconsIntegrator;;
+     ZConstraint<T>* zconsIntegrator;
   };
 
   class PolicyByNumber : public ForceSubtractionPolicy{
@@ -448,9 +448,20 @@ template<typename T> class ZConstraint : public T {
   virtual void update();                      //which is called to indicate the molecules' migration
 #endif
 
+  enum ZConsState {zcsMoving, zcsFixed};  
+
+  vector<Molecule*> zconsMols;              //z-constraint molecules array
+  vector<ZConsState> states;                 //state of z-constraint molecules
+
+ 
+
+  int totNumOfUnconsAtoms;              //total number of uncontraint atoms
+  double totalMassOfUncons;                //total mas of unconstraint molecules
+
+
 protected:
 
-  enum ZConsState {zcsMoving, zcsFixed};  
+
  
   virtual void calcForce( int calcPot, int calcStress ); 
   virtual void thermalize(void);
@@ -473,17 +484,17 @@ template<typename T> class ZConstraint : public T {
   double zForceConst;                           //base force constant term
                                                           //which is estimate by OOPSE
   
-  vector<Molecule*> zconsMols;              //z-constraint molecules array
+
   vector<double> massOfZConsMols;       //mass of z-constraint molecule 
   vector<double> kz;                              //force constant array
-  vector<ZConsState> states;                 //state of z-constraint molecules
+
   vector<double> zPos;                          //
   
   
   vector<Molecule*> unconsMols;           //unconstraint molecules array
   vector<double> massOfUnconsMols;    //mass array of unconstraint molecules
-  double totalMassOfUncons;                //total mas of unconstraint molecules
 
+
   vector<ZConsParaItem>* parameters; //
   
   vector<int> indexOfAllZConsMols;     //index of All Z-Constraint Molecuels
@@ -492,8 +503,8 @@ template<typename T> class ZConstraint : public T {
   double* fz;
   double* curZPos;
   
-  int totNumOfUnconsAtoms;              //total number of uncontraint atoms
 
+
   int whichDirection;                           //constraint direction 
   
 private: