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 1269 by gezelter, Tue Jul 1 13:28:23 2008 UTC vs.
Revision 1282 by gezelter, Wed Jul 30 18:11:19 2008 UTC

# Line 48 | Line 48
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 67 | Line 68 | namespace oopse {
68      //set default force field filename
69      setForceFieldFileName("DUFF2.frc");
70  
70    //The order of adding section parsers is important.
71    //OptionSectionParser must come first to set options for other parsers
72    //DirectionalAtomTypesSectionParser should be added before
73    //AtomTypesSectionParser, and these two section parsers will actually
74    //create "real" AtomTypes (AtomTypesSectionParser will create AtomType and
75    //DirectionalAtomTypesSectionParser will create DirectionalAtomType, which
76    //is a subclass of AtomType and should come first). Other AtomTypes Section
77    //Parser will not create the "real" AtomType, they only add and set some
78    //attribute of the AtomType. Thus their order are not important.
79    //AtomTypesSectionParser should be added before other atom type section
80    //parsers. Make sure they are added after DirectionalAtomTypesSectionParser
81    //and AtomTypesSectionParser. The order of BondTypesSectionParser,
82    //BendTypesSectionParser and TorsionTypesSectionParser are not important.
71      spMan_.push_back(new OptionSectionParser(forceFieldOptions_));    
84    spMan_.push_back(new DirectionalAtomTypesSectionParser(forceFieldOptions_));
72      spMan_.push_back(new BaseAtomTypesSectionParser());
73      spMan_.push_back(new AtomTypesSectionParser());
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_));
# Line 109 | 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  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines