ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/UseTheForce/EAM_FF.cpp
(Generate patch)

Comparing trunk/OOPSE-4/src/UseTheForce/EAM_FF.cpp (file contents):
Revision 2204 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
Revision 2501 by chuckv, Thu Dec 8 15:38:49 2005 UTC

# Line 54 | Line 54
54   #include "io/BondTypesSectionParser.hpp"
55   #include "io/BendTypesSectionParser.hpp"
56   #include "io/TorsionTypesSectionParser.hpp"
57 + #include "io/OptionSectionParser.hpp"
58   #include "UseTheForce/ForceFieldCreator.hpp"
59   #include "utils/simError.h"
60   namespace oopse {
# Line 64 | Line 65 | namespace oopse {
65      setForceFieldFileName("EAM.frc");
66  
67      //the order of adding section parsers are important
68 +    //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
# Line 73 | Line 75 | namespace oopse {
75      //Make sure they are added after DirectionalAtomTypesSectionParser and AtomTypesSectionParser.
76      //The order of BondTypesSectionParser, BendTypesSectionParser and TorsionTypesSectionParser are
77      //not important.
78 <    spMan_.push_back(new DirectionalAtomTypesSectionParser());
78 >    spMan_.push_back(new OptionSectionParser(forceFieldOptions_));
79      spMan_.push_back(new AtomTypesSectionParser());
80 <    spMan_.push_back(new LennardJonesAtomTypesSectionParser());
81 <    spMan_.push_back(new ChargeAtomTypesSectionParser());
80 <    spMan_.push_back(new MultipoleAtomTypesSectionParser());
81 <    spMan_.push_back(new EAMAtomTypesSectionParser());
82 <    spMan_.push_back(new StickyAtomTypesSectionParser());
83 <    spMan_.push_back(new BondTypesSectionParser());
84 <    spMan_.push_back(new BendTypesSectionParser());
85 <    spMan_.push_back(new TorsionTypesSectionParser());
80 >    spMan_.push_back(new EAMAtomTypesSectionParser(forceFieldOptions_));
81 >
82      
83    }
84  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines