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

Comparing branches/development/src/brains/ForceManager.hpp (file contents):
Revision 1576 by gezelter, Wed Jun 8 16:05:07 2011 UTC vs.
Revision 1711 by gezelter, Sat May 19 02:58:35 2012 UTC

#	Line 36 \| Line 36
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).
39	<	* [4] Vardeman & Gezelter, in progress (2009).
39	>	* [4] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010).
40	>	* [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41		*/
42
43		/**
#	Line 81 \| Line 82 \| namespace OpenMD {
82
83		protected:
84		bool initialized_;
85	+	bool doParticlePot_;
86
87		virtual void setupCutoffs();
86	–	virtual void setupSwitching();
88		virtual void preCalculation();
89		virtual void shortRangeInteractions();
90		virtual void longRangeInteractions();

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