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

Comparing:
trunk/src/UseTheForce/SHAPES_FF.cpp (file contents), Revision 512 by chrisfen, Mon Apr 18 03:50:23 2005 UTC vs.
branches/heatflux/src/UseTheForce/SHAPES_FF.cpp (file contents), Revision 1670 by chuckv, Fri Jan 27 19:07:19 2012 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/DarkSide/shapes_interface.h"
43   #include "UseTheForce/DarkSide/lj_interface.h"
44   #include "UseTheForce/DarkSide/sticky_interface.h"
45   #include "UseTheForce/ForceFieldFactory.hpp"
46 + #include "io/OptionSectionParser.hpp"
47   #include "io/DirectionalAtomTypesSectionParser.hpp"
48 + #include "io/BaseAtomTypesSectionParser.hpp"
49   #include "io/AtomTypesSectionParser.hpp"
50   #include "io/LennardJonesAtomTypesSectionParser.hpp"
51   #include "io/ChargeAtomTypesSectionParser.hpp"
# Line 54 | Line 56
56   #include "io/BendTypesSectionParser.hpp"
57   #include "io/TorsionTypesSectionParser.hpp"
58   #include "UseTheForce/ForceFieldCreator.hpp"
59 + #include "UseTheForce/SHAPES_FF.hpp"
60   #include "utils/simError.h"
61 < namespace oopse {
61 > namespace OpenMD {
62      
63    SHAPES_FF::SHAPES_FF(){
64      
65      //set default force field filename
66 <    setForceFieldFileName("EAM.frc");
66 >    setForceFieldFileName("Shapes.frc");
67      
68 <    //The order of adding section parsers are important
69 <    //DirectionalAtomTypesSectionParser should be added before
70 <    //AtomTypesSectionParser since these two section parsers will actually
68 <    //create "real" AtomTypes (AtomTypesSectionParser will create AtomType
69 <    //and DirectionalAtomTypesSectionParser will creat DirectionalAtomType
70 <    //which is a subclass of AtomType, therefore it should come first). Other
71 <    //AtomTypes Section Parser will not create the "real" AtomType, they only
72 <    //add and set some attribute of the AtomType. Thus their order are not
73 <    //important. AtomTypesSectionParser should be added before other atom
74 <    //type section parsers. Make sure they are added after
75 <    //DirectionalAtomTypesSectionParser and AtomTypesSectionParser. The order
76 <    //of BondTypesSectionParser, BendTypesSectionParser and
77 <    //TorsionTypesSectionParser are not important.
78 <
79 <    spMan_.push_back(new ShapeAtomTypesSectionParser());
80 <    spMan_.push_back(new DirectionalAtomTypesSectionParser());
68 >    spMan_.push_back(new OptionSectionParser(forceFieldOptions_));
69 >    spMan_.push_back(new ShapeAtomTypesSectionParser(forceFieldOptions_));
70 >    spMan_.push_back(new BaseAtomTypesSectionParser());
71      spMan_.push_back(new AtomTypesSectionParser());
72 <    spMan_.push_back(new LennardJonesAtomTypesSectionParser());
73 <    spMan_.push_back(new ChargeAtomTypesSectionParser());
74 <    spMan_.push_back(new MultipoleAtomTypesSectionParser());
75 <    spMan_.push_back(new StickyAtomTypesSectionParser());
76 <    spMan_.push_back(new BondTypesSectionParser());
77 <    spMan_.push_back(new BendTypesSectionParser());
78 <    spMan_.push_back(new TorsionTypesSectionParser());
72 >    spMan_.push_back(new DirectionalAtomTypesSectionParser(forceFieldOptions_));
73 >    spMan_.push_back(new LennardJonesAtomTypesSectionParser(forceFieldOptions_));
74 >    spMan_.push_back(new ChargeAtomTypesSectionParser(forceFieldOptions_));
75 >    spMan_.push_back(new MultipoleAtomTypesSectionParser(forceFieldOptions_));
76 >    spMan_.push_back(new StickyAtomTypesSectionParser(forceFieldOptions_));
77 >    spMan_.push_back(new BondTypesSectionParser(forceFieldOptions_));
78 >    spMan_.push_back(new BendTypesSectionParser(forceFieldOptions_));
79 >    spMan_.push_back(new TorsionTypesSectionParser(forceFieldOptions_));
80      
81 < }
82 <
81 >  }
82 >  
83    SHAPES_FF::~SHAPES_FF(){
84      // We need to clean up the fortran side so we don't have bad things happen if
85      // we try to create a second EAM force field.
86 <    destroyEAMTypes();
86 >    destroyShapeTypes();
87    }
88 < } //end namespace oopse
89 <
99 < void SHAPES_FF::parse(const std::string& filename) {
88 >  
89 >  void SHAPES_FF::parse(const std::string& filename) {
90      ifstrstream* ffStream;
91      ffStream = openForceFieldFile(filename);
92 <
92 >    
93      spMan_.parse(*ffStream, *this);
94 <
94 >    
95      ForceField::AtomTypeContainer::MapTypeIterator i;
96      AtomType* at;
97 <
97 >    
98      for (at = atomTypeCont_.beginType(i); at != NULL; at = atomTypeCont_.nextType(i)) {
99 <        at->makeFortranAtomType();
100 <    }
99 >      // useBase sets the responsibilities, and these have to be done
100 >      // after the atomTypes and Base types have all been scanned:
101  
102 +      std::vector<AtomType*> ayb = at->allYourBase();      
103 +      if (ayb.size() > 1) {
104 +        for (int j = ayb.size()-1; j > 0; j--) {
105 +          
106 +          ayb[j-1]->useBase(ayb[j]);
107 +
108 +        }
109 +      }
110 +      at->makeFortranAtomType();
111 +    }
112 +    
113      for (at = atomTypeCont_.beginType(i); at != NULL; at = atomTypeCont_.nextType(i)) {
114 <        at->complete();
114 >      at->complete();
115      }
116  
117 +    int isError = 0;
118 +    completeShapeFF(&isError);
119 +    
120      delete ffStream;
121 < }
122 <
123 <
124 < double SHAPES_FF::getRcutFromAtomType(AtomType* at){
125 <
126 < }
127 <
124 <
121 >  }
122 >  
123 >  
124 > //  RealType SHAPES_FF::getRcutFromAtomType(AtomType* at){
125 > //  }
126 > } //end namespace OpenMD
127 >  

Comparing:
trunk/src/UseTheForce/SHAPES_FF.cpp (property svn:keywords), Revision 512 by chrisfen, Mon Apr 18 03:50:23 2005 UTC vs.
branches/heatflux/src/UseTheForce/SHAPES_FF.cpp (property svn:keywords), Revision 1670 by chuckv, Fri Jan 27 19:07:19 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines