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 1721 by tim, Tue Nov 9 01:08:31 2004 UTC vs.
Revision 1756 by tim, Thu Nov 18 23:26:27 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   /**
42   * @class VelocityVerletIntegrator VelocityVerletIntegrator.hpp "integrators/VelocityVerletIntegrator.hpp"
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();
48 >        virtual ~VelocityVerletIntegrator();
49          
50          virtual void integrate();
51          
# Line 50 | Line 53 | class VelocityVerletIntegrator : Integrator {
53  
54          VelocityVerletIntegrator(SimInfo* info);
55  
56 <        virtual void moveA();
56 >    private:
57 >        virtual void integrateStep();
58          
59 <        virtual void moveB();
56 <
57 <        virtual void calcForce(int needPotential, int needStress);
59 >        virtual void thermalize();
60          
61 +        virtual void calcForce(bool needPotential, bool needStress);    
62 +        
63 +        virtual void moveA() = 0;
64 +        
65 +        virtual void moveB() = 0;        
66 +        
67 +
68   };
69  
70   } //end namespace oopse

Diff Legend

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