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 822 by chuckv, Wed Dec 28 21:44:06 2005 UTC vs.
Revision 981 by gezelter, Mon Jun 5 18:24:45 2006 UTC

# Line 56 | Line 56 | namespace oopse {
56      DeclareParameter(DistanceMixingRule, std::string);
57      DeclareParameter(DistanceType, std::string);
58      DeclareParameter(EnergyMixingRule, std::string);
59 <    DeclareParameter(EnergyUnitScaling, double);
60 <    DeclareParameter(DistanceUnitScaling, double);
61 <    DeclareParameter(AngleUnitScaling, double);
59 >    DeclareParameter(CutoffPolicy, std::string);
60 >    DeclareParameter(EnergyUnitScaling, RealType);
61 >    DeclareParameter(DistanceUnitScaling, RealType);
62 >    DeclareParameter(AngleUnitScaling, RealType);
63      DeclareParameter(TorsionAngleConvention, std::string);
64 <    DeclareParameter(vdw14scale, double);
65 <    DeclareParameter(electrostatic14scale, double);
66 <    DeclareParameter(dielectric, double);
64 >    DeclareParameter(vdw14scale, RealType);
65 >    DeclareParameter(electrostatic14scale, RealType);
66 >    DeclareParameter(dielectric, RealType);
67 >    DeclareParameter(GayBerneMu, RealType);
68 >    DeclareParameter(GayBerneNu, RealType);
69      
70    public:
71      ForceFieldOptions();
# Line 71 | Line 74 | namespace oopse {
74      
75      void validateOptions() {
76        CheckParameter(vdWtype, isEqualIgnoreCase(std::string("Lennard-Jones")));
77 <      CheckParameter(DistanceMixingRule, isEqualIgnoreCase(std::string("arithmetic")) || isEqualIgnoreCase(std::string("geometric")));
77 >      CheckParameter(DistanceMixingRule, isEqualIgnoreCase(std::string("arithmetic")) || isEqualIgnoreCase(std::string("geometric")) || isEqualIgnoreCase(std::string("cubic")));
78        CheckParameter(DistanceType, isEqualIgnoreCase(std::string("sigma")) || isEqualIgnoreCase(std::string("Rmin")));
79 <      CheckParameter(EnergyMixingRule, isEqualIgnoreCase(std::string("arithmetic")) || isEqualIgnoreCase(std::string("geometric")));
79 >      CheckParameter(EnergyMixingRule, isEqualIgnoreCase(std::string("arithmetic")) || isEqualIgnoreCase(std::string("geometric")) || isEqualIgnoreCase(std::string("hhg")));
80        CheckParameter(TorsionAngleConvention, isEqualIgnoreCase(std::string("180 is trans")) || isEqualIgnoreCase(std::string("0 is trans")));
81 <    }
81 >      CheckParameter(CutoffPolicy, isEqualIgnoreCase(std::string("MIX")) || isEqualIgnoreCase(std::string("MAX")) || isEqualIgnoreCase(std::string("TRADITIONAL")));
82 >   }
83      
84      bool setData(const std::string& keyword, const std::string& value) {
85        bool result;
86        ParamMap::iterator i =parameters_.find(keyword);
87        if (i != parameters_.end()) {
88 <        if(isType<int>(value)){
88 >        if(isInteger(value)){
89            int ival = lexi_cast<int>(value);
90            result = i->second->setData(ival);
91          }      
92 <        else if (isType<double>(value)){
93 <          double dval = lexi_cast<double>(value);
92 >        else if (isType<RealType>(value)){
93 >          RealType dval = lexi_cast<RealType>(value);
94            result = i->second->setData(dval);
95          } else{
96            result = i->second->setData(value);

Diff Legend

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