[ViewVC] Diff of: OpenMD/branches/devel_omp/src/brains/ForceManager.hpp

Comparing branches/development/src/brains/ForceManager.hpp (file contents):
Revision 1480 by gezelter, Mon Jul 26 19:50:53 2010 UTC vs.
Revision 1503 by gezelter, Sat Oct 2 19:54:41 2010 UTC

#	Line 53 \| Line 53
53		#include "brains/SimInfo.hpp"
54		#include "primitives/Molecule.hpp"
55		#include "nonbonded/LJ.hpp"
56	+	#include "nonbonded/GB.hpp"
57	+	#include "nonbonded/Sticky.hpp"
58		#include "nonbonded/EAM.hpp"
59	+	#include "nonbonded/SC.hpp"
60	+	#include "nonbonded/Morse.hpp"
61	+	#include "nonbonded/Electrostatic.hpp"
62
63		namespace OpenMD {
64		/**
#	Line 94 \| Line 99 \| namespace OpenMD {
99
100		bool NBforcesInitialized_;
101		LJ* lj_;
102	+	GB* gb_;
103	+	Sticky* sticky_;
104		EAM* eam_;
105	+	SC* sc_;
106	+	Morse* morse_;
107	+	Electrostatic* electrostatic_;
108
109		};
110

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