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 705 by chrisfen, Tue Nov 1 19:14:27 2005 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 +
55   #include "minimizers/MinimizerFactory.hpp"
56   #include "minimizers/MinimizerCreator.hpp"
57   #include "minimizers/PRCG.hpp"
# Line 57 | Line 60
60   #include "UseTheForce/EAM_FF.hpp"
61   #include "UseTheForce/ForceFieldFactory.hpp"
62   #include "UseTheForce/ForceFieldCreator.hpp"
63 + #include "UseTheForce/SHAPES_FF.hpp"
64   #include "lattice/LatticeFactory.hpp"
65   #include "lattice/LatticeCreator.hpp"
66   #include "lattice/FCCLattice.hpp"
# Line 72 | Line 76 | namespace oopse {
76      ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("LJ"));
77      //in theory, EAM can also be merged
78      ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<EAM_FF>("EAM"));
79 +    //heck, that worked...  let's try merging SHAPES
80 +    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SHAPES_FF>("SHAPES"));
81 +
82    }
83  
84    void registerIntegrators() {
85      IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NVE>("NVE"));
86      IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NVT>("NVT"));
87 <    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTi>("NPTi"));
88 <    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTf>("NPTf"));
89 <    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTxyz>("NPTxyz"));
87 >    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTi>("NPTI"));
88 >    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTf>("NPTF"));
89 >    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTxyz>("NPTXYZ"));
90 >    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPAT>("NPAT"));
91 >    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPrT>("NPRT"));
92 >
93    }
94  
95    void registerMinimizers() {

Diff Legend

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