From: Peter Munch Date: Tue, 11 May 2021 04:37:38 +0000 (+0200) Subject: Rename FE_Wedge and FE_Pyramid X-Git-Tag: v9.3.0-rc1~98^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F12174%2Fhead;p=dealii.git Rename FE_Wedge and FE_Pyramid --- diff --git a/include/deal.II/fe/fe_pyramid_p.h b/include/deal.II/fe/fe_pyramid_p.h index ee18e1f742..a4a95ed36f 100644 --- a/include/deal.II/fe/fe_pyramid_p.h +++ b/include/deal.II/fe/fe_pyramid_p.h @@ -32,15 +32,15 @@ DEAL_II_NAMESPACE_OPEN * @ingroup simplex */ template -class FE_Pyramid : public dealii::FE_Poly +class FE_PyramidPoly : public dealii::FE_Poly { public: /** * Constructor. */ - FE_Pyramid(const unsigned int degree, - const internal::GenericDoFsPerObject & dpos, - const typename FiniteElementData::Conformity conformity); + FE_PyramidPoly(const unsigned int degree, + const internal::GenericDoFsPerObject & dpos, + const typename FiniteElementData::Conformity conformity); }; /** @@ -51,7 +51,7 @@ public: * @ingroup simplex */ template -class FE_PyramidP : public FE_Pyramid +class FE_PyramidP : public FE_PyramidPoly { public: /** @@ -110,7 +110,7 @@ public: * @ingroup simplex */ template -class FE_PyramidDGP : public FE_Pyramid +class FE_PyramidDGP : public FE_PyramidPoly { public: /** diff --git a/include/deal.II/fe/fe_wedge_p.h b/include/deal.II/fe/fe_wedge_p.h index 6396c608f8..ef44d5e128 100644 --- a/include/deal.II/fe/fe_wedge_p.h +++ b/include/deal.II/fe/fe_wedge_p.h @@ -32,15 +32,15 @@ DEAL_II_NAMESPACE_OPEN * @ingroup simplex */ template -class FE_Wedge : public dealii::FE_Poly +class FE_WedgePoly : public dealii::FE_Poly { public: /** * Constructor. */ - FE_Wedge(const unsigned int degree, - const internal::GenericDoFsPerObject & dpos, - const typename FiniteElementData::Conformity conformity); + FE_WedgePoly(const unsigned int degree, + const internal::GenericDoFsPerObject & dpos, + const typename FiniteElementData::Conformity conformity); }; /** @@ -51,7 +51,7 @@ public: * @ingroup simplex */ template -class FE_WedgeP : public FE_Wedge +class FE_WedgeP : public FE_WedgePoly { public: /** @@ -110,7 +110,7 @@ public: * @ingroup simplex */ template -class FE_WedgeDGP : public FE_Wedge +class FE_WedgeDGP : public FE_WedgePoly { public: /** diff --git a/include/deal.II/matrix_free/shape_info.templates.h b/include/deal.II/matrix_free/shape_info.templates.h index c0165887b3..591010b170 100644 --- a/include/deal.II/matrix_free/shape_info.templates.h +++ b/include/deal.II/matrix_free/shape_info.templates.h @@ -94,8 +94,8 @@ namespace internal const auto fe_poly = dynamic_cast *>(&fe); if (dynamic_cast *>(&fe) != nullptr || - dynamic_cast *>(&fe) != nullptr || - dynamic_cast *>(&fe) != nullptr) + dynamic_cast *>(&fe) != nullptr || + dynamic_cast *>(&fe) != nullptr) { scalar_lexicographic.resize(fe.n_dofs_per_cell()); for (unsigned int i = 0; i < scalar_lexicographic.size(); ++i) diff --git a/source/fe/fe_pyramid_p.cc b/source/fe/fe_pyramid_p.cc index 2f3805cc87..92d516e0bd 100644 --- a/source/fe/fe_pyramid_p.cc +++ b/source/fe/fe_pyramid_p.cc @@ -73,7 +73,7 @@ namespace template -FE_Pyramid::FE_Pyramid( +FE_PyramidPoly::FE_PyramidPoly( const unsigned int degree, const internal::GenericDoFsPerObject & dpos, const typename FiniteElementData::Conformity conformity) @@ -110,9 +110,9 @@ FE_Pyramid::FE_Pyramid( template FE_PyramidP::FE_PyramidP(const unsigned int degree) - : FE_Pyramid(degree, - get_dpo_vector_fe_pyramid_p(degree), - FiniteElementData::H1) + : FE_PyramidPoly(degree, + get_dpo_vector_fe_pyramid_p(degree), + FiniteElementData::H1) {} @@ -279,9 +279,9 @@ FE_PyramidP::hp_quad_dof_identities( template FE_PyramidDGP::FE_PyramidDGP(const unsigned int degree) - : FE_Pyramid(degree, - get_dpo_vector_fe_pyramid_dgp(degree), - FiniteElementData::L2) + : FE_PyramidPoly(degree, + get_dpo_vector_fe_pyramid_dgp(degree), + FiniteElementData::L2) {} diff --git a/source/fe/fe_pyramid_p.inst.in b/source/fe/fe_pyramid_p.inst.in index 06ccde4690..b53a359cf1 100644 --- a/source/fe/fe_pyramid_p.inst.in +++ b/source/fe/fe_pyramid_p.inst.in @@ -18,7 +18,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS) { #if deal_II_dimension <= deal_II_space_dimension - template class FE_Pyramid; + template class FE_PyramidPoly; template class FE_PyramidP; template class FE_PyramidDGP; #endif diff --git a/source/fe/fe_wedge_p.cc b/source/fe/fe_wedge_p.cc index 2013c7bd29..33a6b62aba 100644 --- a/source/fe/fe_wedge_p.cc +++ b/source/fe/fe_wedge_p.cc @@ -81,7 +81,7 @@ namespace } // namespace template -FE_Wedge::FE_Wedge( +FE_WedgePoly::FE_WedgePoly( const unsigned int degree, const internal::GenericDoFsPerObject & dpos, const typename FiniteElementData::Conformity conformity) @@ -118,9 +118,9 @@ FE_Wedge::FE_Wedge( template FE_WedgeP::FE_WedgeP(const unsigned int degree) - : FE_Wedge(degree, - get_dpo_vector_fe_wedge_p(degree), - FiniteElementData::H1) + : FE_WedgePoly(degree, + get_dpo_vector_fe_wedge_p(degree), + FiniteElementData::H1) {} @@ -287,9 +287,9 @@ FE_WedgeP::hp_quad_dof_identities( template FE_WedgeDGP::FE_WedgeDGP(const unsigned int degree) - : FE_Wedge(degree, - get_dpo_vector_fe_wedge_dgp(degree), - FiniteElementData::L2) + : FE_WedgePoly(degree, + get_dpo_vector_fe_wedge_dgp(degree), + FiniteElementData::L2) {} diff --git a/source/fe/fe_wedge_p.inst.in b/source/fe/fe_wedge_p.inst.in index f328b4abf7..cd0c441a11 100644 --- a/source/fe/fe_wedge_p.inst.in +++ b/source/fe/fe_wedge_p.inst.in @@ -18,7 +18,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS) { #if deal_II_dimension <= deal_II_space_dimension - template class FE_Wedge; + template class FE_WedgePoly; template class FE_WedgeP; template class FE_WedgeDGP; #endif