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

Comparing branches/development/src/brains/ForceManager.hpp (file contents):
Revision 1548 by gezelter, Sun Apr 10 15:16:39 2011 UTC vs.
Revision 1549 by gezelter, Wed Apr 27 18:38:15 2011 UTC

#	Line 53 \| Line 53
53		#include "brains/SimInfo.hpp"
54		#include "primitives/Molecule.hpp"
55		#include "nonbonded/InteractionManager.hpp"
56	<	#include "parallel/Decomposition.hpp"
56	>	#include "parallel/ForceDecomposition.hpp"
57
58		#define PREPAIR_LOOP 0
59		#define PAIR_LOOP 1
#	Line 94 \| Line 94 \| namespace OpenMD {
94		vector<pair<int, int> > neighborList_;
95
96		InteractionManager* interactionMan_;
97	<	Decomposition* decomp_;
97	>	ForceDecomposition* fDecomp_;
98		SwitchingFunction* swfun_;
99		vector<pair<int, int> > neighborList;
100		map< pair<int, int>, pair<RealType, RealType> > groupCutoffMap;

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