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

Comparing trunk/src/UseTheForce/DUFF.cpp (file contents):
Revision 532 by chrisfen, Tue May 17 22:35:01 2005 UTC vs.
Revision 1282 by gezelter, Wed Jul 30 18:11:19 2008 UTC

# Line 43 | Line 43
43   #include "UseTheForce/DUFF.hpp"
44   #include "UseTheForce/DarkSide/lj_interface.h"
45   #include "UseTheForce/DarkSide/sticky_interface.h"
46 + #include "UseTheForce/DarkSide/gb_interface.h"
47   #include "UseTheForce/ForceFieldFactory.hpp"
48 + #include "io/BaseAtomTypesSectionParser.hpp"
49   #include "io/DirectionalAtomTypesSectionParser.hpp"
50   #include "io/AtomTypesSectionParser.hpp"
51 + #include "io/BaseAtomTypesSectionParser.hpp"
52   #include "io/LennardJonesAtomTypesSectionParser.hpp"
53   #include "io/ChargeAtomTypesSectionParser.hpp"
54   #include "io/MultipoleAtomTypesSectionParser.hpp"
# Line 55 | Line 58
58   #include "io/BondTypesSectionParser.hpp"
59   #include "io/BendTypesSectionParser.hpp"
60   #include "io/TorsionTypesSectionParser.hpp"
61 + #include "io/OptionSectionParser.hpp"
62   #include "UseTheForce/ForceFieldCreator.hpp"
63  
64   namespace oopse {
# Line 64 | Line 68 | namespace oopse {
68      //set default force field filename
69      setForceFieldFileName("DUFF2.frc");
70  
71 <    //The order of adding section parsers is important.
72 <    //DirectionalAtomTypesSectionParser should be added before
69 <    //AtomTypesSectionParser, and these two section parsers will actually
70 <    //create "real" AtomTypes (AtomTypesSectionParser will create AtomType and
71 <    //DirectionalAtomTypesSectionParser will create DirectionalAtomType, which
72 <    //is a subclass of AtomType and should come first). Other AtomTypes Section
73 <    //Parser will not create the "real" AtomType, they only add and set some
74 <    //attribute of the AtomType. Thus their order are not important.
75 <    //AtomTypesSectionParser should be added before other atom type section
76 <    //parsers. Make sure they are added after DirectionalAtomTypesSectionParser
77 <    //and AtomTypesSectionParser. The order of BondTypesSectionParser,
78 <    //BendTypesSectionParser and TorsionTypesSectionParser are not important.
79 <    spMan_.push_back(new DirectionalAtomTypesSectionParser());
71 >    spMan_.push_back(new OptionSectionParser(forceFieldOptions_));    
72 >    spMan_.push_back(new BaseAtomTypesSectionParser());
73      spMan_.push_back(new AtomTypesSectionParser());
74 <    spMan_.push_back(new LennardJonesAtomTypesSectionParser());
75 <    spMan_.push_back(new ChargeAtomTypesSectionParser());
76 <    spMan_.push_back(new MultipoleAtomTypesSectionParser());
77 <    spMan_.push_back(new StickyAtomTypesSectionParser());
78 <    spMan_.push_back(new StickyPowerAtomTypesSectionParser());
79 <    spMan_.push_back(new GayBerneAtomTypesSectionParser());
80 <    spMan_.push_back(new BondTypesSectionParser());
81 <    spMan_.push_back(new BendTypesSectionParser());
82 <    spMan_.push_back(new TorsionTypesSectionParser());
74 >    spMan_.push_back(new DirectionalAtomTypesSectionParser(forceFieldOptions_));
75 >    spMan_.push_back(new LennardJonesAtomTypesSectionParser(forceFieldOptions_));
76 >    spMan_.push_back(new ChargeAtomTypesSectionParser(forceFieldOptions_));
77 >    spMan_.push_back(new MultipoleAtomTypesSectionParser(forceFieldOptions_));
78 >    spMan_.push_back(new StickyAtomTypesSectionParser(forceFieldOptions_));
79 >    spMan_.push_back(new StickyPowerAtomTypesSectionParser(forceFieldOptions_));
80 >    spMan_.push_back(new GayBerneAtomTypesSectionParser(forceFieldOptions_));
81 >    spMan_.push_back(new BondTypesSectionParser(forceFieldOptions_));
82 >    spMan_.push_back(new BendTypesSectionParser(forceFieldOptions_));
83 >    spMan_.push_back(new TorsionTypesSectionParser(forceFieldOptions_));
84      
85    }
86  
87    void DUFF::parse(const std::string& filename) {
88      ifstrstream* ffStream;
89 +    bool hasGBtypes;
90 +
91      ffStream = openForceFieldFile(filename);
92  
93      spMan_.parse(*ffStream, *this);
# Line 101 | Line 97 | namespace oopse {
97  
98      for (at = atomTypeCont_.beginType(i); at != NULL;
99           at = atomTypeCont_.nextType(i)) {
100 +      // useBase sets the responsibilities, and these have to be done
101 +      // after the atomTypes and Base types have all been scanned:
102 +
103 +      std::vector<AtomType*> ayb = at->allYourBase();      
104 +      if (ayb.size() > 1) {
105 +        for (int j = ayb.size()-1; j > 0; j--) {
106 +          
107 +          ayb[j-1]->useBase(ayb[j]);
108 +
109 +        }
110 +      }
111        at->makeFortranAtomType();
112      }
113  
# Line 109 | Line 116 | namespace oopse {
116        at->complete();
117      }
118  
119 +    hasGBtypes = false;
120 +    for (at = atomTypeCont_.beginType(i); at != NULL;
121 +         at = atomTypeCont_.nextType(i)) {
122 +      if (at->isGayBerne())
123 +        hasGBtypes = true;
124 +    }
125 +    
126 +    int isError = 0;
127 +
128 +    if (hasGBtypes) {
129 +      completeGBFF(&isError);
130 +    }
131 +
132      delete ffStream;
133      
134    }
# Line 116 | Line 136 | namespace oopse {
136    DUFF::~DUFF(){
137      destroyLJTypes();
138      destroyStickyTypes();
139 +    destroyGayBerneTypes();
140    }
141   } //end namespace oopse

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines