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 2447 by chuckv, Wed Nov 16 21:37:45 2005 UTC vs.
Revision 2492 by chuckv, Tue Dec 6 19:26:37 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.3 2005-11-16 21:37:43 chuckv Exp $
47 > *  @version $Id: SC_FF.cpp,v 1.4 2005-12-06 19:26:37 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 84 | Line 85 | namespace oopse {
85      //Make sure they are added after DirectionalAtomTypesSectionParser and AtomTypesSectionParser.
86      //The order of BondTypesSectionParser, BendTypesSectionParser and TorsionTypesSectionParser are
87      //not important.
88 +    spMan_.push_back(new OptionSectionParser(SCForceFieldOptions_));
89      spMan_.push_back(new DirectionalAtomTypesSectionParser());
90      spMan_.push_back(new AtomTypesSectionParser());
91      spMan_.push_back(new SCAtomTypesSectionParser());
# Line 99 | 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