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 423 by mmeineke, Thu Mar 27 20:12:15 2003 UTC vs.
Revision 542 by mmeineke, Fri May 30 21:31:48 2003 UTC

# Line 6 | Line 6
6   #include "AbstractClasses.hpp"
7   #include "SimInfo.hpp"
8   #include "ForceFields.hpp"
9 + #include "Thermo.hpp"
10 + #include "ReadWrite.hpp"
11  
12 < class Verlet : public Integrator {
12 > class Integrator : public BaseIntegrator {
13  
14   public:
15 <  Verlet( SimInfo &info, ForceFields* the_ff );
16 <  ~Verlet();
15 >  Symplectic( SimInfo &theInfo, ForceFields* the_ff );
16 >  virtual ~Symplectic();
17    void integrate( void );
18  
19 < private:
19 >
20 > protected:
21 >
22    
23 <  void move_a( double dt );
24 <  void move_b( double dt );
23 >  virtual void integrateStep( int calcPot, int calcStress );
24 >  virtual void moveA( void );
25 >  virtual void moveB( void );
26 >  virtual void constrainA( void );
27 >  virtual void constrainB( void );
28 >  
29 >  
30 >  void checkConstraints( void );
31 >  void rotate( int axes1, int axes2, double angle, double j[3],
32 >               double A[3][3] );
33  
34 +
35    ForceFields* myFF;
36  
37 <  SimInfo *entry_plug; // all the info we'll ever need
38 <  int c_natoms;  /* the number of atoms */
39 <  Atom **c_atoms; /* array of atom pointers */
37 >  SimInfo *info; // all the info we'll ever need
38 >  int nAtoms;  /* the number of atoms */
39 >  Atom **atoms; /* array of atom pointers */
40    Molecule* molecules;
41    int nMols;
42  
43 <  int c_is_constrained; /*boolean to know whether the systems contains
44 <                          constraints. */
45 <  int c_n_constrained; /*counter for number of constraints */
46 <  int *c_constrained_i; /* the i of a constraint pair */
47 <  int *c_constrained_j; /* the j of a constraint pair */
48 <  double *c_constrained_dsqr; /* the square of the constraint distance */
49 <  double *c_mass; /* the array of masses */
50 <  short is_first; /*boolean for the first time integrate is called */
51 <  double c_box_x;
52 <  double c_box_y;
53 <  double c_box_z;
41 < };
43 >  int isConstrained; /*boolean to know whether the systems contains
44 >                       constraints. */
45 >  int nConstrained; /*counter for number of constraints */
46 >  int *constrainedI; /* the i of a constraint pair */
47 >  int *constrainedJ; /* the j of a constraint pair */
48 >  double *constrainedDsqr; /* the square of the constraint distance */
49 >  short isFirst; /*boolean for the first time integrate is called */
50 >  
51 >  double dt;
52 >  double dt2;
53 >  const double eConvert = 4.184e-4; // converts kcal/mol -> amu*A^2/fs^2
54  
43 class Symplectic : public Integrator {
55    
56 < public:
57 <  Symplectic( SimInfo* the_entry_plug,  ForceFields* the_ff );
58 <  ~Symplectic();
56 >  double* pos;
57 >  double* vel;
58 >  double* frc;
59 >  double* trq;
60 >  double* Amat;
61    
49  void integrate( void );
62  
51 private:
63  
64 <  void rotate( int axes1, int axes2, double angle, double j[3],
65 <               double A[3][3] );
64 >  Thermo *tStats;
65 >  StatWriter*  statOut;
66 >  DumpWriter*  dumpOut;
67 >  
68 > };
69  
56  SimInfo* entry_plug;
57  ForceFields* myFF;
70  
71 <  Molecule* molecules;
60 <  int nMols;
71 > class NVT : public Integrator{
72  
73 <  int is_constrained; /*boolean to know whether the systems contains
74 <                          constraints. */
64 <  int n_constrained; /*counter for number of constraints */
65 <  int *constrained_i; /* the i of a constraint pair */
66 <  int *constrained_j; /* the j of a constraint pair */
67 <  double *constrained_dsqr; /* the square of the constraint distance */
68 <  double *mass; /* the array of masses */
73 >  NVT ( void );
74 >  virtual ~NVT();
75  
76 <  short int isFirst;
76 > protected:
77 >  virtual moveA( void );
78 >  virtual moveB( void );
79  
72  SRI **srInteractions; /* array of SRI pointers */
73  int nSRI; /* the number of short range interactions */
74  
80   };
81  
82 +  
83 +
84 +
85   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines