[ViewVC] Diff of: OpenMD/trunk/src/nonbonded/InteractionManager.hpp

Comparing trunk/src/nonbonded/InteractionManager.hpp (file contents):
Revision 1925 by gezelter, Wed Aug 7 15:24:16 2013 UTC vs.
Revision 1969 by gezelter, Wed Feb 26 14:14:50 2014 UTC

#	Line 55 \| Line 55
55		#include "nonbonded/MAW.hpp"
56		#include "nonbonded/RepulsivePower.hpp"
57		#include "nonbonded/SwitchingFunction.hpp"
58	+	#include "flucq/FluctuatingChargeForces.hpp"
59
60		using namespace std;
61
#	Line 100 \| Line 101 \| namespace OpenMD {
101		Electrostatic* electrostatic_;
102		RepulsivePower* repulsivePower_;
103		MAW* maw_;
104	+	FluctuatingChargeForces* flucq_;
105
106		map<int, AtomType*> typeMap_;
107		/**
#	Line 118 \| Line 120 \| namespace OpenMD {
120		*/
121		vector<vector<set<NonBondedInteraction*> > > interactions_;
122		vector<vector<int> > iHash_;
123	+
124	+	/* sHash_ contains the self-interaction version of iHash_ */
125	+	vector<int> sHash_;
126		};
127		}
128		#endif

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