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 536 by tim, Thu May 19 04:28:26 2005 UTC vs.
Revision 728 by chuckv, Mon Nov 14 21:29:36 2005 UTC

# Line 61 | Line 61
61   #include "UseTheForce/ForceFieldFactory.hpp"
62   #include "UseTheForce/ForceFieldCreator.hpp"
63   #include "UseTheForce/SHAPES_FF.hpp"
64 + #include "UseTheForce/SC_FF.hpp"
65   #include "lattice/LatticeFactory.hpp"
66   #include "lattice/LatticeCreator.hpp"
67   #include "lattice/FCCLattice.hpp"
# Line 78 | Line 79 | namespace oopse {
79      ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<EAM_FF>("EAM"));
80      //heck, that worked...  let's try merging SHAPES
81      ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SHAPES_FF>("SHAPES"));
82 <
82 >    //Well if EAM worked... then Sutton-Chen should work like a CHARMM(Hopefully not).
83 >    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SC_FF>("SC"));
84    }
85  
86    void registerIntegrators() {
87      IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NVE>("NVE"));
88      IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NVT>("NVT"));
89 <    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTi>("NPTi"));
90 <    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTf>("NPTf"));
91 <    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTxyz>("NPTxyz"));
89 >    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTi>("NPTI"));
90 >    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTf>("NPTF"));
91 >    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTxyz>("NPTXYZ"));
92      IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPAT>("NPAT"));
93 <    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPrT>("NPrT"));
93 >    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPrT>("NPRT"));
94  
95    }
96  

Diff Legend

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