Relax the check for points inside a pyramid.

diff --git a/include/deal.II/grid/reference_cell.h b/include/deal.II/grid/reference_cell.h
index b769c476d6814ce771d0604e9bcf306a78d50669..db61250178306ec1e534aefd11a63ae82ac1a6a7 100644 (file)
--- a/include/deal.II/grid/reference_cell.h
+++ b/include/deal.II/grid/reference_cell.h
@@ -2622,7 +2622,7 @@ ReferenceCell::contains_point(const Point<dim> &p, const double tolerance) const
 
           // We are inside the pyramid if the distance from the axis is less
           // than (1-z)
-          return (distance_from_axis < 1 + tolerance - p[z_coordinate]);
+          return (distance_from_axis <= 1 + tolerance - p[z_coordinate]);
         }
       case ReferenceCells::Wedge:
         {

diff --git a/tests/grid/reference_cell_type_04.cc b/tests/grid/reference_cell_type_04.cc
index 07c69f4b442c1694e04cbd6cae2bc40c3b4e1089..cbb8a9a2d6b980687ee6170e25563c7d9b13853a 100644 (file)
--- a/tests/grid/reference_cell_type_04.cc
+++ b/tests/grid/reference_cell_type_04.cc
@@ -35,6 +35,12 @@ test(const ReferenceCell &reference_cell)
   unsigned int       n_samples_inside = 0;
   const unsigned int n_samples        = 200000;
 
+  // sanity check: does the reference cell contain its own nodes?
+  for (unsigned int vertex_no : reference_cell.vertex_indices())
+    AssertThrow(reference_cell.contains_point(
+                  reference_cell.template vertex<dim>(vertex_no)),
+                ExcInternalError());
+
   for (unsigned int n = 0; n < n_samples; ++n)
     {
       // Choose a random point in the box [-1,1]^d that contains all