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 1774 by tim, Tue Nov 23 23:12:23 2004 UTC vs.
Revision 1819 by tim, Wed Dec 1 22:45:49 2004 UTC

# Line 46 | Line 46 | class VelocityVerletIntegrator : public Integrator {
46   class VelocityVerletIntegrator : public Integrator {
47      public:
48          virtual ~VelocityVerletIntegrator();
49 <        
50 <        virtual void integrate();
51 <        
49 >                
50      protected:
51  
52          VelocityVerletIntegrator(SimInfo* info);
53  
54 <    protected:
54 >        virtual void doIntegrate();
55 >
56 >        virtual void initialize();
57 >
58 >        virtual void preStep();
59          
60 <        double dt;
60 >        virtual void postStep();
61 >
62 >        virtual void finalize();
63 >        
64          double dt2;
65 +
66 +        double currSample;
67 +        double currStatus;
68 +        double currThermal;
69          
70      private:
71 +        
72          virtual void integrateStep();
73          
64 –        virtual void thermalize();
65 –        
74          virtual void calcForce(bool needPotential, bool needStress);    
75          
76          virtual void moveA() = 0;
77          
78          virtual void moveB() = 0;        
71 –        
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