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 1108 by tim, Wed Apr 14 15:37:41 2004 UTC vs.
Revision 1249 by tim, Fri Jun 4 20:29:36 2004 UTC

# Line 13 | Line 13
13   #include "Thermo.hpp"
14   #include "ReadWrite.hpp"
15   #include "ZConsWriter.hpp"
16 + #include "Restraints.hpp"
17  
18   using namespace std;
19   const double kB = 8.31451e-7;// boltzmann constant amu*Ang^2*fs^-2/K
# Line 21 | Line 22 | template<typename T = BaseIntegrator> class Integrator
22   const int maxIteration = 300;
23   const double tol = 1.0e-6;
24  
25 + class RattleFramework;
26   template<typename T = BaseIntegrator> class Integrator : public T {
27  
28   public:
# Line 33 | Line 35 | template<typename T = BaseIntegrator> class Integrator
35   protected:
36  
37    virtual void integrateStep( int calcPot, int calcStress );
38 <  virtual void preMove( void );
38 >  //virtual void preMove( void );
39    virtual void moveA( void );
40    virtual void moveB( void );
41 <  virtual void constrainA( void );
42 <  virtual void constrainB( void );
41 >  //virtual void constrainA( void );
42 >  //virtual void constrainB( void );
43    virtual int  readyCheck( void ) { return 1; }
44  
45    virtual void resetIntegrator( void ) { }
# Line 49 | Line 51 | template<typename T = BaseIntegrator> class Integrator
51  
52    virtual void rotationPropagation( StuntDouble* sd, double ji[3] );
53  
54 <  void checkConstraints( void );
54 >  //void checkConstraints( void );
55    void rotate( int axes1, int axes2, double angle, double j[3],
56           double A[3][3] );
57  
# Line 63 | Line 65 | template<typename T = BaseIntegrator> class Integrator
65    Molecule* molecules;
66    int nMols;
67  
68 <  int isConstrained; // boolean to know whether the systems contains
67 <         // constraints.
68 <  int nConstrained;  // counter for number of constraints
69 <  int *constrainedA; // the i of a constraint pair
70 <  int *constrainedB; // the j of a constraint pair
71 <  double *constrainedDsqr; // the square of the constraint distance
68 >  RattleFramework* rattle;
69  
70 <  int* moving; // tells whether we are moving atom i
71 <  int* moved;  // tells whether we have moved atom i
72 <  double* oldPos; // pre constrained positions
70 >  //int isConstrained; // boolean to know whether the systems contains constraints.
71 >  //int nConstrained;  // counter for number of constraints
72 >  //int *constrainedA; // the i of a constraint pair
73 >  //int *constrainedB; // the j of a constraint pair
74 >  //double *constrainedDsqr; // the square of the constraint distance
75  
76 +  //int* moving; // tells whether we are moving atom i
77 +  //int* moved;  // tells whether we have moved atom i
78 +  //double* oldPos; // pre constrained positions
79 +
80    short isFirst; /*boolean for the first time integrate is called */
81  
82    double dt;
# Line 87 | Line 90 | template<typename T> class NVE : public T {
90  
91   typedef Integrator<BaseIntegrator> RealIntegrator;
92  
93 + // ansi instantiation
94 + template class Integrator<BaseIntegrator>;
95 +
96   template<typename T> class NVE : public T {
97  
98   public:
# Line 457 | Line 463 | template<typename T> class ZConstraint : public T { (p
463    vector<double> curZPos;
464  
465    bool usingSMD;
466 +  vector<double> prevCantPos;
467    vector<double> cantPos;
468    vector<double> cantVel;
469  
# Line 482 | Line 489 | template<typename T> class ZConstraint : public T { (p
489    
490    ForceSubtractionPolicy* forcePolicy; //force subtraction policy
491    friend class ForceSubtractionPolicy;
485 –
486 – };
487 –
488 – /*
489 – template<typename T> class SingleZConstrain : public T{
490 –
491 –
492 – };
493 – */
494 –
495 – template<typename T> class NonEquMD : public T {
496 –  public:
497 –    
492  
499 –
493   };
494  
502 –
503 – //
504 – template<typename T> class SingleZConstraint : public T{
505 –  public:
506 –    SingleZConstraint(SimInfo *theInfo, ForceFields* the_ff);
507 –    ~SingleZConstraint();
508 –    
509 –    bool stopIntegrator();
510 –    
511 –  protected:
512 –    
513 – };
514 –
515 – //Steered Molecular Dynamics, curret implement only support one steered molecule
516 – template<typename T> class SMD : public T{
517 –  public:
518 –    SMD( SimInfo *theInfo, ForceFields* the_ff);
519 –    ~SMD();
520 –  
521 –    virtual void integrate();
522 –    virtual void calcForce( int calcPot, int calcStress );  
523 –    bool stopIntegrator();
524 –  private:
525 –    
526 – };
527 –
528 – //By using state pattern, Coordinate Drive is responsible for switching back and forth between
529 – //Driven Molecular Dynamics and ZConstraint Method.
530 – template<typename T> class CoordinateDriver : public T {
531 –  public:
532 –    typedef T ParentIntegrator;
533 –
534 –    CoordinateDriver(SimInfo*, ForceFields*, BaseIntegrator*, BaseIntegrator*);
535 –    ~CoordinateDriver();
536 –    
537 –    virtual void integrate();
538 –
539 –  private:    
540 –    BaseIntegrator* zconsIntegrator;
541 –    BaseIntegrator* drivenIntegrator;
542 –    
543 – };
544 –
495   #endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines