From: Matthias Maier Date: Thu, 13 Jul 2017 17:57:53 +0000 (-0500) Subject: Cleanup: Use LinearOperator instead of PointerMatrix X-Git-Tag: v9.0.0-rc1~1423^2~5 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b96d0c1870a6515400071a9ca287c5df6023a922;p=dealii.git Cleanup: Use LinearOperator instead of PointerMatrix --- diff --git a/include/deal.II/multigrid/mg_smoother.h b/include/deal.II/multigrid/mg_smoother.h index fbb7bd685d..8ff6c6609a 100644 --- a/include/deal.II/multigrid/mg_smoother.h +++ b/include/deal.II/multigrid/mg_smoother.h @@ -18,11 +18,11 @@ #include +#include #include -#include +#include #include #include -#include #include DEAL_II_NAMESPACE_OPEN @@ -395,7 +395,7 @@ private: /** * Pointer to the matrices. */ - MGLevelObject > matrices; + MGLevelObject > matrices; }; @@ -547,7 +547,7 @@ private: /** * Pointer to the matrices. */ - MGLevelObject > matrices; + MGLevelObject > matrices; }; @@ -786,7 +786,7 @@ MGSmootherRelaxation::clear () unsigned int i=matrices.min_level(), max_level=matrices.max_level(); for (; i<=max_level; ++i) - matrices[i]=nullptr; + matrices[i] = LinearOperator(); } @@ -805,7 +805,7 @@ MGSmootherRelaxation::initialize for (unsigned int i=min; i<=max; ++i) { - matrices[i] = &m[i]; + matrices[i] = linear_operator(m[i]); smoothers[i].initialize(m[i], data); } } @@ -830,7 +830,7 @@ MGSmootherRelaxation::initialize for (unsigned int i=min; i<=max; ++i) { - matrices[i] = &m[i]; + matrices[i] = linear_operator(m[i]); smoothers[i].initialize(m[i], data[i]); } } @@ -989,7 +989,7 @@ MGSmootherPrecondition::clear () unsigned int i=matrices.min_level(), max_level=matrices.max_level(); for (; i<=max_level; ++i) - matrices[i]=nullptr; + matrices[i]=LinearOperator(); } @@ -1009,7 +1009,7 @@ MGSmootherPrecondition::initialize for (unsigned int i=min; i<=max; ++i) { - matrices[i] = &m[i]; + matrices[i] = linear_operator(m[i]); smoothers[i].initialize(m[i], data); } }