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 1330 by gezelter, Fri Jul 16 16:29:44 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  
25 <
25 > class VelVerletConsFramework;
26   template<typename T = BaseIntegrator> class Integrator : public T {
27  
28   public:
# Line 28 | Line 30 | template<typename T = BaseIntegrator> class Integrator
30    virtual ~Integrator();
31    void integrate( void );
32    virtual double  getConservedQuantity(void);
33 +  virtual string getAdditionalParameters(void);
34  
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 ) { }
46 <
47 <  virtual void calcForce( int calcPot, int calcStress );  
46 >
47 >  virtual void calcForce( int calcPot, int calcStress );
48    virtual void thermalize();
46 –  
47 –  virtual void rotationPropagation( DirectionalAtom* dAtom, double ji[3] );
49  
50 <  void checkConstraints( void );
51 <  void rotate( int axes1, int axes2, double angle, double j[3],
50 >  virtual bool stopIntegrator() {return false;}
51 >
52 >  virtual void rotationPropagation( StuntDouble* sd, double ji[3] );
53 >
54 >  //void checkConstraints( void );
55 >  void rotate( int axes1, int axes2, double angle, double j[3],
56           double A[3][3] );
57 <        
57 >
58    ForceFields* myFF;
59  
60    SimInfo *info; // all the info we'll ever need
61 +  vector<StuntDouble*> integrableObjects;
62    int nAtoms;  /* the number of atoms */
63    int oldAtoms;
64    Atom **atoms; /* array of atom pointers */
65    Molecule* molecules;
66    int nMols;
67  
68 <  int isConstrained; // boolean to know whether the systems contains
63 <         // constraints.
64 <  int nConstrained;  // counter for number of constraints
65 <  int *constrainedA; // the i of a constraint pair
66 <  int *constrainedB; // the j of a constraint pair
67 <  double *constrainedDsqr; // the square of the constraint distance
68 <  
69 <  int* moving; // tells whether we are moving atom i
70 <  int* moved;  // tells whether we have moved atom i
71 <  double* oldPos; // pre constrained positions
68 >  VelVerletConsFramework* consFramework;
69  
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 <  
81 >
82    double dt;
83    double dt2;
84  
85    Thermo *tStats;
86    StatWriter*  statOut;
87    DumpWriter*  dumpOut;
88 <  
88 >
89   };
90  
91   typedef Integrator<BaseIntegrator> RealIntegrator;
92  
93 + // ansi instantiation
94 + // template class Integrator<BaseIntegrator>;
95 +
96 +
97   template<typename T> class NVE : public T {
98  
99   public:
100    NVE ( SimInfo *theInfo, ForceFields* the_ff ):
101      T( theInfo, the_ff ){}
102 <  virtual ~NVE(){}  
102 >  virtual ~NVE(){}
103   };
104  
105  
# Line 103 | Line 114 | template<typename T> class NVT : public T { (public)
114    void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
115    void setChiTolerance(double tol) {chiTolerance = tol;}
116    virtual double  getConservedQuantity(void);
117 +  virtual string getAdditionalParameters(void);
118  
119   protected:
120  
# Line 124 | Line 136 | template<typename T> class NVT : public T { (public)
136  
137    double targetTemp;
138    double tauThermostat;
139 <  
139 >
140    short int have_tau_thermostat, have_target_temp;
141  
142    double *oldVel;
# Line 143 | Line 155 | template<typename T> class NPT : public T{ (public)
155  
156    NPT ( SimInfo *theInfo, ForceFields* the_ff);
157    virtual ~NPT();
158 <  
158 >
159    virtual void integrateStep( int calcPot, int calcStress ){
160      calcStress = 1;
161      T::integrateStep( calcPot, calcStress );
162    }
163  
164    virtual double getConservedQuantity(void) = 0;
165 +  virtual string getAdditionalParameters(void) = 0;
166 +  
167 +  double myTauThermo( void ) { return tauThermostat; }
168 +  double myTauBaro( void ) { return tauBarostat; }
169  
170    void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
171    void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
# Line 170 | Line 186 | template<typename T> class NPT : public T{ (public)
186  
187    virtual void getVelScaleA( double sc[3], double vel[3] ) = 0;
188    virtual void getVelScaleB( double sc[3], int index ) = 0;
189 <  virtual void getPosScale(double pos[3], double COM[3],
189 >  virtual void getPosScale(double pos[3], double COM[3],
190                             int index, double sc[3]) = 0;
191  
192 +  virtual void calcVelScale( void ) = 0;
193 +
194    virtual bool chiConverged( void );
195    virtual bool etaConverged( void ) = 0;
196 <  
196 >
197    virtual void evolveChiA( void );
198    virtual void evolveEtaA( void ) = 0;
199    virtual void evolveChiB( void );
# Line 195 | Line 213 | template<typename T> class NPT : public T{ (public)
213  
214    double tt2, tb2;
215    double instaTemp, instaPress, instaVol;
216 +  double press[3][3];
217  
218    int Nparticles;
219  
220    double integralOfChidt;
221  
222 <  // targetTemp, targetPressure, and tauBarostat must be set.  
222 >  // targetTemp, targetPressure, and tauBarostat must be set.
223    // One of qmass or tauThermostat must be set;
224  
225    double targetTemp;
# Line 225 | Line 244 | template<typename T> class NPTi : public T{
244   };
245  
246   template<typename T> class NPTi : public T{
247 <  
247 >
248   public:
249    NPTi( SimInfo *theInfo, ForceFields* the_ff);
250    ~NPTi();
251  
252    virtual double getConservedQuantity(void);
253    virtual void resetIntegrator(void);
254 <
254 >  virtual string getAdditionalParameters(void);
255   protected:
256  
238 –
257  
258 +
259    virtual void evolveEtaA(void);
260    virtual void evolveEtaB(void);
261  
# Line 246 | Line 265 | template<typename T> class NPTi : public T{ (protected
265  
266    virtual void getVelScaleA( double sc[3], double vel[3] );
267    virtual void getVelScaleB( double sc[3], int index );
268 <  virtual void getPosScale(double pos[3], double COM[3],
268 >  virtual void getPosScale(double pos[3], double COM[3],
269                             int index, double sc[3]);
270  
271 +  virtual void calcVelScale( void );
272 +
273    double eta, oldEta, prevEta;
274 +  double vScale;
275   };
276  
277 + template<typename T> class NPTf : public T{
278  
256 – template<typename T> class NPTim : public T{
257 –
279   public:
280  
281 <  NPTim ( SimInfo *theInfo, ForceFields* the_ff);
282 <  virtual ~NPTim() {}
281 >  NPTf ( SimInfo *theInfo, ForceFields* the_ff);
282 >  virtual ~NPTf();
283  
263 –  virtual void integrateStep( int calcPot, int calcStress ){
264 –    calcStress = 1;
265 –    T::integrateStep( calcPot, calcStress );
266 –    accIntegralOfChidt();  
267 –  }
268 –
284    virtual double getConservedQuantity(void);
285 +  virtual string getAdditionalParameters(void);
286 +  virtual void resetIntegrator(void);
287  
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 –
288   protected:
289  
290 <  virtual void moveA( void );
291 <  virtual void moveB( void );
290 >  virtual void evolveEtaA(void);
291 >  virtual void evolveEtaB(void);
292  
293 <  virtual int readyCheck();
293 >  virtual bool etaConverged( void );
294  
295 <  virtual void resetIntegrator( void );
295 >  virtual void scaleSimBox( void );
296  
297 <  void accIntegralOfChidt(void) { integralOfChidt += dt * chi;}
298 <  
299 <  Molecule* myMolecules;
300 <  Atom** myAtoms;
297 >  virtual void getVelScaleA( double sc[3], double vel[3] );
298 >  virtual void getVelScaleB( double sc[3], int index );
299 >  virtual void getPosScale(double pos[3], double COM[3],
300 >                           int index, double sc[3]);
301  
302 <  // chi and eta are the propagated degrees of freedom
302 >  virtual void calcVelScale( void );
303  
304 <  double chi;
305 <  double eta;
306 <  double NkBT;
307 <  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 <
304 >  double eta[3][3];
305 >  double oldEta[3][3];
306 >  double prevEta[3][3];
307 >  double vScale[3][3];
308   };
309  
310 < template<typename T> class NPTzm : public T{
310 > template<typename T> class NPTxyz : public T{
311  
312   public:
313  
314 <  NPTzm ( SimInfo *theInfo, ForceFields* the_ff);
315 <  virtual ~NPTzm() {};
314 >  NPTxyz ( SimInfo *theInfo, ForceFields* the_ff);
315 >  virtual ~NPTxyz();
316  
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:
334 –
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 –  
317    virtual double getConservedQuantity(void);
318 +  virtual string getAdditionalParameters(void);
319 +  virtual void resetIntegrator(void);
320  
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 –
321   protected:
322  
323 <  virtual void  moveA( void );
324 <  virtual void moveB( void );
323 >  virtual void evolveEtaA(void);
324 >  virtual void evolveEtaB(void);
325  
326 <  virtual void resetIntegrator( void );
326 >  virtual bool etaConverged( void );
327  
328 <  virtual int readyCheck();
328 >  virtual void scaleSimBox( void );
329  
330 +  virtual void getVelScaleA( double sc[3], double vel[3] );
331 +  virtual void getVelScaleB( double sc[3], int index );
332 +  virtual void getPosScale(double pos[3], double COM[3],
333 +                           int index, double sc[3]);
334  
335 <  // chi and eta are the propagated degrees of freedom
335 >  virtual void calcVelScale( void );
336  
398 –  double chi;
337    double eta[3][3];
338 <  double NkBT;
339 <  double fkBT;
340 <
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 <
338 >  double oldEta[3][3];
339 >  double prevEta[3][3];
340 >  double vScale[3][3];
341   };
342  
343  
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;
519 –  double eta[3][3];
520 –  double NkBT;
521 –  double integralOfChidt;
522 –
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 –
538 – };
539 –
540 –
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 –
344   template<typename T> class ZConstraint : public T {
345 <  
346 <  public:
345 >
346 >  public:
347    class ForceSubtractionPolicy{
348      public:
349        ForceSubtractionPolicy(ZConstraint<T>* integrator) {zconsIntegrator = integrator;}
350  
351 <      virtual void update() = 0;    
351 >      virtual void update() = 0;
352        virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) = 0;
353        virtual double getZFOfMovingMols(Atom* atom, double totalForce) = 0;
354        virtual double getHFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) = 0;
355        virtual double getHFOfUnconsMols(Atom* atom, double totalForce) = 0;
356 <    
356 >
357     protected:
358 <     ZConstraint<T>* zconsIntegrator;;
358 >     ZConstraint<T>* zconsIntegrator;
359    };
360  
361    class PolicyByNumber : public ForceSubtractionPolicy{
362  
363      public:
364 <      PolicyByNumber(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}    
365 <      virtual void update();    
364 >      PolicyByNumber(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}
365 >      virtual void update();
366        virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) ;
367        virtual double getZFOfMovingMols(Atom* atom, double totalForce) ;
368        virtual double getHFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce);
369        virtual double getHFOfUnconsMols(Atom* atom, double totalForce);
370 <    
370 >
371      private:
372        int totNumOfMovingAtoms;
373    };
# Line 624 | Line 375 | template<typename T> class ZConstraint : public T {
375    class PolicyByMass : public ForceSubtractionPolicy{
376  
377      public:
378 <      PolicyByMass(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}  
379 <      
380 <      virtual void update();    
378 >      PolicyByMass(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}
379 >
380 >      virtual void update();
381        virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) ;
382        virtual double getZFOfMovingMols(Atom* atom, double totalForce) ;
383        virtual double getHFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce);
# Line 640 | Line 391 | template<typename T> class ZConstraint : public T {
391  
392    ZConstraint( SimInfo *theInfo, ForceFields* the_ff);
393    ~ZConstraint();
394 <    
394 >
395    void setZConsTime(double time)                  {this->zconsTime = time;}
396    void getZConsTime()                             {return zconsTime;}
397 <  
397 >
398    void setIndexOfAllZConsMols(vector<int> index) {indexOfAllZConsMols = index;}
399    void getIndexOfAllZConsMols()                  {return indexOfAllZConsMols;}
400 <  
400 >
401    void setZConsOutput(const char * fileName)          {zconsOutput = fileName;}
402    string getZConsOutput()                         {return zconsOutput;}
403 <  
403 >
404    virtual void integrate();
654 –  
405  
406 +
407   #ifdef IS_MPI
408    virtual void update();                      //which is called to indicate the molecules' migration
409   #endif
410  
411 +  enum ZConsState {zcsMoving, zcsFixed};
412 +
413 +  vector<Molecule*> zconsMols;              //z-constraint molecules array
414 +  vector<ZConsState> states;                 //state of z-constraint molecules
415 +
416 +
417 +
418 +  int totNumOfUnconsAtoms;              //total number of uncontraint atoms
419 +  double totalMassOfUncons;                //total mas of unconstraint molecules
420 +
421 +
422   protected:
423  
424 <  enum ZConsState {zcsMoving, zcsFixed};  
425 <
426 <  virtual void calcForce( int calcPot, int calcStress );
424 >
425 >
426 >  virtual void calcForce( int calcPot, int calcStress );
427    virtual void thermalize(void);
428 <  
428 >
429    void zeroOutVel();
430    void doZconstraintForce();
431 <  void doHarmonic();
431 >  void doHarmonic(vector<double>& resPos);
432    bool checkZConsState();
433  
434    bool haveFixedZMols();
# Line 681 | Line 443 | template<typename T> class ZConstraint : public T {
443    double zconsTol;                                 //tolerance of z-contratint
444    double zForceConst;                           //base force constant term
445                                                            //which is estimate by OOPSE
446 <  
447 <  vector<Molecule*> zconsMols;              //z-constraint molecules array
448 <  vector<double> massOfZConsMols;       //mass of z-constraint molecule
446 >
447 >
448 >  vector<double> massOfZConsMols;       //mass of z-constraint molecule
449    vector<double> kz;                              //force constant array
450 <  vector<ZConsState> states;                 //state of z-constraint molecules
450 >
451    vector<double> zPos;                          //
452 <  
453 <  
452 >
453 >
454    vector<Molecule*> unconsMols;           //unconstraint molecules array
455    vector<double> massOfUnconsMols;    //mass array of unconstraint molecules
694 –  double totalMassOfUncons;                //total mas of unconstraint molecules
456  
457 +
458    vector<ZConsParaItem>* parameters; //
459 <  
459 >
460    vector<int> indexOfAllZConsMols;     //index of All Z-Constraint Molecuels
461  
462 <  int* indexOfZConsMols;                   //index of local Z-Constraint Molecules  
463 <  double* fz;
464 <  double* curZPos;
703 <  
704 <  int totNumOfUnconsAtoms;              //total number of uncontraint atoms
462 >  vector<int> indexOfZConsMols;                   //index of local Z-Constraint Molecules
463 >  vector<double> fz;
464 >  vector<double> curZPos;
465  
466 <  int whichDirection;                           //constraint direction
466 >  bool usingSMD;
467 >  vector<double> prevCantPos;
468 >  vector<double> cantPos;
469 >  vector<double> cantVel;
470 >
471 >  double zconsFixTime;  
472 >  double zconsGap;
473 >  bool hasZConsGap;
474 >  vector<double> endFixTime;
475    
476 +  int whichDirection;                           //constraint direction
477 +
478   private:
479 <  
479 >
480    string zconsOutput;                         //filename of zconstraint output
481    ZConsWriter* fzOut;                         //z-constraint writer
482  
483 <  double curZconsTime;                      
483 >  double curZconsTime;
484  
485    double calcMovingMolsCOMVel();
486    double calcSysCOMVel();
487    double calcTotalForce();
488 +  void updateZPos();
489 +  void updateCantPos();
490    
491    ForceSubtractionPolicy* forcePolicy; //force subtraction policy
492    friend class ForceSubtractionPolicy;
493  
494   };
495  
496 +
497 + //Sympletic quaternion Scheme Integrator
498 + //Reference:
499 + // T.F. Miller, M. Eleftheriou, P. Pattnaik, A. Ndirango, D. Newns and G.J. Martyna
500 + //Symplectic quaternion Scheme for biophysical molecular dynamics
501 + //116(20), 8649, J. Chem. Phys. (2002)
502 + template<typename T> class SQSIntegrator : public T{
503 +  public:
504 +    virtual void moveA();
505 +    virtual void moveB();
506 +  protected:
507 +    void freeRotor();
508 +    void rotate(int k, double dt);
509 +    
510 + };
511   #endif

Diff Legend

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