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 788 by gezelter, Mon Dec 5 22:23:57 2005 UTC vs.
Revision 822 by chuckv, Wed Dec 28 21:44:06 2005 UTC

# Line 45 | Line 45
45   #include "utils/ParameterManager.hpp"
46   #include "utils/StringUtils.hpp"
47   #include "io/ParamConstraint.hpp"
48 + #define __C
49 + #include "UseTheForce/fForceOptions.h"
50  
51   namespace oopse {
52    
# Line 63 | Line 65 | namespace oopse {
65      DeclareParameter(dielectric, double);
66      
67    public:
68 <    ForceFieldOptions() {
67 <      DefineOptionalParameter(Name, "Name");
68 <      DefineOptionalParameterWithDefaultValue(vdWtype, "vdWtype", "Lennard-Jones");
69 <      DefineOptionalParameterWithDefaultValue(DistanceMixingRule, "DistanceMixingRule", "arithmetic");
70 <      DefineOptionalParameterWithDefaultValue(DistanceType, "DistanceType", "sigma");
71 <      DefineOptionalParameterWithDefaultValue(EnergyMixingRule, "EnergyMixingRule", "geometric");
72 <      DefineOptionalParameterWithDefaultValue(EnergyUnitScaling, "EnergyUnitScaling", 1.0);
73 <      DefineOptionalParameterWithDefaultValue(DistanceUnitScaling, "DistanceUnitScaling", 1.0);
74 <      DefineOptionalParameterWithDefaultValue(AngleUnitScaling, "AngleUnitScaling", 1.0);
75 <      DefineOptionalParameterWithDefaultValue(TorsionAngleConvention, "TorsionAngleConvention", "180 is trans");
76 <      DefineOptionalParameterWithDefaultValue(vdw14scale, "vdW-14-scale", 0.0);
77 <      DefineOptionalParameterWithDefaultValue(electrostatic14scale, "electrostatic-14-scale", 0.0);
78 <      DefineOptionalParameterWithDefaultValue(dielectric, "dielectric", 1.0);
79 <    }
80 <        
68 >    ForceFieldOptions();
69      ForceFieldOptions(const ForceFieldOptions&);
70      ForceFieldOptions& operator = (const ForceFieldOptions&);
71      
# Line 111 | Line 99 | namespace oopse {
99        
100        return result;
101      }
102 <    
102 >
103 >    void makeFortranOptions(ForceOptions & fortranForceOptions);
104    private:
105      typedef std::map<std::string, ParameterBase*> ParamMap;
106      ParamMap parameters_;                  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines