From dadda17354963c78e20fed9b348d442bc42181dd Mon Sep 17 00:00:00 2001 From: Daniel Arndt <arndtd@ornl.gov> Date: Fri, 26 Jun 2020 09:25:51 -0400 Subject: [PATCH] Allow FE_NedelecSZ to be used in FETools::get_fe_by_name --- include/deal.II/fe/fe_tools.templates.h | 3 +++ source/fe/fe_nedelec_sz.inst.in | 2 -- tests/fe/get_fe_by_name_01.cc | 4 ++++ tests/fe/get_fe_by_name_01.output | 12 ++++++++++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/include/deal.II/fe/fe_tools.templates.h b/include/deal.II/fe/fe_tools.templates.h index 784a5c9d66..c01b81eaa9 100644 --- a/include/deal.II/fe/fe_tools.templates.h +++ b/include/deal.II/fe/fe_tools.templates.h @@ -40,6 +40,7 @@ #include <deal.II/fe/fe_dgq.h> #include <deal.II/fe/fe_face.h> #include <deal.II/fe/fe_nedelec.h> +#include <deal.II/fe/fe_nedelec_sz.h> #include <deal.II/fe/fe_nothing.h> #include <deal.II/fe/fe_q.h> #include <deal.II/fe/fe_q_bubbles.h> @@ -1174,6 +1175,8 @@ namespace FETools std::make_unique<FETools::FEFactory<FE_RT_Bubbles<dim>>>(); result["FE_Nedelec"] = std::make_unique<FETools::FEFactory<FE_Nedelec<dim>>>(); + result["FE_NedelecSZ"] = + std::make_unique<FETools::FEFactory<FE_NedelecSZ<dim>>>(); result["FE_DGPNonparametric"] = std::make_unique<FETools::FEFactory<FE_DGPNonparametric<dim>>>(); result["FE_DGP"] = std::make_unique<FETools::FEFactory<FE_DGP<dim>>>(); diff --git a/source/fe/fe_nedelec_sz.inst.in b/source/fe/fe_nedelec_sz.inst.in index 9d344ecc7c..0176ab9851 100644 --- a/source/fe/fe_nedelec_sz.inst.in +++ b/source/fe/fe_nedelec_sz.inst.in @@ -17,7 +17,5 @@ for (deal_II_dimension : DIMENSIONS) { -#if deal_II_dimension != 1 template class FE_NedelecSZ<deal_II_dimension>; -#endif } diff --git a/tests/fe/get_fe_by_name_01.cc b/tests/fe/get_fe_by_name_01.cc index f728cdcba4..c7d071e6ec 100644 --- a/tests/fe/get_fe_by_name_01.cc +++ b/tests/fe/get_fe_by_name_01.cc @@ -87,6 +87,8 @@ main() gen.generate<3, 3>("FE_RaviartThomasNodal(1)"); gen.generate<2, 2>("FE_Nedelec(1)"); gen.generate<3, 3>("FE_Nedelec(1)"); + gen.generate<2, 2>("FE_NedelecSZ(1)"); + gen.generate<3, 3>("FE_NedelecSZ(1)"); gen.generate_all_dim("FE_DGPNonparametric(1)"); gen.generate_all_dim("FE_DGPMonomial(1)"); gen.generate_all_dim("FE_FaceQ(1)"); @@ -109,6 +111,8 @@ main() gen.generate<3, 3>("FE_RaviartThomasNodal(2)"); gen.generate<2, 2>("FE_Nedelec(2)"); gen.generate<3, 3>("FE_Nedelec(2)"); + gen.generate<2, 2>("FE_NedelecSZ(2)"); + gen.generate<3, 3>("FE_NedelecSZ(2)"); gen.generate_all_dim("FE_DGPNonparametric(2)"); gen.generate_all_dim("FE_DGPMonomial(2)"); gen.generate_all_dim("FE_FaceQ(2)"); diff --git a/tests/fe/get_fe_by_name_01.output b/tests/fe/get_fe_by_name_01.output index 8bb30049ca..096155d2c0 100644 --- a/tests/fe/get_fe_by_name_01.output +++ b/tests/fe/get_fe_by_name_01.output @@ -53,6 +53,12 @@ DEAL::FE_Nedelec<2>(1) DEAL::Read FE_Nedelec(1) DEAL::Generated : DEAL::FE_Nedelec<3>(1) +DEAL::Read FE_NedelecSZ(1) +DEAL::Generated : +DEAL::FE_NedelecSZ<2>(1) +DEAL::Read FE_NedelecSZ(1) +DEAL::Generated : +DEAL::FE_NedelecSZ<3>(1) DEAL::Read FE_DGPNonparametric(1) DEAL::Generated : DEAL::FE_DGPNonparametric<1>(1) @@ -146,6 +152,12 @@ DEAL::FE_Nedelec<2>(2) DEAL::Read FE_Nedelec(2) DEAL::Generated : DEAL::FE_Nedelec<3>(2) +DEAL::Read FE_NedelecSZ(2) +DEAL::Generated : +DEAL::FE_NedelecSZ<2>(2) +DEAL::Read FE_NedelecSZ(2) +DEAL::Generated : +DEAL::FE_NedelecSZ<3>(2) DEAL::Read FE_DGPNonparametric(2) DEAL::Generated : DEAL::FE_DGPNonparametric<1>(2) -- 2.39.5