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 778 by mmeineke, Fri Sep 19 20:00:27 2003 UTC vs.
Revision 1180 by chrisfen, Thu May 20 20:24:07 2004 UTC

# Line 4 | Line 4
4   #include <string>
5   #include <vector>
6   #include "Atom.hpp"
7 + #include "StuntDouble.hpp"
8   #include "Molecule.hpp"
9   #include "SRI.hpp"
10   #include "AbstractClasses.hpp"
# Line 12 | 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 20 | Line 22 | const double tol = 1.0e-6;
22   const int maxIteration = 300;
23   const double tol = 1.0e-6;
24  
23 –
25   template<typename T = BaseIntegrator> class Integrator : public T {
26  
27   public:
# Line 28 | Line 29 | template<typename T = BaseIntegrator> class Integrator
29    virtual ~Integrator();
30    void integrate( void );
31    virtual double  getConservedQuantity(void);
32 +  virtual string getAdditionalParameters(void);
33  
34   protected:
35  
# Line 40 | Line 42 | template<typename T = BaseIntegrator> class Integrator
42    virtual int  readyCheck( void ) { return 1; }
43  
44    virtual void resetIntegrator( void ) { }
45 <
46 <  virtual void calcForce( int calcPot, int calcStress );  
45 >
46 >  virtual void calcForce( int calcPot, int calcStress );
47    virtual void thermalize();
46 –  
47 –  virtual void rotationPropagation( DirectionalAtom* dAtom, double ji[3] );
48  
49 +  virtual bool stopIntegrator() {return false;}
50 +
51 +  virtual void rotationPropagation( StuntDouble* sd, double ji[3] );
52 +
53    void checkConstraints( void );
54 <  void rotate( int axes1, int axes2, double angle, double j[3],
54 >  void rotate( int axes1, int axes2, double angle, double j[3],
55           double A[3][3] );
56 <        
56 >
57    ForceFields* myFF;
58  
59    SimInfo *info; // all the info we'll ever need
60 +  vector<StuntDouble*> integrableObjects;
61    int nAtoms;  /* the number of atoms */
62    int oldAtoms;
63    Atom **atoms; /* array of atom pointers */
# Line 61 | Line 66 | template<typename T = BaseIntegrator> class Integrator
66  
67    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
73 <  
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
73 >
74    int* moving; // tells whether we are moving atom i
75    int* moved;  // tells whether we have moved atom i
76 <  double* oldPos; // pre constrained positions
76 >  double* oldPos; // pre constrained positions
77  
78    short isFirst; /*boolean for the first time integrate is called */
79 <  
79 >
80    double dt;
81    double dt2;
82  
83    Thermo *tStats;
84    StatWriter*  statOut;
85    DumpWriter*  dumpOut;
86 <  
86 >
87 >  int i; // just an int
88   };
89  
90   typedef Integrator<BaseIntegrator> RealIntegrator;
91  
92 + // ansi instantiation
93 + template class Integrator<BaseIntegrator>;
94 +
95   template<typename T> class NVE : public T {
96  
97   public:
98    NVE ( SimInfo *theInfo, ForceFields* the_ff ):
99      T( theInfo, the_ff ){}
100 <  virtual ~NVE(){}  
100 >  virtual ~NVE(){}
101   };
102  
103  
# Line 103 | Line 112 | template<typename T> class NVT : public T { (public)
112    void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
113    void setChiTolerance(double tol) {chiTolerance = tol;}
114    virtual double  getConservedQuantity(void);
115 +  virtual string getAdditionalParameters(void);
116  
117   protected:
118  
# Line 124 | Line 134 | template<typename T> class NVT : public T { (public)
134  
135    double targetTemp;
136    double tauThermostat;
137 <  
137 >
138    short int have_tau_thermostat, have_target_temp;
139  
140    double *oldVel;
# Line 143 | Line 153 | template<typename T> class NPT : public T{ (public)
153  
154    NPT ( SimInfo *theInfo, ForceFields* the_ff);
155    virtual ~NPT();
156 <  
156 >
157    virtual void integrateStep( int calcPot, int calcStress ){
158      calcStress = 1;
159      T::integrateStep( calcPot, calcStress );
160    }
161  
162    virtual double getConservedQuantity(void) = 0;
163 +  virtual string getAdditionalParameters(void) = 0;
164 +  
165 +  double myTauThermo( void ) { return tauThermostat; }
166 +  double myTauBaro( void ) { return tauBarostat; }
167  
168    void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
169    void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
# Line 170 | Line 184 | template<typename T> class NPT : public T{ (public)
184  
185    virtual void getVelScaleA( double sc[3], double vel[3] ) = 0;
186    virtual void getVelScaleB( double sc[3], int index ) = 0;
187 <  virtual void getPosScale(double pos[3], double COM[3],
187 >  virtual void getPosScale(double pos[3], double COM[3],
188                             int index, double sc[3]) = 0;
189  
190 +  virtual void calcVelScale( void ) = 0;
191 +
192    virtual bool chiConverged( void );
193    virtual bool etaConverged( void ) = 0;
194 <  
194 >
195    virtual void evolveChiA( void );
196    virtual void evolveEtaA( void ) = 0;
197    virtual void evolveChiB( void );
# Line 195 | Line 211 | template<typename T> class NPT : public T{ (public)
211  
212    double tt2, tb2;
213    double instaTemp, instaPress, instaVol;
214 +  double press[3][3];
215  
216    int Nparticles;
217  
218    double integralOfChidt;
219  
220 <  // targetTemp, targetPressure, and tauBarostat must be set.  
220 >  // targetTemp, targetPressure, and tauBarostat must be set.
221    // One of qmass or tauThermostat must be set;
222  
223    double targetTemp;
# Line 225 | Line 242 | template<typename T> class NPTi : public T{
242   };
243  
244   template<typename T> class NPTi : public T{
245 <  
245 >
246   public:
247    NPTi( SimInfo *theInfo, ForceFields* the_ff);
248    ~NPTi();
249  
250    virtual double getConservedQuantity(void);
251    virtual void resetIntegrator(void);
252 <
252 >  virtual string getAdditionalParameters(void);
253   protected:
254  
238 –
255  
256 +
257    virtual void evolveEtaA(void);
258    virtual void evolveEtaB(void);
259  
# Line 246 | Line 263 | template<typename T> class NPTi : public T{
263  
264    virtual void getVelScaleA( double sc[3], double vel[3] );
265    virtual void getVelScaleB( double sc[3], int index );
266 <  virtual void getPosScale(double pos[3], double COM[3],
266 >  virtual void getPosScale(double pos[3], double COM[3],
267                             int index, double sc[3]);
268  
269 +  virtual void calcVelScale( void );
270 +
271    double eta, oldEta, prevEta;
272 +  double vScale;
273   };
274  
275 + template<typename T> class NPTf : public T{
276  
256 – template<typename T> class NPTim : public T{
257 –
277   public:
278  
279 <  NPTim ( SimInfo *theInfo, ForceFields* the_ff);
280 <  virtual ~NPTim() {}
262 <
263 <  virtual void integrateStep( int calcPot, int calcStress ){
264 <    calcStress = 1;
265 <    T::integrateStep( calcPot, calcStress );
266 <    accIntegralOfChidt();  
267 <  }
279 >  NPTf ( SimInfo *theInfo, ForceFields* the_ff);
280 >  virtual ~NPTf();
281  
282    virtual double getConservedQuantity(void);
283 +  virtual string getAdditionalParameters(void);
284 +  virtual void resetIntegrator(void);
285  
271 –  void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
272 –  void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
273 –  void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
274 –  void setTargetPressure(double tp) {targetPressure = tp; have_target_pressure = 1;}
275 –  void setChiTolerance(double tol) {chiTolerance = tol;}
276 –  void setPosIterTolerance(double tol) {posIterTolerance = tol;}
277 –
286   protected:
287  
288 <  virtual void moveA( void );
289 <  virtual void moveB( void );
288 >  virtual void evolveEtaA(void);
289 >  virtual void evolveEtaB(void);
290  
291 <  virtual int readyCheck();
291 >  virtual bool etaConverged( void );
292  
293 <  virtual void resetIntegrator( void );
293 >  virtual void scaleSimBox( void );
294  
295 <  void accIntegralOfChidt(void) { integralOfChidt += dt * chi;}
296 <  
297 <  Molecule* myMolecules;
298 <  Atom** myAtoms;
295 >  virtual void getVelScaleA( double sc[3], double vel[3] );
296 >  virtual void getVelScaleB( double sc[3], int index );
297 >  virtual void getPosScale(double pos[3], double COM[3],
298 >                           int index, double sc[3]);
299  
300 <  // chi and eta are the propagated degrees of freedom
300 >  virtual void calcVelScale( void );
301  
302 <  double chi;
303 <  double eta;
304 <  double NkBT;
305 <  double integralOfChidt;
298 <
299 <  // targetTemp, targetPressure, and tauBarostat must be set.  
300 <  // One of qmass or tauThermostat must be set;
301 <
302 <  double targetTemp;
303 <  double targetPressure;
304 <  double tauThermostat;
305 <  double tauBarostat;
306 <
307 <  short int have_tau_thermostat, have_tau_barostat, have_target_temp;
308 <  short int have_target_pressure;
309 <  double chiTolerance;
310 <  short int have_chi_tolerance;
311 <  double posIterTolerance;
312 <  short int have_pos_iter_tolerance;
313 <
302 >  double eta[3][3];
303 >  double oldEta[3][3];
304 >  double prevEta[3][3];
305 >  double vScale[3][3];
306   };
307  
308 < template<typename T> class NPTzm : public T{
308 > template<typename T> class NPTxyz : public T{
309  
310   public:
311  
312 <  NPTzm ( SimInfo *theInfo, ForceFields* the_ff);
313 <  virtual ~NPTzm() {};
322 <
323 <  virtual void integrateStep( int calcPot, int calcStress ){
324 <    calcStress = 1;
325 <    T::integrateStep( calcPot, calcStress );
326 <  }
327 <
328 <  void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
329 <  void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
330 <  void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
331 <  void setTargetPressure(double tp) {targetPressure = tp; have_target_pressure = 1;}
332 <
333 < protected:
312 >  NPTxyz ( SimInfo *theInfo, ForceFields* the_ff);
313 >  virtual ~NPTxyz();
314  
335 –  virtual void moveA( void );
336 –  virtual void moveB( void );
337 –
338 –  virtual int readyCheck();
339 –
340 –  virtual void resetIntegrator( void );
341 –
342 –  Molecule* myMolecules;
343 –  Atom** myAtoms;
344 –
345 –  // chi and eta are the propagated degrees of freedom
346 –
347 –  double chi;
348 –  double eta;
349 –  double etaZ;
350 –  double NkBT;
351 –
352 –  // targetTemp, targetPressure, and tauBarostat must be set.  
353 –  // One of qmass or tauThermostat must be set;
354 –
355 –  double targetTemp;
356 –  double targetPressure;
357 –  double tauThermostat;
358 –  double tauBarostat;
359 –
360 –  short int have_tau_thermostat, have_tau_barostat, have_target_temp;
361 –  short int have_target_pressure;
362 –
363 – };
364 –
365 – template<typename T> class NPTf : public T{
366 –
367 – public:
368 –
369 –  NPTf ( SimInfo *theInfo, ForceFields* the_ff);
370 –  virtual ~NPTf();
371 –
372 –  virtual void integrateStep( int calcPot, int calcStress ){
373 –    calcStress = 1;
374 –    T::integrateStep( calcPot, calcStress );
375 –  }
376 –  
315    virtual double getConservedQuantity(void);
316 +  virtual string getAdditionalParameters(void);
317 +  virtual void resetIntegrator(void);
318  
379 –  void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
380 –  void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
381 –  void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
382 –  void setTargetPressure(double tp) {targetPressure = tp; have_target_pressure = 1;}
383 –  void setChiTolerance(double tol) {chiTolerance = tol;}
384 –  void setPosIterTolerance(double tol) {posIterTolerance = tol;}
385 –
319   protected:
320  
321 <  virtual void  moveA( void );
322 <  virtual void moveB( void );
321 >  virtual void evolveEtaA(void);
322 >  virtual void evolveEtaB(void);
323  
324 <  virtual void resetIntegrator( void );
324 >  virtual bool etaConverged( void );
325  
326 <  virtual int readyCheck();
326 >  virtual void scaleSimBox( void );
327  
328 +  virtual void getVelScaleA( double sc[3], double vel[3] );
329 +  virtual void getVelScaleB( double sc[3], int index );
330 +  virtual void getPosScale(double pos[3], double COM[3],
331 +                           int index, double sc[3]);
332  
333 <  // chi and eta are the propagated degrees of freedom
333 >  virtual void calcVelScale( void );
334  
398 –  double chi;
399 –  double eta[3][3];
400 –  double NkBT;
401 –  double fkBT;
402 –
403 –  int Nparticles;
404 –
405 –  double *oldPos;
406 –  double *oldVel;
407 –  double *oldJi;
408 –
409 –  double integralOfChidt;
410 –  
411 –  // targetTemp, targetPressure, and tauBarostat must be set.  
412 –  // One of qmass or tauThermostat must be set;
413 –
414 –  double targetTemp;
415 –  double targetPressure;
416 –  double tauThermostat;
417 –  double tauBarostat;
418 –
419 –  short int have_tau_thermostat, have_tau_barostat, have_target_temp;
420 –  short int have_target_pressure;
421 –  double chiTolerance;
422 –  short int have_chi_tolerance;
423 –  double posIterTolerance;
424 –  short int have_pos_iter_tolerance;
425 –  double etaTolerance;
426 –  short int have_eta_tolerance;
427 – };
428 –
429 – template<typename T> class NPTxym : public T{
430 –
431 – public:
432 –
433 –  NPTxym ( SimInfo *theInfo, ForceFields* the_ff);
434 –  virtual ~NPTxym() {};
435 –
436 –  virtual void integrateStep( int calcPot, int calcStress ){
437 –    calcStress = 1;
438 –    T::integrateStep( calcPot, calcStress );
439 –  }
440 –
441 –  void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
442 –  void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
443 –  void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
444 –  void setTargetPressure(double tp) {targetPressure = tp; have_target_pressure = 1;}
445 –
446 – protected:
447 –
448 –  virtual void moveA( void );
449 –  virtual void moveB( void );
450 –
451 –  virtual int readyCheck();
452 –
453 –  virtual void resetIntegrator( void );
454 –
455 –  Molecule* myMolecules;
456 –  Atom** myAtoms;
457 –
458 –  // chi and eta are the propagated degrees of freedom
459 –
460 –  double chi;
461 –  double eta;
462 –  double etaX;
463 –  double etaY;
464 –  double NkBT;
465 –
466 –  // targetTemp, targetPressure, and tauBarostat must be set.  
467 –  // One of qmass or tauThermostat must be set;
468 –
469 –  double targetTemp;
470 –  double targetPressure;
471 –  double tauThermostat;
472 –  double tauBarostat;
473 –
474 –  short int have_tau_thermostat, have_tau_barostat, have_target_temp;
475 –  short int have_target_pressure;
476 –
477 – };
478 –
479 –
480 – template<typename T> class NPTfm : public T{
481 –
482 – public:
483 –
484 –  NPTfm ( SimInfo *theInfo, ForceFields* the_ff);
485 –  virtual ~NPTfm() {};
486 –
487 –  virtual void integrateStep( int calcPot, int calcStress ){
488 –    calcStress = 1;
489 –    T::integrateStep( calcPot, calcStress );
490 –    accIntegralOfChidt();
491 –  }
492 –
493 –  virtual double getConservedQuantity(void);
494 –  
495 –  void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
496 –  void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
497 –  void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
498 –  void setTargetPressure(double tp) {targetPressure = tp; have_target_pressure = 1;}
499 –  void setChiTolerance(double tol) {chiTolerance = tol;}
500 –  void setPosIterTolerance(double tol) {posIterTolerance = tol;}
501 –
502 – protected:
503 –
504 –  virtual void  moveA( void );
505 –  virtual void moveB( void );
506 –
507 –  virtual void resetIntegrator( void );
508 –
509 –  virtual int readyCheck();
510 –
511 –  void accIntegralOfChidt(void) { integralOfChidt += dt * chi;}
512 –
513 –  Molecule* myMolecules;
514 –  Atom** myAtoms;
515 –
516 –  // chi and eta are the propagated degrees of freedom
517 –
518 –  double chi;
335    double eta[3][3];
336 <  double NkBT;
337 <  double integralOfChidt;
338 <
523 <  // targetTemp, targetPressure, and tauBarostat must be set.  
524 <  // One of qmass or tauThermostat must be set;
525 <
526 <  double targetTemp;
527 <  double targetPressure;
528 <  double tauThermostat;
529 <  double tauBarostat;
530 <
531 <  short int have_tau_thermostat, have_tau_barostat, have_target_temp;
532 <  short int have_target_pressure;
533 <  double chiTolerance;
534 <  short int have_chi_tolerance;
535 <  double posIterTolerance;
536 <  short int have_pos_iter_tolerance;
537 <
336 >  double oldEta[3][3];
337 >  double prevEta[3][3];
338 >  double vScale[3][3];
339   };
340  
341  
541 – template<typename T> class NPTpr : public T{
542 –
543 – public:
544 –
545 –  NPTpr ( SimInfo *theInfo, ForceFields* the_ff);
546 –  virtual ~NPTpr() {};
547 –
548 –  virtual void integrateStep( int calcPot, int calcStress ){
549 –    calcStress = 1;
550 –    T::integrateStep( calcPot, calcStress );
551 –  }
552 –
553 –  void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
554 –  void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
555 –  void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
556 –  void setTargetPressure(double tp) {targetPressure = tp; have_target_pressure = 1;}
557 –  void setChiTolerance(double tol) {chiTolerance = tol;}
558 –  void setPosIterTolerance(double tol) {posIterTolerance = tol;}
559 –
560 – protected:
561 –
562 –  virtual void  moveA( void );
563 –  virtual void moveB( void );
564 –
565 –  virtual int readyCheck();
566 –
567 –  virtual void resetIntegrator( void );
568 –
569 –  // chi and eta are the propagated degrees of freedom
570 –
571 –  double chi;
572 –  double eta[3][3];
573 –  double NkBT;
574 –
575 –  // targetTemp, targetPressure, and tauBarostat must be set.  
576 –  // One of qmass or tauThermostat must be set;
577 –
578 –  double targetTemp;
579 –  double targetPressure;
580 –  double tauThermostat;
581 –  double tauBarostat;
582 –
583 –  short int have_tau_thermostat, have_tau_barostat, have_target_temp;
584 –  short int have_target_pressure;
585 –  double chiTolerance;
586 –  short int have_chi_tolerance;
587 –  double posIterTolerance;
588 –  short int have_pos_iter_tolerance;
589 –
590 – };
591 –
592 –
342   template<typename T> class ZConstraint : public T {
343 <  
344 <  public:
343 >
344 >  public:
345    class ForceSubtractionPolicy{
346      public:
347        ForceSubtractionPolicy(ZConstraint<T>* integrator) {zconsIntegrator = integrator;}
348  
349 <      virtual void update() = 0;    
349 >      virtual void update() = 0;
350        virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) = 0;
351        virtual double getZFOfMovingMols(Atom* atom, double totalForce) = 0;
352        virtual double getHFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) = 0;
353        virtual double getHFOfUnconsMols(Atom* atom, double totalForce) = 0;
354 <    
354 >
355     protected:
356 <     ZConstraint<T>* zconsIntegrator;;
356 >     ZConstraint<T>* zconsIntegrator;
357    };
358  
359    class PolicyByNumber : public ForceSubtractionPolicy{
360  
361      public:
362 <      PolicyByNumber(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}    
363 <      virtual void update();    
362 >      PolicyByNumber(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}
363 >      virtual void update();
364        virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) ;
365        virtual double getZFOfMovingMols(Atom* atom, double totalForce) ;
366        virtual double getHFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce);
367        virtual double getHFOfUnconsMols(Atom* atom, double totalForce);
368 <    
368 >
369      private:
370        int totNumOfMovingAtoms;
371    };
# Line 624 | Line 373 | template<typename T> class ZConstraint : public T {
373    class PolicyByMass : public ForceSubtractionPolicy{
374  
375      public:
376 <      PolicyByMass(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}  
377 <      
378 <      virtual void update();    
376 >      PolicyByMass(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}
377 >
378 >      virtual void update();
379        virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) ;
380        virtual double getZFOfMovingMols(Atom* atom, double totalForce) ;
381        virtual double getHFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce);
# Line 640 | Line 389 | template<typename T> class ZConstraint : public T {
389  
390    ZConstraint( SimInfo *theInfo, ForceFields* the_ff);
391    ~ZConstraint();
392 <    
392 >
393    void setZConsTime(double time)                  {this->zconsTime = time;}
394    void getZConsTime()                             {return zconsTime;}
395 <  
395 >
396    void setIndexOfAllZConsMols(vector<int> index) {indexOfAllZConsMols = index;}
397    void getIndexOfAllZConsMols()                  {return indexOfAllZConsMols;}
398 <  
398 >
399    void setZConsOutput(const char * fileName)          {zconsOutput = fileName;}
400    string getZConsOutput()                         {return zconsOutput;}
401 <  
401 >
402    virtual void integrate();
654 –  
403  
404 +
405   #ifdef IS_MPI
406    virtual void update();                      //which is called to indicate the molecules' migration
407   #endif
408  
409 +  enum ZConsState {zcsMoving, zcsFixed};
410 +
411 +  vector<Molecule*> zconsMols;              //z-constraint molecules array
412 +  vector<ZConsState> states;                 //state of z-constraint molecules
413 +
414 +
415 +
416 +  int totNumOfUnconsAtoms;              //total number of uncontraint atoms
417 +  double totalMassOfUncons;                //total mas of unconstraint molecules
418 +
419 +
420   protected:
421  
422 <  enum ZConsState {zcsMoving, zcsFixed};  
423 <
424 <  virtual void calcForce( int calcPot, int calcStress );
422 >
423 >
424 >  virtual void calcForce( int calcPot, int calcStress );
425    virtual void thermalize(void);
426 <  
426 >
427    void zeroOutVel();
428    void doZconstraintForce();
429 <  void doHarmonic();
429 >  void doHarmonic(vector<double>& resPos);
430    bool checkZConsState();
431  
432    bool haveFixedZMols();
# Line 681 | Line 441 | template<typename T> class ZConstraint : public T {
441    double zconsTol;                                 //tolerance of z-contratint
442    double zForceConst;                           //base force constant term
443                                                            //which is estimate by OOPSE
444 <  
445 <  vector<Molecule*> zconsMols;              //z-constraint molecules array
446 <  vector<double> massOfZConsMols;       //mass of z-constraint molecule
444 >
445 >
446 >  vector<double> massOfZConsMols;       //mass of z-constraint molecule
447    vector<double> kz;                              //force constant array
448 <  vector<ZConsState> states;                 //state of z-constraint molecules
448 >
449    vector<double> zPos;                          //
450 <  
451 <  
450 >
451 >
452    vector<Molecule*> unconsMols;           //unconstraint molecules array
453    vector<double> massOfUnconsMols;    //mass array of unconstraint molecules
694 –  double totalMassOfUncons;                //total mas of unconstraint molecules
454  
455 +
456    vector<ZConsParaItem>* parameters; //
457 <  
457 >
458    vector<int> indexOfAllZConsMols;     //index of All Z-Constraint Molecuels
459  
460 <  int* indexOfZConsMols;                   //index of local Z-Constraint Molecules  
461 <  double* fz;
462 <  double* curZPos;
703 <  
704 <  int totNumOfUnconsAtoms;              //total number of uncontraint atoms
460 >  vector<int> indexOfZConsMols;                   //index of local Z-Constraint Molecules
461 >  vector<double> fz;
462 >  vector<double> curZPos;
463  
464 <  int whichDirection;                           //constraint direction
464 >  bool usingSMD;
465 >  vector<double> prevCantPos;
466 >  vector<double> cantPos;
467 >  vector<double> cantVel;
468 >
469 >  double zconsFixTime;  
470 >  double zconsGap;
471 >  bool hasZConsGap;
472 >  vector<double> endFixTime;
473    
474 +  int whichDirection;                           //constraint direction
475 +
476   private:
477 <  
477 >
478    string zconsOutput;                         //filename of zconstraint output
479    ZConsWriter* fzOut;                         //z-constraint writer
480  
481 <  double curZconsTime;                      
481 >  double curZconsTime;
482  
483    double calcMovingMolsCOMVel();
484    double calcSysCOMVel();
485    double calcTotalForce();
486 +  void updateZPos();
487 +  void updateCantPos();
488    
489    ForceSubtractionPolicy* forcePolicy; //force subtraction policy
490    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 + };
507 +
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 +    
519 + };
520 +
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 +
551   #endif

Diff Legend

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