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

Comparing trunk/OOPSE-4/src/UseTheForce/SC_FF.cpp (file contents):
Revision 2434 by chuckv, Tue Nov 15 16:18:36 2005 UTC vs.
Revision 2501 by chuckv, Thu Dec 8 15:38:49 2005 UTC

# Line 44 | Line 44
44   *
45   *  Created by Charles F. Vardeman II on 11/9/05.
46   *  @author  Charles F. Vardeman II
47 < *  @version $Id: SC_FF.cpp,v 1.2 2005-11-15 16:18:36 chuckv Exp $
47 > *  @version $Id: SC_FF.cpp,v 1.5 2005-12-08 15:38:49 chuckv Exp $
48   *
49   */
50  
# Line 65 | Line 65
65   #include "io/BendTypesSectionParser.hpp"
66   #include "io/TorsionTypesSectionParser.hpp"
67   #include "io/SCAtomTypesSectionParser.hpp"
68 + #include "io/OptionSectionParser.hpp"
69   #include "UseTheForce/ForceFieldCreator.hpp"
70   #include "utils/simError.h"
71   namespace oopse {
# Line 75 | Line 76 | namespace oopse {
76      setForceFieldFileName("SuttonChen.QSC.frc");
77      
78      //the order of adding section parsers are important
79 +    //OptionSectionParser must come first to set options for other parsers
80      //DirectionalAtomTypesSectionParser should be added before AtomTypesSectionParser Since
81      //These two section parsers will actually create "real" AtomTypes (AtomTypesSectionParser will create
82      //AtomType and DirectionalAtomTypesSectionParser will creat DirectionalAtomType which is a subclass
# Line 84 | Line 86 | namespace oopse {
86      //Make sure they are added after DirectionalAtomTypesSectionParser and AtomTypesSectionParser.
87      //The order of BondTypesSectionParser, BendTypesSectionParser and TorsionTypesSectionParser are
88      //not important.
89 <    spMan_.push_back(new DirectionalAtomTypesSectionParser());
89 >    spMan_.push_back(new OptionSectionParser(SCForceFieldOptions_));
90      spMan_.push_back(new AtomTypesSectionParser());
91 <    spMan_.push_back(new LennardJonesAtomTypesSectionParser());
90 <    spMan_.push_back(new ChargeAtomTypesSectionParser());
91 <    spMan_.push_back(new MultipoleAtomTypesSectionParser());
92 <    spMan_.push_back(new EAMAtomTypesSectionParser());
93 <    spMan_.push_back(new StickyAtomTypesSectionParser());
94 <    spMan_.push_back(new BondTypesSectionParser());
95 <    spMan_.push_back(new BendTypesSectionParser());
96 <    spMan_.push_back(new TorsionTypesSectionParser());
97 <    spMan_.push_back(new SCAtomTypesSectionParser());
91 >    spMan_.push_back(new SCAtomTypesSectionParser(SCForceFieldOptions_));
92      
93    }
94    
# Line 107 | Line 101 | namespace oopse {
101      ForceField::AtomTypeContainer::MapTypeIterator i;
102      AtomType* at;
103      
104 +    // Set forcefield options
105 +    
106      for (at = atomTypeCont_.beginType(i); at != NULL; at = atomTypeCont_.nextType(i)) {
107        at->makeFortranAtomType();
108      }
109      
110 +    
111      for (at = atomTypeCont_.beginType(i); at != NULL; at = atomTypeCont_.nextType(i)) {
112        at->complete();
113      }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines