--- trunk/OOPSE/libmdtools/Integrator.hpp	2003/09/05 21:28:52	747
+++ trunk/OOPSE/libmdtools/Integrator.hpp	2003/10/29 00:19:10	837
@@ -27,10 +27,11 @@ template<typename T = BaseIntegrator> class Integrator
   Integrator( SimInfo *theInfo, ForceFields* the_ff );
   virtual ~Integrator();
   void integrate( void );
+  virtual double  getConservedQuantity(void);
+  virtual string getAdditionalParameters(void);
 
-
 protected:
-  
+
   virtual void integrateStep( int calcPot, int calcStress );
   virtual void preMove( void );
   virtual void moveA( void );
@@ -41,13 +42,15 @@ template<typename T = BaseIntegrator> class Integrator
 
   virtual void resetIntegrator( void ) { }
 
-  virtual void calcForce( int calcPot, int calcStress );  
+  virtual void calcForce( int calcPot, int calcStress );
   virtual void thermalize();
-  
+
+  virtual void rotationPropagation( DirectionalAtom* dAtom, double ji[3] );
+
   void checkConstraints( void );
-  void rotate( int axes1, int axes2, double angle, double j[3], 
+  void rotate( int axes1, int axes2, double angle, double j[3],
          double A[3][3] );
-         
+
   ForceFields* myFF;
 
   SimInfo *info; // all the info we'll ever need
@@ -59,24 +62,24 @@ template<typename T = BaseIntegrator> class Integrator
 
   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 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 
+  double* oldPos; // pre constrained positions
 
   short isFirst; /*boolean for the first time integrate is called */
-  
+
   double dt;
   double dt2;
 
   Thermo *tStats;
   StatWriter*  statOut;
   DumpWriter*  dumpOut;
-  
+
 };
 
 typedef Integrator<BaseIntegrator> RealIntegrator;
@@ -86,7 +89,7 @@ template<typename T> class NVE : public T { (public)
 public:
   NVE ( SimInfo *theInfo, ForceFields* the_ff ):
     T( theInfo, the_ff ){}
-  virtual ~NVE(){}  
+  virtual ~NVE(){}
 };
 
 
@@ -95,10 +98,13 @@ template<typename T> class NVT : public T { (public)
 public:
 
   NVT ( SimInfo *theInfo, ForceFields* the_ff);
-  virtual ~NVT() {}
+  virtual ~NVT();
 
   void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
   void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
+  void setChiTolerance(double tol) {chiTolerance = tol;}
+  virtual double  getConservedQuantity(void);
+  virtual string getAdditionalParameters(void);
 
 protected:
 
@@ -113,33 +119,47 @@ template<typename T> class NVT : public T { (public)
 
   double chi;
 
+  //integral of chi(t)dt
+  double integralOfChidt;
+
   // targetTemp must be set.  tauThermostat must also be set;
 
   double targetTemp;
   double tauThermostat;
-  
+
   short int have_tau_thermostat, have_target_temp;
 
+  double *oldVel;
+  double *oldJi;
+
+  double chiTolerance;
+  short int have_chi_tolerance;
+
 };
 
 
 
-template<typename T> class NPTi : public T{
+template<typename T> class NPT : public T{
 
 public:
 
-  NPTi ( SimInfo *theInfo, ForceFields* the_ff);
-  virtual ~NPTi() {};
+  NPT ( SimInfo *theInfo, ForceFields* the_ff);
+  virtual ~NPT();
 
   virtual void integrateStep( int calcPot, int calcStress ){
     calcStress = 1;
     T::integrateStep( calcPot, calcStress );
   }
 
+  virtual double getConservedQuantity(void) = 0;
+  virtual string getAdditionalParameters(void) = 0;
   void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
   void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
   void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
   void setTargetPressure(double tp) {targetPressure = tp; have_target_pressure = 1;}
+  void setChiTolerance(double tol) {chiTolerance = tol; have_chi_tolerance = 1;}
+  void setPosIterTolerance(double tol) {posIterTolerance = tol; have_pos_iter_tolerance = 1;}
+  void setEtaTolerance(double tol) {etaTolerance = tol; have_eta_tolerance = 1;}
 
 protected:
 
@@ -150,13 +170,40 @@ template<typename T> class NPTi : public T{ (protected
 
   virtual void resetIntegrator( void );
 
+  virtual void getVelScaleA( double sc[3], double vel[3] ) = 0;
+  virtual void getVelScaleB( double sc[3], int index ) = 0;
+  virtual void getPosScale(double pos[3], double COM[3],
+			   int index, double sc[3]) = 0;
+
+  virtual bool chiConverged( void );
+  virtual bool etaConverged( void ) = 0;
+
+  virtual void evolveChiA( void );
+  virtual void evolveEtaA( void ) = 0;
+  virtual void evolveChiB( void );
+  virtual void evolveEtaB( void ) = 0;
+
+  virtual void scaleSimBox( void ) = 0;
+
+  void accIntegralOfChidt(void) { integralOfChidt += dt * chi;}
+
   // chi and eta are the propagated degrees of freedom
 
+  double oldChi;
+  double prevChi;
   double chi;
-  double eta;
   double NkBT;
+  double fkBT;
 
-  // targetTemp, targetPressure, and tauBarostat must be set.  
+  double tt2, tb2;
+  double instaTemp, instaPress, instaVol;
+  double press[3][3];
+
+  int Nparticles;
+
+  double integralOfChidt;
+
+  // targetTemp, targetPressure, and tauBarostat must be set.
   // One of qmass or tauThermostat must be set;
 
   double targetTemp;
@@ -167,54 +214,45 @@ template<typename T> class NPTi : public T{ (protected
   short int have_tau_thermostat, have_tau_barostat, have_target_temp;
   short int have_target_pressure;
 
+  double *oldPos;
+  double *oldVel;
+  double *oldJi;
+
+  double chiTolerance;
+  short int have_chi_tolerance;
+  double posIterTolerance;
+  short int have_pos_iter_tolerance;
+  double etaTolerance;
+  short int have_eta_tolerance;
+
 };
 
-template<typename T> class NPTim : public T{
+template<typename T> class NPTi : public T{
 
 public:
+  NPTi( SimInfo *theInfo, ForceFields* the_ff);
+  ~NPTi();
 
-  NPTim ( SimInfo *theInfo, ForceFields* the_ff);
-  virtual ~NPTim() {};
-
-  virtual void integrateStep( int calcPot, int calcStress ){
-    calcStress = 1;
-    T::integrateStep( calcPot, calcStress );
-  }
-
-  void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
-  void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
-  void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
-  void setTargetPressure(double tp) {targetPressure = tp; have_target_pressure = 1;}
-
+  virtual double getConservedQuantity(void);
+  virtual void resetIntegrator(void);
+  virtual string getAdditionalParameters(void);
 protected:
 
-  virtual void moveA( void );
-  virtual void moveB( void );
 
-  virtual int readyCheck();
 
-  virtual void resetIntegrator( void );
+  virtual void evolveEtaA(void);
+  virtual void evolveEtaB(void);
 
-  Molecule* myMolecules;
-  Atom** myAtoms;
+  virtual bool etaConverged( void );
 
-  // chi and eta are the propagated degrees of freedom
+  virtual void scaleSimBox( void );
 
-  double chi;
-  double eta;
-  double NkBT;
+  virtual void getVelScaleA( double sc[3], double vel[3] );
+  virtual void getVelScaleB( double sc[3], int index );
+  virtual void getPosScale(double pos[3], double COM[3],
+			   int index, double sc[3]);
 
-  // targetTemp, targetPressure, and tauBarostat must be set.  
-  // One of qmass or tauThermostat must be set;
-
-  double targetTemp;
-  double targetPressure;
-  double tauThermostat;
-  double tauBarostat;
-
-  short int have_tau_thermostat, have_tau_barostat, have_target_temp;
-  short int have_target_pressure;
-
+  double eta, oldEta, prevEta;
 };
 
 template<typename T> class NPTf : public T{
@@ -222,178 +260,99 @@ template<typename T> class NPTf : public T{ (public)
 public:
 
   NPTf ( SimInfo *theInfo, ForceFields* the_ff);
-  virtual ~NPTf() {};
+  virtual ~NPTf();
 
-  virtual void integrateStep( int calcPot, int calcStress ){
-    calcStress = 1;
-    T::integrateStep( calcPot, calcStress );
-  }
+  virtual double getConservedQuantity(void);
+  virtual string getAdditionalParameters(void);
+  virtual void resetIntegrator(void);
 
-  void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
-  void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
-  void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
-  void setTargetPressure(double tp) {targetPressure = tp; have_target_pressure = 1;}
-
 protected:
 
-  virtual void  moveA( void );
-  virtual void moveB( void );
+  virtual void evolveEtaA(void);
+  virtual void evolveEtaB(void);
 
-  virtual void resetIntegrator( void );
+  virtual bool etaConverged( void );
 
-  virtual int readyCheck();
+  virtual void scaleSimBox( void );
 
-  // chi and eta are the propagated degrees of freedom
+  virtual void getVelScaleA( double sc[3], double vel[3] );
+  virtual void getVelScaleB( double sc[3], int index );
+  virtual void getPosScale(double pos[3], double COM[3],
+			   int index, double sc[3]);
 
-  double chi;
   double eta[3][3];
-  double NkBT;
-
-  // targetTemp, targetPressure, and tauBarostat must be set.  
-  // One of qmass or tauThermostat must be set;
-
-  double targetTemp;
-  double targetPressure;
-  double tauThermostat;
-  double tauBarostat;
-
-  short int have_tau_thermostat, have_tau_barostat, have_target_temp;
-  short int have_target_pressure;
-
+  double oldEta[3][3];
+  double prevEta[3][3];
 };
 
-template<typename T> class NPTfm : public T{
+template<typename T> class NPTxyz : public T{
 
 public:
 
-  NPTfm ( SimInfo *theInfo, ForceFields* the_ff);
-  virtual ~NPTfm() {};
+  NPTxyz ( SimInfo *theInfo, ForceFields* the_ff);
+  virtual ~NPTxyz();
 
-  virtual void integrateStep( int calcPot, int calcStress ){
-    calcStress = 1;
-    T::integrateStep( calcPot, calcStress );
-  }
+  virtual double getConservedQuantity(void);
+  virtual string getAdditionalParameters(void);
+  virtual void resetIntegrator(void);
 
-  void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
-  void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
-  void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
-  void setTargetPressure(double tp) {targetPressure = tp; have_target_pressure = 1;}
-
 protected:
 
-  virtual void  moveA( void );
-  virtual void moveB( void );
+  virtual void evolveEtaA(void);
+  virtual void evolveEtaB(void);
 
-  virtual void resetIntegrator( void );
+  virtual bool etaConverged( void );
 
-  virtual int readyCheck();
+  virtual void scaleSimBox( void );
 
-  Molecule* myMolecules;
-  Atom** myAtoms;
+  virtual void getVelScaleA( double sc[3], double vel[3] );
+  virtual void getVelScaleB( double sc[3], int index );
+  virtual void getPosScale(double pos[3], double COM[3],
+			   int index, double sc[3]);
 
-  // chi and eta are the propagated degrees of freedom
-
-  double chi;
   double eta[3][3];
-  double NkBT;
-
-  // targetTemp, targetPressure, and tauBarostat must be set.  
-  // One of qmass or tauThermostat must be set;
-
-  double targetTemp;
-  double targetPressure;
-  double tauThermostat;
-  double tauBarostat;
-
-  short int have_tau_thermostat, have_tau_barostat, have_target_temp;
-  short int have_target_pressure;
-
+  double oldEta[3][3];
+  double prevEta[3][3];
 };
 
 
-template<typename T> class NPTpr : public T{
-
-public:
-
-  NPTpr ( SimInfo *theInfo, ForceFields* the_ff);
-  virtual ~NPTpr() {};
-
-  virtual void integrateStep( int calcPot, int calcStress ){
-    calcStress = 1;
-    T::integrateStep( calcPot, calcStress );
-  }
-
-  void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
-  void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
-  void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
-  void setTargetPressure(double tp) {targetPressure = tp; have_target_pressure = 1;}
-
-protected:
-
-  virtual void  moveA( void );
-  virtual void moveB( void );
-
-  virtual int readyCheck();
-
-  virtual void resetIntegrator( void );
-
-  // chi and eta are the propagated degrees of freedom
-
-  double chi;
-  double eta[3][3];
-  double NkBT;
-
-  // targetTemp, targetPressure, and tauBarostat must be set.  
-  // One of qmass or tauThermostat must be set;
-
-  double targetTemp;
-  double targetPressure;
-  double tauThermostat;
-  double tauBarostat;
-
-  short int have_tau_thermostat, have_tau_barostat, have_target_temp;
-  short int have_target_pressure;
-
-};
-
-
 template<typename T> class ZConstraint : public T {
-  
-  public: 
+
+  public:
   class ForceSubtractionPolicy{
     public:
       ForceSubtractionPolicy(ZConstraint<T>* integrator) {zconsIntegrator = integrator;}
 
-      virtual void update() = 0;    
+      virtual void update() = 0;
       virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) = 0;
       virtual double getZFOfMovingMols(Atom* atom, double totalForce) = 0;
       virtual double getHFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) = 0;
       virtual double getHFOfUnconsMols(Atom* atom, double totalForce) = 0;
-    
+
    protected:
-     ZConstraint<T>* zconsIntegrator;;
+     ZConstraint<T>* zconsIntegrator;
   };
 
   class PolicyByNumber : public ForceSubtractionPolicy{
 
     public:
-      PolicyByNumber(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}    
-      virtual void update();    
+      PolicyByNumber(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}
+      virtual void update();
       virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) ;
       virtual double getZFOfMovingMols(Atom* atom, double totalForce) ;
       virtual double getHFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce);
       virtual double getHFOfUnconsMols(Atom* atom, double totalForce);
-    
+
     private:
-    int totNumOfMovingAtoms;
+      int totNumOfMovingAtoms;
   };
 
   class PolicyByMass : public ForceSubtractionPolicy{
 
     public:
-      PolicyByMass(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}  
-      
-      virtual void update();    
+      PolicyByMass(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}
+
+      virtual void update();
       virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) ;
       virtual double getZFOfMovingMols(Atom* atom, double totalForce) ;
       virtual double getHFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce);
@@ -407,30 +366,41 @@ template<typename T> class ZConstraint : public T { (p
 
   ZConstraint( SimInfo *theInfo, ForceFields* the_ff);
   ~ZConstraint();
-    
+
   void setZConsTime(double time)                  {this->zconsTime = time;}
   void getZConsTime()                             {return zconsTime;}
-  
+
   void setIndexOfAllZConsMols(vector<int> index) {indexOfAllZConsMols = index;}
   void getIndexOfAllZConsMols()                  {return indexOfAllZConsMols;}
-  
+
   void setZConsOutput(const char * fileName)          {zconsOutput = fileName;}
   string getZConsOutput()                         {return zconsOutput;}
-  
+
   virtual void integrate();
-  
 
+
 #ifdef IS_MPI
   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 calcForce( int calcPot, int calcStress );
   virtual void thermalize(void);
-  
+
   void zeroOutVel();
   void doZconstraintForce();
   void doHarmonic();
@@ -448,41 +418,41 @@ template<typename T> class ZConstraint : public T { (p
   double zconsTol;                                 //tolerance of z-contratint
   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> 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
 
-  int* indexOfZConsMols;                   //index of local Z-Constraint Molecules  
+  int* indexOfZConsMols;                   //index of local Z-Constraint Molecules
   double* fz;
   double* curZPos;
-  
-  int totNumOfUnconsAtoms;              //total number of uncontraint atoms
 
-  int whichDirection;                           //constraint direction 
-  
+
+
+  int whichDirection;                           //constraint direction
+
 private:
-  
+
   string zconsOutput;                         //filename of zconstraint output
   ZConsWriter* fzOut;                         //z-constraint writer
 
-  double curZconsTime;                      
+  double curZconsTime;
 
   double calcMovingMolsCOMVel();
   double calcSysCOMVel();
   double calcTotalForce();
-  
+
   ForceSubtractionPolicy* forcePolicy; //force subtraction policy
   friend class ForceSubtractionPolicy;