Fix the number of pyramid lines and one pyramid table.

diff --git a/include/deal.II/grid/reference_cell.h b/include/deal.II/grid/reference_cell.h
index 2a70b4d5a01ab33f9eb5332ec77f70aae058040f..b769c476d6814ce771d0604e9bcf306a78d50669 100644 (file)
--- a/include/deal.II/grid/reference_cell.h
+++ b/include/deal.II/grid/reference_cell.h
@@ -1200,7 +1200,7 @@ ReferenceCell::n_lines() const
       case ReferenceCells::Tetrahedron:
         return 6;
       case ReferenceCells::Pyramid:
-        return 7;
+        return 8;
       case ReferenceCells::Wedge:
         return 9;
       case ReferenceCells::Hexahedron:
@@ -1821,7 +1821,7 @@ ReferenceCell::face_to_cell_lines(const unsigned int  face,
              {{0, 6, 4, X}},
              {{1, 5, 7, X}},
              {{2, 4, 5, X}},
-             {{3, 7, 6, 2}}}};
+             {{3, 7, 6, X}}}};
 
           return table[face][standard_to_real_face_line(
             line, face, face_orientation)];

diff --git a/tests/fe/generic_dofs_per_object_01.output b/tests/fe/generic_dofs_per_object_01.output
index 22e20dbfac5dadcce21d206e6ee69a9d45cbddda..70619994379e8eb7c86cbaca209e1561f05cad23 100644 (file)
--- a/tests/fe/generic_dofs_per_object_01.output
+++ b/tests/fe/generic_dofs_per_object_01.output
@@ -60,9 +60,9 @@ DEAL::0 1 2 3 4 5 6 7 8 9 10 10 10 10 10
 DEAL::0 0 0 0 3 3 3 3 6 6 6 6 
 DEAL::
 DEAL::FE_PyramidP<3>(1)
-DEAL::1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 
-DEAL::1 1 1 1 1 2 2 2 2 2 2 2 4 3 3 3 3 5 
-DEAL::0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 5 5 
+DEAL::1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+DEAL::1 1 1 1 1 2 2 2 2 2 2 2 2 4 3 3 3 3 5 
+DEAL::0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
 DEAL::0 0 0 0 0 4 3 3 3 3 4 3 3 3 3 
 DEAL::
 DEAL::FE_WedgeP<3>(1)