From c9334a8667759fbddd792ec94de2cecaffb7f16e Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Fri, 26 Jun 2020 09:25:06 -0400 Subject: [PATCH] Remove FETools::get_fe_from_name --- include/deal.II/fe/fe_tools.h | 9 --------- include/deal.II/fe/fe_tools.templates.h | 9 --------- source/fe/fe_nedelec_sz.cc | 9 ++------- source/fe/fe_tools.inst.in | 3 --- 4 files changed, 2 insertions(+), 28 deletions(-) diff --git a/include/deal.II/fe/fe_tools.h b/include/deal.II/fe/fe_tools.h index 08982b6745..6f3f4b486a 100644 --- a/include/deal.II/fe/fe_tools.h +++ b/include/deal.II/fe/fe_tools.h @@ -1298,15 +1298,6 @@ namespace FETools std::unique_ptr> get_fe_by_name(const std::string &name); - - /** - * @deprecated Use get_fe_by_name() with two template parameters instead - */ - template - DEAL_II_DEPRECATED FiniteElement * - get_fe_from_name(const std::string &name); - - /** * Extend the list of finite elements that can be generated by * get_fe_by_name() by the one given as @p name. If get_fe_by_name() is diff --git a/include/deal.II/fe/fe_tools.templates.h b/include/deal.II/fe/fe_tools.templates.h index 76898520b9..784a5c9d66 100644 --- a/include/deal.II/fe/fe_tools.templates.h +++ b/include/deal.II/fe/fe_tools.templates.h @@ -2635,15 +2635,6 @@ namespace FETools - template - FiniteElement * - get_fe_from_name(const std::string ¶meter_name) - { - return get_fe_by_name(parameter_name).release(); - } - - - template std::unique_ptr> get_fe_by_name(const std::string ¶meter_name) diff --git a/source/fe/fe_nedelec_sz.cc b/source/fe/fe_nedelec_sz.cc index 15a6b4901c..03221321ba 100644 --- a/source/fe/fe_nedelec_sz.cc +++ b/source/fe/fe_nedelec_sz.cc @@ -2203,13 +2203,8 @@ template std::string FE_NedelecSZ::get_name() const { - // note that the - // FETools::get_fe_from_name - // function depends on the - // particular format of the string - // this function returns, so they - // have to be kept in synch - + // note that the FETools::get_fe_by_name function depends on the particular + // format of the string this function returns, so they have to be kept in sync std::ostringstream namebuf; namebuf << "FE_NedelecSZ<" << dim << ">(" << this->degree - 1 << ")"; diff --git a/source/fe/fe_tools.inst.in b/source/fe/fe_tools.inst.in index 29faa5dbd7..c77d24dc53 100644 --- a/source/fe/fe_tools.inst.in +++ b/source/fe/fe_tools.inst.in @@ -176,9 +176,6 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) template class FEFactoryBase; - template FiniteElement * - get_fe_from_name(const std::string &); - template FullMatrix compute_node_matrix(const FiniteElement &); -- 2.39.5