[ViewVC] Diff of: OpenMD/branches/development/src/parallel/ForceDecomposition.hpp

Comparing branches/development/src/parallel/ForceDecomposition.hpp (file contents):
Revision 1760 by gezelter, Thu Jun 21 19:26:46 2012 UTC vs.
Revision 1850 by gezelter, Wed Feb 20 15:39:39 2013 UTC

#	Line 35 \| Line 35
35		*
36		* [1] Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).
37		* [2] Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).
38	<	* [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).
38	>	* [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).
39		* [4] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010).
40		* [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41		*/
#	Line 109 \| Line 109 \| namespace OpenMD {
109		virtual potVec* getEmbeddingPotential() { return &embeddingPot; }
110		virtual potVec* getPairwisePotential() { return &pairwisePot; }
111		virtual potVec* getExcludedPotential() { return &excludedPot; }
112	+	virtual potVec* getExcludedSelfPotential() { return &excludedSelfPot; }
113
114		// neighbor list routines
115		virtual bool checkNeighborList();
#	Line 170 \| Line 171 \| namespace OpenMD {
171		potVec pairwisePot;
172		potVec embeddingPot;
173		potVec excludedPot;
174	+	potVec excludedSelfPot;
175
176		/**
177		* The topological distance between two atomic sites is handled

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