From: Matthias Maier Date: Thu, 13 Jul 2017 17:56:56 +0000 (-0500) Subject: Cleanup: Use LinearOperator instead of PointerMatrix X-Git-Tag: v9.0.0-rc1~1423^2~8 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd787b698a1385d31b3c332b21a24f3cc4d77ee3;p=dealii.git Cleanup: Use LinearOperator instead of PointerMatrix --- diff --git a/include/deal.II/multigrid/mg_block_smoother.h b/include/deal.II/multigrid/mg_block_smoother.h index efaa62ae79..1a9c1ceb56 100644 --- a/include/deal.II/multigrid/mg_block_smoother.h +++ b/include/deal.II/multigrid/mg_block_smoother.h @@ -18,12 +18,12 @@ #include +#include #include -#include -#include #include +#include +#include #include -#include #include DEAL_II_NAMESPACE_OPEN @@ -114,12 +114,12 @@ private: /** * Pointer to the matrices. */ - MGLevelObject > > matrices; + MGLevelObject > > matrices; /** * Pointer to the matrices. */ - MGLevelObject > > smoothers; + MGLevelObject > > smoothers; /** * Reverse? @@ -174,8 +174,8 @@ MGSmootherBlock::clear () max_level=matrices.max_level(); for (; i<=max_level; ++i) { - smoothers[i] = nullptr; - matrices[i] = nullptr; + smoothers[i] = LinearOperator >(); + matrices[i] = LinearOperator >(); } } @@ -194,8 +194,8 @@ MGSmootherBlock::initialize (const MGMatrixT for (unsigned int i=min; i<=max; ++i) { - matrices[i] = &m[i]; - smoothers[i] = &s[i]; + matrices[i] = linear_operator >(m[i]); + smoothers[i] = linear_operator >(s[i]); } }