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

Comparing branches/development/src/brains/ForceManager.cpp (file contents):
Revision 1469 by gezelter, Mon Jul 19 14:07:59 2010 UTC vs.
Revision 1485 by gezelter, Wed Jul 28 19:52:00 2010 UTC

#	Line 62 \| Line 62 \| namespace OpenMD {
62
63		ForceManager::ForceManager(SimInfo * info) : info_(info),
64		NBforcesInitialized_(false) {
65	<	std::cerr << __PRETTY_FUNCTION__ << "\n";
66	<	lj_ = new LJ(info_->getForceField());
65	>	lj_ = LJ::Instance();
66	>	lj_->setForceField(info_->getForceField());
67	>
68	>	gb_ = GB::Instance();
69	>	gb_->setForceField(info_->getForceField());
70	>
71	>	sticky_ = Sticky::Instance();
72	>	sticky_->setForceField(info_->getForceField());
73	>
74	>	eam_ = EAM::Instance();
75	>	eam_->setForceField(info_->getForceField());
76		}
77
78		void ForceManager::calcForces() {
79
71	–	std::cerr << __PRETTY_FUNCTION__ << "\n";
80		if (!info_->isFortranInitialized()) {
81		info_->update();
82		}
83
76	–	if (!NBforcesInitialized_) {
77	–	lj_->initialize();
78	–	}
79	–
84		preCalculation();
85
86		calcShortRangeInteraction();

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