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 565 by gezelter, Tue Jun 24 22:51:57 2003 UTC vs.
Revision 594 by mmeineke, Fri Jul 11 22:34:48 2003 UTC

# Line 11 | Line 11 | const int maxIteration = 300;
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 double p_convert = 1.63882576e8; //converts amu*fs^-2*Ang^-1 -> atm
15   const int maxIteration = 300;
16   const double tol = 1.0e-6;
17  
# Line 34 | Line 35 | class Integrator : public BaseIntegrator { (protected)
35    
36    void checkConstraints( void );
37    void rotate( int axes1, int axes2, double angle, double j[3],
38 <               double A[9] );
38 >               double A[3][3] );
39  
40  
41    ForceFields* myFF;
# Line 116 | Line 117 | class NPT : public Integrator{
117   };
118  
119  
120 < class NPT : public Integrator{
120 > class NPTi : public Integrator{
121  
122   public:
123  
124 <  NPT ( SimInfo *theInfo, ForceFields* the_ff);
125 <  virtual ~NPT() {};
124 >  NPTi ( SimInfo *theInfo, ForceFields* the_ff);
125 >  virtual ~NPTi() {};
126  
127 +  virtual void integrateStep( int calcPot, int calcStress ){
128 +    calcStress = 1;
129 +    Integrator::integrateStep( calcPot, calcStress );
130 +  }
131 +
132    void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
133    void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
134    void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
# Line 139 | Line 145 | class NPT : public Integrator{ (protected)
145  
146    double chi;
147    double eta;
148 +  double NkBT;
149  
150    // targetTemp, targetPressure, and tauBarostat must be set.  
151    // One of qmass or tauThermostat must be set;
# Line 153 | Line 160 | class NPT : public Integrator{ (protected)
160  
161   };
162  
163 + class NPTf : public Integrator{
164 +
165 + public:
166 +
167 +  NPTf ( SimInfo *theInfo, ForceFields* the_ff);
168 +  virtual ~NPTf() {};
169 +
170 +  virtual void integrateStep( int calcPot, int calcStress ){
171 +    calcStress = 1;
172 +    Integrator::integrateStep( calcPot, calcStress );
173 +  }
174 +
175 +  void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
176 +  void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
177 +  void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
178 +  void setTargetPressure(double tp) {targetPressure = tp; have_target_pressure = 1;}
179 +
180 + protected:
181 +
182 +  virtual void  moveA( void );
183 +  virtual void moveB( void );
184 +
185 +  virtual int readyCheck();
186 +
187 +  // chi and eta are the propagated degrees of freedom
188 +
189 +  double chi;
190 +  double eta[3][3];
191 +  double NkBT;
192 +
193 +  // targetTemp, targetPressure, and tauBarostat must be set.  
194 +  // One of qmass or tauThermostat must be set;
195 +
196 +  double targetTemp;
197 +  double targetPressure;
198 +  double tauThermostat;
199 +  double tauBarostat;
200 +
201 +  short int have_tau_thermostat, have_tau_barostat, have_target_temp;
202 +  short int have_target_pressure;
203 +
204 + };
205 +
206   #endif

Diff Legend

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