--- trunk/OOPSE/libmdtools/Integrator.hpp	2004/02/03 20:43:08	1010
+++ trunk/OOPSE/libmdtools/Integrator.hpp	2004/03/16 19:22:56	1091
@@ -452,9 +452,12 @@ template<typename T> class ZConstraint : public T { (p
   int* indexOfZConsMols;                   //index of local Z-Constraint Molecules
   double* fz;
   double* curZPos;
-
-
 
+  double zconsFixTime;  
+  double zconsGap;
+  bool hasZConsGap;
+  vector<double> endFixTime;
+  
   int whichDirection;                           //constraint direction
 
 private:
@@ -467,28 +470,22 @@ template<typename T> class ZConstraint : public T { (p
   double calcMovingMolsCOMVel();
   double calcSysCOMVel();
   double calcTotalForce();
+  void updateZPos();
 
   ForceSubtractionPolicy* forcePolicy; //force subtraction policy
   friend class ForceSubtractionPolicy;
 
 };
 
-class OOPSEMinimizerBase : public RealIntegrator {
+/*
+//Steered Molecular Dynamics
+ template<typename T> class SMD : public T{
   public:
-
-    OOPSEMinimizerBase ( SimInfo *theInfo, ForceFields* the_ff );
-    virtual ~OOPSEMinimizerBase();
-    
-    double calcGradient(vector<double>& x, vector<double>& grad);
-    void setOptCoor(vector<double>& x);
-    void getOptCoor(vector<double>& x);
-    void output();
-    
-};
-
-template<typename TMinimizer> class OOPSEMinimizer : public OOPSEMinimizerBase, TMinimizer{
-  public:
-    void writeOutput();
-};
+    SMD( SimInfo *theInfo, ForceFields* the_ff);
+    ~SMD();
   
+   virtual void integrate();
+  virtual void calcForce( int calcPot, int calcStress );   
+};
+*/
 #endif