| # | Line 63 | Line 63 | namespace OpenMD { | |
|---|---|---|
| 63 | DefineOptionalParameterWithDefaultValue(electrostatic14scale, "electrostatic-14-scale", 0.0) | |
| 64 | DefineOptionalParameterWithDefaultValue(GayBerneMu, "GayBerneMu", 2.0); | |
| 65 | DefineOptionalParameterWithDefaultValue(GayBerneNu, "GayBerneNu", 1.0); | |
| 66 | + | DefineOptionalParameterWithDefaultValue(EAMMixingMethod, "EAMMixingMethod", "Johnson"); |
| 67 | } | |
| 68 | ||
| 69 | ||
| # | Line 100 | Line 101 | namespace OpenMD { | |
| 101 | }else{ | |
| 102 | fortranForceOptions.EnergyMixingRule = GEOMETRIC_MIXING_RULE; | |
| 103 | } | |
| 103 | – | |
| 104 | – | |
| 104 | } | |
| 105 | ||
| 106 | } | |
| – | Removed lines |
| + | Added lines |
| < | Changed lines |
| > | Changed lines |