From: Daniel Arndt Date: Wed, 8 Apr 2020 16:27:43 +0000 (-0400) Subject: Remove some deprecated functions and variables X-Git-Tag: v9.2.0-rc1~258^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9860%2Fhead;p=dealii.git Remove some deprecated functions and variables --- diff --git a/doc/news/changes/incompatibilities/20200408DanielArndt b/doc/news/changes/incompatibilities/20200408DanielArndt new file mode 100644 index 0000000000..80c9aa8375 --- /dev/null +++ b/doc/news/changes/incompatibilities/20200408DanielArndt @@ -0,0 +1,8 @@ +Removed: The deprecated functions Utilities::fixed_int_power(), +LinearAlgebra::distributed::BlockVector::equ(), +LinearAlgebra::distributed::BlockVector::sadd() +and FEEvaluationBase::get_cell_data_number() and the deprecated variable +DoFHandler::invalid_dof_index and hp::DoFHandler::invalid_dof_index have been +removed. +
+(Daniel Arndt, 2020/04/08) diff --git a/include/deal.II/base/utilities.h b/include/deal.II/base/utilities.h index 059b617232..60908f97c6 100644 --- a/include/deal.II/base/utilities.h +++ b/include/deal.II/base/utilities.h @@ -466,49 +466,6 @@ namespace Utilities T fixed_power(const T t); - /** - * Calculate a fixed power of an integer number by a template expression - * where both the number a and the power N are - * compile-time constants. This computes the result of the power operation - * at compile time, enabling its use e.g. in other templates. - * - * Use this class as in fixed_int_power@<5,2@>::%value to - * compute 52. - * - * @deprecated This template has been deprecated in favor of C++11's support - * for constexpr calculations, e.g., use - * - * @code - * constexpr int value = Utilities::pow(2, dim); - * @endcode - * - * instead of - * - * @code - * const int value = Utilities::fixed_int_power<2, dim>::value; - * @endcode - * - * to obtain a constant expression for value. - */ - template - struct DEAL_II_DEPRECATED fixed_int_power - { - static const int value = a * fixed_int_power::value; - }; - - /** - * Base case for the power operation with N=0, which gives the - * result 1. - * - * @deprecated This template is deprecated: see the note in the general - * version of this template for more information. - */ - template - struct DEAL_II_DEPRECATED fixed_int_power - { - static const int value = 1; - }; - /** * A replacement for std::pow that allows compile-time * calculations for constant expression arguments. The @p base must diff --git a/include/deal.II/dofs/dof_handler.h b/include/deal.II/dofs/dof_handler.h index be7c0258fe..db99c0dd48 100644 --- a/include/deal.II/dofs/dof_handler.h +++ b/include/deal.II/dofs/dof_handler.h @@ -409,21 +409,6 @@ public: */ static const bool is_hp_dof_handler = false; - /** - * When the arrays holding the DoF indices are set up, but before they are - * filled with actual values, they are set to an invalid value, in order to - * monitor possible problems. This invalid value is the constant defined - * here. - * - * Please note that you should not rely on it having a certain value, but - * rather take its symbolic name. - * - * @deprecated Use numbers::invalid_dof_index instead. - */ - DEAL_II_DEPRECATED - static const types::global_dof_index invalid_dof_index = - numbers::invalid_dof_index; - /** * The default index of the finite element to be used on a given cell. Since * the present class only supports the same finite element to be used on all diff --git a/include/deal.II/hp/dof_handler.h b/include/deal.II/hp/dof_handler.h index ce1e50f700..a6514f9447 100644 --- a/include/deal.II/hp/dof_handler.h +++ b/include/deal.II/hp/dof_handler.h @@ -360,21 +360,6 @@ namespace hp */ static const bool is_hp_dof_handler = true; - /** - * When the arrays holding the DoF indices are set up, but before they are - * filled with actual values, they are set to an invalid value, in order - * to monitor possible problems. This invalid value is the constant - * defined here. - * - * Please note that you should not rely on it having a certain value, but - * rather take its symbolic name. - * - * @deprecated Use numbers::invalid_dof_index instead. - */ - DEAL_II_DEPRECATED - static const types::global_dof_index invalid_dof_index = - numbers::invalid_dof_index; - /** * The default index of the finite element to be used on a given cell. For * the usual, non-hp dealii::DoFHandler class that only supports the same diff --git a/include/deal.II/lac/la_parallel_block_vector.h b/include/deal.II/lac/la_parallel_block_vector.h index 10d2b49c2c..b4908d8e7b 100644 --- a/include/deal.II/lac/la_parallel_block_vector.h +++ b/include/deal.II/lac/la_parallel_block_vector.h @@ -376,31 +376,6 @@ namespace LinearAlgebra void sadd(const Number s, const BlockVector &V); - /** - * Assignment *this = a*u + b*v. - * - * This function is deprecated. - */ - DEAL_II_DEPRECATED - void - equ(const Number a, - const BlockVector &u, - const Number b, - const BlockVector &v); - - /** - * Scaling and multiple addition. - * - * This function is deprecated. - */ - DEAL_II_DEPRECATED - void - sadd(const Number s, - const Number a, - const BlockVector &V, - const Number b, - const BlockVector &W); - /** * Return whether the vector contains only elements with value zero. * This function is mainly for internal consistency checks and should diff --git a/include/deal.II/lac/la_parallel_block_vector.templates.h b/include/deal.II/lac/la_parallel_block_vector.templates.h index 6aea0feb69..e9649242c2 100644 --- a/include/deal.II/lac/la_parallel_block_vector.templates.h +++ b/include/deal.II/lac/la_parallel_block_vector.templates.h @@ -390,21 +390,6 @@ namespace LinearAlgebra - template - void - BlockVector::equ(const Number a, - const BlockVector &v, - const Number b, - const BlockVector &w) - { - AssertDimension(this->n_blocks(), v.n_blocks()); - AssertDimension(this->n_blocks(), w.n_blocks()); - for (unsigned int block = 0; block < this->n_blocks(); ++block) - this->block(block).equ(a, v.block(block), b, w.block(block)); - } - - - template BlockVector & BlockVector::operator+=(const VectorSpaceVector &vv) @@ -522,22 +507,6 @@ namespace LinearAlgebra - template - void - BlockVector::sadd(const Number x, - const Number a, - const BlockVector &v, - const Number b, - const BlockVector &w) - { - AssertDimension(this->n_blocks(), v.n_blocks()); - AssertDimension(this->n_blocks(), w.n_blocks()); - for (unsigned int block = 0; block < this->n_blocks(); ++block) - this->block(block).sadd(x, a, v.block(block), b, w.block(block)); - } - - - template template void diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h index 71bd3457df..b05a248881 100644 --- a/include/deal.II/matrix_free/fe_evaluation.h +++ b/include/deal.II/matrix_free/fe_evaluation.h @@ -117,13 +117,6 @@ public: */ ~FEEvaluationBase(); - /** - * @deprecated Use get_mapping_data_index_offset() instead. - */ - DEAL_II_DEPRECATED - unsigned int - get_cell_data_number() const; - /** * Return the index offset within the geometry fields for the cell the @p * reinit() function has been called for. This index can be used to access @@ -3408,20 +3401,6 @@ FEEvaluationBase:: -template -inline unsigned int -FEEvaluationBase:: - get_cell_data_number() const -{ - return get_mapping_data_index_offset(); -} - - - template ::dimension; template const unsigned int DoFHandler::space_dimension; -template -const types::global_dof_index DoFHandler::invalid_dof_index; - template const unsigned int DoFHandler::default_fe_index; diff --git a/source/hp/dof_handler.cc b/source/hp/dof_handler.cc index 2431997e41..2068ac9c1e 100644 --- a/source/hp/dof_handler.cc +++ b/source/hp/dof_handler.cc @@ -1259,9 +1259,6 @@ namespace hp template const unsigned int DoFHandler::dimension; - template - const types::global_dof_index DoFHandler::invalid_dof_index; - template const unsigned int DoFHandler::default_fe_index;