[ViewVC] Diff of: OpenMD/branches/development/src/nonbonded/SC.hpp

Comparing branches/development/src/nonbonded/SC.hpp (file contents):
Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC vs.
Revision 1710 by gezelter, Fri May 18 21:44:02 2012 UTC

#	Line 46 \| Line 46
46		#include "nonbonded/NonBondedInteraction.hpp"
47		#include "UseTheForce/ForceField.hpp"
48		#include "math/CubicSpline.hpp"
49	+	#include "types/SuttonChenAdapter.hpp"
50
51		namespace OpenMD {
52
#	Line 85 \| Line 86 \| namespace OpenMD {
86
87		private:
88		void initialize();
88	–	SCParam getSCParam(AtomType* atomType);
89	–	RealType getC(AtomType* atomType);
90	–	RealType getM(AtomType* atomType);
91	–	RealType getN(AtomType* atomType);
92	–	RealType getAlpha(AtomType* atomType);
93	–	RealType getEpsilon(AtomType* atomType);
89		RealType getAlpha(AtomType* atomType1, AtomType* atomType2);
90		RealType getEpsilon(AtomType* atomType1, AtomType* atomType2);
91		RealType getM(AtomType* atomType1, AtomType* atomType2);

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