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

Comparing branches/development/src/brains/Register.cpp (file contents):
Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC vs.
Revision 1725 by gezelter, Sat May 26 18:13:43 2012 UTC

# Line 63 | Line 63
63   #include "minimizers/MinimizerCreator.hpp"
64   #include "minimizers/PRCG.hpp"
65   #include "minimizers/SDMinimizer.hpp"
66 #include "UseTheForce/DUFF.hpp"
67 #include "UseTheForce/EAM_FF.hpp"
68 #include "UseTheForce/EADM_FF.hpp"
69 #include "UseTheForce/ForceFieldFactory.hpp"
70 #include "UseTheForce/ForceFieldCreator.hpp"
71 #include "UseTheForce/SHAPES_FF.hpp"
72 #include "UseTheForce/SC_FF.hpp"
73 #include "UseTheForce/MnM_FF.hpp"
74 #include "UseTheForce/CLAYFF.hpp"
75 #include "UseTheForce/Amber_FF.hpp"
66   #include "lattice/LatticeFactory.hpp"
67   #include "lattice/LatticeCreator.hpp"
68   #include "lattice/FCCLattice.hpp"
69  
70   namespace OpenMD {
71  
82
83  void registerForceFields() {
84    /** @todo move to a seperate initialization module */
85    //DUFF, WATER and LJ are merged into one force field
86    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("DUFF"));
87    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("WATER"));
88    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("LJ"));
89    //in theory, EAM can also be merged
90    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<EAM_FF>("EAM"));
91    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<EADM_FF>("EADM"));
92    //heck, that worked...  let's try merging SHAPES
93    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SHAPES_FF>("SHAPES"));
94    //Well if EAM worked... then Sutton-Chen should work like a CHARMM(Hopefully not).
95    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SC_FF>("SC"));
96    //Well if Sutton-Chen worked... then lets just mangle all of the forcefields together in MnM.
97    //That sounds like a good idea right......
98    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<MnM_FF>("MnM"));
99    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<CLAYFF>("CLAY"));
100    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<Amber_FF>("Amber"));
101  }
102  
72    void registerIntegrators() {
73      IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NVE>("NVE"));
74      IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NVT>("NVT"));
# Line 130 | Line 99 | namespace OpenMD {
99    }
100  
101    void registerAll() {
133    registerForceFields();
102      registerIntegrators();
103      registerMinimizers();
104    }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines