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 1198 by tim, Thu May 27 00:48:12 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   };
88  
89   typedef Integrator<BaseIntegrator> RealIntegrator;
90 +
91 + // ansi instantiation
92 + template class Integrator<BaseIntegrator>;
93  
94   template<typename T> class NVE : public T {
95  
96   public:
97    NVE ( SimInfo *theInfo, ForceFields* the_ff ):
98      T( theInfo, the_ff ){}
99 <  virtual ~NVE(){}  
99 >  virtual ~NVE(){}
100   };
101  
102  
# Line 103 | Line 111 | template<typename T> class NVT : public T { (public)
111    void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
112    void setChiTolerance(double tol) {chiTolerance = tol;}
113    virtual double  getConservedQuantity(void);
114 +  virtual string getAdditionalParameters(void);
115  
116   protected:
117  
# Line 124 | Line 133 | template<typename T> class NVT : public T { (public)
133  
134    double targetTemp;
135    double tauThermostat;
136 <  
136 >
137    short int have_tau_thermostat, have_target_temp;
138  
139    double *oldVel;
# Line 143 | Line 152 | template<typename T> class NPT : public T{ (public)
152  
153    NPT ( SimInfo *theInfo, ForceFields* the_ff);
154    virtual ~NPT();
155 <  
155 >
156    virtual void integrateStep( int calcPot, int calcStress ){
157      calcStress = 1;
158      T::integrateStep( calcPot, calcStress );
159    }
160  
161    virtual double getConservedQuantity(void) = 0;
162 +  virtual string getAdditionalParameters(void) = 0;
163 +  
164 +  double myTauThermo( void ) { return tauThermostat; }
165 +  double myTauBaro( void ) { return tauBarostat; }
166  
167    void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
168    void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
# Line 170 | Line 183 | template<typename T> class NPT : public T{ (public)
183  
184    virtual void getVelScaleA( double sc[3], double vel[3] ) = 0;
185    virtual void getVelScaleB( double sc[3], int index ) = 0;
186 <  virtual void getPosScale(double pos[3], double COM[3],
186 >  virtual void getPosScale(double pos[3], double COM[3],
187                             int index, double sc[3]) = 0;
188  
189 +  virtual void calcVelScale( void ) = 0;
190 +
191    virtual bool chiConverged( void );
192    virtual bool etaConverged( void ) = 0;
193 <  
193 >
194    virtual void evolveChiA( void );
195    virtual void evolveEtaA( void ) = 0;
196    virtual void evolveChiB( void );
# Line 195 | Line 210 | template<typename T> class NPT : public T{ (public)
210  
211    double tt2, tb2;
212    double instaTemp, instaPress, instaVol;
213 +  double press[3][3];
214  
215    int Nparticles;
216  
217    double integralOfChidt;
218  
219 <  // targetTemp, targetPressure, and tauBarostat must be set.  
219 >  // targetTemp, targetPressure, and tauBarostat must be set.
220    // One of qmass or tauThermostat must be set;
221  
222    double targetTemp;
# Line 225 | Line 241 | template<typename T> class NPTi : public T{
241   };
242  
243   template<typename T> class NPTi : public T{
244 <  
244 >
245   public:
246    NPTi( SimInfo *theInfo, ForceFields* the_ff);
247    ~NPTi();
248  
249    virtual double getConservedQuantity(void);
250    virtual void resetIntegrator(void);
251 <
251 >  virtual string getAdditionalParameters(void);
252   protected:
253  
238 –
254  
255 +
256    virtual void evolveEtaA(void);
257    virtual void evolveEtaB(void);
258  
# Line 246 | Line 262 | template<typename T> class NPTi : public T{
262  
263    virtual void getVelScaleA( double sc[3], double vel[3] );
264    virtual void getVelScaleB( double sc[3], int index );
265 <  virtual void getPosScale(double pos[3], double COM[3],
265 >  virtual void getPosScale(double pos[3], double COM[3],
266                             int index, double sc[3]);
267  
268 +  virtual void calcVelScale( void );
269 +
270    double eta, oldEta, prevEta;
271 +  double vScale;
272   };
273  
274 + template<typename T> class NPTf : public T{
275  
256 – template<typename T> class NPTim : public T{
257 –
276   public:
277  
278 <  NPTim ( SimInfo *theInfo, ForceFields* the_ff);
279 <  virtual ~NPTim() {}
278 >  NPTf ( SimInfo *theInfo, ForceFields* the_ff);
279 >  virtual ~NPTf();
280  
263 –  virtual void integrateStep( int calcPot, int calcStress ){
264 –    calcStress = 1;
265 –    T::integrateStep( calcPot, calcStress );
266 –    accIntegralOfChidt();  
267 –  }
268 –
281    virtual double getConservedQuantity(void);
282 +  virtual string getAdditionalParameters(void);
283 +  virtual void resetIntegrator(void);
284  
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 –
285   protected:
286  
287 <  virtual void moveA( void );
288 <  virtual void moveB( void );
287 >  virtual void evolveEtaA(void);
288 >  virtual void evolveEtaB(void);
289  
290 <  virtual int readyCheck();
290 >  virtual bool etaConverged( void );
291  
292 <  virtual void resetIntegrator( void );
292 >  virtual void scaleSimBox( void );
293  
294 <  void accIntegralOfChidt(void) { integralOfChidt += dt * chi;}
295 <  
296 <  Molecule* myMolecules;
297 <  Atom** myAtoms;
294 >  virtual void getVelScaleA( double sc[3], double vel[3] );
295 >  virtual void getVelScaleB( double sc[3], int index );
296 >  virtual void getPosScale(double pos[3], double COM[3],
297 >                           int index, double sc[3]);
298  
299 <  // chi and eta are the propagated degrees of freedom
299 >  virtual void calcVelScale( void );
300  
301 <  double chi;
302 <  double eta;
303 <  double NkBT;
304 <  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 <
314 < };
315 <
316 < template<typename T> class NPTzm : public T{
317 <
318 < public:
319 <
320 <  NPTzm ( SimInfo *theInfo, ForceFields* the_ff);
321 <  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:
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 <
301 >  double eta[3][3];
302 >  double oldEta[3][3];
303 >  double prevEta[3][3];
304 >  double vScale[3][3];
305   };
306  
307 < template<typename T> class NPTf : public T{
307 > template<typename T> class NPTxyz : public T{
308  
309   public:
310  
311 <  NPTf ( SimInfo *theInfo, ForceFields* the_ff);
312 <  virtual ~NPTf();
311 >  NPTxyz ( SimInfo *theInfo, ForceFields* the_ff);
312 >  virtual ~NPTxyz();
313  
372 –  virtual void integrateStep( int calcPot, int calcStress ){
373 –    calcStress = 1;
374 –    T::integrateStep( calcPot, calcStress );
375 –  }
376 –  
314    virtual double getConservedQuantity(void);
315 +  virtual string getAdditionalParameters(void);
316 +  virtual void resetIntegrator(void);
317  
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 –
318   protected:
319  
320 <  virtual void  moveA( void );
321 <  virtual void moveB( void );
320 >  virtual void evolveEtaA(void);
321 >  virtual void evolveEtaB(void);
322  
323 <  virtual void resetIntegrator( void );
323 >  virtual bool etaConverged( void );
324  
325 <  virtual int readyCheck();
325 >  virtual void scaleSimBox( void );
326  
327 +  virtual void getVelScaleA( double sc[3], double vel[3] );
328 +  virtual void getVelScaleB( double sc[3], int index );
329 +  virtual void getPosScale(double pos[3], double COM[3],
330 +                           int index, double sc[3]);
331  
332 <  // chi and eta are the propagated degrees of freedom
332 >  virtual void calcVelScale( void );
333  
398 –  double chi;
334    double eta[3][3];
335 <  double NkBT;
336 <  double fkBT;
337 <
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 <
335 >  double oldEta[3][3];
336 >  double prevEta[3][3];
337 >  double vScale[3][3];
338   };
339  
340  
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 –
341   template<typename T> class ZConstraint : public T {
342 <  
343 <  public:
342 >
343 >  public:
344    class ForceSubtractionPolicy{
345      public:
346        ForceSubtractionPolicy(ZConstraint<T>* integrator) {zconsIntegrator = integrator;}
347  
348 <      virtual void update() = 0;    
348 >      virtual void update() = 0;
349        virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) = 0;
350        virtual double getZFOfMovingMols(Atom* atom, double totalForce) = 0;
351        virtual double getHFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) = 0;
352        virtual double getHFOfUnconsMols(Atom* atom, double totalForce) = 0;
353 <    
353 >
354     protected:
355 <     ZConstraint<T>* zconsIntegrator;;
355 >     ZConstraint<T>* zconsIntegrator;
356    };
357  
358    class PolicyByNumber : public ForceSubtractionPolicy{
359  
360      public:
361 <      PolicyByNumber(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}    
362 <      virtual void update();    
361 >      PolicyByNumber(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}
362 >      virtual void update();
363        virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) ;
364        virtual double getZFOfMovingMols(Atom* atom, double totalForce) ;
365        virtual double getHFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce);
366        virtual double getHFOfUnconsMols(Atom* atom, double totalForce);
367 <    
367 >
368      private:
369        int totNumOfMovingAtoms;
370    };
# Line 624 | Line 372 | template<typename T> class ZConstraint : public T {
372    class PolicyByMass : public ForceSubtractionPolicy{
373  
374      public:
375 <      PolicyByMass(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}  
376 <      
377 <      virtual void update();    
375 >      PolicyByMass(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}
376 >
377 >      virtual void update();
378        virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) ;
379        virtual double getZFOfMovingMols(Atom* atom, double totalForce) ;
380        virtual double getHFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce);
# Line 640 | Line 388 | template<typename T> class ZConstraint : public T {
388  
389    ZConstraint( SimInfo *theInfo, ForceFields* the_ff);
390    ~ZConstraint();
391 <    
391 >
392    void setZConsTime(double time)                  {this->zconsTime = time;}
393    void getZConsTime()                             {return zconsTime;}
394 <  
394 >
395    void setIndexOfAllZConsMols(vector<int> index) {indexOfAllZConsMols = index;}
396    void getIndexOfAllZConsMols()                  {return indexOfAllZConsMols;}
397 <  
397 >
398    void setZConsOutput(const char * fileName)          {zconsOutput = fileName;}
399    string getZConsOutput()                         {return zconsOutput;}
400 <  
400 >
401    virtual void integrate();
654 –  
402  
403 +
404   #ifdef IS_MPI
405    virtual void update();                      //which is called to indicate the molecules' migration
406   #endif
407  
408 +  enum ZConsState {zcsMoving, zcsFixed};
409 +
410 +  vector<Molecule*> zconsMols;              //z-constraint molecules array
411 +  vector<ZConsState> states;                 //state of z-constraint molecules
412 +
413 +
414 +
415 +  int totNumOfUnconsAtoms;              //total number of uncontraint atoms
416 +  double totalMassOfUncons;                //total mas of unconstraint molecules
417 +
418 +
419   protected:
420  
421 <  enum ZConsState {zcsMoving, zcsFixed};  
422 <
423 <  virtual void calcForce( int calcPot, int calcStress );
421 >
422 >
423 >  virtual void calcForce( int calcPot, int calcStress );
424    virtual void thermalize(void);
425 <  
425 >
426    void zeroOutVel();
427    void doZconstraintForce();
428 <  void doHarmonic();
428 >  void doHarmonic(vector<double>& resPos);
429    bool checkZConsState();
430  
431    bool haveFixedZMols();
# Line 681 | Line 440 | template<typename T> class ZConstraint : public T {
440    double zconsTol;                                 //tolerance of z-contratint
441    double zForceConst;                           //base force constant term
442                                                            //which is estimate by OOPSE
443 <  
444 <  vector<Molecule*> zconsMols;              //z-constraint molecules array
445 <  vector<double> massOfZConsMols;       //mass of z-constraint molecule
443 >
444 >
445 >  vector<double> massOfZConsMols;       //mass of z-constraint molecule
446    vector<double> kz;                              //force constant array
447 <  vector<ZConsState> states;                 //state of z-constraint molecules
447 >
448    vector<double> zPos;                          //
449 <  
450 <  
449 >
450 >
451    vector<Molecule*> unconsMols;           //unconstraint molecules array
452    vector<double> massOfUnconsMols;    //mass array of unconstraint molecules
694 –  double totalMassOfUncons;                //total mas of unconstraint molecules
453  
454 +
455    vector<ZConsParaItem>* parameters; //
456 <  
456 >
457    vector<int> indexOfAllZConsMols;     //index of All Z-Constraint Molecuels
458  
459 <  int* indexOfZConsMols;                   //index of local Z-Constraint Molecules  
460 <  double* fz;
461 <  double* curZPos;
703 <  
704 <  int totNumOfUnconsAtoms;              //total number of uncontraint atoms
459 >  vector<int> indexOfZConsMols;                   //index of local Z-Constraint Molecules
460 >  vector<double> fz;
461 >  vector<double> curZPos;
462  
463 <  int whichDirection;                           //constraint direction
463 >  bool usingSMD;
464 >  vector<double> prevCantPos;
465 >  vector<double> cantPos;
466 >  vector<double> cantVel;
467 >
468 >  double zconsFixTime;  
469 >  double zconsGap;
470 >  bool hasZConsGap;
471 >  vector<double> endFixTime;
472    
473 +  int whichDirection;                           //constraint direction
474 +
475   private:
476 <  
476 >
477    string zconsOutput;                         //filename of zconstraint output
478    ZConsWriter* fzOut;                         //z-constraint writer
479  
480 <  double curZconsTime;                      
480 >  double curZconsTime;
481  
482    double calcMovingMolsCOMVel();
483    double calcSysCOMVel();
484    double calcTotalForce();
485 +  void updateZPos();
486 +  void updateCantPos();
487    
488    ForceSubtractionPolicy* forcePolicy; //force subtraction policy
489    friend class ForceSubtractionPolicy;

Diff Legend

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