From: bangerth Date: Thu, 1 Nov 2012 02:22:40 +0000 (+0000) Subject: Remove some piece of code that could only be enabled using a ./configure switch and... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=331777741b32b29e23b9ca7347aca303f86d6e60;p=dealii-svn.git Remove some piece of code that could only be enabled using a ./configure switch and that almost certainly hasn't been used in a very long time. Clean this up to make Matthias's life a bit simpler in the cmake conversion. git-svn-id: https://svn.dealii.org/trunk@27277 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/configure.in b/deal.II/configure.in index 0081b431e4..1ac517db4c 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -428,13 +428,6 @@ AC_ARG_ENABLE(parser, AC_SUBST(enableparser) AC_SUBST(DEAL_II_DISABLE_PARSER) -AC_ARG_ENABLE(mgcompatibility, - AS_HELP_STRING([--enable-mgcompatibility], - [Use preconditioner interface in MGSmootherRelaxation instead of the new interface using the function step. Defaults to disabled.]), - [ if test "x$enableval" = "xyes" ; then - AC_MSG_RESULT(enable multigrid compatibility mode) - AC_DEFINE(DEAL_II_MULTIGRID_COMPATIBILITY, 1, [enable multigrid compatibility mode]) - fi]) dnl -------------------------------------------------------------- dnl Backward compatibility functions diff --git a/deal.II/include/deal.II/multigrid/mg_smoother.h b/deal.II/include/deal.II/multigrid/mg_smoother.h index cef5e53639..d7ebb3e0b3 100644 --- a/deal.II/include/deal.II/multigrid/mg_smoother.h +++ b/deal.II/include/deal.II/multigrid/mg_smoother.h @@ -975,65 +975,6 @@ MGSmootherRelaxation::initialize ( } } -#ifdef DEAL_II_MULTIGRID_COMPATIBILITY - -template -inline void -MGSmootherRelaxation::smooth( - const unsigned int level, - VECTOR& u, - const VECTOR& rhs) const -{ - unsigned int maxlevel = matrices.get_maxlevel(); - unsigned int steps2 = this->steps; - - if (this->variable) - steps2 *= (1<<(maxlevel-level)); - - typename VectorMemory::Pointer r(*this->mem); - typename VectorMemory::Pointer d(*this->mem); - r->reinit(u); - d->reinit(u); - - bool T = this->transpose; - if (this->symmetric && (steps2 % 2 == 0)) - T = false; - if (this->debug > 0) - deallog << 'S' << level << ' '; - - for (unsigned int i=0; idebug > 0) - deallog << 'T'; - matrices[level].vmult(*r,u); - r->sadd(-1.,1.,rhs); - if (this->debug > 2) - deallog << ' ' << r->l2_norm() << ' '; - smoothers[level].Tvmult(*d, *r); - if (this->debug > 1) - deallog << ' ' << d->l2_norm() << ' '; - } else { - if (this->debug > 0) - deallog << 'N'; - matrices[level].vmult(*r,u); - r->sadd(-1.,1.,rhs); - if (this->debug > 2) - deallog << ' ' << r->l2_norm() << ' '; - smoothers[level].vmult(*d, *r); - if (this->debug > 1) - deallog << ' ' << d->l2_norm() << ' '; - } - u += *d; - if (this->symmetric) - T = !T; - } - if (this->debug > 0) - deallog << std::endl; -} - -#else template inline void @@ -1065,7 +1006,6 @@ MGSmootherRelaxation::smooth( } } -#endif template