--- trunk/src/brains/Register.cpp 2006/08/30 18:42:29 1024 +++ trunk/src/brains/Register.cpp 2006/10/20 15:40:46 1084 @@ -51,6 +51,7 @@ #include "integrators/NPTxyz.hpp" #include "integrators/NPAT.hpp" #include "integrators/NPrT.hpp" +#include "integrators/NgammaT.hpp" #include "integrators/LangevinDynamics.hpp" #include "minimizers/MinimizerFactory.hpp" @@ -75,7 +76,7 @@ #include "openbabel/pdbformat.hpp" //#include "openbabel/povrayformat.hpp" //#include "openbabel/smilesformat.hpp" -#include "openbabel/tinkerformat.hpp" +//#include "openbabel/tinkerformat.hpp" #include "openbabel/xyzformat.hpp" @@ -106,6 +107,8 @@ namespace oopse { IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder("NPAT")); IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder("NPRT")); IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder("NPGT")); + IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder("NGT")); + IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder("NGAMMAT")); IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder("LANGEVINDYNAMICS")); IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder("LD")); @@ -128,7 +131,7 @@ namespace oopse { static OpenBabel::PDBFormat pdbFormatInstance; //static OpenBabel::PovrayFormat povaryFormatInstance; //static OpenBabel::SMIFormat smilesFormatInstance; - static OpenBabel::TinkerFormat tinkerFormatInstance; + //static OpenBabel::TinkerFormat tinkerFormatInstance; static OpenBabel::XYZFormat xyzFormatInstance; }