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 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
Revision 1292 by chuckv, Fri Sep 12 20:51:22 2008 UTC

# Line 49 | Line 49
49   #include "integrators/NPTi.hpp"
50   #include "integrators/NPTf.hpp"
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 + #include "integrators/SMIPDynamics.hpp"
57 +
58   #include "minimizers/MinimizerFactory.hpp"
59   #include "minimizers/MinimizerCreator.hpp"
60   #include "minimizers/PRCG.hpp"
# Line 57 | Line 63
63   #include "UseTheForce/EAM_FF.hpp"
64   #include "UseTheForce/ForceFieldFactory.hpp"
65   #include "UseTheForce/ForceFieldCreator.hpp"
66 + #include "UseTheForce/SHAPES_FF.hpp"
67 + #include "UseTheForce/SC_FF.hpp"
68 + #include "UseTheForce/MnM_FF.hpp"
69 + #include "UseTheForce/CLAYFF.hpp"
70 + #include "UseTheForce/Amber_FF.hpp"
71   #include "lattice/LatticeFactory.hpp"
72   #include "lattice/LatticeCreator.hpp"
73   #include "lattice/FCCLattice.hpp"
# Line 72 | Line 83 | namespace oopse {
83      ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("LJ"));
84      //in theory, EAM can also be merged
85      ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<EAM_FF>("EAM"));
86 +    //heck, that worked...  let's try merging SHAPES
87 +    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SHAPES_FF>("SHAPES"));
88 +    //Well if EAM worked... then Sutton-Chen should work like a CHARMM(Hopefully not).
89 +    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SC_FF>("SC"));
90 +    //Well if Sutton-Chen worked... then lets just mangle all of the forcefields together in MnM.
91 +    //That sounds like a good idea right......
92 +    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<MnM_FF>("MnM"));
93 +    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<CLAYFF>("CLAY"));
94 +    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<Amber_FF>("Amber"));
95    }
96 <
96 >  
97    void registerIntegrators() {
98      IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NVE>("NVE"));
99      IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NVT>("NVT"));
100 <    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTi>("NPTi"));
101 <    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTf>("NPTf"));
102 <    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTxyz>("NPTxyz"));
100 >    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTi>("NPTI"));
101 >    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTf>("NPTF"));
102 >    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTxyz>("NPTXYZ"));
103 >    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPAT>("NPAT"));
104 >    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPrT>("NPRT"));
105 >    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPrT>("NPGT"));
106 >    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NgammaT>("NGT"));
107 >    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NgammaT>("NGAMMAT"));
108 >    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<LangevinDynamics>("LANGEVINDYNAMICS"));
109 >    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<LangevinDynamics>("LD"));
110 >    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<SMIPDynamics>("SMIPD"));
111    }
112  
113    void registerMinimizers() {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines