From 8bf71b1ea2ac9b2084a3bf1c6d45b3bf4288f136 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 29 Dec 2014 20:36:42 -0600 Subject: [PATCH] Remove deprecated constructors of MGSmoother* classes that take VectorMemory objects as arguments. --- doc/news/changes.h | 6 +- examples/step-16/step-16.cc | 5 -- include/deal.II/multigrid/mg_smoother.h | 85 +------------------------ tests/bits/step-16.cc | 4 +- tests/bits/step-16b.cc | 6 +- 5 files changed, 8 insertions(+), 98 deletions(-) diff --git a/doc/news/changes.h b/doc/news/changes.h index ea5e2533e6..bd92a5a891 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -50,9 +50,9 @@ inconvenience this causes. data postprocessor classes implemented in your program that overload these functions, you will have to change it in a way that they overload the functions of same name but with the evaluation point argument instead. -
- (Wolfgang Bangerth, 2015/01/04) - + - The constructors of classes MGSmoother, MGSmootherRelaxation and + MGSmootherPrecondition that take a VectorMemory object. +
  • Removed: The config.h file no longer exports HAVE_* definitions. Those are either entirely removed (for the blas/lapack symbols) or diff --git a/examples/step-16/step-16.cc b/examples/step-16/step-16.cc index a3204e4fe8..48fc783fd8 100644 --- a/examples/step-16/step-16.cc +++ b/examples/step-16/step-16.cc @@ -504,11 +504,6 @@ namespace Step16 // iteration. To this end, we define an appropriate typedef // and then setup a smoother object. // - // Since this smoother needs temporary vectors to store intermediate - // results, we need to provide a VectorMemory object. Since these vectors - // will be reused over and over, the GrowingVectorMemory is more time - // efficient than the PrimitiveVectorMemory class in the current case. - // // The last step is to initialize the smoother object with our level // matrices and to set some smoothing parameters. The // initialize() function can optionally take additional diff --git a/include/deal.II/multigrid/mg_smoother.h b/include/deal.II/multigrid/mg_smoother.h index 1622faa3b7..24fdd64c6c 100644 --- a/include/deal.II/multigrid/mg_smoother.h +++ b/include/deal.II/multigrid/mg_smoother.h @@ -47,26 +47,13 @@ class MGSmoother : public MGSmootherBase { public: /** - * Constructor. Sets smoothing parameters and creates a private - * GrowingVectorMemory object to be used to retrieve vectors. + * Constructor. */ MGSmoother(const unsigned int steps = 1, const bool variable = false, const bool symmetric = false, const bool transpose = false); - /** - * @deprecated Since GrowingVectorMemory now uses a joint memory pool, it is - * recommended to use the constructor without the memory object. - * - * Constructor. Sets memory and smoothing parameters. - */ - MGSmoother(VectorMemory &mem, - const unsigned int steps = 1, - const bool variable = false, - const bool symmetric = false, - const bool transpose = false) DEAL_II_DEPRECATED; - /** * Modify the number of smoothing steps on finest level. */ @@ -201,7 +188,7 @@ namespace mg { public: /** - * Constructor. Sets memory and smoothing parameters. + * Constructor. Sets smoothing parameters. */ SmootherRelaxation(const unsigned int steps = 1, const bool variable = false, @@ -311,17 +298,6 @@ public: const bool symmetric = false, const bool transpose = false); - /** - * Constructor. Sets memory and smoothing parameters. - * - * @deprecated Use the constructor without the vector memory object - */ - MGSmootherRelaxation(VectorMemory &mem, - const unsigned int steps = 1, - const bool variable = false, - const bool symmetric = false, - const bool transpose = false) DEAL_II_DEPRECATED; - /** * Initialize for matrices. This function stores pointers to the level * matrices and initializes the smoothing operator with the same smoother @@ -451,17 +427,6 @@ public: const bool symmetric = false, const bool transpose = false); - /** - * Constructor. Sets memory and smoothing parameters. - * - * @deprecated Use the constructor without the vector memory object - */ - MGSmootherPrecondition(VectorMemory &mem, - const unsigned int steps = 1, - const bool variable = false, - const bool symmetric = false, - const bool transpose = false) DEAL_II_DEPRECATED; - /** * Initialize for matrices. This function stores pointers to the level * matrices and initializes the smoothing operator with the same smoother @@ -584,24 +549,6 @@ MGSmoother::MGSmoother( {} -template -inline -MGSmoother::MGSmoother( - VectorMemory &mem, - const unsigned int steps, - const bool variable, - const bool symmetric, - const bool transpose) - : - steps(steps), - variable(variable), - symmetric(symmetric), - transpose(transpose), - debug(0), - mem(&mem) -{} - - template inline void MGSmoother::set_steps (const unsigned int s) @@ -745,20 +692,6 @@ namespace mg //----------------------------------------------------------------------// -template -inline -MGSmootherRelaxation::MGSmootherRelaxation( - VectorMemory &mem, - const unsigned int steps, - const bool variable, - const bool symmetric, - const bool transpose) - : - MGSmoother(mem, steps, variable, symmetric, transpose) -{} - - - template inline MGSmootherRelaxation::MGSmootherRelaxation( @@ -927,20 +860,6 @@ memory_consumption () const //----------------------------------------------------------------------// -template -inline -MGSmootherPrecondition::MGSmootherPrecondition( - VectorMemory &mem, - const unsigned int steps, - const bool variable, - const bool symmetric, - const bool transpose) - : - MGSmoother(mem, steps, variable, symmetric, transpose) -{} - - - template inline MGSmootherPrecondition::MGSmootherPrecondition( diff --git a/tests/bits/step-16.cc b/tests/bits/step-16.cc index c7b3439b46..273ac93cd8 100644 --- a/tests/bits/step-16.cc +++ b/tests/bits/step-16.cc @@ -242,8 +242,6 @@ void LaplaceProblem::assemble_multigrid () template void LaplaceProblem::solve () { - GrowingVectorMemory<> vector_memory; - MGTransferPrebuilt > mg_transfer; mg_transfer.build_matrices(mg_dof_handler); @@ -254,7 +252,7 @@ void LaplaceProblem::solve () typedef PreconditionSOR > RELAXATION; MGSmootherRelaxation, RELAXATION, Vector > - mg_smoother(vector_memory); + mg_smoother; RELAXATION::AdditionalData smoother_data; mg_smoother.initialize(mg_matrices, smoother_data); diff --git a/tests/bits/step-16b.cc b/tests/bits/step-16b.cc index 410f89bdce..25ba59ddd7 100644 --- a/tests/bits/step-16b.cc +++ b/tests/bits/step-16b.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2005 - 2013 by the deal.II authors +// Copyright (C) 2005 - 2014 by the deal.II authors // // This file is part of the deal.II library. // @@ -245,8 +245,6 @@ void LaplaceProblem::assemble_multigrid () template void LaplaceProblem::solve () { - GrowingVectorMemory<> vector_memory; - MGTransferPrebuilt > mg_transfer; mg_transfer.build_matrices(mg_dof_handler); @@ -257,7 +255,7 @@ void LaplaceProblem::solve () typedef PreconditionSOR > RELAXATION; MGSmootherRelaxation, RELAXATION, Vector > - mg_smoother(vector_memory); + mg_smoother; RELAXATION::AdditionalData smoother_data; mg_smoother.initialize(mg_matrices, smoother_data); -- 2.39.5