ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/heatflux/src/UseTheForce/EAM_FF.cpp
(Generate patch)

Comparing trunk/src/UseTheForce/EAM_FF.cpp (file contents):
Revision 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
Revision 1442 by gezelter, Mon May 10 17:28:26 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   #include "UseTheForce/EAM_FF.hpp"
# Line 44 | Line 44
44   #include "UseTheForce/DarkSide/lj_interface.h"
45   #include "UseTheForce/DarkSide/sticky_interface.h"
46   #include "UseTheForce/ForceFieldFactory.hpp"
47 < #include "io/DirectionalAtomTypesSectionParser.hpp"
47 > #include "io/BaseAtomTypesSectionParser.hpp"
48   #include "io/AtomTypesSectionParser.hpp"
49 #include "io/LennardJonesAtomTypesSectionParser.hpp"
50 #include "io/ChargeAtomTypesSectionParser.hpp"
51 #include "io/MultipoleAtomTypesSectionParser.hpp"
49   #include "io/EAMAtomTypesSectionParser.hpp"
53 #include "io/StickyAtomTypesSectionParser.hpp"
54 #include "io/BondTypesSectionParser.hpp"
55 #include "io/BendTypesSectionParser.hpp"
56 #include "io/TorsionTypesSectionParser.hpp"
50   #include "io/OptionSectionParser.hpp"
51   #include "UseTheForce/ForceFieldCreator.hpp"
52   #include "utils/simError.h"
53 < namespace oopse {
53 > namespace OpenMD {
54      
55    EAM_FF::EAM_FF(){
56  
# Line 66 | Line 59 | namespace oopse {
59  
60      //the order of adding section parsers are important
61      //OptionSectionParser must come first to set options for other parsers
69    //DirectionalAtomTypesSectionParser should be added before AtomTypesSectionParser Since
70    //These two section parsers will actually create "real" AtomTypes (AtomTypesSectionParser will create
71    //AtomType and DirectionalAtomTypesSectionParser will creat DirectionalAtomType which is a subclass
72    //of AtomType, therefore it should come first). Other AtomTypes Section Parser will not create the
73    //"real" AtomType, they only add and set some attribute of the AtomType. Thus their order are not
74    //important. AtomTypesSectionParser should be added before other atom type section parsers.
75    //Make sure they are added after DirectionalAtomTypesSectionParser and AtomTypesSectionParser.
76    //The order of BondTypesSectionParser, BendTypesSectionParser and TorsionTypesSectionParser are
77    //not important.
62      spMan_.push_back(new OptionSectionParser(forceFieldOptions_));
63 +    spMan_.push_back(new BaseAtomTypesSectionParser());
64      spMan_.push_back(new AtomTypesSectionParser());
65      spMan_.push_back(new EAMAtomTypesSectionParser(forceFieldOptions_));
81
82    
66    }
67  
68    void EAM_FF::parse(const std::string& filename) {
# Line 92 | Line 75 | namespace oopse {
75      AtomType* at;
76  
77      for (at = atomTypeCont_.beginType(i); at != NULL; at = atomTypeCont_.nextType(i)) {
78 +      // useBase sets the responsibilities, and these have to be done
79 +      // after the atomTypes and Base types have all been scanned:
80 +
81 +      std::vector<AtomType*> ayb = at->allYourBase();      
82 +      if (ayb.size() > 1) {
83 +        for (int j = ayb.size()-1; j > 0; j--) {
84 +          
85 +          ayb[j-1]->useBase(ayb[j]);
86 +
87 +        }
88 +      }
89        at->makeFortranAtomType();
90      }
91  
# Line 117 | Line 111 | namespace oopse {
111          } else {
112            sprintf( painCave.errMsg,
113                     "Can not cast GenericData to EAMParam\n");
114 <          painCave.severity = OOPSE_ERROR;
114 >          painCave.severity = OPENMD_ERROR;
115            painCave.isFatal = 1;
116            simError();          
117          }
118        } else {
119          sprintf( painCave.errMsg, "Can not find EAM Parameters\n");
120 <        painCave.severity = OOPSE_ERROR;
120 >        painCave.severity = OPENMD_ERROR;
121          painCave.isFatal = 1;
122          simError();          
123        }
# Line 139 | Line 133 | namespace oopse {
133      // we try to create a second EAM force field.
134      destroyEAMTypes();
135    }
136 < } //end namespace oopse
136 > } //end namespace OpenMD

Comparing trunk/src/UseTheForce/EAM_FF.cpp (property svn:keywords):
Revision 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
Revision 1442 by gezelter, Mon May 10 17:28:26 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines