From: David Wells <drwells@email.unc.edu>
Date: Sat, 3 Jul 2021 14:14:15 +0000 (-0400)
Subject: Use the new ctor for FE_Simplex(DG)P.
X-Git-Tag: v9.4.0-rc1~1160^2~3
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea91e4789a314e779769ceca031a4f310fe4d31e;p=dealii.git

Use the new ctor for FE_Simplex(DG)P.
---

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 <int dim, int spacedim = dim>
 class FE_SimplexPoly : public dealii::FE_Poly<dim, spacedim>
 {
 public:
-  /**
-   * Constructor.
-   */
-  FE_SimplexPoly(const unsigned int                                degree,
-                 const std::vector<unsigned int> &                 dpo_vector,
-                 const typename FiniteElementData<dim>::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 <int dim, int spacedim>
-FE_SimplexPoly<dim, spacedim>::FE_SimplexPoly(
-  const unsigned int                                degree,
-  const std::vector<unsigned int> &                 dpo_vector,
-  const typename FiniteElementData<dim>::Conformity conformity)
-  : FE_SimplexPoly(BarycentricPolynomials<dim>::get_fe_p_basis(degree),
-                   FiniteElementData<dim>(dpo_vector,
-                                          dim == 2 ?
-                                            ReferenceCells::Triangle :
-                                            ReferenceCells::Tetrahedron,
-                                          1,
-                                          degree,
-                                          conformity),
-                   unit_support_points_fe_p<dim>(degree),
-                   unit_face_support_points_fe_p<dim>(degree, conformity),
-                   constraints_fe_p<dim>(degree))
-{}
-
-
-
 template <int dim, int spacedim>
 FE_SimplexPoly<dim, spacedim>::FE_SimplexPoly(
   const BarycentricPolynomials<dim>              polynomials,
@@ -627,9 +607,17 @@ FE_SimplexPoly<dim, spacedim>::
 
 template <int dim, int spacedim>
 FE_SimplexP<dim, spacedim>::FE_SimplexP(const unsigned int degree)
-  : FE_SimplexPoly<dim, spacedim>(degree,
-                                  get_dpo_vector_fe_p(dim, degree),
-                                  FiniteElementData<dim>::H1)
+  : FE_SimplexPoly<dim, spacedim>(
+      BarycentricPolynomials<dim>::get_fe_p_basis(degree),
+      FiniteElementData<dim>(get_dpo_vector_fe_p(dim, degree),
+                             dim == 2 ? ReferenceCells::Triangle :
+                                        ReferenceCells::Tetrahedron,
+                             1,
+                             degree,
+                             FiniteElementData<dim>::H1),
+      unit_support_points_fe_p<dim>(degree),
+      unit_face_support_points_fe_p<dim>(degree, FiniteElementData<dim>::H1),
+      constraints_fe_p<dim>(degree))
 {}
 
 
@@ -847,9 +835,17 @@ FE_SimplexP<dim, spacedim>::hp_line_dof_identities(
 
 template <int dim, int spacedim>
 FE_SimplexDGP<dim, spacedim>::FE_SimplexDGP(const unsigned int degree)
-  : FE_SimplexPoly<dim, spacedim>(degree,
-                                  get_dpo_vector_fe_dgp(dim, degree),
-                                  FiniteElementData<dim>::L2)
+  : FE_SimplexPoly<dim, spacedim>(
+      BarycentricPolynomials<dim>::get_fe_p_basis(degree),
+      FiniteElementData<dim>(get_dpo_vector_fe_dgp(dim, degree),
+                             dim == 2 ? ReferenceCells::Triangle :
+                                        ReferenceCells::Tetrahedron,
+                             1,
+                             degree,
+                             FiniteElementData<dim>::L2),
+      unit_support_points_fe_p<dim>(degree),
+      unit_face_support_points_fe_p<dim>(degree, FiniteElementData<dim>::H1),
+      constraints_fe_p<dim>(degree))
 {}