[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 1765 by tim, Mon Nov 22 20:55:52 2004 UTC vs.
Revision 1774 by tim, Tue Nov 23 23:12:23 2004 UTC

#	Line 67 \| Line 67 \| void NVE::moveA(){
67		mass = integrableObject->getMass();
68
69		// velocity half step
70	<	vel += (halfStep /mass * UnitConstant::eConvert) * frc;
70	>	vel += (dt2 /mass * UnitConstant::eConvert) * frc;
71
72		// position whole step
73	<	pos += fullStep * vel;
73	>	pos += dt * vel;
74
75		integrableObject->setVel(vel);
76		integrableObject->setPos(pos);
#	Line 85 \| Line 85 \| void NVE::moveA(){
85
86		ji = integrableObject->getJ();
87
88	<	ji += (halfStep * UnitConstant::eConvert) * Tb;
88	>	ji += (dt2 * UnitConstant::eConvert) * Tb;
89
90		this->rotationPropagation( integrableObject, ji );
91
#	Line 120 \| Line 120 \| void NVE::moveB(){
120		mass = integrableObject->getMass();
121
122		// velocity half step
123	<	vel += (halfStep /mass * UnitConstant::eConvert) * frc;
123	>	vel += (dt2 /mass * UnitConstant::eConvert) * frc;
124
125		integrableObject->setVel(vel);
126
#	Line 134 \| Line 134 \| void NVE::moveB(){
134
135		ji = integrableObject->getJ();
136
137	<	ji += (halfStep * UnitConstant::eConvert) * Tb;
137	>	ji += (dt2 * UnitConstant::eConvert) * Tb;
138
139		integrableObject->setJ(ji);
140		}
#	Line 149 \| Line 149 \| void NVE::calcConservedQuantity() {
149		}
150
151
152	<	void NVE::calcConservedQuantity() {
152	>	double NVE::calcConservedQuantity() {
153
154		}
155

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