From e960fe5ec941c584f28c33dbb260a4090c04b869 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Tue, 1 Jun 2021 10:17:27 -0400 Subject: [PATCH] Remove deprecated versions of the DoFTools::count_dofs_per_*() --- .../incompatibilities/20210601DanielArndt | 4 +++ include/deal.II/dofs/dof_tools.h | 23 ---------------- source/dofs/dof_tools.cc | 27 ------------------- source/dofs/dof_tools.inst.in | 15 ----------- .../step-44-sd-quadrature_level.h | 5 ++-- 5 files changed, 6 insertions(+), 68 deletions(-) create mode 100644 doc/news/changes/incompatibilities/20210601DanielArndt diff --git a/doc/news/changes/incompatibilities/20210601DanielArndt b/doc/news/changes/incompatibilities/20210601DanielArndt new file mode 100644 index 0000000000..9111ef3c55 --- /dev/null +++ b/doc/news/changes/incompatibilities/20210601DanielArndt @@ -0,0 +1,4 @@ +Removed: The deprecated versions of DoFTools::count_dofs_per_component() +and DoFTools::count_dofs_per_block() have been removed. +
+(Daniel Arndt, 2021/06/01) diff --git a/include/deal.II/dofs/dof_tools.h b/include/deal.II/dofs/dof_tools.h index f92075f96e..6a5d6102d2 100644 --- a/include/deal.II/dofs/dof_tools.h +++ b/include/deal.II/dofs/dof_tools.h @@ -2076,18 +2076,6 @@ namespace DoFTools const bool vector_valued_once = false, const std::vector &target_component = {}); - /** - * @deprecated A version of the previous function that returns its - * information through the non-`const` second argument. - */ - template - DEAL_II_DEPRECATED void - count_dofs_per_component( - const DoFHandler & dof_handler, - std::vector &dofs_per_component, - const bool vector_valued_once = false, - const std::vector & target_component = {}); - /** * Count the degrees of freedom in each block. This function is similar to * count_dofs_per_component(), with the difference that the counting is done @@ -2110,17 +2098,6 @@ namespace DoFTools const std::vector &target_block = std::vector()); - /** - * @deprecated A version of the previous function that returns its - * information through the non-`const` second argument. - */ - template - DEAL_II_DEPRECATED void - count_dofs_per_block(const DoFHandler & dof, - std::vector &dofs_per_block, - const std::vector & target_block = - std::vector()); - /** * For each active cell of a DoFHandler, extract the active finite element * index and fill the vector given as second argument. This vector is assumed diff --git a/source/dofs/dof_tools.cc b/source/dofs/dof_tools.cc index e595c456fc..2774128843 100644 --- a/source/dofs/dof_tools.cc +++ b/source/dofs/dof_tools.cc @@ -1846,21 +1846,6 @@ namespace DoFTools - // deprecated function - template - void - count_dofs_per_component( - const DoFHandler & dof_handler, - std::vector &dofs_per_component, - const bool only_once, - const std::vector & target_component) - { - dofs_per_component = - count_dofs_per_fe_component(dof_handler, only_once, target_component); - } - - - template std::vector count_dofs_per_fe_component( @@ -1953,18 +1938,6 @@ namespace DoFTools - // deprecated function - template - void - count_dofs_per_block(const DoFHandler & dof_handler, - std::vector &dofs_per_block, - const std::vector & target_block) - { - dofs_per_block = count_dofs_per_fe_block(dof_handler, target_block); - } - - - template std::vector count_dofs_per_fe_block(const DoFHandler &dof_handler, diff --git a/source/dofs/dof_tools.inst.in b/source/dofs/dof_tools.inst.in index 9f907a2eb1..32898e84bf 100644 --- a/source/dofs/dof_tools.inst.in +++ b/source/dofs/dof_tools.inst.in @@ -54,21 +54,6 @@ for (deal_II_dimension, deal_II_space_dimension : DIMENSIONS) & dof_handler, const ComponentMask &components); - // deprecated versions of the count_dofs_per_*() functions - template void - count_dofs_per_component( - const DoFHandler &, - std::vector &, - const bool, - const std::vector &); - - template void - count_dofs_per_block( - const DoFHandler &, - std::vector &, - const std::vector &); - - // new versions of the count_dofs_per_*() functions template std::vector count_dofs_per_fe_component( const DoFHandler &, diff --git a/tests/symengine/sd_common_tests/step-44-sd-quadrature_level.h b/tests/symengine/sd_common_tests/step-44-sd-quadrature_level.h index 1dc2f869b4..962ce30367 100644 --- a/tests/symengine/sd_common_tests/step-44-sd-quadrature_level.h +++ b/tests/symengine/sd_common_tests/step-44-sd-quadrature_level.h @@ -1055,9 +1055,8 @@ namespace Step44 dof_handler_ref.distribute_dofs(fe); DoFRenumbering::Cuthill_McKee(dof_handler_ref); DoFRenumbering::component_wise(dof_handler_ref, block_component); - DoFTools::count_dofs_per_block(dof_handler_ref, - dofs_per_block, - block_component); + dofs_per_block = + DoFTools::count_dofs_per_block(dof_handler_ref, block_component); std::cout << "Triangulation:" << "\n\t Number of active cells: " << triangulation.n_active_cells() -- 2.39.5