[ViewVC] Diff of: OpenMD/branches/development/src/brains/ForceManager.cpp

Comparing branches/development/src/brains/ForceManager.cpp (file contents):
Revision 1570 by gezelter, Thu May 26 21:56:04 2011 UTC vs.
Revision 1571 by gezelter, Fri May 27 16:45:44 2011 UTC

#	Line 63 \| Line 63 \| namespace OpenMD {
63
64		ForceManager::ForceManager(SimInfo * info) : info_(info) {
65
66	–	#ifdef IS_MPI
66		fDecomp_ = new ForceMatrixDecomposition(info_);
68	–	#else
69	–	// fDecomp_ = new ForceSerialDecomposition(info);
70	–	#endif
67		}
68
69		void ForceManager::calcForces() {
#	Line 77 \| Line 73 \| namespace OpenMD {
73		interactionMan_->setSimInfo(info_);
74		interactionMan_->initialize();
75		swfun_ = interactionMan_->getSwitchingFunction();
80	–	fDecomp_->distributeInitialData();
76		info_->prepareTopology();
77	+	fDecomp_->distributeInitialData();
78		}
79
80		preCalculation();

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