ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/Integrator.hpp
(Generate patch)

Comparing trunk/OOPSE/libmdtools/Integrator.hpp (file contents):
Revision 1057 by tim, Tue Feb 17 19:23:44 2004 UTC vs.
Revision 1091 by tim, Tue Mar 16 19:22:56 2004 UTC

# Line 452 | Line 452 | template<typename T> class ZConstraint : public T { (p
452    int* indexOfZConsMols;                   //index of local Z-Constraint Molecules
453    double* fz;
454    double* curZPos;
455
456
455  
456 +  double zconsFixTime;  
457 +  double zconsGap;
458 +  bool hasZConsGap;
459 +  vector<double> endFixTime;
460 +  
461    int whichDirection;                           //constraint direction
462  
463   private:
# Line 467 | Line 470 | template<typename T> class ZConstraint : public T { (p
470    double calcMovingMolsCOMVel();
471    double calcSysCOMVel();
472    double calcTotalForce();
473 +  void updateZPos();
474  
475    ForceSubtractionPolicy* forcePolicy; //force subtraction policy
476    friend class ForceSubtractionPolicy;
477  
478   };
479  
480 < class OOPSEMinimizerBase : public RealIntegrator {
480 > /*
481 > //Steered Molecular Dynamics
482 > template<typename T> class SMD : public T{
483    public:
484 <
485 <    OOPSEMinimizerBase ( SimInfo *theInfo, ForceFields* the_ff );
480 <    virtual ~OOPSEMinimizerBase();
481 <    
482 <    double calcGradient(vector<double>& x, vector<double>& grad);
483 <    void setCoor(vector<double>& x);
484 <    vector<double> getCoor();
485 <    void output(vector<double>& x, int iteration);
486 <    int getDim() {return dim;}
487 <    void constraintMove();
488 <    void shakeF();
489 <    void shakeR();
490 <  protected:
491 <    
492 <    int dim;
493 <    void calcDim();
494 < };
495 <
496 < //template<typename TMinimizer> class OOPSEMinimizer : public OOPSEMinimizerBase, TMinimizer{
497 < //  public:
498 < //    void writeOutput();
499 < //};
484 >    SMD( SimInfo *theInfo, ForceFields* the_ff);
485 >    ~SMD();
486    
487 +   virtual void integrate();
488 +  virtual void calcForce( int calcPot, int calcStress );  
489 + };
490 + */
491   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines