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

Comparing trunk/src/brains/Register.cpp (file contents):
Revision 744 by tim, Wed Nov 16 21:20:11 2005 UTC vs.
Revision 1024 by tim, Wed Aug 30 18:42:29 2006 UTC

# Line 51 | Line 51
51   #include "integrators/NPTxyz.hpp"
52   #include "integrators/NPAT.hpp"
53   #include "integrators/NPrT.hpp"
54 + #include "integrators/LangevinDynamics.hpp"
55  
56   #include "minimizers/MinimizerFactory.hpp"
57   #include "minimizers/MinimizerCreator.hpp"
# Line 62 | Line 63
63   #include "UseTheForce/ForceFieldCreator.hpp"
64   #include "UseTheForce/SHAPES_FF.hpp"
65   #include "UseTheForce/SC_FF.hpp"
66 + #include "UseTheForce/CLAYFF.hpp"
67   #include "lattice/LatticeFactory.hpp"
68   #include "lattice/LatticeCreator.hpp"
69   #include "lattice/FCCLattice.hpp"
70  
71 < #include "openbabel/amberformat.hpp"
72 < #include "openbabel/fingerprintformat.hpp"
73 < #include "openbabel/gromos96format.hpp"
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"
76 > //#include "openbabel/povrayformat.hpp"
77 > //#include "openbabel/smilesformat.hpp"
78   #include "openbabel/tinkerformat.hpp"
79   #include "openbabel/xyzformat.hpp"
80  
# Line 92 | Line 94 | namespace oopse {
94      ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SHAPES_FF>("SHAPES"));
95      //Well if EAM worked... then Sutton-Chen should work like a CHARMM(Hopefully not).
96      ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SC_FF>("SC"));
97 +    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<CLAYFF>("CLAY"));
98    }
99  
100    void registerIntegrators() {
# Line 102 | Line 105 | namespace oopse {
105      IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTxyz>("NPTXYZ"));
106      IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPAT>("NPAT"));
107      IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPrT>("NPRT"));
108 +    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPrT>("NPGT"));
109 +    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<LangevinDynamics>("LANGEVINDYNAMICS"));
110 +    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<LangevinDynamics>("LD"));
111 +    
112  
113    }
114  
# Line 115 | Line 122 | namespace oopse {
122    }
123  
124    void registerOBFormats(){
125 <    static OpenBabel::AmberPrepFormat amberFormatInstance;
126 <    static OpenBabel::FingerprintFormat fingerprintFormatInstance;
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;
129 >    //static OpenBabel::PovrayFormat povaryFormatInstance;
130 >    //static OpenBabel::SMIFormat smilesFormatInstance;
131      static OpenBabel::TinkerFormat tinkerFormatInstance;
132      static OpenBabel::XYZFormat xyzFormatInstance;    
133    }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines