[ViewVC] Diff of: OpenMD/branches/devel_omp/src/io/ForceFieldOptions.cpp

Comparing branches/development/src/io/ForceFieldOptions.cpp (file contents):
Revision 1478 by chuckv, Fri Jul 9 23:08:25 2010 UTC vs.
Revision 1479 by gezelter, Mon Jul 26 19:00:48 2010 UTC

#	Line 63 \| Line 63 \| namespace OpenMD {
63		DefineOptionalParameterWithDefaultValue(electrostatic14scale, "electrostatic-14-scale", 0.0)
64		DefineOptionalParameterWithDefaultValue(GayBerneMu, "GayBerneMu", 2.0);
65		DefineOptionalParameterWithDefaultValue(GayBerneNu, "GayBerneNu", 1.0);
66	+	DefineOptionalParameterWithDefaultValue(EAMMixingMethod, "EAMMixingMethod", "Johnson");
67		}
68
69

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