From 233bfb29ab9bc42a6befc72c5ba88a7b5e859974 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Thu, 3 Jun 2021 15:54:57 -0400 Subject: [PATCH] Remove deprecated FETools::lexicographic/hierarchc_to_hierarchic/lexicographic_numbering --- .../incompatibilities/20210603DanielArndt-2 | 5 ++ include/deal.II/fe/fe_tools.h | 50 ----------------- include/deal.II/fe/fe_tools.templates.h | 54 ------------------- source/fe/fe_tools.cc | 4 -- source/fe/fe_tools.inst.in | 23 -------- 5 files changed, 5 insertions(+), 131 deletions(-) create mode 100644 doc/news/changes/incompatibilities/20210603DanielArndt-2 diff --git a/doc/news/changes/incompatibilities/20210603DanielArndt-2 b/doc/news/changes/incompatibilities/20210603DanielArndt-2 new file mode 100644 index 0000000000..4ecc407f8c --- /dev/null +++ b/doc/news/changes/incompatibilities/20210603DanielArndt-2 @@ -0,0 +1,5 @@ +Removed: The deprecated overloads of +FETools::lexicographic_to_hierarchic_numbering() and +FETools::hierarchic_to_lexicographic_numbering() have been removed. +
+(Daniel Arndt, 2021/06/03) diff --git a/include/deal.II/fe/fe_tools.h b/include/deal.II/fe/fe_tools.h index 70134cc2fc..615bdb77c9 100644 --- a/include/deal.II/fe/fe_tools.h +++ b/include/deal.II/fe/fe_tools.h @@ -880,38 +880,6 @@ namespace FETools std::vector hierarchic_to_lexicographic_numbering(unsigned int degree); - /** - * Like the previous function but instead of returning its result as a value - * return it through the last argument. - * - * @deprecated Use the function that returns the renumbering in a vector - * instead. - */ - template - DEAL_II_DEPRECATED void - hierarchic_to_lexicographic_numbering(unsigned int degree, - std::vector &h2l); - - /** - * Like the previous functions but using a FiniteElementData instead of the - * polynomial degree. - * - * @deprecated Use the function that returns the renumbering in a vector and - * uses the degree of the basis as an argument instead. - */ - template - DEAL_II_DEPRECATED void - hierarchic_to_lexicographic_numbering(const FiniteElementData &fe_data, - std::vector & h2l); - - /** - * @deprecated Use the function that uses the degree of the basis as an - * argument instead. - */ - template - DEAL_II_DEPRECATED std::vector - hierarchic_to_lexicographic_numbering(const FiniteElementData &fe_data); - /** * This is the reverse function to the above one, generating the map from * the lexicographic to the hierarchical numbering for a given polynomial @@ -922,24 +890,6 @@ namespace FETools std::vector lexicographic_to_hierarchic_numbering(unsigned int degree); - /** - * @deprecated Use the function that returns the renumbering in a vector and - * uses the degree of the basis as an argument instead. - */ - template - DEAL_II_DEPRECATED void - lexicographic_to_hierarchic_numbering(const FiniteElementData &fe_data, - std::vector & l2h); - - /** - * @deprecated Use the function that uses the degree of the basis as an - * argument instead. - */ - template - DEAL_II_DEPRECATED std::vector - lexicographic_to_hierarchic_numbering(const FiniteElementData &fe_data); - - /** * A namespace that contains functions that help setting up internal * data structures when implementing FiniteElement which are build diff --git a/include/deal.II/fe/fe_tools.templates.h b/include/deal.II/fe/fe_tools.templates.h index 7ffc2beeb9..a3ed30800b 100644 --- a/include/deal.II/fe/fe_tools.templates.h +++ b/include/deal.II/fe/fe_tools.templates.h @@ -3152,39 +3152,6 @@ namespace FETools - template - void - hierarchic_to_lexicographic_numbering(const unsigned int degree, - std::vector &h2l) - { - AssertDimension(h2l.size(), Utilities::fixed_power(degree + 1)); - h2l = hierarchic_to_lexicographic_numbering(degree); - } - - - - template - void - hierarchic_to_lexicographic_numbering(const FiniteElementData &fe, - std::vector & h2l) - { - Assert(h2l.size() == fe.n_dofs_per_cell(), - ExcDimensionMismatch(h2l.size(), fe.n_dofs_per_cell())); - hierarchic_to_lexicographic_numbering(fe.n_dofs_per_line() + 1, h2l); - } - - - - template - std::vector - hierarchic_to_lexicographic_numbering(const FiniteElementData &fe) - { - Assert(fe.n_components() == 1, ExcInvalidFE()); - return hierarchic_to_lexicographic_numbering(fe.n_dofs_per_line() + 1); - } - - - template std::vector lexicographic_to_hierarchic_numbering(const unsigned int degree) @@ -3192,27 +3159,6 @@ namespace FETools return Utilities::invert_permutation( hierarchic_to_lexicographic_numbering(degree)); } - - - - template - void - lexicographic_to_hierarchic_numbering(const FiniteElementData &fe, - std::vector & l2h) - { - l2h = lexicographic_to_hierarchic_numbering(fe); - } - - - - template - std::vector - lexicographic_to_hierarchic_numbering(const FiniteElementData &fe) - { - return Utilities::invert_permutation( - hierarchic_to_lexicographic_numbering(fe)); - } - } // namespace FETools diff --git a/source/fe/fe_tools.cc b/source/fe/fe_tools.cc index eaa4626115..1c3029d5d3 100644 --- a/source/fe/fe_tools.cc +++ b/source/fe/fe_tools.cc @@ -133,10 +133,6 @@ namespace FETools return std::make_unique>(quad); } - template void - hierarchic_to_lexicographic_numbering<0>(unsigned int, - std::vector &); - template std::vector hierarchic_to_lexicographic_numbering<0>(unsigned int); diff --git a/source/fe/fe_tools.inst.in b/source/fe/fe_tools.inst.in index 981a5bc527..92299892da 100644 --- a/source/fe/fe_tools.inst.in +++ b/source/fe/fe_tools.inst.in @@ -254,35 +254,12 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) FullMatrix &); # endif - template void - hierarchic_to_lexicographic_numbering( - unsigned int, - std::vector &); - - template void - hierarchic_to_lexicographic_numbering( - const FiniteElementData &, - std::vector &); - - template void - lexicographic_to_hierarchic_numbering( - const FiniteElementData &, - std::vector &); - template std::vector hierarchic_to_lexicographic_numbering(unsigned int); template std::vector lexicographic_to_hierarchic_numbering(unsigned int); - template std::vector - hierarchic_to_lexicographic_numbering( - const FiniteElementData &); - - template std::vector - lexicographic_to_hierarchic_numbering( - const FiniteElementData &); - #endif \} } -- 2.39.5