--- trunk/src/brains/Register.cpp	2005/01/12 22:41:40	246
+++ trunk/src/brains/Register.cpp	2005/04/21 14:12:19	514
@@ -1,4 +1,4 @@
- /*
+/*
  * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
  *
  * The University of Notre Dame grants you ("Licensee") a
@@ -54,40 +54,51 @@
 #include "minimizers/PRCG.hpp"
 #include "minimizers/SDMinimizer.hpp"
 #include "UseTheForce/DUFF.hpp"
-#include "UseTheForce/EAM.hpp"
+#include "UseTheForce/EAM_FF.hpp"
 #include "UseTheForce/ForceFieldFactory.hpp"
 #include "UseTheForce/ForceFieldCreator.hpp"
+#include "UseTheForce/SHAPES_FF.hpp"
+#include "lattice/LatticeFactory.hpp"
+#include "lattice/LatticeCreator.hpp"
+#include "lattice/FCCLattice.hpp"
 
 namespace oopse {
 
 
-void registerForceFields() {
+  void registerForceFields() {
     /** @todo move to a seperate initialization module */
     //DUFF, WATER and LJ are merged into one force field
     ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("DUFF"));
     ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("WATER"));
     ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("LJ"));
     //in theory, EAM can also be merged
-    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<EAM>("EAM"));
-}
+    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<EAM_FF>("EAM"));
+    //heck, that worked...  let's try merging SHAPES
+    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SHAPES_FF>("SHAPES"));
 
-void registerIntegrators() {
+  }
+
+  void registerIntegrators() {
     IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NVE>("NVE"));
     IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NVT>("NVT"));
     IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTi>("NPTi"));
     IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTf>("NPTf"));
     IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTxyz>("NPTxyz"));
-}
+  }
 
-void registerMinimizers() {
+  void registerMinimizers() {
     MinimizerFactory::getInstance()->registerMinimizer(new MinimizerBuilder<SDMinimizer>("SD"));
     MinimizerFactory::getInstance()->registerMinimizer(new MinimizerBuilder<PRCGMinimizer>("CG"));
-}
+  }
 
-void registerAll() {
+  void registerLattice(){
+    LatticeFactory::getInstance()->registerLattice(new LatticeBuilder<FCCLattice>("FCC"));
+  }
+
+  void registerAll() {
     registerForceFields();
     registerIntegrators();
     registerMinimizers();
-}
+  }
 
 }