From d831f24fcc1fa6ce45e14fc025ffdec1ccfd3a75 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Sat, 13 Feb 2010 04:53:39 +0000 Subject: [PATCH] Provide default arguments for the two-argument initialize() functions. Name second template argument for MGSmoothPrecondition according to its meaning. git-svn-id: https://svn.dealii.org/trunk@20589 0785d39b-7218-0410-832d-ea1e28bc413d --- .../deal.II/include/multigrid/mg_smoother.h | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/deal.II/deal.II/include/multigrid/mg_smoother.h b/deal.II/deal.II/include/multigrid/mg_smoother.h index 13fa78ecc6..b352d3c2e5 100644 --- a/deal.II/deal.II/include/multigrid/mg_smoother.h +++ b/deal.II/deal.II/include/multigrid/mg_smoother.h @@ -238,7 +238,7 @@ class MGSmootherRelaxation : public MGSmoother */ template void initialize (const MGLevelObject& matrices, - const DATA& additional_data); + const DATA& additional_data = RELAX::AdditionalData()); /** * Initialize for matrices. This @@ -376,7 +376,7 @@ class MGSmootherRelaxation : public MGSmoother * * @author Guido Kanschat, 2009 */ -template +template class MGSmootherPrecondition : public MGSmoother { public: @@ -400,14 +400,14 @@ class MGSmootherPrecondition : public MGSmoother * * @p additional_data is an * object of type - * @p RELAX::AdditionalData and + * @p PRECONDITIONER::AdditionalData and * is handed to the * initialization function of the * relaxation method. */ template void initialize (const MGLevelObject& matrices, - const DATA& additional_data); + const DATA& additional_data = PRECONDITIONER::AdditionalData()); /** * Initialize for matrices. This @@ -419,7 +419,7 @@ class MGSmootherPrecondition : public MGSmoother * * @p additional_data is an * object of type - * @p RELAX::AdditionalData and + * @p PRECONDITIONER::AdditionalData and * is handed to the * initialization function of the * relaxation method. @@ -443,7 +443,7 @@ class MGSmootherPrecondition : public MGSmoother * * @p additional_data is an * object of type - * @p RELAX::AdditionalData and + * @p PRECONDITIONER::AdditionalData and * is handed to the * initialization function of the * relaxation method. @@ -469,7 +469,7 @@ class MGSmootherPrecondition : public MGSmoother * * @p additional_data is an * object of type - * @p RELAX::AdditionalData and + * @p PRECONDITIONER::AdditionalData and * is handed to the * initialization function of the * relaxation method. @@ -496,7 +496,7 @@ class MGSmootherPrecondition : public MGSmoother * Object containing relaxation * methods. */ - MGLevelObject smoothers; + MGLevelObject smoothers; /** * Memory used by this object. @@ -816,9 +816,9 @@ memory_consumption () const //----------------------------------------------------------------------// -template +template inline -MGSmootherPrecondition::MGSmootherPrecondition( +MGSmootherPrecondition::MGSmootherPrecondition( VectorMemory& mem, const unsigned int steps, const bool variable, @@ -829,9 +829,9 @@ MGSmootherPrecondition::MGSmootherPrecondition( {} -template +template inline void -MGSmootherPrecondition::clear () +MGSmootherPrecondition::clear () { smoothers.clear(); @@ -842,10 +842,10 @@ MGSmootherPrecondition::clear () } -template +template template inline void -MGSmootherPrecondition::initialize ( +MGSmootherPrecondition::initialize ( const MGLevelObject& m, const DATA& data) { @@ -862,10 +862,10 @@ MGSmootherPrecondition::initialize ( } } -template +template template inline void -MGSmootherPrecondition::initialize ( +MGSmootherPrecondition::initialize ( const MGLevelObject& m, const MGLevelObject& data) { @@ -887,10 +887,10 @@ MGSmootherPrecondition::initialize ( } } -template +template template inline void -MGSmootherPrecondition::initialize ( +MGSmootherPrecondition::initialize ( const MGLevelObject& m, const DATA& data, const unsigned int row, @@ -909,10 +909,10 @@ MGSmootherPrecondition::initialize ( } } -template +template template inline void -MGSmootherPrecondition::initialize ( +MGSmootherPrecondition::initialize ( const MGLevelObject& m, const MGLevelObject& data, const unsigned int row, @@ -936,9 +936,9 @@ MGSmootherPrecondition::initialize ( } } -template +template inline void -MGSmootherPrecondition::smooth( +MGSmootherPrecondition::smooth( const unsigned int level, VECTOR& u, const VECTOR& rhs) const @@ -1009,9 +1009,9 @@ MGSmootherPrecondition::smooth( } -template +template inline unsigned int -MGSmootherPrecondition:: +MGSmootherPrecondition:: memory_consumption () const { return sizeof(*this) -- 2.39.5