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

Comparing branches/development/src/integrators/Integrator.cpp (file contents):
Revision 1737 by jmichalk, Tue Jun 5 17:54:42 2012 UTC vs.
Revision 1755 by gezelter, Thu Jun 14 01:58:35 2012 UTC

#	Line 104 \| Line 104 \| namespace OpenMD {
104
105		// Create a default ForceManager: If the subclass wants to use
106		// a different ForceManager, use setForceManager
107	–
107		forceMan_ = new ForceManager(info);
108
109		// check for the temperature set flag (velocity scaling)
#	Line 140 \| Line 139 \| namespace OpenMD {
139
140		rotAlgo_ = new DLM();
141		rattle_ = new Rattle(info);
142	<	forceMan_->initialize();
143	<	flucQ_ = new FluctuatingChargeNVT(info);
142	>	//forceMan_->initialize();
143	>	flucQ_ = new FluctuatingChargeNVT(info, forceMan_);
144		}
145
146		Integrator::~Integrator(){

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