[ViewVC] Diff of: group/branches/new_design/OOPSE-2.0/src/integrators/NVE.cpp

Comparing branches/new_design/OOPSE-2.0/src/integrators/NVE.cpp (file contents):
Revision 1756 by tim, Thu Nov 18 23:26:27 2004 UTC vs.
Revision 1765 by tim, Mon Nov 22 20:55:52 2004 UTC

#	Line 34 \| Line 34 \| namespace oopse {
34		#include "integrators/NVE.hpp"
35		namespace oopse {
36
37	+	Integrator* createNVE(SimInfo* info) {
38	+	return new NVE(info);
39	+	}
40	+
41		//register the creator to IntegratorFactory
42	<	REGISTER_CREATOR(IntegratorFactory, "NVE", NVE);
42	>	IntegratorFactory::getInstance()->registerIntegrator("NVE", createNVE);
43
44		NVE::NVE(SimInfo* info) : VelocityVerletIntegrator(info){
45
#	Line 43 \| Line 47 \| void NVE::moveA(){
47
48		void NVE::moveA(){
49		typename SimInfo::MoleculeIterator i;
50	<	std::vector<StuntDouble*>::iterator j;
50	>	typename Molecule::IntegrableObjectIterator j;
51		Molecule* mol;
52		StuntDouble* integrableObject;
53		Vector3d vel;
#	Line 92 \| Line 96 \| void NVE::moveA(){
96		}
97		} //end for(mol = info_->beginMolecule(i))
98
99	<	constraintAlgorithm->doConstrainA();
99	>	//constraintAlgorithm->doConstrainA();
100
101		}
102
103		void NVE::moveB(){
104		typename SimInfo::MoleculeIterator i;
105	<	std::vector<StuntDouble*>::iterator j;
105	>	typename Molecule::IntegrableObjectIterator j;
106		Molecule* mol;
107		StuntDouble* integrableObject;
108		Vector3d vel;
#	Line 140 \| Line 144 \| void NVE::moveB(){
144		} //end for(mol = info_->beginMolecule(i))
145
146
147	<	constraintAlgorithm->doConstrainB();
147	>	//constraintAlgorithm->doConstrainB();
148
149		}
150

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