From c77d1ea4579ad40efdf1913b15d890f97da66534 Mon Sep 17 00:00:00 2001 From: guido Date: Thu, 29 Jun 2000 20:04:11 +0000 Subject: [PATCH] Inheritance changed to private git-svn-id: https://svn.dealii.org/trunk@3105 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/lac/include/lac/precondition_block.h | 36 ++++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/deal.II/lac/include/lac/precondition_block.h b/deal.II/lac/include/lac/precondition_block.h index 33f5d53095..bd5eedfb6c 100644 --- a/deal.II/lac/include/lac/precondition_block.h +++ b/deal.II/lac/include/lac/precondition_block.h @@ -75,7 +75,7 @@ template class Vector; * @author Ralf Hartmann, 1999 */ template -class PreconditionBlock: public Subscriptor +class PreconditionBlock { public: /** @@ -86,7 +86,7 @@ class PreconditionBlock: public Subscriptor /** * Destructor. */ - virtual ~PreconditionBlock(); + ~PreconditionBlock(); /** * Initialize matrix and block @@ -108,7 +108,7 @@ class PreconditionBlock: public Subscriptor * that it had directly after * calling the constructor. */ - virtual void clear(); + void clear(); /** * Use only the inverse of the @@ -248,9 +248,21 @@ class PreconditionBlock: public Subscriptor * Block Jacobi preconditioning. */ template -class PreconditionBlockJacobi : public PreconditionBlock +class PreconditionBlockJacobi : public Subscriptor, + private PreconditionBlock { public: + /** + * Make initialization function + * publicly available. + */ + PreconditionBlock::initialize; + + /** + * Make function public. + */ + PreconditionBlock::invert_diagblocks; + /** * Execute block Jacobi * preconditioning. @@ -283,7 +295,8 @@ class PreconditionBlockJacobi : public PreconditionBlock * in the @p{operator ()} function of this class. */ template -class PreconditionBlockSOR : public PreconditionBlock +class PreconditionBlockSOR : public Subscriptor, + private PreconditionBlock { public: /** @@ -297,6 +310,17 @@ class PreconditionBlockSOR : public PreconditionBlock */ virtual ~PreconditionBlockSOR(); + /** + * Make initialization function + * publicly available. + */ + PreconditionBlock::initialize; + + /** + * Make function public. + */ + PreconditionBlock::invert_diagblocks; + /** * Set the relaxation parameter. */ @@ -323,7 +347,7 @@ class PreconditionBlockSOR : public PreconditionBlock private: /** - * Damping parameter. + * Relaxation parameter. */ number omega; }; -- 2.39.5