From: Matthias Maier <tamiko@43-1.org>
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 <deal.II/base/config.h>
+#include <deal.II/base/mg_level_object.h>
 #include <deal.II/base/smartpointer.h>
-#include <deal.II/lac/pointer_matrix.h>
-#include <deal.II/lac/vector_memory.h>
 #include <deal.II/lac/block_vector.h>
+#include <deal.II/lac/linear_operator.h>
+#include <deal.II/lac/vector_memory.h>
 #include <deal.II/multigrid/mg_smoother.h>
-#include <deal.II/base/mg_level_object.h>
 #include <vector>
 
 DEAL_II_NAMESPACE_OPEN
@@ -114,12 +114,12 @@ private:
   /**
    * Pointer to the matrices.
    */
-  MGLevelObject<PointerMatrix<MatrixType, BlockVector<number> > > matrices;
+  MGLevelObject<LinearOperator<BlockVector<number> > > matrices;
 
   /**
    * Pointer to the matrices.
    */
-  MGLevelObject<PointerMatrix<RelaxationType, BlockVector<number> > > smoothers;
+  MGLevelObject<LinearOperator<BlockVector<number> > > smoothers;
 
   /**
    * Reverse?
@@ -174,8 +174,8 @@ MGSmootherBlock<MatrixType, RelaxationType, number>::clear ()
                max_level=matrices.max_level();
   for (; i<=max_level; ++i)
     {
-      smoothers[i] = nullptr;
-      matrices[i] = nullptr;
+      smoothers[i] = LinearOperator<BlockVector<number> >();
+      matrices[i] = LinearOperator<BlockVector<number> >();
     }
 }
 
@@ -194,8 +194,8 @@ MGSmootherBlock<MatrixType, RelaxationType, number>::initialize (const MGMatrixT
 
   for (unsigned int i=min; i<=max; ++i)
     {
-      matrices[i] = &m[i];
-      smoothers[i] = &s[i];
+      matrices[i] = linear_operator<BlockVector<number> >(m[i]);
+      smoothers[i] = linear_operator<BlockVector<number> >(s[i]);
     }
 }