Reduce duplication of information.

Instead, use ReferenceCell as the one normative place to draw vertex orders from.

diff --git a/source/fe/fe_pyramid_p.cc b/source/fe/fe_pyramid_p.cc
index 92d516e0bd67d5d8c6ab72e0988cea01005521ba..0d0df5be11b75f29676d8fd6ebfd024270154b16 100644 (file)
--- a/source/fe/fe_pyramid_p.cc
+++ b/source/fe/fe_pyramid_p.cc
@@ -95,15 +95,14 @@ FE_PyramidPoly<dim, spacedim>::FE_PyramidPoly(
 {
   AssertDimension(dim, 3);
 
-
   if (degree == 1)
     {
-      this->unit_support_points.emplace_back(-1.0, -1.0, 0.0);
-      this->unit_support_points.emplace_back(+1.0, -1.0, 0.0);
-      this->unit_support_points.emplace_back(-1.0, +1.0, 0.0);
-      this->unit_support_points.emplace_back(+1.0, +1.0, 0.0);
-      this->unit_support_points.emplace_back(+0.0, +0.0, 1.0);
+      for (const unsigned int i : ReferenceCells::Pyramid.vertex_indices())
+        this->unit_support_points.emplace_back(
+          ReferenceCells::Pyramid.vertex<dim>(i));
     }
+  else
+    Assert(false, ExcNotImplemented());
 }
 
 

diff --git a/source/fe/fe_wedge_p.cc b/source/fe/fe_wedge_p.cc
index 33a6b62abaa26a5823ef2388779736d6b20f1372..33072f17ea50d4ddf55b654bc04c6e8dd2f1e7d3 100644 (file)
--- a/source/fe/fe_wedge_p.cc
+++ b/source/fe/fe_wedge_p.cc
@@ -80,6 +80,8 @@ namespace
   }
 } // namespace
 
+
+
 template <int dim, int spacedim>
 FE_WedgePoly<dim, spacedim>::FE_WedgePoly(
   const unsigned int                                degree,
@@ -105,12 +107,16 @@ FE_WedgePoly<dim, spacedim>::FE_WedgePoly(
 
   if (degree == 1)
     {
-      this->unit_support_points.emplace_back(0.0, 0.0, 0.0);
-      this->unit_support_points.emplace_back(1.0, 0.0, 0.0);
-      this->unit_support_points.emplace_back(0.0, 1.0, 0.0);
-      this->unit_support_points.emplace_back(0.0, 0.0, 1.0);
-      this->unit_support_points.emplace_back(1.0, 0.0, 1.0);
-      this->unit_support_points.emplace_back(0.0, 1.0, 1.0);
+      for (const unsigned int i : ReferenceCells::Wedge.vertex_indices())
+        this->unit_support_points.emplace_back(
+          ReferenceCells::Wedge.vertex<dim>(i));
+    }
+  else
+    {
+      // TODO: Wedge elements work for higher degrees, but we don't currently
+      // fill their support points. Leaving the array empty is valid, however,
+      // and will simply result in an error when someone tries to access the
+      // array.
     }
 }