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 962 by tim, Mon Jan 9 19:11:52 2006 UTC vs.
Revision 963 by tim, Wed May 17 21:51:42 2006 UTC

# Line 57 | Line 57 | namespace oopse {
57      DeclareParameter(DistanceType, std::string);
58      DeclareParameter(EnergyMixingRule, std::string);
59      DeclareParameter(CutoffPolicy, std::string);
60 <    DeclareParameter(EnergyUnitScaling, double);
61 <    DeclareParameter(DistanceUnitScaling, double);
62 <    DeclareParameter(AngleUnitScaling, double);
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      
68    public:
69      ForceFieldOptions();
# Line 87 | Line 87 | namespace oopse {
87            int ival = lexi_cast<int>(value);
88            result = i->second->setData(ival);
89          }      
90 <        else if (isType<double>(value)){
91 <          double dval = lexi_cast<double>(value);
90 >        else if (isType<RealType>(value)){
91 >          RealType dval = lexi_cast<RealType>(value);
92            result = i->second->setData(dval);
93          } else{
94            result = i->second->setData(value);

Diff Legend

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