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 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC vs.
Revision 2057 by gezelter, Tue Mar 3 15:22:26 2015 UTC

# Line 56 | Line 56 | namespace OpenMD {
56      DeclareParameter(DistanceMixingRule, std::string);
57      DeclareParameter(DistanceType, std::string);
58      DeclareParameter(EnergyMixingRule, std::string);
59 –    DeclareParameter(CutoffPolicy, std::string);
59      DeclareParameter(EnergyUnitScaling, RealType);
60      DeclareParameter(MetallicEnergyUnitScaling, RealType);
61      DeclareParameter(DistanceUnitScaling, RealType);
# Line 83 | Line 82 | namespace OpenMD {
82        CheckParameter(DistanceType, isEqualIgnoreCase(std::string("sigma")) || isEqualIgnoreCase(std::string("Rmin")));
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")));
86 –      CheckParameter(CutoffPolicy, isEqualIgnoreCase(std::string("MIX")) || isEqualIgnoreCase(std::string("MAX")) || isEqualIgnoreCase(std::string("TRADITIONAL")));
85        CheckParameter(EAMMixingMethod, isEqualIgnoreCase(std::string("JOHNSON")) || isEqualIgnoreCase(std::string("DAW")));
86     }
87      

Diff Legend

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