[ViewVC] Diff of: OpenMD/trunk/src/parallel/ForceMatrixDecomposition.hpp

Comparing branches/development/src/parallel/ForceMatrixDecomposition.hpp (file contents):
Revision 1579 by gezelter, Thu Jun 9 20:26:29 2011 UTC vs.
Revision 1581 by gezelter, Mon Jun 13 22:13:12 2011 UTC

#	Line 91 \| Line 91 \| namespace OpenMD {
91		void addForceToAtomColumn(int atom2, Vector3d fg);
92
93		// filling interaction blocks with pointers
94	<	InteractionData fillInteractionData(int atom1, int atom2);
94	>	void fillInteractionData(InteractionData idat, int atom1, int atom2);
95		void unpackInteractionData(InteractionData idat, int atom1, int atom2);
96	<	InteractionData fillSkipData(int atom1, int atom2);
96	>	void fillSkipData(InteractionData idat, int atom1, int atom2);
97
98		private:
99		void createGtypeCutoffMap();
#	Line 103 \| Line 103 \| namespace OpenMD {
103		vector<int> identsLocal;
104		vector<int> AtomLocalToGlobal;
105		vector<int> cgLocalToGlobal;
106	–	vector<RealType> massFactorsLocal;
106		vector<RealType> groupCutoff;
107		vector<int> groupToGtype;
108

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