From ea91e4789a314e779769ceca031a4f310fe4d31e Mon Sep 17 00:00:00 2001 From: David Wells Date: Sat, 3 Jul 2021 10:14:15 -0400 Subject: [PATCH] Use the new ctor for FE_Simplex(DG)P. --- include/deal.II/fe/fe_simplex_p.h | 7 ----- source/fe/fe_simplex_p.cc | 48 ++++++++++++++----------------- 2 files changed, 22 insertions(+), 33 deletions(-) diff --git a/include/deal.II/fe/fe_simplex_p.h b/include/deal.II/fe/fe_simplex_p.h index 85c05da306..e99e7b7a98 100644 --- a/include/deal.II/fe/fe_simplex_p.h +++ b/include/deal.II/fe/fe_simplex_p.h @@ -35,13 +35,6 @@ template class FE_SimplexPoly : public dealii::FE_Poly { public: - /** - * Constructor. - */ - FE_SimplexPoly(const unsigned int degree, - const std::vector & dpo_vector, - const typename FiniteElementData::Conformity conformity); - /** * Constructor. */ diff --git a/source/fe/fe_simplex_p.cc b/source/fe/fe_simplex_p.cc index 9dde03ee7d..a41434af29 100644 --- a/source/fe/fe_simplex_p.cc +++ b/source/fe/fe_simplex_p.cc @@ -314,26 +314,6 @@ namespace -template -FE_SimplexPoly::FE_SimplexPoly( - const unsigned int degree, - const std::vector & dpo_vector, - const typename FiniteElementData::Conformity conformity) - : FE_SimplexPoly(BarycentricPolynomials::get_fe_p_basis(degree), - FiniteElementData(dpo_vector, - dim == 2 ? - ReferenceCells::Triangle : - ReferenceCells::Tetrahedron, - 1, - degree, - conformity), - unit_support_points_fe_p(degree), - unit_face_support_points_fe_p(degree, conformity), - constraints_fe_p(degree)) -{} - - - template FE_SimplexPoly::FE_SimplexPoly( const BarycentricPolynomials polynomials, @@ -627,9 +607,17 @@ FE_SimplexPoly:: template FE_SimplexP::FE_SimplexP(const unsigned int degree) - : FE_SimplexPoly(degree, - get_dpo_vector_fe_p(dim, degree), - FiniteElementData::H1) + : FE_SimplexPoly( + BarycentricPolynomials::get_fe_p_basis(degree), + FiniteElementData(get_dpo_vector_fe_p(dim, degree), + dim == 2 ? ReferenceCells::Triangle : + ReferenceCells::Tetrahedron, + 1, + degree, + FiniteElementData::H1), + unit_support_points_fe_p(degree), + unit_face_support_points_fe_p(degree, FiniteElementData::H1), + constraints_fe_p(degree)) {} @@ -847,9 +835,17 @@ FE_SimplexP::hp_line_dof_identities( template FE_SimplexDGP::FE_SimplexDGP(const unsigned int degree) - : FE_SimplexPoly(degree, - get_dpo_vector_fe_dgp(dim, degree), - FiniteElementData::L2) + : FE_SimplexPoly( + BarycentricPolynomials::get_fe_p_basis(degree), + FiniteElementData(get_dpo_vector_fe_dgp(dim, degree), + dim == 2 ? ReferenceCells::Triangle : + ReferenceCells::Tetrahedron, + 1, + degree, + FiniteElementData::L2), + unit_support_points_fe_p(degree), + unit_face_support_points_fe_p(degree, FiniteElementData::H1), + constraints_fe_p(degree)) {} -- 2.39.5