ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/brains/ForceField.cpp
(Generate patch)

Comparing:
trunk/src/UseTheForce/ForceField.cpp (file contents), Revision 1303 by cli2, Mon Oct 13 21:35:22 2008 UTC vs.
branches/development/src/UseTheForce/ForceField.cpp (file contents), Revision 1535 by gezelter, Fri Dec 31 18:31:56 2010 UTC

# Line 6 | Line 6
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.
# Line 37 | Line 28
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   /**
# Line 51 | Line 51
51   #include "UseTheForce/ForceField.hpp"
52   #include "utils/simError.h"
53   #include "utils/Tuple.hpp"
54 < #include "UseTheForce/DarkSide/atype_interface.h"
55 < #include "UseTheForce/DarkSide/fForceOptions_interface.h"
56 < #include "UseTheForce/DarkSide/switcheroo_interface.h"
57 < namespace oopse {
54 > namespace OpenMD {
55  
56    ForceField::ForceField() {
57 +
58      char* tempPath;
59      tempPath = getenv("FORCE_PARAM_PATH");
60 <
60 >    
61      if (tempPath == NULL) {
62        //convert a macro from compiler to a string in c++
63        STR_DEFINE(ffPath_, FRC_PATH );
64      } else {
65        ffPath_ = tempPath;
66      }
69  }
70
71
72  ForceField::~ForceField() {
73    deleteAtypes();
74    deleteSwitch();
67    }
68  
69 +  /**
70 +   * getAtomType by string
71 +   *
72 +   * finds the requested atom type in this force field using the string
73 +   * name of the atom type.
74 +   */
75    AtomType* ForceField::getAtomType(const std::string &at) {
76      std::vector<std::string> keys;
77      keys.push_back(at);
78      return atomTypeCont_.find(keys);
79 +  }
80 +
81 +  /**
82 +   * getAtomType by ident
83 +   *
84 +   * finds the requested atom type in this force field using the
85 +   * integer ident instead of the string name of the atom type.
86 +   */
87 +  AtomType* ForceField::getAtomType(int ident) {  
88 +    std::string at = atypeIdentToName.find(ident)->second;
89 +    return getAtomType(at);
90    }
91  
92    BondType* ForceField::getBondType(const std::string &at1,
# Line 442 | Line 451 | namespace oopse {
451      std::vector<std::string> keys;
452      keys.push_back(at1);
453      keys.push_back(at2);    
454 <    
454 >  
455      //try exact match first
456      NonBondedInteractionType* nbiType = nonBondedInteractionTypeCont_.find(keys);
457      if (nbiType) {
458        return nbiType;
459      } else {
460        //if no exact match found, try wild card match
461 <      return nonBondedInteractionTypeCont_.find(keys, wildCardAtomTypeName_);
461 >      return nonBondedInteractionTypeCont_.find(keys, wildCardAtomTypeName_);  
462      }    
463    }
464    
# Line 506 | Line 515 | namespace oopse {
515    bool ForceField::addAtomType(const std::string &at, AtomType* atomType) {
516      std::vector<std::string> keys;
517      keys.push_back(at);
518 +    atypeIdentToName[atomType->getIdent()] = at;
519      return atomTypeCont_.add(keys, atomType);
520    }
521  
522    bool ForceField::replaceAtomType(const std::string &at, AtomType* atomType) {
523      std::vector<std::string> keys;
524      keys.push_back(at);
525 +    atypeIdentToName[atomType->getIdent()] = at;
526      return atomTypeCont_.replace(keys, atomType);
527    }
528  
# Line 586 | Line 597 | namespace oopse {
597          } else {
598            sprintf( painCave.errMsg,
599                     "Can not cast GenericData to LJParam\n");
600 <          painCave.severity = OOPSE_ERROR;
600 >          painCave.severity = OPENMD_ERROR;
601            painCave.isFatal = 1;
602            simError();          
603          }            
604        } else {
605          sprintf( painCave.errMsg, "Can not find Parameters for LennardJones\n");
606 <        painCave.severity = OOPSE_ERROR;
606 >        painCave.severity = OPENMD_ERROR;
607          painCave.isFatal = 1;
608          simError();          
609        }
# Line 622 | Line 633 | namespace oopse {
633                   "\tHave you tried setting the FORCE_PARAM_PATH environment "
634                   "variable?\n",
635                   forceFieldFilename.c_str() );
636 <        painCave.severity = OOPSE_ERROR;
636 >        painCave.severity = OPENMD_ERROR;
637          painCave.isFatal = 1;
638          simError();
639        }
# Line 630 | Line 641 | namespace oopse {
641      return ffStream;
642    }
643  
644 <  void ForceField::setFortranForceOptions(){
634 <    ForceOptions theseFortranOptions;
635 <    forceFieldOptions_.makeFortranOptions(theseFortranOptions);
636 <    setfForceOptions(&theseFortranOptions);
637 <  }
638 < } //end namespace oopse
644 > } //end namespace OpenMD

Comparing:
trunk/src/UseTheForce/ForceField.cpp (property svn:keywords), Revision 1303 by cli2, Mon Oct 13 21:35:22 2008 UTC vs.
branches/development/src/UseTheForce/ForceField.cpp (property svn:keywords), Revision 1535 by gezelter, Fri Dec 31 18:31:56 2010 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines