ViewVC Help

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

root/OpenMD/branches/development/src/io/ForceFieldOptions.hpp

Comparing:
trunk/src/io/ForceFieldOptions.hpp (file contents), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/io/ForceFieldOptions.hpp (file contents), Revision 1479 by gezelter, Mon Jul 26 19:00:48 2010 UTC

#	Line 70 | Line 70 | namespace OpenMD {
70		DeclareParameter(electrostatic14scale, RealType);
71		DeclareParameter(GayBerneMu, RealType);
72		DeclareParameter(GayBerneNu, RealType);
73	+	DeclareParameter(EAMMixingMethod, std::string);
74
75		public:
76		ForceFieldOptions();
#	Line 83 | Line 84 | namespace OpenMD {
84		CheckParameter(EnergyMixingRule, isEqualIgnoreCase(std::string("arithmetic")) || isEqualIgnoreCase(std::string("geometric")) || isEqualIgnoreCase(std::string("hhg")));
85		CheckParameter(TorsionAngleConvention, isEqualIgnoreCase(std::string("180 is trans")) || isEqualIgnoreCase(std::string("0 is trans")));
86		CheckParameter(CutoffPolicy, isEqualIgnoreCase(std::string("MIX")) || isEqualIgnoreCase(std::string("MAX")) || isEqualIgnoreCase(std::string("TRADITIONAL")));
87	+	CheckParameter(EAMMixingMethod, isEqualIgnoreCase(std::string("JOHNSON")) || isEqualIgnoreCase(std::string("DAW")));
88		}
89
90		bool setData(const std::string& keyword, const std::string& value) {

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

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

Diff Legend

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