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 1629 by gezelter, Wed Sep 14 21:15:17 2011 UTC vs.
Revision 1725 by gezelter, Sat May 26 18:13:43 2012 UTC

# Line 36 | Line 36
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38   * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 < * [4]  Vardeman & Gezelter, in progress (2009).                        
39 > * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #include "brains/Register.hpp"
# Line 62 | Line 63
63   #include "minimizers/MinimizerCreator.hpp"
64   #include "minimizers/PRCG.hpp"
65   #include "minimizers/SDMinimizer.hpp"
65 #include "UseTheForce/DUFF.hpp"
66 #include "UseTheForce/EAM_FF.hpp"
67 #include "UseTheForce/EADM_FF.hpp"
68 #include "UseTheForce/ForceFieldFactory.hpp"
69 #include "UseTheForce/ForceFieldCreator.hpp"
70 #include "UseTheForce/SHAPES_FF.hpp"
71 #include "UseTheForce/SC_FF.hpp"
72 #include "UseTheForce/MnM_FF.hpp"
73 #include "UseTheForce/CLAYFF.hpp"
74 #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  
81
82  void registerForceFields() {
83    /** @todo move to a seperate initialization module */
84    //DUFF, WATER and LJ are merged into one force field
85    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("DUFF"));
86    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("WATER"));
87    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("LJ"));
88    //in theory, EAM can also be merged
89    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<EAM_FF>("EAM"));
90    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<EADM_FF>("EADM"));
91    //heck, that worked...  let's try merging SHAPES
92    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SHAPES_FF>("SHAPES"));
93    //Well if EAM worked... then Sutton-Chen should work like a CHARMM(Hopefully not).
94    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SC_FF>("SC"));
95    //Well if Sutton-Chen worked... then lets just mangle all of the forcefields together in MnM.
96    //That sounds like a good idea right......
97    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<MnM_FF>("MnM"));
98    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<CLAYFF>("CLAY"));
99    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<Amber_FF>("Amber"));
100  }
101  
72    void registerIntegrators() {
73      IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NVE>("NVE"));
74      IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NVT>("NVT"));
# Line 129 | Line 99 | namespace OpenMD {
99    }
100  
101    void registerAll() {
132    registerForceFields();
102      registerIntegrators();
103      registerMinimizers();
104    }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines