ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/branches/devel_omp/src/io/ForceFieldOptions.cpp

Comparing:
trunk/src/io/ForceFieldOptions.cpp (file contents), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/io/ForceFieldOptions.cpp (file contents), Revision 1480 by gezelter, Mon Jul 26 19:50:53 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
#	Line 100 | Line 101 | namespace OpenMD {
101		}else{
102		fortranForceOptions.EnergyMixingRule = GEOMETRIC_MIXING_RULE;
103		}
103	–
104	–
104		}
105
106		}

Comparing:
trunk/src/io/ForceFieldOptions.cpp (property svn:keywords), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/io/ForceFieldOptions.cpp (property svn:keywords), Revision 1480 by gezelter, Mon Jul 26 19:50:53 2010 UTC

#	Line 0 | Line 1
1	+	Author Id Revision Date

Diff Legend

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