From: guido Date: Wed, 29 Nov 2000 18:43:16 +0000 (+0000) Subject: Preconditioners and solvers have Subscriptor X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db6e54ccf558db4d489b2506cca128696e0323ad;p=dealii-svn.git 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 d4a147fad1..d8dab482c1 100644 --- a/deal.II/lac/include/lac/precondition.h +++ b/deal.II/lac/include/lac/precondition.h @@ -30,7 +30,7 @@ template 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 PreconditionJacobi : private PreconditionRelaxation +class PreconditionJacobi : public Subscriptor, private PreconditionRelaxation { public: /** @@ -259,7 +259,7 @@ class PreconditionJacobi : private PreconditionRelaxation * @author Guido Kanschat, 2000 */ template > -class PreconditionSOR : private PreconditionRelaxation +class PreconditionSOR : public Subscriptor, private PreconditionRelaxation { public: /** @@ -312,7 +312,7 @@ class PreconditionSOR : private PreconditionRelaxation * @author Guido Kanschat, 2000 */ template > -class PreconditionSSOR : private PreconditionRelaxation +class PreconditionSSOR : public Subscriptor, private PreconditionRelaxation { public: /** @@ -390,7 +390,7 @@ class PreconditionSSOR : private PreconditionRelaxation * @author Guido Kanschat, 1999 */ template, class PRECONDITION = PreconditionIdentity> -class PreconditionLACSolver +class PreconditionLACSolver : public Subscriptor { public: /** @@ -448,7 +448,7 @@ class PreconditionLACSolver * @author Guido Kanschat, 2000 */ template -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 Vector = Vector > -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 #include #include - +#include /** * Bicgstab algorithm by van der Vorst. * @@ -43,7 +43,7 @@ * work for you, try to change this value. */ template > -class SolverBicgstab : private Solver +class SolverBicgstab : public Subscriptor, private Solver { 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 #include #include +#include #include @@ -44,7 +45,7 @@ * @author Original implementation by G. Kanschat, R. Becker and F.-T. Suttmeier, reworking and documentation by Wolfgang Bangerth */ template > -class SolverCG : private Solver +class SolverCG : public Subscriptor, private Solver { 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 #include #include #include @@ -72,7 +72,7 @@ * @author Wolfgang Bangerth */ template > -class SolverGMRES : private Solver +class SolverGMRES : public Subscriptor, private Solver { 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 #include #include - +#include /** @@ -48,7 +48,7 @@ * @author Thomas Richter, 2000 */ template > -class SolverMinRes : private Solver +class SolverMinRes : public Subscriptor, private Solver { 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 #include #include - +#include /** * QMRS method. @@ -49,7 +49,7 @@ * @author Guido Kanschat, 1999 */ template > -class SolverQMRS : private Solver +class SolverQMRS : public Subscriptor, private Solver { 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 #include - +#include /** * Implementation of the richardson iteration method. The stopping criterion @@ -38,7 +38,7 @@ * @author Ralf Hartmann */ template > -class SolverRichardson : private Solver +class SolverRichardson : public Subscriptor, private Solver { 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 SolverSelector +class SolverSelector : public Subscriptor { public: