[ViewVC] Diff of: group/trunk/OOPSE/libmdtools/Integrator.hpp

Comparing trunk/OOPSE/libmdtools/Integrator.hpp (file contents):
Revision 1108 by tim, Wed Apr 14 15:37:41 2004 UTC vs.
Revision 1180 by chrisfen, Thu May 20 20:24:07 2004 UTC

#	Line 13 \| Line 13
13		#include "Thermo.hpp"
14		#include "ReadWrite.hpp"
15		#include "ZConsWriter.hpp"
16	+	#include "Restraints.hpp"
17
18		using namespace std;
19		const double kB = 8.31451e-7;// boltzmann constant amuAng^2fs^-2/K
#	Line 83 \| Line 84 \| template<typename T = BaseIntegrator> class Integrator
84		StatWriter* statOut;
85		DumpWriter* dumpOut;
86
87	+	int i; // just an int
88		};
89
90		typedef Integrator<BaseIntegrator> RealIntegrator;
91	+
92	+	// ansi instantiation
93	+	template class Integrator<BaseIntegrator>;
94
95		template<typename T> class NVE : public T {
96
#	Line 457 \| Line 462 \| template<typename T> class ZConstraint : public T { (p
462		vector<double> curZPos;
463
464		bool usingSMD;
465	+	vector<double> prevCantPos;
466		vector<double> cantPos;
467		vector<double> cantVel;
468

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