--- trunk/src/brains/Register.cpp	2005/04/15 22:04:00	507
+++ trunk/src/brains/Register.cpp	2008/09/12 20:51:22	1292
@@ -49,6 +49,12 @@
 #include "integrators/NPTi.hpp"
 #include "integrators/NPTf.hpp"
 #include "integrators/NPTxyz.hpp"
+#include "integrators/NPAT.hpp"
+#include "integrators/NPrT.hpp"
+#include "integrators/NgammaT.hpp"
+#include "integrators/LangevinDynamics.hpp"
+#include "integrators/SMIPDynamics.hpp"
+
 #include "minimizers/MinimizerFactory.hpp"
 #include "minimizers/MinimizerCreator.hpp"
 #include "minimizers/PRCG.hpp"
@@ -57,6 +63,11 @@
 #include "UseTheForce/EAM_FF.hpp"
 #include "UseTheForce/ForceFieldFactory.hpp"
 #include "UseTheForce/ForceFieldCreator.hpp"
+#include "UseTheForce/SHAPES_FF.hpp"
+#include "UseTheForce/SC_FF.hpp"
+#include "UseTheForce/MnM_FF.hpp"
+#include "UseTheForce/CLAYFF.hpp"
+#include "UseTheForce/Amber_FF.hpp"
 #include "lattice/LatticeFactory.hpp"
 #include "lattice/LatticeCreator.hpp"
 #include "lattice/FCCLattice.hpp"
@@ -72,14 +83,31 @@ namespace oopse {
     ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("LJ"));
     //in theory, EAM can also be merged
     ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<EAM_FF>("EAM"));
+    //heck, that worked...  let's try merging SHAPES
+    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SHAPES_FF>("SHAPES"));
+    //Well if EAM worked... then Sutton-Chen should work like a CHARMM(Hopefully not).
+    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SC_FF>("SC"));
+    //Well if Sutton-Chen worked... then lets just mangle all of the forcefields together in MnM.
+    //That sounds like a good idea right......
+    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<MnM_FF>("MnM"));
+    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<CLAYFF>("CLAY"));
+    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<Amber_FF>("Amber"));
   }
-
+  
   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"));
+    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTi>("NPTI"));
+    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTf>("NPTF"));
+    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTxyz>("NPTXYZ"));
+    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPAT>("NPAT"));
+    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPrT>("NPRT"));
+    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPrT>("NPGT"));
+    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NgammaT>("NGT"));
+    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NgammaT>("NGAMMAT"));
+    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<LangevinDynamics>("LANGEVINDYNAMICS"));
+    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<LangevinDynamics>("LD"));
+    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<SMIPDynamics>("SMIPD"));
   }
 
   void registerMinimizers() {