| # | Line 57 | Line 57 | namespace OpenMD { | |
|---|---|---|
| 57 | namespace OpenMD { | |
| 58 | ||
| 59 | ForceField::ForceField() { | |
| 60 | + | |
| 61 | char* tempPath; | |
| 62 | tempPath = getenv("FORCE_PARAM_PATH"); | |
| 63 | < | |
| 63 | > | |
| 64 | if (tempPath == NULL) { | |
| 65 | < | ffPath_ = "ORNULL(FRC_PATH)"; |
| 65 | > | //convert a macro from compiler to a string in c++ |
| 66 | > | STR_DEFINE(ffPath_, FRC_PATH ); |
| 67 | } else { | |
| 68 | ffPath_ = tempPath; | |
| 69 | } | |
| # | Line 70 | Line 72 | namespace OpenMD { | |
| 72 | ||
| 73 | ForceField::~ForceField() { | |
| 74 | deleteAtypes(); | |
| 75 | < | deleteSwitch(); |
| 75 | > | deleteSwitch(); |
| 76 | } | |
| 77 | ||
| 78 | AtomType* ForceField::getAtomType(const std::string &at) { | |
| – | Removed lines |
| + | Added lines |
| < | Changed lines |
| > | Changed lines |