ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new_design/OOPSE-3.0/src/integrators/VelocityVerletIntegrator.hpp
(Generate patch)

Comparing branches/new_design/OOPSE-3.0/src/integrators/VelocityVerletIntegrator.hpp (file contents):
Revision 1725 by tim, Wed Nov 10 22:01:06 2004 UTC vs.
Revision 1819 by tim, Wed Dec 1 22:45:49 2004 UTC

# Line 34 | Line 34 | namespace oopse {
34   #ifndef INTEGRATORS_VELOCITYVERLETINTEGRATOR_HPP
35   #define INTEGRATORS_VELOCITYVERLETINTEGRATOR_HPP
36  
37 + #include "integrators/Integrator.hpp"
38 +
39   namespace oopse {
40  
41   /**
# Line 41 | Line 43 | class VelocityVerletIntegrator : Integrator {
43   * @brief  Velocity-Verlet Family Integrator
44   * Template pattern is used in VelocityVerletIntegrator class.
45   */
46 < class VelocityVerletIntegrator : Integrator {
46 > class VelocityVerletIntegrator : public Integrator {
47      public:
48          virtual ~VelocityVerletIntegrator();
49 <        
48 <        virtual void integrate();
49 <        
49 >                
50      protected:
51  
52          VelocityVerletIntegrator(SimInfo* info);
53  
54 <        virtual void integrateStep();
54 >        virtual void doIntegrate();
55 >
56 >        virtual void initialize();
57 >
58 >        virtual void preStep();
59          
60 <        virtual void moveA() = 0;
57 <        
58 <        virtual void moveB() = 0;
60 >        virtual void postStep();
61  
62 <        virtual void thermalize();
62 >        virtual void finalize();
63          
64 <        virtual void calcForce(bool needPotential, bool needStress);
64 >        double dt2;
65  
66 +        double currSample;
67 +        double currStatus;
68 +        double currThermal;
69 +        
70      private:
71          
72 <        void velocitize();
72 >        virtual void integrateStep();
73 >        
74 >        virtual void calcForce(bool needPotential, bool needStress);    
75 >        
76 >        virtual void moveA() = 0;
77 >        
78 >        virtual void moveB() = 0;        
79  
80 +
81 +
82   };
83  
84   } //end namespace oopse
85 < #endif //INTEGRATORS_VELOCITYVERLETINTEGRATOR_HPP
85 > #endif //INTEGRATORS_VELOCITYVERLETINTEGRATOR_HPP

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines