--- trunk/OOPSE/libmdtools/Integrator.hpp	2003/08/11 19:41:36	677
+++ trunk/OOPSE/libmdtools/Integrator.hpp	2003/08/12 17:51:33	682
@@ -332,6 +332,7 @@ template<typename T> class ZConstraint : public T { (p
   
   void zeroOutVel();
   void doZconstraintForce();
+  void doHarmonic();
   bool checkZConsState();
 
   bool haveFixedZMols();
@@ -343,19 +344,21 @@ template<typename T> class ZConstraint : public T { (p
 
 
   double zconsTime;
-  double ztol;
+  double zconsTol;
+  double zForceConst;
   
   vector<Molecule*> zconsMols;
   vector<double> massOfZConsMols;
-  vector<double> zconsPos;
   vector<double> kz;
   vector<ZConsState> states; 
-  vector<double> ZPos;
+  vector<double> zPos;
   
   
   vector<Molecule*> unconsMols;
   vector<double> massOfUnconsMols;
   double totalMassOfUncons;
+
+  vector<ZConsParaItem>* parameters;
   
   vector<int> indexOfAllZConsMols;     //index of All Z-Constraint Molecuels