ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/io/ForceFieldOptions.hpp
(Generate patch)

Comparing trunk/src/io/ForceFieldOptions.hpp (file contents):
Revision 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
Revision 1287 by gezelter, Wed Sep 10 18:11:32 2008 UTC

# Line 58 | Line 58 | namespace oopse {
58      DeclareParameter(EnergyMixingRule, std::string);
59      DeclareParameter(CutoffPolicy, std::string);
60      DeclareParameter(EnergyUnitScaling, RealType);
61 +    DeclareParameter(MetallicEnergyUnitScaling, RealType);
62      DeclareParameter(DistanceUnitScaling, RealType);
63      DeclareParameter(AngleUnitScaling, RealType);
64      DeclareParameter(TorsionAngleConvention, std::string);
65 +    DeclareParameter(vdw12scale, RealType);
66 +    DeclareParameter(vdw13scale, RealType);
67      DeclareParameter(vdw14scale, RealType);
68 +    DeclareParameter(electrostatic12scale, RealType);
69 +    DeclareParameter(electrostatic13scale, RealType);
70      DeclareParameter(electrostatic14scale, RealType);
71 <    DeclareParameter(dielectric, RealType);
71 >    DeclareParameter(GayBerneMu, RealType);
72 >    DeclareParameter(GayBerneNu, RealType);
73      
74    public:
75      ForceFieldOptions();
# Line 72 | Line 78 | namespace oopse {
78      
79      void validateOptions() {
80        CheckParameter(vdWtype, isEqualIgnoreCase(std::string("Lennard-Jones")));
81 <      CheckParameter(DistanceMixingRule, isEqualIgnoreCase(std::string("arithmetic")) || isEqualIgnoreCase(std::string("geometric")));
81 >      CheckParameter(DistanceMixingRule, isEqualIgnoreCase(std::string("arithmetic")) || isEqualIgnoreCase(std::string("geometric")) || isEqualIgnoreCase(std::string("cubic")));
82        CheckParameter(DistanceType, isEqualIgnoreCase(std::string("sigma")) || isEqualIgnoreCase(std::string("Rmin")));
83 <      CheckParameter(EnergyMixingRule, isEqualIgnoreCase(std::string("arithmetic")) || isEqualIgnoreCase(std::string("geometric")));
83 >      CheckParameter(EnergyMixingRule, isEqualIgnoreCase(std::string("arithmetic")) || isEqualIgnoreCase(std::string("geometric")) || isEqualIgnoreCase(std::string("hhg")));
84        CheckParameter(TorsionAngleConvention, isEqualIgnoreCase(std::string("180 is trans")) || isEqualIgnoreCase(std::string("0 is trans")));
85        CheckParameter(CutoffPolicy, isEqualIgnoreCase(std::string("MIX")) || isEqualIgnoreCase(std::string("MAX")) || isEqualIgnoreCase(std::string("TRADITIONAL")));
86     }

Diff Legend

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