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

Comparing trunk/OOPSE-3.0/src/brains/Register.cpp (file contents):
Revision 1930 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
Revision 2181 by tim, Tue Apr 12 21:58:09 2005 UTC

# Line 54 | Line 54
54   #include "minimizers/PRCG.hpp"
55   #include "minimizers/SDMinimizer.hpp"
56   #include "UseTheForce/DUFF.hpp"
57 < #include "UseTheForce/EAM.hpp"
57 > #include "UseTheForce/EAM_FF.hpp"
58   #include "UseTheForce/ForceFieldFactory.hpp"
59   #include "UseTheForce/ForceFieldCreator.hpp"
60 + #include "lattice/LatticeFactory.hpp"
61 + #include "lattice/LatticeCreator.hpp"
62 + #include "lattice/Lattice.hpp"
63  
64   namespace oopse {
65  
# Line 68 | Line 71 | void registerForceFields() {
71      ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("WATER"));
72      ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("LJ"));
73      //in theory, EAM can also be merged
74 <    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<EAM>("EAM"));
74 >    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<EAM_FF>("EAM"));
75   }
76  
77   void registerIntegrators() {
# Line 84 | Line 87 | void registerAll() {
87      MinimizerFactory::getInstance()->registerMinimizer(new MinimizerBuilder<PRCGMinimizer>("CG"));
88   }
89  
90 + void registerLattice(){
91 +    LatticeFactory::getInstance()->registerLattice(new LatticeBuilder<CubicLattice>("CUBIC"));
92 +    LatticeFactory::getInstance()->registerLattice(new LatticeBuilder<FCCLattice>("FCC"));
93 + }
94 +
95   void registerAll() {
96      registerForceFields();
97      registerIntegrators();

Diff Legend

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