From db6e54ccf558db4d489b2506cca128696e0323ad Mon Sep 17 00:00:00 2001
From: guido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Wed, 29 Nov 2000 18:43:16 +0000
Subject: [PATCH] Preconditioners and solvers have Subscriptor

git-svn-id: https://svn.dealii.org/trunk@3513 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/lac/include/lac/precondition.h          | 12 ++++++------
 deal.II/lac/include/lac/precondition_selector.h |  2 +-
 deal.II/lac/include/lac/solver_bicgstab.h       |  4 ++--
 deal.II/lac/include/lac/solver_cg.h             |  3 ++-
 deal.II/lac/include/lac/solver_gmres.h          |  4 ++--
 deal.II/lac/include/lac/solver_minres.h         |  4 ++--
 deal.II/lac/include/lac/solver_qmrs.h           |  4 ++--
 deal.II/lac/include/lac/solver_richardson.h     |  4 ++--
 deal.II/lac/include/lac/solver_selector.h       |  2 +-
 9 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/deal.II/lac/include/lac/precondition.h b/deal.II/lac/include/lac/precondition.h
index d4a147fad1..d8dab482c1 100644
--- a/deal.II/lac/include/lac/precondition.h
+++ b/deal.II/lac/include/lac/precondition.h
@@ -30,7 +30,7 @@ template <typename number> class SparseMatrix;
  *
  * @author Guido Kanschat, 1999
  */
-class PreconditionIdentity
+class PreconditionIdentity : public Subscriptor
 {
   public:
 				     /**
@@ -204,7 +204,7 @@ class PreconditionRelaxation
  * @author Guido Kanschat, 2000
  */
 template <class MATRIX = SparseMatrix<double> >
-class PreconditionJacobi : private PreconditionRelaxation<MATRIX>
+class PreconditionJacobi : public Subscriptor, private PreconditionRelaxation<MATRIX>
 {
   public:
 				     /**
@@ -259,7 +259,7 @@ class PreconditionJacobi : private PreconditionRelaxation<MATRIX>
  * @author Guido Kanschat, 2000
  */
 template <class MATRIX = SparseMatrix<double> >
-class PreconditionSOR : private PreconditionRelaxation<MATRIX>
+class PreconditionSOR : public Subscriptor, private PreconditionRelaxation<MATRIX>
 {
   public:
 				     /**
@@ -312,7 +312,7 @@ class PreconditionSOR : private PreconditionRelaxation<MATRIX>
  * @author Guido Kanschat, 2000
  */
 template <class MATRIX = SparseMatrix<double> >
-class PreconditionSSOR : private PreconditionRelaxation<MATRIX>
+class PreconditionSSOR : public Subscriptor, private PreconditionRelaxation<MATRIX>
 {
   public:
 				     /**
@@ -390,7 +390,7 @@ class PreconditionSSOR : private PreconditionRelaxation<MATRIX>
  * @author Guido Kanschat, 1999
  */
 template<class SOLVER, class MATRIX = SparseMatrix<double>, class PRECONDITION = PreconditionIdentity>
-class PreconditionLACSolver
+class PreconditionLACSolver : public Subscriptor
 {
   public:
 				     /**
@@ -448,7 +448,7 @@ class PreconditionLACSolver
  * @author Guido Kanschat, 2000
  */
 template<class MATRIX, class PRECOND, class VECTOR>
-class PreconditionedMatrix
+class PreconditionedMatrix : public Subscriptor
 {
   public:
 				     /**
diff --git a/deal.II/lac/include/lac/precondition_selector.h b/deal.II/lac/include/lac/precondition_selector.h
index cec7dad356..c325cca30a 100644
--- a/deal.II/lac/include/lac/precondition_selector.h
+++ b/deal.II/lac/include/lac/precondition_selector.h
@@ -80,7 +80,7 @@
  */
 template <class Matrix = SparseMatrix<double>,
           class Vector = Vector<double> >
-class PreconditionSelector
+class PreconditionSelector : public Subscriptor
 {
   public:
     
diff --git a/deal.II/lac/include/lac/solver_bicgstab.h b/deal.II/lac/include/lac/solver_bicgstab.h
index a4883513a0..ed2a1fcbe6 100644
--- a/deal.II/lac/include/lac/solver_bicgstab.h
+++ b/deal.II/lac/include/lac/solver_bicgstab.h
@@ -18,7 +18,7 @@
 #include <lac/solver.h>
 #include <lac/solver_control.h>
 #include <cmath>
-
+#include <base/subscriptor.h>
 /**
  * Bicgstab algorithm by van der Vorst.
  *
@@ -43,7 +43,7 @@
  * work for you, try to change this value.
  */
 template <class VECTOR = Vector<double> >
-class SolverBicgstab : private Solver<VECTOR>
+class SolverBicgstab : public Subscriptor, private Solver<VECTOR>
 {
   public:
     				     /**
diff --git a/deal.II/lac/include/lac/solver_cg.h b/deal.II/lac/include/lac/solver_cg.h
index 9e04fa9134..5ebb3e822e 100644
--- a/deal.II/lac/include/lac/solver_cg.h
+++ b/deal.II/lac/include/lac/solver_cg.h
@@ -17,6 +17,7 @@
 #include <lac/solver.h>
 #include <lac/solver_control.h>
 #include <base/logstream.h>
+#include <base/subscriptor.h>
 #include <cmath>
 
 
@@ -44,7 +45,7 @@
  * @author Original implementation by G. Kanschat, R. Becker and F.-T. Suttmeier, reworking and  documentation by Wolfgang Bangerth
  */
 template <class VECTOR = Vector<double> >
-class SolverCG : private Solver<VECTOR>
+class SolverCG : public Subscriptor, private Solver<VECTOR>
 {
   public:
     				     /**
diff --git a/deal.II/lac/include/lac/solver_gmres.h b/deal.II/lac/include/lac/solver_gmres.h
index 0e84368b46..23e5e190b1 100644
--- a/deal.II/lac/include/lac/solver_gmres.h
+++ b/deal.II/lac/include/lac/solver_gmres.h
@@ -16,7 +16,7 @@
 
 /*----------------------------   solver_pgmres.h     ---------------------------*/
 
-
+#include <base/subscriptor.h>
 #include <base/logstream.h>
 #include <lac/solver.h>
 #include <lac/solver_control.h>
@@ -72,7 +72,7 @@
  * @author Wolfgang Bangerth
  */
 template <class VECTOR = Vector<double> >
-class SolverGMRES : private Solver<VECTOR>
+class SolverGMRES : public Subscriptor, private Solver<VECTOR>
 {
   public:
     				     /**
diff --git a/deal.II/lac/include/lac/solver_minres.h b/deal.II/lac/include/lac/solver_minres.h
index b332dff9d0..58ba84785f 100644
--- a/deal.II/lac/include/lac/solver_minres.h
+++ b/deal.II/lac/include/lac/solver_minres.h
@@ -18,7 +18,7 @@
 #include <lac/solver_control.h>
 #include <base/logstream.h>
 #include <cmath>
-
+#include <base/subscriptor.h>
 
 
 /**
@@ -48,7 +48,7 @@
  * @author Thomas Richter, 2000
  */
 template <class VECTOR = Vector<double> >
-class SolverMinRes : private Solver<VECTOR>
+class SolverMinRes : public Subscriptor, private Solver<VECTOR>
 {
   public:
     				     /**
diff --git a/deal.II/lac/include/lac/solver_qmrs.h b/deal.II/lac/include/lac/solver_qmrs.h
index 356a30fe13..81a2ac359f 100644
--- a/deal.II/lac/include/lac/solver_qmrs.h
+++ b/deal.II/lac/include/lac/solver_qmrs.h
@@ -17,7 +17,7 @@
 #include <lac/solver_control.h>
 #include <base/logstream.h>
 #include <cmath>
-
+#include <base/subscriptor.h>
 
 /**
  * QMRS method.
@@ -49,7 +49,7 @@
  * @author Guido Kanschat, 1999
  */
 template <class VECTOR = Vector<double> >
-class SolverQMRS : private Solver<VECTOR>
+class SolverQMRS : public Subscriptor, private Solver<VECTOR>
 {
   public:
     				     /**
diff --git a/deal.II/lac/include/lac/solver_richardson.h b/deal.II/lac/include/lac/solver_richardson.h
index af356e52f3..4ad356a1b8 100644
--- a/deal.II/lac/include/lac/solver_richardson.h
+++ b/deal.II/lac/include/lac/solver_richardson.h
@@ -16,7 +16,7 @@
 
 #include <lac/solver.h>
 #include <lac/solver_control.h>
-
+#include <base/subscriptor.h>
 
 /**
  * Implementation of the richardson iteration method. The stopping criterion
@@ -38,7 +38,7 @@
  * @author Ralf Hartmann
  */
 template <class VECTOR = Vector<double> >
-class SolverRichardson : private Solver<VECTOR>
+class SolverRichardson : public Subscriptor, private Solver<VECTOR>
 {
   public:
 				     /**
diff --git a/deal.II/lac/include/lac/solver_selector.h b/deal.II/lac/include/lac/solver_selector.h
index bcf138ff7d..30d94dfc5b 100644
--- a/deal.II/lac/include/lac/solver_selector.h
+++ b/deal.II/lac/include/lac/solver_selector.h
@@ -85,7 +85,7 @@
  * @author Ralf Hartmann, 1999
  */
 template <class Vector = Vector<double> >
-class SolverSelector
+class SolverSelector : public Subscriptor
 {
   public:
 
-- 
2.39.5