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 1293 by chuckv, Sun Sep 14 01:32:26 2008 UTC

# Line 45 | Line 45
45   #include "utils/ParameterManager.hpp"
46   #include "utils/StringUtils.hpp"
47   #include "io/ParamConstraint.hpp"
48 < #define __C
48 > #define __OOPSE_C
49   #include "UseTheForce/fForceOptions.h"
50  
51   namespace oopse {
# 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(MetallicEnergyUnitScaling, RealType);
62 >    DeclareParameter(DistanceUnitScaling, RealType);
63 >    DeclareParameter(AngleUnitScaling, RealType);
64      DeclareParameter(TorsionAngleConvention, std::string);
65 <    DeclareParameter(vdw14scale, double);
66 <    DeclareParameter(electrostatic14scale, double);
67 <    DeclareParameter(dielectric, double);
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(GayBerneMu, RealType);
72 >    DeclareParameter(GayBerneNu, RealType);
73      
74    public:
75      ForceFieldOptions();
# Line 71 | 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 <    }
85 >      CheckParameter(CutoffPolicy, isEqualIgnoreCase(std::string("MIX")) || isEqualIgnoreCase(std::string("MAX")) || isEqualIgnoreCase(std::string("TRADITIONAL")));
86 >   }
87      
88      bool setData(const std::string& keyword, const std::string& value) {
89        bool result;
90        ParamMap::iterator i =parameters_.find(keyword);
91        if (i != parameters_.end()) {
92 <        if(isType<int>(value)){
92 >        if(isInteger(value)){
93            int ival = lexi_cast<int>(value);
94            result = i->second->setData(ival);
95          }      
96 <        else if (isType<double>(value)){
97 <          double dval = lexi_cast<double>(value);
96 >        else if (isType<RealType>(value)){
97 >          RealType dval = lexi_cast<RealType>(value);
98            result = i->second->setData(dval);
99          } else{
100            result = i->second->setData(value);

Diff Legend

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