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 1275 by cli2, Fri Jul 4 20:54:29 2008 UTC vs.
Revision 1282 by gezelter, Wed Jul 30 18:11:19 2008 UTC

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