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

Comparing trunk/OOPSE/libmdtools/Integrator.cpp (file contents):
Revision 767 by tim, Mon Sep 15 16:52:02 2003 UTC vs.
Revision 768 by mmeineke, Wed Sep 17 14:22:15 2003 UTC

#	Line 254 \| Line 254 \| template<typename T> void Integrator<T>::integrateStep
254
255		moveA();
256
257	<	if (nConstrained){
258	<	constrainA();
259	<	}
257	>
258
259
260		#ifdef IS_MPI
#	Line 279 \| Line 277 \| template<typename T> void Integrator<T>::integrateStep
277
278		moveB();
279
282	–	if (nConstrained){
283	–	constrainB();
284	–	}
280
281	+
282		#ifdef IS_MPI
283		strcpy(checkPointMsg, "Succesful moveB\n");
284		MPIcheckPoint();
#	Line 361 \| Line 357 \| template<typename T> void Integrator<T>::moveA(void){
357		dAtom->setA(A);
358		}
359		}
360	+
361	+	if (nConstrained){
362	+	constrainA();
363	+	}
364		}
365
366
#	Line 402 \| Line 402 \| template<typename T> void Integrator<T>::moveB(void){
402		dAtom->setJ(ji);
403		}
404		}
405	+
406	+	if (nConstrained){
407	+	constrainB();
408	+	}
409		}
410
411		template<typename T> void Integrator<T>::preMove(void){
#	Line 560 \| Line 564 \| template<typename T> void Integrator<T>::constrainA(){
564		painCave.isFatal = 1;
565		simError();
566		}
567	+
568		}
569
570		template<typename T> void Integrator<T>::constrainB(void){
#	Line 756 \| Line 761 \| template<typename T> double Integrator<T>::getConserve
761
762		template<typename T> double Integrator<T>::getConservedQuantity(void){
763		return tStats->getTotalE();
764	<	}
764	>	}

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