ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/brains/Register.cpp
(Generate patch)

Comparing trunk/src/brains/Register.cpp (file contents):
Revision 1032 by gezelter, Fri Sep 1 19:16:02 2006 UTC vs.
Revision 1210 by gezelter, Wed Jan 23 03:45:33 2008 UTC

# Line 64 | Line 64
64   #include "UseTheForce/ForceFieldCreator.hpp"
65   #include "UseTheForce/SHAPES_FF.hpp"
66   #include "UseTheForce/SC_FF.hpp"
67 + #include "UseTheForce/MnM_FF.hpp"
68   #include "UseTheForce/CLAYFF.hpp"
69   #include "lattice/LatticeFactory.hpp"
70   #include "lattice/LatticeCreator.hpp"
71   #include "lattice/FCCLattice.hpp"
72  
72 //#include "openbabel/amberformat.hpp"
73 //#include "openbabel/fingerprintformat.hpp"
74 //#include "openbabel/gromos96format.hpp"
75 #include "openbabel/oopseformat.hpp"
76 #include "openbabel/pdbformat.hpp"
77 //#include "openbabel/povrayformat.hpp"
78 //#include "openbabel/smilesformat.hpp"
79 #include "openbabel/tinkerformat.hpp"
80 #include "openbabel/xyzformat.hpp"
81
82
73   namespace oopse {
74  
75  
# Line 95 | Line 85 | namespace oopse {
85      ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SHAPES_FF>("SHAPES"));
86      //Well if EAM worked... then Sutton-Chen should work like a CHARMM(Hopefully not).
87      ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SC_FF>("SC"));
88 +                //Well if Sutton-Chen worked... then lets just mangle all of the forcefields together in MnM.
89 +                //That sounds like a good idea right......
90 +                ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<MnM_FF>("MnM"));
91      ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<CLAYFF>("CLAY"));
92    }
93  
# Line 124 | Line 117 | namespace oopse {
117      LatticeFactory::getInstance()->registerLattice(new LatticeBuilder<FCCLattice>("FCC"));
118    }
119  
127  void registerOBFormats(){
128    //static OpenBabel::AmberPrepFormat amberFormatInstance;
129    //static OpenBabel::FingerprintFormat fingerprintFormatInstance;
130    static OpenBabel::OOPSEFormat oopseFormatInstance;    
131    static OpenBabel::PDBFormat pdbFormatInstance;
132    //static OpenBabel::PovrayFormat povaryFormatInstance;
133    //static OpenBabel::SMIFormat smilesFormatInstance;
134    static OpenBabel::TinkerFormat tinkerFormatInstance;
135    static OpenBabel::XYZFormat xyzFormatInstance;    
136  }
137  
120    void registerAll() {
121      registerForceFields();
122      registerIntegrators();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines