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

Comparing branches/development/src/io/ForceFieldOptions.cpp (file contents):
Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC vs.
Revision 1530 by gezelter, Tue Dec 28 21:47:55 2010 UTC

# Line 45 | Line 45 | namespace OpenMD {
45  
46      ForceFieldOptions::ForceFieldOptions() {
47        DefineOptionalParameter(Name, "Name");
48      DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
48        DefineOptionalParameterWithDefaultValue(vdWtype, "vdWtype", "Lennard-Jones");
49        DefineOptionalParameterWithDefaultValue(DistanceMixingRule, "DistanceMixingRule", "arithmetic");
50        DefineOptionalParameterWithDefaultValue(DistanceType, "DistanceType", "sigma");
# Line 63 | Line 62 | namespace OpenMD {
62        DefineOptionalParameterWithDefaultValue(electrostatic14scale, "electrostatic-14-scale", 0.0)
63        DefineOptionalParameterWithDefaultValue(GayBerneMu, "GayBerneMu", 2.0);
64        DefineOptionalParameterWithDefaultValue(GayBerneNu, "GayBerneNu", 1.0);
65 <    }
65 >      DefineOptionalParameterWithDefaultValue(EAMMixingMethod, "EAMMixingMethod", "Johnson");
66  
67 <
69 <  void ForceFieldOptions::makeFortranOptions(ForceOptions& fortranForceOptions){
70 <    
71 <    fortranForceOptions.vdw12scale = this->getvdw12scale();
72 <    fortranForceOptions.vdw13scale = this->getvdw13scale();
73 <    fortranForceOptions.vdw14scale = this->getvdw14scale();
74 <    fortranForceOptions.electrostatic12scale = this->getelectrostatic12scale();
75 <    fortranForceOptions.electrostatic13scale = this->getelectrostatic13scale();
76 <    fortranForceOptions.electrostatic14scale = this->getelectrostatic14scale();
77 <    fortranForceOptions.GayBerneMu = this->getGayBerneMu();
78 <    fortranForceOptions.GayBerneNu = this->getGayBerneNu();
79 <
80 <
81 <    std::string DistanceMix = this->getDistanceMixingRule();
82 <    toUpper(DistanceMix);
83 <    if(DistanceMix == "ARITHMETIC"){
84 <      fortranForceOptions.DistanceMixingRule = ARITHMETIC_MIXING_RULE;
85 <    }else if(DistanceMix == "GEOMETRIC"){
86 <      fortranForceOptions.DistanceMixingRule = GEOMETRIC_MIXING_RULE;
87 <    }else if(DistanceMix == "CUBIC"){
88 <      fortranForceOptions.DistanceMixingRule = CUBIC_MIXING_RULE;
89 <    }else{
90 <      fortranForceOptions.DistanceMixingRule = ARITHMETIC_MIXING_RULE;
67 >      deprecatedKeywords_.insert("cutoffPolicy");
68      }
92    std::string EnergyMix = this->getEnergyMixingRule();  
93    toUpper(EnergyMix);
94    if(EnergyMix == "ARITHMETIC"){
95      fortranForceOptions.EnergyMixingRule = ARITHMETIC_MIXING_RULE;
96    }else if(EnergyMix == "GEOMETRIC"){
97      fortranForceOptions.EnergyMixingRule = GEOMETRIC_MIXING_RULE;
98    }else if(EnergyMix == "HHG"){
99      fortranForceOptions.EnergyMixingRule = HHG_MIXING_RULE;
100    }else{
101      fortranForceOptions.EnergyMixingRule = GEOMETRIC_MIXING_RULE;
102    }
103
104
105  }
106
69   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines