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 1180 by chrisfen, Thu May 20 20:24:07 2004 UTC vs.
Revision 1234 by tim, Fri Jun 4 03:15:31 2004 UTC

# Line 22 | 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 34 | 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 50 | 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 64 | 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
68 <         // constraints.
69 <  int nConstrained;  // counter for number of constraints
70 <  int *constrainedA; // the i of a constraint pair
71 <  int *constrainedB; // the j of a constraint pair
72 <  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  
# Line 84 | Line 86 | template<typename T = BaseIntegrator> class Integrator
86    StatWriter*  statOut;
87    DumpWriter*  dumpOut;
88  
87 –  int i; // just an int
89   };
90  
91   typedef Integrator<BaseIntegrator> RealIntegrator;
# Line 488 | Line 489 | template<typename T> class ZConstraint : public T { (p
489    
490    ForceSubtractionPolicy* forcePolicy; //force subtraction policy
491    friend class ForceSubtractionPolicy;
491 –
492 – };
493 –
494 – /*
495 – template<typename T> class SingleZConstrain : public T{
496 –
497 –
498 – };
499 – */
500 –
501 – template<typename T> class NonEquMD : public T {
502 –  public:
503 –    
504 –
505 –
506 – };
492  
508 –
509 – //
510 – template<typename T> class SingleZConstraint : public T{
511 –  public:
512 –    SingleZConstraint(SimInfo *theInfo, ForceFields* the_ff);
513 –    ~SingleZConstraint();
514 –    
515 –    bool stopIntegrator();
516 –    
517 –  protected:
518 –    
493   };
494  
521 – //Steered Molecular Dynamics, curret implement only support one steered molecule
522 – template<typename T> class SMD : public T{
523 –  public:
524 –    SMD( SimInfo *theInfo, ForceFields* the_ff);
525 –    ~SMD();
526 –  
527 –    virtual void integrate();
528 –    virtual void calcForce( int calcPot, int calcStress );  
529 –    bool stopIntegrator();
530 –  private:
531 –    
532 – };
533 –
534 – //By using state pattern, Coordinate Drive is responsible for switching back and forth between
535 – //Driven Molecular Dynamics and ZConstraint Method.
536 – template<typename T> class CoordinateDriver : public T {
537 –  public:
538 –    typedef T ParentIntegrator;
539 –
540 –    CoordinateDriver(SimInfo*, ForceFields*, BaseIntegrator*, BaseIntegrator*);
541 –    ~CoordinateDriver();
542 –    
543 –    virtual void integrate();
544 –
545 –  private:    
546 –    BaseIntegrator* zconsIntegrator;
547 –    BaseIntegrator* drivenIntegrator;
548 –    
549 – };
550 –
495   #endif

Diff Legend

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