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

Comparing branches/development/src/io/ForceFieldOptions.cpp (file contents):
Revision 1479 by gezelter, Mon Jul 26 19:00:48 2010 UTC vs.
Revision 1528 by gezelter, Fri Dec 17 20:11:05 2010 UTC

#	Line 45 \| Line 45 \| namespace OpenMD {
45
46		ForceFieldOptions::ForceFieldOptions() {
47		DefineOptionalParameter(Name, "Name");
48	–	DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
48		DefineOptionalParameterWithDefaultValue(vdWtype, "vdWtype", "Lennard-Jones");
49		DefineOptionalParameterWithDefaultValue(DistanceMixingRule, "DistanceMixingRule", "arithmetic");
50		DefineOptionalParameterWithDefaultValue(DistanceType, "DistanceType", "sigma");
#	Line 64 \| Line 63 \| namespace OpenMD {
63		DefineOptionalParameterWithDefaultValue(GayBerneMu, "GayBerneMu", 2.0);
64		DefineOptionalParameterWithDefaultValue(GayBerneNu, "GayBerneNu", 1.0);
65		DefineOptionalParameterWithDefaultValue(EAMMixingMethod, "EAMMixingMethod", "Johnson");
66	+
67	+	deprecatedKeywords_.insert("cutoffPolicy");
68		}
69
70
#	Line 101 \| Line 102 \| namespace OpenMD {
102		}else{
103		fortranForceOptions.EnergyMixingRule = GEOMETRIC_MIXING_RULE;
104		}
104	–
105	–
105		}
106
107		}

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