Preconditioners and solvers have Subscriptor

git-svn-id: https://svn.dealii.org/trunk@3513 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/lac/include/lac/precondition.h b/deal.II/lac/include/lac/precondition.h
index d4a147fad15bfa00748a6eaa6a5ecfcfcd02e114..d8dab482c15bb4415b68262a0b9a12e5d8e9b59a 100644 (file)
--- 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 cec7dad356a91848bf902b47850966f400f25c8c..c325cca30a3720e5e2e604bd8f7c51b50757ba84 100644 (file)
--- 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 a4883513a0f35b45122d9d35a8d198fd6aaa5710..ed2a1fcbe6c4735db34553ba4e8ed97f73c9fefd 100644 (file)
--- 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 9e04fa9134858873801896ceb3519c4b1bae18ac..5ebb3e822e7dcbd53533c5fbc1665d927b105b68 100644 (file)
--- 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 0e84368b464223c24ac77a92c511ac19ce20fe91..23e5e190b11ff75d9e9fae02bca80de3160d44a7 100644 (file)
--- 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 b332dff9d07c8fbf29bb704f43f03309d1bea5b2..58ba84785fa44613a1033e35a013f0b4a578ba0e 100644 (file)
--- 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 356a30fe13923702e08e85ab974d729dda5a2716..81a2ac359f635ecd93df134e490d9c1e4388d025 100644 (file)
--- 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 af356e52f3cc5b8d05a7f241c6b6bb0422ae459b..4ad356a1b85cceaab9e03fe4fcf8f8ab5c8b36a2 100644 (file)
--- 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 bcf138ff7dc601c83ad5d8fcf832e82a12211826..30d94dfc5b9e82142bd79dae6327fd56db9fa375 100644 (file)
--- 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: