[ViewVC] Diff of: OpenMD/branches/development/src/integrators/Integrator.hpp

Comparing trunk/src/integrators/Integrator.hpp (file contents):
Revision 1329 by gezelter, Sat Mar 14 01:23:53 2009 UTC vs.
Revision 1360 by cli2, Mon Sep 7 16:31:51 2009 UTC

#	Line 54 \| Line 54
54		#include "restraints/ThermoIntegrationForceManager.hpp"
55		#include "io/DumpWriter.hpp"
56		#include "io/StatWriter.hpp"
57	–	#include "io/RestWriter.hpp"
57		#include "integrators/Velocitizer.hpp"
58		#include "integrators/RNEMD.hpp"
59
#	Line 81 \| Line 80 \| namespace oopse {
80		}
81
82		void setForceManager(ForceManager* forceMan) {
83	+
84		if (forceMan_ != forceMan && forceMan_ != NULL) {
85		delete forceMan_;
86		}
#	Line 128 \| Line 128 \| namespace oopse {
128
129		DumpWriter* dumpWriter;
130		StatWriter* statWriter;
131	–	RestWriter* restWriter;
131		Thermo thermo;
132
133		RealType runTime;

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