| # | Line 200 | Line 200 | namespace OpenMD { | |
|---|---|---|
| 200 | ||
| 201 | // set up the mixing method: | |
| 202 | ForceFieldOptions& fopts = forceField_->getForceFieldOptions(); | |
| 203 | < | string EAMMixMeth = toUpperCopy(fopts.getEAMMixingMethod()); |
| 204 | < | |
| 203 | > | std::string EAMMixMeth = fopts.getEAMMixingMethod(); |
| 204 | > | toUpper(EAMMixMeth); |
| 205 | > | |
| 206 | if (EAMMixMeth == "JOHNSON") | |
| 207 | mixMeth_ = eamJohnson; | |
| 208 | else if (EAMMixMeth == "DAW") | |
| – | Removed lines |
| + | Added lines |
| < | Changed lines |
| > | Changed lines |