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 484 by tim, Tue Apr 12 21:58:09 2005 UTC vs.
Revision 705 by chrisfen, Tue Nov 1 19:14:27 2005 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# 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/Lattice.hpp"
66 > #include "lattice/FCCLattice.hpp"
67  
68   namespace oopse {
69  
70  
71 < void registerForceFields() {
71 >  void registerForceFields() {
72      /** @todo move to a seperate initialization module */
73      //DUFF, WATER and LJ are merged into one force field
74      ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("DUFF"));
# Line 72 | Line 76 | void registerForceFields() {
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 < }
79 >    //heck, that worked...  let's try merging SHAPES
80 >    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SHAPES_FF>("SHAPES"));
81  
82 < void registerIntegrators() {
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"));
90 < }
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 < void registerMinimizers() {
93 >  }
94 >
95 >  void registerMinimizers() {
96      MinimizerFactory::getInstance()->registerMinimizer(new MinimizerBuilder<SDMinimizer>("SD"));
97      MinimizerFactory::getInstance()->registerMinimizer(new MinimizerBuilder<PRCGMinimizer>("CG"));
98 < }
98 >  }
99  
100 < void registerLattice(){
91 <    LatticeFactory::getInstance()->registerLattice(new LatticeBuilder<CubicLattice>("CUBIC"));
100 >  void registerLattice(){
101      LatticeFactory::getInstance()->registerLattice(new LatticeBuilder<FCCLattice>("FCC"));
102 < }
102 >  }
103  
104 < void registerAll() {
104 >  void registerAll() {
105      registerForceFields();
106      registerIntegrators();
107      registerMinimizers();
108 < }
108 >  }
109  
110   }

Diff Legend

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