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 767 by tim, Tue Sep 16 20:02:11 2003 UTC vs.
Revision 837 by tim, Wed Oct 29 00:19:10 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 <  
34 >
35    virtual void integrateStep( int calcPot, int calcStress );
36    virtual void preMove( void );
37    virtual void moveA( void );
# 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 59 | 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 86 | 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 101 | 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 122 | 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 135 | Line 139 | template<typename T> class NPTi : public T{
139  
140  
141  
142 < template<typename T> class NPTi : public T{
142 > template<typename T> class NPT : public T{
143  
144   public:
145  
146 <  NPTi ( SimInfo *theInfo, ForceFields* the_ff);
147 <  virtual ~NPTi();
148 <  
146 >  NPT ( SimInfo *theInfo, ForceFields* the_ff);
147 >  virtual ~NPT();
148 >
149    virtual void integrateStep( int calcPot, int calcStress ){
150      calcStress = 1;
151      T::integrateStep( calcPot, calcStress );
148 –    /* accIntegralOfChidt(); */
152    }
153  
154 <  virtual double getConservedQuantity(void);
155 <
154 >  virtual double getConservedQuantity(void) = 0;
155 >  virtual string getAdditionalParameters(void) = 0;
156    void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
157    void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
158    void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
# Line 167 | Line 170 | template<typename T> class NPTi : public T{ (protected
170  
171    virtual void resetIntegrator( void );
172  
173 +  virtual void getVelScaleA( double sc[3], double vel[3] ) = 0;
174 +  virtual void getVelScaleB( double sc[3], int index ) = 0;
175 +  virtual void getPosScale(double pos[3], double COM[3],
176 +                           int index, double sc[3]) = 0;
177 +
178 +  virtual bool chiConverged( void );
179 +  virtual bool etaConverged( void ) = 0;
180 +
181 +  virtual void evolveChiA( void );
182 +  virtual void evolveEtaA( void ) = 0;
183 +  virtual void evolveChiB( void );
184 +  virtual void evolveEtaB( void ) = 0;
185 +
186 +  virtual void scaleSimBox( void ) = 0;
187 +
188    void accIntegralOfChidt(void) { integralOfChidt += dt * chi;}
189  
190    // chi and eta are the propagated degrees of freedom
191  
192 +  double oldChi;
193 +  double prevChi;
194    double chi;
175 –  double eta;
195    double NkBT;
196    double fkBT;
197  
198 +  double tt2, tb2;
199 +  double instaTemp, instaPress, instaVol;
200 +  double press[3][3];
201 +
202    int Nparticles;
203  
204    double integralOfChidt;
205  
206 <  // targetTemp, targetPressure, and tauBarostat must be set.  
206 >  // targetTemp, targetPressure, and tauBarostat must be set.
207    // One of qmass or tauThermostat must be set;
208  
209    double targetTemp;
# Line 204 | Line 227 | template<typename T> class NPTim : public T{
227  
228   };
229  
230 < template<typename T> class NPTim : public T{
230 > template<typename T> class NPTi : public T{
231  
232   public:
233 +  NPTi( SimInfo *theInfo, ForceFields* the_ff);
234 +  ~NPTi();
235  
211 –  NPTim ( SimInfo *theInfo, ForceFields* the_ff);
212 –  virtual ~NPTim() {}
213 –
214 –  virtual void integrateStep( int calcPot, int calcStress ){
215 –    calcStress = 1;
216 –    T::integrateStep( calcPot, calcStress );
217 –    accIntegralOfChidt();  
218 –  }
219 –
236    virtual double getConservedQuantity(void);
237 <
238 <  void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
223 <  void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
224 <  void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
225 <  void setTargetPressure(double tp) {targetPressure = tp; have_target_pressure = 1;}
226 <  void setChiTolerance(double tol) {chiTolerance = tol;}
227 <  void setPosIterTolerance(double tol) {posIterTolerance = tol;}
228 <
237 >  virtual void resetIntegrator(void);
238 >  virtual string getAdditionalParameters(void);
239   protected:
240  
231 –  virtual void moveA( void );
232 –  virtual void moveB( void );
241  
234 –  virtual int readyCheck();
242  
243 <  virtual void resetIntegrator( void );
243 >  virtual void evolveEtaA(void);
244 >  virtual void evolveEtaB(void);
245  
246 <  void accIntegralOfChidt(void) { integralOfChidt += dt * chi;}
239 <  
240 <  Molecule* myMolecules;
241 <  Atom** myAtoms;
246 >  virtual bool etaConverged( void );
247  
248 <  // chi and eta are the propagated degrees of freedom
248 >  virtual void scaleSimBox( void );
249  
250 <  double chi;
251 <  double eta;
252 <  double NkBT;
253 <  double integralOfChidt;
249 <
250 <  // targetTemp, targetPressure, and tauBarostat must be set.  
251 <  // One of qmass or tauThermostat must be set;
252 <
253 <  double targetTemp;
254 <  double targetPressure;
255 <  double tauThermostat;
256 <  double tauBarostat;
257 <
258 <  short int have_tau_thermostat, have_tau_barostat, have_target_temp;
259 <  short int have_target_pressure;
260 <  double chiTolerance;
261 <  short int have_chi_tolerance;
262 <  double posIterTolerance;
263 <  short int have_pos_iter_tolerance;
264 <
265 < };
266 <
267 < template<typename T> class NPTzm : public T{
250 >  virtual void getVelScaleA( double sc[3], double vel[3] );
251 >  virtual void getVelScaleB( double sc[3], int index );
252 >  virtual void getPosScale(double pos[3], double COM[3],
253 >                           int index, double sc[3]);
254  
255 < public:
270 <
271 <  NPTzm ( SimInfo *theInfo, ForceFields* the_ff);
272 <  virtual ~NPTzm() {};
273 <
274 <  virtual void integrateStep( int calcPot, int calcStress ){
275 <    calcStress = 1;
276 <    T::integrateStep( calcPot, calcStress );
277 <  }
278 <
279 <  void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
280 <  void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
281 <  void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
282 <  void setTargetPressure(double tp) {targetPressure = tp; have_target_pressure = 1;}
283 <
284 < protected:
285 <
286 <  virtual void moveA( void );
287 <  virtual void moveB( void );
288 <
289 <  virtual int readyCheck();
290 <
291 <  virtual void resetIntegrator( void );
292 <
293 <  Molecule* myMolecules;
294 <  Atom** myAtoms;
295 <
296 <  // chi and eta are the propagated degrees of freedom
297 <
298 <  double chi;
299 <  double eta;
300 <  double etaZ;
301 <  double NkBT;
302 <
303 <  // targetTemp, targetPressure, and tauBarostat must be set.  
304 <  // One of qmass or tauThermostat must be set;
305 <
306 <  double targetTemp;
307 <  double targetPressure;
308 <  double tauThermostat;
309 <  double tauBarostat;
310 <
311 <  short int have_tau_thermostat, have_tau_barostat, have_target_temp;
312 <  short int have_target_pressure;
313 <
255 >  double eta, oldEta, prevEta;
256   };
257  
258   template<typename T> class NPTf : public T{
# Line 320 | Line 262 | template<typename T> class NPTf : public T{ (public)
262    NPTf ( SimInfo *theInfo, ForceFields* the_ff);
263    virtual ~NPTf();
264  
323 –  virtual void integrateStep( int calcPot, int calcStress ){
324 –    calcStress = 1;
325 –    T::integrateStep( calcPot, calcStress );
326 –  }
327 –  
265    virtual double getConservedQuantity(void);
266 +  virtual string getAdditionalParameters(void);
267 +  virtual void resetIntegrator(void);
268  
330 –  void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
331 –  void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
332 –  void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
333 –  void setTargetPressure(double tp) {targetPressure = tp; have_target_pressure = 1;}
334 –  void setChiTolerance(double tol) {chiTolerance = tol;}
335 –  void setPosIterTolerance(double tol) {posIterTolerance = tol;}
336 –
269   protected:
270  
271 <  virtual void  moveA( void );
272 <  virtual void moveB( void );
271 >  virtual void evolveEtaA(void);
272 >  virtual void evolveEtaB(void);
273  
274 <  virtual void resetIntegrator( void );
274 >  virtual bool etaConverged( void );
275  
276 <  virtual int readyCheck();
276 >  virtual void scaleSimBox( void );
277  
278 +  virtual void getVelScaleA( double sc[3], double vel[3] );
279 +  virtual void getVelScaleB( double sc[3], int index );
280 +  virtual void getPosScale(double pos[3], double COM[3],
281 +                           int index, double sc[3]);
282  
347 –  // chi and eta are the propagated degrees of freedom
348 –
349 –  double chi;
283    double eta[3][3];
284 <  double NkBT;
285 <  double fkBT;
353 <
354 <  int Nparticles;
355 <
356 <  double *oldPos;
357 <  double *oldVel;
358 <  double *oldJi;
359 <
360 <  double integralOfChidt;
361 <  
362 <  // targetTemp, targetPressure, and tauBarostat must be set.  
363 <  // One of qmass or tauThermostat must be set;
364 <
365 <  double targetTemp;
366 <  double targetPressure;
367 <  double tauThermostat;
368 <  double tauBarostat;
369 <
370 <  short int have_tau_thermostat, have_tau_barostat, have_target_temp;
371 <  short int have_target_pressure;
372 <  double chiTolerance;
373 <  short int have_chi_tolerance;
374 <  double posIterTolerance;
375 <  short int have_pos_iter_tolerance;
376 <  double etaTolerance;
377 <  short int have_eta_tolerance;
378 < };
379 <
380 < template<typename T> class NPTxym : public T{
381 <
382 < public:
383 <
384 <  NPTxym ( SimInfo *theInfo, ForceFields* the_ff);
385 <  virtual ~NPTxym() {};
386 <
387 <  virtual void integrateStep( int calcPot, int calcStress ){
388 <    calcStress = 1;
389 <    T::integrateStep( calcPot, calcStress );
390 <  }
391 <
392 <  void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
393 <  void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
394 <  void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
395 <  void setTargetPressure(double tp) {targetPressure = tp; have_target_pressure = 1;}
396 <
397 < protected:
398 <
399 <  virtual void moveA( void );
400 <  virtual void moveB( void );
401 <
402 <  virtual int readyCheck();
403 <
404 <  virtual void resetIntegrator( void );
405 <
406 <  Molecule* myMolecules;
407 <  Atom** myAtoms;
408 <
409 <  // chi and eta are the propagated degrees of freedom
410 <
411 <  double chi;
412 <  double eta;
413 <  double etaX;
414 <  double etaY;
415 <  double NkBT;
416 <
417 <  // targetTemp, targetPressure, and tauBarostat must be set.  
418 <  // One of qmass or tauThermostat must be set;
419 <
420 <  double targetTemp;
421 <  double targetPressure;
422 <  double tauThermostat;
423 <  double tauBarostat;
424 <
425 <  short int have_tau_thermostat, have_tau_barostat, have_target_temp;
426 <  short int have_target_pressure;
427 <
284 >  double oldEta[3][3];
285 >  double prevEta[3][3];
286   };
287  
288 + template<typename T> class NPTxyz : public T{
289  
431 – template<typename T> class NPTfm : public T{
432 –
290   public:
291  
292 <  NPTfm ( SimInfo *theInfo, ForceFields* the_ff);
293 <  virtual ~NPTfm() {};
292 >  NPTxyz ( SimInfo *theInfo, ForceFields* the_ff);
293 >  virtual ~NPTxyz();
294  
438 –  virtual void integrateStep( int calcPot, int calcStress ){
439 –    calcStress = 1;
440 –    T::integrateStep( calcPot, calcStress );
441 –    accIntegralOfChidt();
442 –  }
443 –
295    virtual double getConservedQuantity(void);
296 <  
297 <  void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
447 <  void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
448 <  void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
449 <  void setTargetPressure(double tp) {targetPressure = tp; have_target_pressure = 1;}
450 <  void setChiTolerance(double tol) {chiTolerance = tol;}
451 <  void setPosIterTolerance(double tol) {posIterTolerance = tol;}
296 >  virtual string getAdditionalParameters(void);
297 >  virtual void resetIntegrator(void);
298  
299   protected:
300  
301 <  virtual void  moveA( void );
302 <  virtual void moveB( void );
301 >  virtual void evolveEtaA(void);
302 >  virtual void evolveEtaB(void);
303  
304 <  virtual void resetIntegrator( void );
304 >  virtual bool etaConverged( void );
305  
306 <  virtual int readyCheck();
306 >  virtual void scaleSimBox( void );
307  
308 <  void accIntegralOfChidt(void) { integralOfChidt += dt * chi;}
308 >  virtual void getVelScaleA( double sc[3], double vel[3] );
309 >  virtual void getVelScaleB( double sc[3], int index );
310 >  virtual void getPosScale(double pos[3], double COM[3],
311 >                           int index, double sc[3]);
312  
464 –  Molecule* myMolecules;
465 –  Atom** myAtoms;
466 –
467 –  // chi and eta are the propagated degrees of freedom
468 –
469 –  double chi;
313    double eta[3][3];
314 <  double NkBT;
315 <  double integralOfChidt;
473 <
474 <  // targetTemp, targetPressure, and tauBarostat must be set.  
475 <  // One of qmass or tauThermostat must be set;
476 <
477 <  double targetTemp;
478 <  double targetPressure;
479 <  double tauThermostat;
480 <  double tauBarostat;
481 <
482 <  short int have_tau_thermostat, have_tau_barostat, have_target_temp;
483 <  short int have_target_pressure;
484 <  double chiTolerance;
485 <  short int have_chi_tolerance;
486 <  double posIterTolerance;
487 <  short int have_pos_iter_tolerance;
488 <
314 >  double oldEta[3][3];
315 >  double prevEta[3][3];
316   };
317  
318  
492 – template<typename T> class NPTpr : public T{
493 –
494 – public:
495 –
496 –  NPTpr ( SimInfo *theInfo, ForceFields* the_ff);
497 –  virtual ~NPTpr() {};
498 –
499 –  virtual void integrateStep( int calcPot, int calcStress ){
500 –    calcStress = 1;
501 –    T::integrateStep( calcPot, calcStress );
502 –  }
503 –
504 –  void setTauThermostat(double tt) {tauThermostat = tt; have_tau_thermostat=1;}
505 –  void setTauBarostat(double tb) {tauBarostat = tb; have_tau_barostat=1;}
506 –  void setTargetTemp(double tt) {targetTemp = tt; have_target_temp = 1;}
507 –  void setTargetPressure(double tp) {targetPressure = tp; have_target_pressure = 1;}
508 –  void setChiTolerance(double tol) {chiTolerance = tol;}
509 –  void setPosIterTolerance(double tol) {posIterTolerance = tol;}
510 –
511 – protected:
512 –
513 –  virtual void  moveA( void );
514 –  virtual void moveB( void );
515 –
516 –  virtual int readyCheck();
517 –
518 –  virtual void resetIntegrator( void );
519 –
520 –  // chi and eta are the propagated degrees of freedom
521 –
522 –  double chi;
523 –  double eta[3][3];
524 –  double NkBT;
525 –
526 –  // targetTemp, targetPressure, and tauBarostat must be set.  
527 –  // One of qmass or tauThermostat must be set;
528 –
529 –  double targetTemp;
530 –  double targetPressure;
531 –  double tauThermostat;
532 –  double tauBarostat;
533 –
534 –  short int have_tau_thermostat, have_tau_barostat, have_target_temp;
535 –  short int have_target_pressure;
536 –  double chiTolerance;
537 –  short int have_chi_tolerance;
538 –  double posIterTolerance;
539 –  short int have_pos_iter_tolerance;
540 –
541 – };
542 –
543 –
319   template<typename T> class ZConstraint : public T {
320 <  
321 <  public:
320 >
321 >  public:
322    class ForceSubtractionPolicy{
323      public:
324        ForceSubtractionPolicy(ZConstraint<T>* integrator) {zconsIntegrator = integrator;}
325  
326 <      virtual void update() = 0;    
326 >      virtual void update() = 0;
327        virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) = 0;
328        virtual double getZFOfMovingMols(Atom* atom, double totalForce) = 0;
329        virtual double getHFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) = 0;
330        virtual double getHFOfUnconsMols(Atom* atom, double totalForce) = 0;
331 <    
331 >
332     protected:
333 <     ZConstraint<T>* zconsIntegrator;;
333 >     ZConstraint<T>* zconsIntegrator;
334    };
335  
336    class PolicyByNumber : public ForceSubtractionPolicy{
337  
338      public:
339 <      PolicyByNumber(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}    
340 <      virtual void update();    
339 >      PolicyByNumber(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}
340 >      virtual void update();
341        virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) ;
342        virtual double getZFOfMovingMols(Atom* atom, double totalForce) ;
343        virtual double getHFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce);
344        virtual double getHFOfUnconsMols(Atom* atom, double totalForce);
345 <    
345 >
346      private:
347        int totNumOfMovingAtoms;
348    };
# Line 575 | Line 350 | template<typename T> class ZConstraint : public T {
350    class PolicyByMass : public ForceSubtractionPolicy{
351  
352      public:
353 <      PolicyByMass(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}  
354 <      
355 <      virtual void update();    
353 >      PolicyByMass(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}
354 >
355 >      virtual void update();
356        virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) ;
357        virtual double getZFOfMovingMols(Atom* atom, double totalForce) ;
358        virtual double getHFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce);
# Line 591 | Line 366 | template<typename T> class ZConstraint : public T {
366  
367    ZConstraint( SimInfo *theInfo, ForceFields* the_ff);
368    ~ZConstraint();
369 <    
369 >
370    void setZConsTime(double time)                  {this->zconsTime = time;}
371    void getZConsTime()                             {return zconsTime;}
372 <  
372 >
373    void setIndexOfAllZConsMols(vector<int> index) {indexOfAllZConsMols = index;}
374    void getIndexOfAllZConsMols()                  {return indexOfAllZConsMols;}
375 <  
375 >
376    void setZConsOutput(const char * fileName)          {zconsOutput = fileName;}
377    string getZConsOutput()                         {return zconsOutput;}
378 <  
378 >
379    virtual void integrate();
605 –  
380  
381 +
382   #ifdef IS_MPI
383    virtual void update();                      //which is called to indicate the molecules' migration
384   #endif
385  
386 +  enum ZConsState {zcsMoving, zcsFixed};
387 +
388 +  vector<Molecule*> zconsMols;              //z-constraint molecules array
389 +  vector<ZConsState> states;                 //state of z-constraint molecules
390 +
391 +
392 +
393 +  int totNumOfUnconsAtoms;              //total number of uncontraint atoms
394 +  double totalMassOfUncons;                //total mas of unconstraint molecules
395 +
396 +
397   protected:
398  
399 <  enum ZConsState {zcsMoving, zcsFixed};  
400 <
401 <  virtual void calcForce( int calcPot, int calcStress );
399 >
400 >
401 >  virtual void calcForce( int calcPot, int calcStress );
402    virtual void thermalize(void);
403 <  
403 >
404    void zeroOutVel();
405    void doZconstraintForce();
406    void doHarmonic();
# Line 632 | Line 418 | template<typename T> class ZConstraint : public T {
418    double zconsTol;                                 //tolerance of z-contratint
419    double zForceConst;                           //base force constant term
420                                                            //which is estimate by OOPSE
421 <  
422 <  vector<Molecule*> zconsMols;              //z-constraint molecules array
423 <  vector<double> massOfZConsMols;       //mass of z-constraint molecule
421 >
422 >
423 >  vector<double> massOfZConsMols;       //mass of z-constraint molecule
424    vector<double> kz;                              //force constant array
425 <  vector<ZConsState> states;                 //state of z-constraint molecules
425 >
426    vector<double> zPos;                          //
427 <  
428 <  
427 >
428 >
429    vector<Molecule*> unconsMols;           //unconstraint molecules array
430    vector<double> massOfUnconsMols;    //mass array of unconstraint molecules
645 –  double totalMassOfUncons;                //total mas of unconstraint molecules
431  
432 +
433    vector<ZConsParaItem>* parameters; //
434 <  
434 >
435    vector<int> indexOfAllZConsMols;     //index of All Z-Constraint Molecuels
436  
437 <  int* indexOfZConsMols;                   //index of local Z-Constraint Molecules  
437 >  int* indexOfZConsMols;                   //index of local Z-Constraint Molecules
438    double* fz;
439    double* curZPos;
654 –  
655 –  int totNumOfUnconsAtoms;              //total number of uncontraint atoms
440  
441 <  int whichDirection;                           //constraint direction
442 <  
441 >
442 >
443 >  int whichDirection;                           //constraint direction
444 >
445   private:
446 <  
446 >
447    string zconsOutput;                         //filename of zconstraint output
448    ZConsWriter* fzOut;                         //z-constraint writer
449  
450 <  double curZconsTime;                      
450 >  double curZconsTime;
451  
452    double calcMovingMolsCOMVel();
453    double calcSysCOMVel();
454    double calcTotalForce();
455 <  
455 >
456    ForceSubtractionPolicy* forcePolicy; //force subtraction policy
457    friend class ForceSubtractionPolicy;
458  

Diff Legend

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