ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/io/ForceFieldOptions.cpp
(Generate patch)

Comparing trunk/src/io/ForceFieldOptions.cpp (file contents):
Revision 834 by chuckv, Fri Dec 30 23:15:59 2005 UTC vs.
Revision 1150 by chuckv, Fri Jul 6 18:14:35 2007 UTC

# Line 51 | Line 51 | namespace oopse {
51        DefineOptionalParameterWithDefaultValue(DistanceType, "DistanceType", "sigma");
52        DefineOptionalParameterWithDefaultValue(EnergyMixingRule, "EnergyMixingRule", "geometric");
53        DefineOptionalParameterWithDefaultValue(EnergyUnitScaling, "EnergyUnitScaling", 1.0);
54 +      DefineOptionalParameterWithDefaultValue(MetallicEnergyUnitScaling, "MetallicEnergyUnitScaling", 1.0);
55        DefineOptionalParameterWithDefaultValue(DistanceUnitScaling, "DistanceUnitScaling", 1.0);
56        DefineOptionalParameterWithDefaultValue(AngleUnitScaling, "AngleUnitScaling", 1.0);
57 <      DefineOptionalParameterWithDefaultValue(TorsionAngleConvention, "TorsionAngleConvention", "180 is trans");
57 >      DefineOptionalParameterWithDefaultValue(TorsionAngleConvention, "TorsionAngleConvention", "180_is_trans");
58        DefineOptionalParameterWithDefaultValue(vdw14scale, "vdW-14-scale", 0.0);
59 <      DefineOptionalParameterWithDefaultValue(electrostatic14scale, "electrostatic-14-scale", 0.0);
60 <      DefineOptionalParameterWithDefaultValue(dielectric, "dielectric", 1.0);
59 >      DefineOptionalParameterWithDefaultValue(electrostatic14scale, "electrostatic-14-scale", 0.0)
60 >      DefineOptionalParameterWithDefaultValue(GayBerneMu, "GayBerneMu", 2.0);
61 >      DefineOptionalParameterWithDefaultValue(GayBerneNu, "GayBerneNu", 1.0);
62      }
63  
64  
# Line 64 | Line 66 | namespace oopse {
66      
67      fortranForceOptions.vdw14scale = this->getvdw14scale();
68      fortranForceOptions.electrostatic14scale = this->getelectrostatic14scale();
69 +    fortranForceOptions.GayBerneMu = this->getGayBerneMu();
70 +    fortranForceOptions.GayBerneNu = this->getGayBerneNu();
71  
72 +
73      std::string DistanceMix = this->getDistanceMixingRule();
74      toUpper(DistanceMix);
75      if(DistanceMix == "ARITHMETIC"){
76        fortranForceOptions.DistanceMixingRule = ARITHMETIC_MIXING_RULE;
77      }else if(DistanceMix == "GEOMETRIC"){
78        fortranForceOptions.DistanceMixingRule = GEOMETRIC_MIXING_RULE;
79 +    }else if(DistanceMix == "CUBIC"){
80 +      fortranForceOptions.DistanceMixingRule = CUBIC_MIXING_RULE;
81      }else{
82        fortranForceOptions.DistanceMixingRule = ARITHMETIC_MIXING_RULE;
83      }
# Line 80 | Line 87 | namespace oopse {
87        fortranForceOptions.EnergyMixingRule = ARITHMETIC_MIXING_RULE;
88      }else if(EnergyMix == "GEOMETRIC"){
89        fortranForceOptions.EnergyMixingRule = GEOMETRIC_MIXING_RULE;
90 +    }else if(EnergyMix == "HHG"){
91 +      fortranForceOptions.EnergyMixingRule = HHG_MIXING_RULE;
92      }else{
93        fortranForceOptions.EnergyMixingRule = GEOMETRIC_MIXING_RULE;
94      }

Diff Legend

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