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 718 by gezelter, Mon Aug 25 21:51:30 2003 UTC vs.
Revision 738 by tim, Tue Sep 2 14:30:12 2003 UTC

# Line 346 | Line 346 | template<typename T> class ZConstraint : public T {
346   template<typename T> class ZConstraint : public T {
347    
348    public:
349 <  class ForceSubstractionPolicy{
349 >  class ForceSubtractionPolicy{
350      public:
351 <      ForceSubstractionPolicy(ZConstraint<T>* integrator) {zconsIntegrator = integrator;}
351 >      ForceSubtractionPolicy(ZConstraint<T>* integrator) {zconsIntegrator = integrator;}
352  
353        virtual void update() = 0;    
354        virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) = 0;
# Line 360 | Line 360 | template<typename T> class ZConstraint : public T {
360       ZConstraint<T>* zconsIntegrator;;
361    };
362  
363 <  class PolicyByNumber : ForceSubstractionPolicy{
363 >  class PolicyByNumber : public ForceSubtractionPolicy{
364      public:
365 <      PolicyByNumber(ZConstraint<T>* integrator) :ForceSubstractionPolicy(integrator) {}    
365 >      PolicyByNumber(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}    
366        virtual void update();    
367        virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) ;
368        virtual double getZFOfMovingMols(Atom* atom, double totalForce) ;
# Line 373 | Line 373 | template<typename T> class ZConstraint : public T {
373      int totNumOfMovingAtoms;
374    };
375  
376 <  class PolicyByMass :ForceSubstractionPolicy{
376 >  class PolicyByMass : public ForceSubtractionPolicy{
377      public:
378 <      PolicyByMass(ZConstraint<T>* integrator) :ForceSubstractionPolicy(integrator) {}  
378 >      PolicyByMass(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}  
379        
380        virtual void update();    
381        virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) ;
# Line 467 | Line 467 | template<typename T> class ZConstraint : public T {
467    double calcSysCOMVel();
468    double calcTotalForce();
469    
470 <  ForceSubstractionPolicy* forcePolicy; //force substration policy
471 <  friend class ForceSubstractionPolicy;
470 >  ForceSubtractionPolicy* forcePolicy; //force substration policy
471 >  friend class ForceSubtractionPolicy;
472  
473   };
474  

Diff Legend

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