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

Comparing branches/development/src/brains/ForceManager.hpp (file contents):
Revision 1485 by gezelter, Wed Jul 28 19:52:00 2010 UTC vs.
Revision 1544 by gezelter, Fri Mar 18 19:31:52 2011 UTC

#	Line 52 \| Line 52
52
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"
55	>	#include "nonbonded/InteractionManager.hpp"
56	>	#include "parallel/Decomposition.hpp"
57
58		namespace OpenMD {
59		/**
#	Line 95 \| Line 93 \| namespace OpenMD {
93		Mat3x3d tau;
94
95		bool NBforcesInitialized_;
96	<	LJ* lj_;
97	<	GB* gb_;
100	<	Sticky* sticky_;
101	<	EAM* eam_;
96	>	InteractionManager* nbiMan_;
97	>	Decomposition* decomp_;
98
99		};
100

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