--- trunk/src/brains/Register.cpp 2009/11/25 20:02:06 1390 +++ trunk/src/brains/Register.cpp 2010/11/24 17:40:12 1526 @@ -49,12 +49,13 @@ #include "integrators/NPTi.hpp" #include "integrators/NPTf.hpp" #include "integrators/NPTxyz.hpp" +#include "integrators/NPTsz.hpp" #include "integrators/NPAT.hpp" #include "integrators/NPrT.hpp" #include "integrators/NgammaT.hpp" #include "integrators/LangevinDynamics.hpp" #if defined(HAVE_QHULL) -#include "integrators/SMIPDynamics.hpp" +#include "integrators/LangevinHullDynamics.hpp" #endif #include "minimizers/MinimizerFactory.hpp" @@ -102,6 +103,7 @@ namespace OpenMD { IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder("NPTI")); IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder("NPTF")); IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder("NPTXYZ")); + IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder("NPTSZ")); IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder("NPAT")); IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder("NPRT")); IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder("NPGT")); @@ -110,7 +112,8 @@ namespace OpenMD { IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder("LANGEVINDYNAMICS")); IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder("LD")); #if defined(HAVE_QHULL) - IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder("SMIPD")); + IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder("LHULL")); + IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder("LANGEVINHULL")); #endif }