[ViewVC] Diff of: group/branches/new_design/OOPSE-3.0/src/integrators/VelocityVerletIntegrator.hpp

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 1822 by tim, Thu Dec 2 02:08:29 2004 UTC

#	Line 35 \| Line 35
35		#define INTEGRATORS_VELOCITYVERLETINTEGRATOR_HPP
36
37		#include "integrators/Integrator.hpp"
38	+	#include "integrators/RotationAlgorithm.hpp"
39
40		namespace oopse {
41
#	Line 46 \| Line 47 \| class VelocityVerletIntegrator : public Integrator {
47		class VelocityVerletIntegrator : public Integrator {
48		public:
49		virtual ~VelocityVerletIntegrator();
50	+
51	+	void setRotationAlgorithm(RotationAlgorithm* algo) {
52	+	if (algo != rotAlgo && rotAlgo != NULL){
53	+	delete rotAlgo;
54	+	}
55	+
56	+	rotAlgo = algo;
57	+	}
58
50	–	virtual void integrate();
51	–
59		protected:
60
61		VelocityVerletIntegrator(SimInfo* info);
62
63	<	protected:
63	>	virtual void doIntegrate();
64	>
65	>	virtual void initialize();
66	>
67	>	virtual void preStep();
68
69	<	double dt;
69	>	virtual void integrateStep();
70	>
71	>	virtual void postStep();
72	>
73	>	virtual void finalize();
74	>
75	>	RotationAlgorithm* rotAlgo;
76	>
77		double dt2;
78	+
79	+	double currSample;
80	+	double currStatus;
81	+	double currThermal;
82
83		private:
62	–	virtual void integrateStep();
84
64	–	virtual void thermalize();
65	–
85		virtual void calcForce(bool needPotential, bool needStress);
86
87		virtual void moveA() = 0;
88
89		virtual void moveB() = 0;
90	+
91	+	virtual DumpWriter* createDumpWriter();
92
93	+	virtual StatWriter* createStatWriter();
94
95		};
96
97		} //end namespace oopse
98	<	#endif //INTEGRATORS_VELOCITYVERLETINTEGRATOR_HPP
98	>	#endif //INTEGRATORS_VELOCITYVERLETINTEGRATOR_HPP

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