| 6 |  | * redistribute this software in source and binary code form, provided | 
| 7 |  | * that the following conditions are met: | 
| 8 |  | * | 
| 9 | < | * 1. Acknowledgement of the program authors must be made in any | 
| 10 | < | *    publication of scientific results based in part on use of the | 
| 11 | < | *    program.  An acceptable form of acknowledgement is citation of | 
| 12 | < | *    the article in which the program was described (Matthew | 
| 13 | < | *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher | 
| 14 | < | *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented | 
| 15 | < | *    Parallel Simulation Engine for Molecular Dynamics," | 
| 16 | < | *    J. Comput. Chem. 26, pp. 252-271 (2005)) | 
| 17 | < | * | 
| 18 | < | * 2. Redistributions of source code must retain the above copyright | 
| 9 | > | * 1. Redistributions of source code must retain the above copyright | 
| 10 |  | *    notice, this list of conditions and the following disclaimer. | 
| 11 |  | * | 
| 12 | < | * 3. Redistributions in binary form must reproduce the above copyright | 
| 12 | > | * 2. Redistributions in binary form must reproduce the above copyright | 
| 13 |  | *    notice, this list of conditions and the following disclaimer in the | 
| 14 |  | *    documentation and/or other materials provided with the | 
| 15 |  | *    distribution. | 
| 28 |  | * arising out of the use of or inability to use software, even if the | 
| 29 |  | * University of Notre Dame has been advised of the possibility of | 
| 30 |  | * such damages. | 
| 31 | + | * | 
| 32 | + | * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your | 
| 33 | + | * research, please cite the appropriate papers when you publish your | 
| 34 | + | * work.  Good starting points are: | 
| 35 | + | * | 
| 36 | + | * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005). | 
| 37 | + | * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006). | 
| 38 | + | * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008). | 
| 39 | + | * [4]  Vardeman & Gezelter, in progress (2009). | 
| 40 |  | */ | 
| 41 |  |  | 
| 42 |  | /** | 
| 54 |  | #include "UseTheForce/DarkSide/atype_interface.h" | 
| 55 |  | #include "UseTheForce/DarkSide/fForceOptions_interface.h" | 
| 56 |  | #include "UseTheForce/DarkSide/switcheroo_interface.h" | 
| 57 | < | namespace oopse { | 
| 57 | > | namespace OpenMD { | 
| 58 |  |  | 
| 59 |  | ForceField::ForceField() { | 
| 60 | + |  | 
| 61 |  | char* tempPath; | 
| 62 |  | tempPath = getenv("FORCE_PARAM_PATH"); | 
| 63 | < |  | 
| 63 | > |  | 
| 64 |  | if (tempPath == NULL) { | 
| 65 |  | //convert a macro from compiler to a string in c++ | 
| 66 |  | STR_DEFINE(ffPath_, FRC_PATH ); | 
| 72 |  |  | 
| 73 |  | ForceField::~ForceField() { | 
| 74 |  | deleteAtypes(); | 
| 75 | < | deleteSwitch(); | 
| 75 | > | deleteSwitch(); | 
| 76 |  | } | 
| 77 |  |  | 
| 78 |  | AtomType* ForceField::getAtomType(const std::string &at) { | 
| 349 |  | keys.push_back(at4); | 
| 350 |  |  | 
| 351 |  | //try exact match first | 
| 352 | < | InversionType* inversionType = inversionTypeCont_.find(keys); | 
| 352 | > | InversionType* inversionType = inversionTypeCont_.permutedFindSkippingFirstElement(keys); | 
| 353 |  | if (inversionType) { | 
| 354 |  | return inversionType; | 
| 355 |  | } else { | 
| 411 |  | myKeys.push_back((*k)->getName()); | 
| 412 |  | myKeys.push_back((*l)->getName()); | 
| 413 |  |  | 
| 414 | < | InversionType* inversionType = inversionTypeCont_.find(myKeys); | 
| 414 | > | InversionType* inversionType = inversionTypeCont_.permutedFindSkippingFirstElement(myKeys); | 
| 415 |  | if (inversionType) { | 
| 416 |  | foundInversions.push_back( make_tuple3(Iscore, JKLscore, myKeys) ); | 
| 417 |  | } | 
| 430 |  | int jklscore = foundInversions[0].second; | 
| 431 |  | std::vector<std::string> theKeys = foundInversions[0].third; | 
| 432 |  |  | 
| 433 | < | InversionType* bestType = inversionTypeCont_.find(theKeys); | 
| 433 | > | InversionType* bestType = inversionTypeCont_.permutedFindSkippingFirstElement(theKeys); | 
| 434 |  | return bestType; | 
| 435 |  | } else { | 
| 436 |  | //if no exact match found, try wild card match | 
| 587 |  | } else { | 
| 588 |  | sprintf( painCave.errMsg, | 
| 589 |  | "Can not cast GenericData to LJParam\n"); | 
| 590 | < | painCave.severity = OOPSE_ERROR; | 
| 590 | > | painCave.severity = OPENMD_ERROR; | 
| 591 |  | painCave.isFatal = 1; | 
| 592 |  | simError(); | 
| 593 |  | } | 
| 594 |  | } else { | 
| 595 |  | sprintf( painCave.errMsg, "Can not find Parameters for LennardJones\n"); | 
| 596 | < | painCave.severity = OOPSE_ERROR; | 
| 596 | > | painCave.severity = OPENMD_ERROR; | 
| 597 |  | painCave.isFatal = 1; | 
| 598 |  | simError(); | 
| 599 |  | } | 
| 623 |  | "\tHave you tried setting the FORCE_PARAM_PATH environment " | 
| 624 |  | "variable?\n", | 
| 625 |  | forceFieldFilename.c_str() ); | 
| 626 | < | painCave.severity = OOPSE_ERROR; | 
| 626 | > | painCave.severity = OPENMD_ERROR; | 
| 627 |  | painCave.isFatal = 1; | 
| 628 |  | simError(); | 
| 629 |  | } | 
| 636 |  | forceFieldOptions_.makeFortranOptions(theseFortranOptions); | 
| 637 |  | setfForceOptions(&theseFortranOptions); | 
| 638 |  | } | 
| 639 | < | } //end namespace oopse | 
| 639 | > | } //end namespace OpenMD |