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 559 by mmeineke, Thu Jun 19 22:02:44 2003 UTC vs.
Revision 565 by gezelter, Tue Jun 24 22:51:57 2003 UTC

# Line 9 | Line 9 | class Integrator : public BaseIntegrator {
9   #include "Thermo.hpp"
10   #include "ReadWrite.hpp"
11  
12 + const double kB = 8.31451e-7;// boltzmann constant amu*Ang^2*fs^-2/K
13 + const double eConvert = 4.184e-4; // converts kcal/mol -> amu*A^2/fs^2
14 + const int maxIteration = 300;
15 + const double tol = 1.0e-6;
16 +
17   class Integrator : public BaseIntegrator {
18  
19   public:
20 <  Integrator( SimInfo &theInfo, ForceFields* the_ff );
20 >  Integrator( SimInfo *theInfo, ForceFields* the_ff );
21    virtual ~Integrator();
22    void integrate( void );
23  
24  
25   protected:
21 –
26    
27    virtual void integrateStep( int calcPot, int calcStress );
28    virtual void preMove( void );
# Line 30 | Line 34 | class Integrator : public BaseIntegrator { (protected)
34    
35    void checkConstraints( void );
36    void rotate( int axes1, int axes2, double angle, double j[3],
37 <               double A[3][3] );
37 >               double A[9] );
38  
39  
40    ForceFields* myFF;
# Line 51 | Line 55 | class Integrator : public BaseIntegrator { (protected)
55    
56    int* moving; // tells whether we are moving atom i
57    int* moved;  // tells whether we have moved atom i
58 <  double* prePos; // pre constrained positions
58 >  double* oldPos; // pre constrained positions
59  
60    short isFirst; /*boolean for the first time integrate is called */
61    
62    double dt;
63    double dt2;
60 –  const double eConvert = 4.184e-4; // converts kcal/mol -> amu*A^2/fs^2
64  
62 –  const int maxIteration = 300;
63 –  const double tol = 1.0e-6;
64 –
65 –  
65    double* pos;
66    double* vel;
67    double* frc;
68    double* trq;
69    double* Amat;
71 –  
70  
73 –
71    Thermo *tStats;
72    StatWriter*  statOut;
73    DumpWriter*  dumpOut;
# Line 79 | Line 76 | class NVE : public Integrator{
76  
77   class NVE : public Integrator{
78  
79 <  NVE ( void ):
79 > public:
80 >  NVE ( SimInfo *theInfo, ForceFields* the_ff ):
81      Integrator( theInfo, the_ff ){}
82    virtual ~NVE(){}
83  
# Line 89 | Line 87 | class NVT : public Integrator{
87  
88   class NVT : public Integrator{
89  
90 <  NVT ( SimInfo &theInfo, ForceFields* the_ff ) :
93 <    Integrator( theInfo, the_ff );
94 <  virtual ~NVT();
90 > public:
91  
92 +  NVT ( SimInfo *theInfo, ForceFields* the_ff);
93 +  virtual ~NVT() {}
94 +
95 +  void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
96 +  void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
97 +
98   protected:
97 –  virtual moveA( void );
98 –  virtual moveB( void );
99  
100 < };
100 >  virtual void moveA( void );
101 >  virtual void moveB( void );
102  
103 +  virtual int readyCheck();
104 +
105 +  // chi is a propagated degree of freedom.
106 +
107 +  double chi;
108 +
109 +  // targetTemp must be set.  tauThermostat must also be set;
110 +
111 +  double targetTemp;
112 +  double tauThermostat;
113    
114 +  short int have_tau_thermostat, have_target_temp;
115  
116 + };
117  
118 +
119 + class NPT : public Integrator{
120 +
121 + public:
122 +
123 +  NPT ( SimInfo *theInfo, ForceFields* the_ff);
124 +  virtual ~NPT() {};
125 +
126 +  void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
127 +  void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
128 +  void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
129 +  void setTargetPressure(double tp) {targetPressure = tp; have_target_pressure = 1;}
130 +
131 + protected:
132 +
133 +  virtual void  moveA( void );
134 +  virtual void moveB( void );
135 +
136 +  virtual int readyCheck();
137 +
138 +  // chi and eta are the propagated degrees of freedom
139 +
140 +  double chi;
141 +  double eta;
142 +
143 +  // targetTemp, targetPressure, and tauBarostat must be set.  
144 +  // One of qmass or tauThermostat must be set;
145 +
146 +  double targetTemp;
147 +  double targetPressure;
148 +  double tauThermostat;
149 +  double tauBarostat;
150 +
151 +  short int have_tau_thermostat, have_tau_barostat, have_target_temp;
152 +  short int have_target_pressure;
153 +
154 + };
155 +
156   #endif

Diff Legend

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