Derive solvers publicly from Solver, and remove derivation from Subscriptor since...

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

diff --git a/deal.II/lac/include/lac/solver_bicgstab.h b/deal.II/lac/include/lac/solver_bicgstab.h
index 534720c70867b504f9c1e6116e30b561417f9f34..1ea6e919c57aa05af13bf8a27b35b73a83c280a0 100644 (file)
--- a/deal.II/lac/include/lac/solver_bicgstab.h
+++ b/deal.II/lac/include/lac/solver_bicgstab.h
@@ -46,7 +46,7 @@
  * work for you, try to change this value.
  */
 template <class VECTOR = Vector<double> >
-class SolverBicgstab : public Subscriptor, private Solver<VECTOR>
+class SolverBicgstab : public Solver<VECTOR>
 {
   public:
                                     /**

diff --git a/deal.II/lac/include/lac/solver_cg.h b/deal.II/lac/include/lac/solver_cg.h
index 98c50a0f05ebb7d0b6362f65de157af783f14869..dec580ab28b848bc1e73e09a110067ea885b04f5 100644 (file)
--- a/deal.II/lac/include/lac/solver_cg.h
+++ b/deal.II/lac/include/lac/solver_cg.h
@@ -49,7 +49,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 : public Subscriptor, private Solver<VECTOR>
+class SolverCG : public Solver<VECTOR>
 {
   public:
                                     /**

diff --git a/deal.II/lac/include/lac/solver_gmres.h b/deal.II/lac/include/lac/solver_gmres.h
index ef6f3f6de2144715ebe5345e10b5631b9019d575..b3bec4d7ab50432e8bb0dec66c3b15ab62357caf 100644 (file)
--- a/deal.II/lac/include/lac/solver_gmres.h
+++ b/deal.II/lac/include/lac/solver_gmres.h
@@ -75,7 +75,7 @@
  * @author Wolfgang Bangerth
  */
 template <class VECTOR = Vector<double> >
-class SolverGMRES : public Subscriptor, private Solver<VECTOR>
+class SolverGMRES : public Solver<VECTOR>
 {
   public:
                                     /**

diff --git a/deal.II/lac/include/lac/solver_minres.h b/deal.II/lac/include/lac/solver_minres.h
index 711c7ba1d480e25aa978f103ab1349474aafa4a6..0f3438863dd26f0b44afc152e4196040794a200f 100644 (file)
--- a/deal.II/lac/include/lac/solver_minres.h
+++ b/deal.II/lac/include/lac/solver_minres.h
@@ -51,7 +51,7 @@
  * @author Thomas Richter, 2000
  */
 template <class VECTOR = Vector<double> >
-class SolverMinRes : public Subscriptor, private Solver<VECTOR>
+class SolverMinRes : public Solver<VECTOR>
 {
   public:
                                     /**

diff --git a/deal.II/lac/include/lac/solver_qmrs.h b/deal.II/lac/include/lac/solver_qmrs.h
index 2bca2aec6c0b797e8cb18ed469e56e4c4e9c2aec..3addda0019c84954825372942ce731f8db92cdc9 100644 (file)
--- a/deal.II/lac/include/lac/solver_qmrs.h
+++ b/deal.II/lac/include/lac/solver_qmrs.h
@@ -52,7 +52,7 @@
  * @author Guido Kanschat, 1999
  */
 template <class VECTOR = Vector<double> >
-class SolverQMRS : public Subscriptor, private Solver<VECTOR>
+class SolverQMRS : public Solver<VECTOR>
 {
   public:
                                     /**

diff --git a/deal.II/lac/include/lac/solver_richardson.h b/deal.II/lac/include/lac/solver_richardson.h
index 60682892c0e9a8e68d7a1bd11def134a2fb7bed5..e892d72175aac37ea45ca47e9e6887b0c86cafcd 100644 (file)
--- a/deal.II/lac/include/lac/solver_richardson.h
+++ b/deal.II/lac/include/lac/solver_richardson.h
@@ -41,7 +41,7 @@
  * @author Ralf Hartmann
  */
 template <class VECTOR = Vector<double> >
-class SolverRichardson : public Subscriptor, private Solver<VECTOR>
+class SolverRichardson : public Solver<VECTOR>
 {
   public:
                                     /**