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 843 by mmeineke, Wed Oct 29 20:41:39 2003 UTC

# Line 28 | Line 28 | template<typename T = BaseIntegrator> class Integrator
28    virtual ~Integrator();
29    void integrate( void );
30    virtual double  getConservedQuantity(void);
31 +  virtual string getAdditionalParameters(void);
32  
33   protected:
34  
# Line 40 | Line 41 | template<typename T = BaseIntegrator> class Integrator
41    virtual int  readyCheck( void ) { return 1; }
42  
43    virtual void resetIntegrator( void ) { }
44 <
45 <  virtual void calcForce( int calcPot, int calcStress );  
44 >
45 >  virtual void calcForce( int calcPot, int calcStress );
46    virtual void thermalize();
47 <  
47 >
48    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],
51 >  void rotate( int axes1, int axes2, double angle, double j[3],
52           double A[3][3] );
53 <        
53 >
54    ForceFields* myFF;
55  
56    SimInfo *info; // all the info we'll ever need
# Line 61 | Line 62 | template<typename T = BaseIntegrator> class Integrator
62  
63    int isConstrained; // boolean to know whether the systems contains
64           // constraints.
65 <  int nConstrained;  // counter for number of constraints
66 <  int *constrainedA; // the i of a constraint pair
67 <  int *constrainedB; // the j of a constraint pair
68 <  double *constrainedDsqr; // the square of the constraint distance
69 <  
65 >  int nConstrained;  // counter for number of constraints
66 >  int *constrainedA; // the i of a constraint pair
67 >  int *constrainedB; // the j of a constraint pair
68 >  double *constrainedDsqr; // the square of the constraint distance
69 >
70    int* moving; // tells whether we are moving atom i
71    int* moved;  // tells whether we have moved atom i
72 <  double* oldPos; // pre constrained positions
72 >  double* oldPos; // pre constrained positions
73  
74    short isFirst; /*boolean for the first time integrate is called */
75 <  
75 >
76    double dt;
77    double dt2;
78  
79    Thermo *tStats;
80    StatWriter*  statOut;
81    DumpWriter*  dumpOut;
82 <  
82 >
83   };
84  
85   typedef Integrator<BaseIntegrator> RealIntegrator;
# Line 88 | Line 89 | template<typename T> class NVE : public T { (public)
89   public:
90    NVE ( SimInfo *theInfo, ForceFields* the_ff ):
91      T( theInfo, the_ff ){}
92 <  virtual ~NVE(){}  
92 >  virtual ~NVE(){}
93   };
94  
95  
# Line 103 | Line 104 | template<typename T> class NVT : public T { (public)
104    void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
105    void setChiTolerance(double tol) {chiTolerance = tol;}
106    virtual double  getConservedQuantity(void);
107 +  virtual string getAdditionalParameters(void);
108  
109   protected:
110  
# Line 124 | Line 126 | template<typename T> class NVT : public T { (public)
126  
127    double targetTemp;
128    double tauThermostat;
129 <  
129 >
130    short int have_tau_thermostat, have_target_temp;
131  
132    double *oldVel;
# Line 143 | Line 145 | template<typename T> class NPT : public T{ (public)
145  
146    NPT ( SimInfo *theInfo, ForceFields* the_ff);
147    virtual ~NPT();
148 <  
148 >
149    virtual void integrateStep( int calcPot, int calcStress ){
150      calcStress = 1;
151      T::integrateStep( calcPot, calcStress );
152    }
153  
154    virtual double getConservedQuantity(void) = 0;
155 +  virtual string getAdditionalParameters(void) = 0;
156 +  
157 +  double myTauThermo( void ) { return tauThermostat; }
158 +  double myTauBaro( void ) { return tauBarostat; }
159  
160    void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
161    void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
# Line 170 | Line 176 | template<typename T> class NPT : public T{ (public)
176  
177    virtual void getVelScaleA( double sc[3], double vel[3] ) = 0;
178    virtual void getVelScaleB( double sc[3], int index ) = 0;
179 <  virtual void getPosScale(double pos[3], double COM[3],
179 >  virtual void getPosScale(double pos[3], double COM[3],
180                             int index, double sc[3]) = 0;
181  
182    virtual bool chiConverged( void );
183    virtual bool etaConverged( void ) = 0;
184 <  
184 >
185    virtual void evolveChiA( void );
186    virtual void evolveEtaA( void ) = 0;
187    virtual void evolveChiB( void );
# Line 195 | Line 201 | template<typename T> class NPT : public T{ (public)
201  
202    double tt2, tb2;
203    double instaTemp, instaPress, instaVol;
204 +  double press[3][3];
205  
206    int Nparticles;
207  
208    double integralOfChidt;
209  
210 <  // targetTemp, targetPressure, and tauBarostat must be set.  
210 >  // targetTemp, targetPressure, and tauBarostat must be set.
211    // One of qmass or tauThermostat must be set;
212  
213    double targetTemp;
# Line 225 | Line 232 | template<typename T> class NPTi : public T{
232   };
233  
234   template<typename T> class NPTi : public T{
235 <  
235 >
236   public:
237    NPTi( SimInfo *theInfo, ForceFields* the_ff);
238    ~NPTi();
239  
240    virtual double getConservedQuantity(void);
241    virtual void resetIntegrator(void);
242 <
242 >  virtual string getAdditionalParameters(void);
243   protected:
244  
238 –
245  
246 +
247    virtual void evolveEtaA(void);
248    virtual void evolveEtaB(void);
249  
# Line 246 | Line 253 | template<typename T> class NPTi : public T{
253  
254    virtual void getVelScaleA( double sc[3], double vel[3] );
255    virtual void getVelScaleB( double sc[3], int index );
256 <  virtual void getPosScale(double pos[3], double COM[3],
256 >  virtual void getPosScale(double pos[3], double COM[3],
257                             int index, double sc[3]);
258  
259    double eta, oldEta, prevEta;
260   };
261  
262 + template<typename T> class NPTf : public T{
263  
256 – template<typename T> class NPTim : public T{
257 –
264   public:
265  
266 <  NPTim ( SimInfo *theInfo, ForceFields* the_ff);
267 <  virtual ~NPTim() {}
266 >  NPTf ( SimInfo *theInfo, ForceFields* the_ff);
267 >  virtual ~NPTf();
268  
263 –  virtual void integrateStep( int calcPot, int calcStress ){
264 –    calcStress = 1;
265 –    T::integrateStep( calcPot, calcStress );
266 –    accIntegralOfChidt();  
267 –  }
268 –
269    virtual double getConservedQuantity(void);
270 <
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;}
270 >  virtual string getAdditionalParameters(void);
271 >  virtual void resetIntegrator(void);
272  
273   protected:
274  
275 <  virtual void moveA( void );
276 <  virtual void moveB( void );
275 >  virtual void evolveEtaA(void);
276 >  virtual void evolveEtaB(void);
277  
278 <  virtual int readyCheck();
278 >  virtual bool etaConverged( void );
279  
280 <  virtual void resetIntegrator( void );
280 >  virtual void scaleSimBox( void );
281  
282 <  void accIntegralOfChidt(void) { integralOfChidt += dt * chi;}
283 <  
284 <  Molecule* myMolecules;
285 <  Atom** myAtoms;
282 >  virtual void getVelScaleA( double sc[3], double vel[3] );
283 >  virtual void getVelScaleB( double sc[3], int index );
284 >  virtual void getPosScale(double pos[3], double COM[3],
285 >                           int index, double sc[3]);
286  
287 <  // chi and eta are the propagated degrees of freedom
288 <
289 <  double chi;
295 <  double eta;
296 <  double NkBT;
297 <  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 <
287 >  double eta[3][3];
288 >  double oldEta[3][3];
289 >  double prevEta[3][3];
290   };
291  
292 < template<typename T> class NPTzm : public T{
292 > template<typename T> class NPTxyz : public T{
293  
294   public:
295  
296 <  NPTzm ( SimInfo *theInfo, ForceFields* the_ff);
297 <  virtual ~NPTzm() {};
296 >  NPTxyz ( SimInfo *theInfo, ForceFields* the_ff);
297 >  virtual ~NPTxyz();
298  
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 –  
299    virtual double getConservedQuantity(void);
300 +  virtual string getAdditionalParameters(void);
301 +  virtual void resetIntegrator(void);
302  
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 –
303   protected:
304  
305 <  virtual void  moveA( void );
306 <  virtual void moveB( void );
305 >  virtual void evolveEtaA(void);
306 >  virtual void evolveEtaB(void);
307  
308 <  virtual void resetIntegrator( void );
392 <
393 <  virtual int readyCheck();
394 <
395 <
396 <  // chi and eta are the propagated degrees of freedom
397 <
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();
308 >  virtual bool etaConverged( void );
309  
310 <  virtual void resetIntegrator( void );
310 >  virtual void scaleSimBox( void );
311  
312 <  Molecule* myMolecules;
313 <  Atom** myAtoms;
312 >  virtual void getVelScaleA( double sc[3], double vel[3] );
313 >  virtual void getVelScaleB( double sc[3], int index );
314 >  virtual void getPosScale(double pos[3], double COM[3],
315 >                           int index, double sc[3]);
316  
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;
317    double eta[3][3];
318 <  double NkBT;
319 <  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 <
318 >  double oldEta[3][3];
319 >  double prevEta[3][3];
320   };
321  
322  
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 –
323   template<typename T> class ZConstraint : public T {
324 <  
325 <  public:
324 >
325 >  public:
326    class ForceSubtractionPolicy{
327      public:
328        ForceSubtractionPolicy(ZConstraint<T>* integrator) {zconsIntegrator = integrator;}
329  
330 <      virtual void update() = 0;    
330 >      virtual void update() = 0;
331        virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) = 0;
332        virtual double getZFOfMovingMols(Atom* atom, double totalForce) = 0;
333        virtual double getHFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) = 0;
334        virtual double getHFOfUnconsMols(Atom* atom, double totalForce) = 0;
335 <    
335 >
336     protected:
337 <     ZConstraint<T>* zconsIntegrator;;
337 >     ZConstraint<T>* zconsIntegrator;
338    };
339  
340    class PolicyByNumber : public ForceSubtractionPolicy{
341  
342      public:
343 <      PolicyByNumber(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}    
344 <      virtual void update();    
343 >      PolicyByNumber(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}
344 >      virtual void update();
345        virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) ;
346        virtual double getZFOfMovingMols(Atom* atom, double totalForce) ;
347        virtual double getHFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce);
348        virtual double getHFOfUnconsMols(Atom* atom, double totalForce);
349 <    
349 >
350      private:
351        int totNumOfMovingAtoms;
352    };
# Line 624 | Line 354 | template<typename T> class ZConstraint : public T {
354    class PolicyByMass : public ForceSubtractionPolicy{
355  
356      public:
357 <      PolicyByMass(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}  
358 <      
359 <      virtual void update();    
357 >      PolicyByMass(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}
358 >
359 >      virtual void update();
360        virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) ;
361        virtual double getZFOfMovingMols(Atom* atom, double totalForce) ;
362        virtual double getHFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce);
# Line 640 | Line 370 | template<typename T> class ZConstraint : public T {
370  
371    ZConstraint( SimInfo *theInfo, ForceFields* the_ff);
372    ~ZConstraint();
373 <    
373 >
374    void setZConsTime(double time)                  {this->zconsTime = time;}
375    void getZConsTime()                             {return zconsTime;}
376 <  
376 >
377    void setIndexOfAllZConsMols(vector<int> index) {indexOfAllZConsMols = index;}
378    void getIndexOfAllZConsMols()                  {return indexOfAllZConsMols;}
379 <  
379 >
380    void setZConsOutput(const char * fileName)          {zconsOutput = fileName;}
381    string getZConsOutput()                         {return zconsOutput;}
382 <  
382 >
383    virtual void integrate();
654 –  
384  
385 +
386   #ifdef IS_MPI
387    virtual void update();                      //which is called to indicate the molecules' migration
388   #endif
389  
390 +  enum ZConsState {zcsMoving, zcsFixed};
391 +
392 +  vector<Molecule*> zconsMols;              //z-constraint molecules array
393 +  vector<ZConsState> states;                 //state of z-constraint molecules
394 +
395 +
396 +
397 +  int totNumOfUnconsAtoms;              //total number of uncontraint atoms
398 +  double totalMassOfUncons;                //total mas of unconstraint molecules
399 +
400 +
401   protected:
402  
403 <  enum ZConsState {zcsMoving, zcsFixed};  
404 <
405 <  virtual void calcForce( int calcPot, int calcStress );
403 >
404 >
405 >  virtual void calcForce( int calcPot, int calcStress );
406    virtual void thermalize(void);
407 <  
407 >
408    void zeroOutVel();
409    void doZconstraintForce();
410    void doHarmonic();
# Line 681 | Line 422 | template<typename T> class ZConstraint : public T {
422    double zconsTol;                                 //tolerance of z-contratint
423    double zForceConst;                           //base force constant term
424                                                            //which is estimate by OOPSE
425 <  
426 <  vector<Molecule*> zconsMols;              //z-constraint molecules array
427 <  vector<double> massOfZConsMols;       //mass of z-constraint molecule
425 >
426 >
427 >  vector<double> massOfZConsMols;       //mass of z-constraint molecule
428    vector<double> kz;                              //force constant array
429 <  vector<ZConsState> states;                 //state of z-constraint molecules
429 >
430    vector<double> zPos;                          //
431 <  
432 <  
431 >
432 >
433    vector<Molecule*> unconsMols;           //unconstraint molecules array
434    vector<double> massOfUnconsMols;    //mass array of unconstraint molecules
694 –  double totalMassOfUncons;                //total mas of unconstraint molecules
435  
436 +
437    vector<ZConsParaItem>* parameters; //
438 <  
438 >
439    vector<int> indexOfAllZConsMols;     //index of All Z-Constraint Molecuels
440  
441 <  int* indexOfZConsMols;                   //index of local Z-Constraint Molecules  
441 >  int* indexOfZConsMols;                   //index of local Z-Constraint Molecules
442    double* fz;
443    double* curZPos;
703 –  
704 –  int totNumOfUnconsAtoms;              //total number of uncontraint atoms
444  
445 <  int whichDirection;                           //constraint direction
446 <  
445 >
446 >
447 >  int whichDirection;                           //constraint direction
448 >
449   private:
450 <  
450 >
451    string zconsOutput;                         //filename of zconstraint output
452    ZConsWriter* fzOut;                         //z-constraint writer
453  
454 <  double curZconsTime;                      
454 >  double curZconsTime;
455  
456    double calcMovingMolsCOMVel();
457    double calcSysCOMVel();
458    double calcTotalForce();
459 <  
459 >
460    ForceSubtractionPolicy* forcePolicy; //force subtraction policy
461    friend class ForceSubtractionPolicy;
462  

Diff Legend

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