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 1024 by tim, Wed Aug 30 18:42:29 2006 UTC vs.
Revision 1269 by gezelter, Tue Jul 1 13:28:23 2008 UTC

# Line 51 | Line 51
51   #include "integrators/NPTxyz.hpp"
52   #include "integrators/NPAT.hpp"
53   #include "integrators/NPrT.hpp"
54 + #include "integrators/NgammaT.hpp"
55   #include "integrators/LangevinDynamics.hpp"
56  
57   #include "minimizers/MinimizerFactory.hpp"
# Line 63 | 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 "UseTheForce/Amber_FF.hpp"
70   #include "lattice/LatticeFactory.hpp"
71   #include "lattice/LatticeCreator.hpp"
72   #include "lattice/FCCLattice.hpp"
73  
71 //#include "openbabel/amberformat.hpp"
72 //#include "openbabel/fingerprintformat.hpp"
73 //#include "openbabel/gromos96format.hpp"
74 #include "openbabel/oopseformat.hpp"
75 #include "openbabel/pdbformat.hpp"
76 //#include "openbabel/povrayformat.hpp"
77 //#include "openbabel/smilesformat.hpp"
78 #include "openbabel/tinkerformat.hpp"
79 #include "openbabel/xyzformat.hpp"
80
81
74   namespace oopse {
75  
76  
# Line 94 | Line 86 | namespace oopse {
86      ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SHAPES_FF>("SHAPES"));
87      //Well if EAM worked... then Sutton-Chen should work like a CHARMM(Hopefully not).
88      ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SC_FF>("SC"));
89 +    //Well if Sutton-Chen worked... then lets just mangle all of the forcefields together in MnM.
90 +    //That sounds like a good idea right......
91 +    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<MnM_FF>("MnM"));
92      ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<CLAYFF>("CLAY"));
93 +    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<Amber_FF>("Amber"));
94    }
95 <
95 >  
96    void registerIntegrators() {
97      IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NVE>("NVE"));
98      IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NVT>("NVT"));
# Line 106 | Line 102 | namespace oopse {
102      IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPAT>("NPAT"));
103      IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPrT>("NPRT"));
104      IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPrT>("NPGT"));
105 +    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NgammaT>("NGT"));
106 +    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NgammaT>("NGAMMAT"));
107      IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<LangevinDynamics>("LANGEVINDYNAMICS"));
108      IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<LangevinDynamics>("LD"));
109      
# Line 121 | Line 119 | namespace oopse {
119      LatticeFactory::getInstance()->registerLattice(new LatticeBuilder<FCCLattice>("FCC"));
120    }
121  
124  void registerOBFormats(){
125    //static OpenBabel::AmberPrepFormat amberFormatInstance;
126    //static OpenBabel::FingerprintFormat fingerprintFormatInstance;
127    static OpenBabel::OOPSEFormat oopseFormatInstance;    
128    static OpenBabel::PDBFormat pdbFormatInstance;
129    //static OpenBabel::PovrayFormat povaryFormatInstance;
130    //static OpenBabel::SMIFormat smilesFormatInstance;
131    static OpenBabel::TinkerFormat tinkerFormatInstance;
132    static OpenBabel::XYZFormat xyzFormatInstance;    
133  }
134  
122    void registerAll() {
123      registerForceFields();
124      registerIntegrators();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines