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

Comparing branches/development/src/brains/ForceManager.cpp (file contents):
Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC vs.
Revision 1485 by gezelter, Wed Jul 28 19:52:00 2010 UTC

#	Line 57 \| Line 57
57		#include "primitives/Bend.hpp"
58		#include "primitives/Torsion.hpp"
59		#include "primitives/Inversion.hpp"
60	+
61		namespace OpenMD {
62	+
63	+	ForceManager::ForceManager(SimInfo * info) : info_(info),
64	+	NBforcesInitialized_(false) {
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
80		if (!info_->isFortranInitialized()) {

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