Continue

diff --git a/include/deal.II/grid/reference_cell.h b/include/deal.II/grid/reference_cell.h
index 79c495f2344da80fed746b300f04f634a6870d60..acb18597172788b025b7d843dd34b354c2c4cda6 100644 (file)
--- a/include/deal.II/grid/reference_cell.h
+++ b/include/deal.II/grid/reference_cell.h
@@ -873,9 +873,9 @@ private:
     {{{0, 2, 1}},
      {{0, 1, 2}},
      {{2, 1, 0}},
-     {{1, 2, 0}},
+     {{2, 0, 1}},
      {{1, 0, 2}},
-     {{2, 0, 1}}}};
+     {{1, 2, 0}}}};
 
   /**
    * Table containing all vertex permutations for a quadrilateral.
@@ -2023,9 +2023,9 @@ ReferenceCell::standard_to_real_face_line(
   static constexpr ndarray<unsigned int, 6, 3> triangle_table = {{{{2, 1, 0}},
                                                                   {{0, 1, 2}},
                                                                   {{1, 0, 2}},
-                                                                  {{1, 2, 0}},
+                                                                  {{2, 0, 1}},
                                                                   {{0, 2, 1}},
-                                                                  {{2, 0, 1}}}};
+                                                                  {{1, 2, 0}}}};
 
 
   switch (this->kind)
@@ -2752,11 +2752,11 @@ ReferenceCell::get_combined_orientation(
           return 1;
 
         // face_orientation=true, face_rotation=true, face_flip=false
-        if (v0_equals({vertices_1[2], vertices_1[0], vertices_1[1]}))
+        if (v0_equals({vertices_1[1], vertices_1[2], vertices_1[0]}))
           return 3;
 
         // face_orientation=true, face_rotation=false, face_flip=true
-        if (v0_equals({vertices_1[1], vertices_1[2], vertices_1[0]}))
+        if (v0_equals({vertices_1[2], vertices_1[0], vertices_1[1]}))
           return 5;
 
         // face_orientation=false, face_rotation=false, face_flip=false
@@ -2879,9 +2879,9 @@ ReferenceCell::permute_by_combined_orientation(
             case 1:
               return {vertices[0], vertices[1], vertices[2]};
             case 3:
-              return {vertices[2], vertices[0], vertices[1]};
-            case 5:
               return {vertices[1], vertices[2], vertices[0]};
+            case 5:
+              return {vertices[2], vertices[0], vertices[1]};
             case 0:
               return {vertices[0], vertices[2], vertices[1]};
             case 2:

diff --git a/tests/simplex/orientation_02.output b/tests/simplex/orientation_02.output
index 2d1a155dbe70c44c6fef68f836e0cca371de5870..f308743edbbb6202a8ee97c86b9e645a3f6d0f24 100644 (file)
--- a/tests/simplex/orientation_02.output
+++ b/tests/simplex/orientation_02.output
@@ -18,10 +18,10 @@ DEAL::0-1 vs. 0-1
 DEAL::0-2 vs. 0-2
 DEAL::
 DEAL::face orientation: 3 3 
-DEAL::1 2 0 4  vs. 1 2 0 4 
-DEAL::1-2 vs. 1-2
+DEAL::2 0 1 4  vs. 2 0 1 4 
 DEAL::0-2 vs. 0-2
 DEAL::0-1 vs. 0-1
+DEAL::1-2 vs. 1-2
 DEAL::
 DEAL::face orientation: 4 4 
 DEAL::1 0 2 4  vs. 1 0 2 4 
@@ -30,8 +30,8 @@ DEAL::0-2 vs. 0-2
 DEAL::1-2 vs. 1-2
 DEAL::
 DEAL::face orientation: 5 5 
-DEAL::2 0 1 4  vs. 2 0 1 4 
+DEAL::1 2 0 4  vs. 1 2 0 4 
+DEAL::1-2 vs. 1-2
 DEAL::0-2 vs. 0-2
 DEAL::0-1 vs. 0-1
-DEAL::1-2 vs. 1-2
 DEAL::

diff --git a/tests/simplex/q_projection_01.output b/tests/simplex/q_projection_01.output
index 18003c93c9c0762e7cb5ea6fa59bf2c709f9981e..d6e0e3a2b0161f0781222f4e3986cd6c021f7a8d 100644 (file)
--- a/tests/simplex/q_projection_01.output
+++ b/tests/simplex/q_projection_01.output
@@ -150,17 +150,17 @@ DEAL:3d-4::0.666390 0.155051 0.00000 0.159021
 DEAL:3d-4::0.280020 0.644949 0.00000 0.0909793 
 DEAL:3d-4::
 DEAL:3d-4::face_no=0 face_orientation=true face_flip=true face_rotation=false:
-DEAL:3d-4::0.666390 0.178559 0.00000 0.159021 
-DEAL:3d-4::0.280020 0.0750311 0.00000 0.0909793 
-DEAL:3d-4::0.178559 0.666390 0.00000 0.159021 
-DEAL:3d-4::0.0750311 0.280020 0.00000 0.0909793 
-DEAL:3d-4::
-DEAL:3d-4::face_no=0 face_orientation=true face_flip=false face_rotation=true:
 DEAL:3d-4::0.155051 0.666390 0.00000 0.159021 
 DEAL:3d-4::0.644949 0.280020 0.00000 0.0909793 
 DEAL:3d-4::0.155051 0.178559 0.00000 0.159021 
 DEAL:3d-4::0.644949 0.0750311 0.00000 0.0909793 
 DEAL:3d-4::
+DEAL:3d-4::face_no=0 face_orientation=true face_flip=false face_rotation=true:
+DEAL:3d-4::0.666390 0.178559 0.00000 0.159021 
+DEAL:3d-4::0.280020 0.0750311 0.00000 0.0909793 
+DEAL:3d-4::0.178559 0.666390 0.00000 0.159021 
+DEAL:3d-4::0.0750311 0.280020 0.00000 0.0909793 
+DEAL:3d-4::
 DEAL:3d-4::face_no=0 face_orientation=false face_flip=false face_rotation=false:
 DEAL:3d-4::0.155051 0.178559 0.00000 0.159021 
 DEAL:3d-4::0.644949 0.0750311 0.00000 0.0909793 
@@ -186,17 +186,17 @@ DEAL:3d-4::0.178559 0.00000 0.155051 0.159021
 DEAL:3d-4::0.0750311 0.00000 0.644949 0.0909793 
 DEAL:3d-4::
 DEAL:3d-4::face_no=1 face_orientation=true face_flip=true face_rotation=false:
-DEAL:3d-4::0.155051 0.00000 0.178559 0.159021 
-DEAL:3d-4::0.644949 0.00000 0.0750311 0.0909793 
-DEAL:3d-4::0.155051 0.00000 0.666390 0.159021 
-DEAL:3d-4::0.644949 0.00000 0.280020 0.0909793 
-DEAL:3d-4::
-DEAL:3d-4::face_no=1 face_orientation=true face_flip=false face_rotation=true:
 DEAL:3d-4::0.178559 0.00000 0.666390 0.159021 
 DEAL:3d-4::0.0750311 0.00000 0.280020 0.0909793 
 DEAL:3d-4::0.666390 0.00000 0.178559 0.159021 
 DEAL:3d-4::0.280020 0.00000 0.0750311 0.0909793 
 DEAL:3d-4::
+DEAL:3d-4::face_no=1 face_orientation=true face_flip=false face_rotation=true:
+DEAL:3d-4::0.155051 0.00000 0.178559 0.159021 
+DEAL:3d-4::0.644949 0.00000 0.0750311 0.0909793 
+DEAL:3d-4::0.155051 0.00000 0.666390 0.159021 
+DEAL:3d-4::0.644949 0.00000 0.280020 0.0909793 
+DEAL:3d-4::
 DEAL:3d-4::face_no=1 face_orientation=false face_flip=false face_rotation=false:
 DEAL:3d-4::0.666390 0.00000 0.178559 0.159021 
 DEAL:3d-4::0.280020 0.00000 0.0750311 0.0909793 
@@ -222,17 +222,17 @@ DEAL:3d-4::0.00000 0.666390 0.155051 0.159021
 DEAL:3d-4::0.00000 0.280020 0.644949 0.0909793 
 DEAL:3d-4::
 DEAL:3d-4::face_no=2 face_orientation=true face_flip=true face_rotation=false:
-DEAL:3d-4::0.00000 0.666390 0.178559 0.159021 
-DEAL:3d-4::0.00000 0.280020 0.0750311 0.0909793 
-DEAL:3d-4::0.00000 0.178559 0.666390 0.159021 
-DEAL:3d-4::0.00000 0.0750311 0.280020 0.0909793 
-DEAL:3d-4::
-DEAL:3d-4::face_no=2 face_orientation=true face_flip=false face_rotation=true:
 DEAL:3d-4::0.00000 0.155051 0.666390 0.159021 
 DEAL:3d-4::0.00000 0.644949 0.280020 0.0909793 
 DEAL:3d-4::0.00000 0.155051 0.178559 0.159021 
 DEAL:3d-4::0.00000 0.644949 0.0750311 0.0909793 
 DEAL:3d-4::
+DEAL:3d-4::face_no=2 face_orientation=true face_flip=false face_rotation=true:
+DEAL:3d-4::0.00000 0.666390 0.178559 0.159021 
+DEAL:3d-4::0.00000 0.280020 0.0750311 0.0909793 
+DEAL:3d-4::0.00000 0.178559 0.666390 0.159021 
+DEAL:3d-4::0.00000 0.0750311 0.280020 0.0909793 
+DEAL:3d-4::
 DEAL:3d-4::face_no=2 face_orientation=false face_flip=false face_rotation=false:
 DEAL:3d-4::0.00000 0.155051 0.178559 0.159021 
 DEAL:3d-4::0.00000 0.644949 0.0750311 0.0909793 
@@ -258,17 +258,17 @@ DEAL:3d-4::0.666390 0.178559 0.155051 0.275432
 DEAL:3d-4::0.280020 0.0750311 0.644949 0.157581 
 DEAL:3d-4::
 DEAL:3d-4::face_no=3 face_orientation=true face_flip=true face_rotation=false:
-DEAL:3d-4::0.666390 0.155051 0.178559 0.275432 
-DEAL:3d-4::0.280020 0.644949 0.0750311 0.157581 
-DEAL:3d-4::0.178559 0.155051 0.666390 0.275432 
-DEAL:3d-4::0.0750311 0.644949 0.280020 0.157581 
-DEAL:3d-4::
-DEAL:3d-4::face_no=3 face_orientation=true face_flip=false face_rotation=true:
 DEAL:3d-4::0.155051 0.178559 0.666390 0.275432 
 DEAL:3d-4::0.644949 0.0750311 0.280020 0.157581 
 DEAL:3d-4::0.155051 0.666390 0.178559 0.275432 
 DEAL:3d-4::0.644949 0.280020 0.0750311 0.157581 
 DEAL:3d-4::
+DEAL:3d-4::face_no=3 face_orientation=true face_flip=false face_rotation=true:
+DEAL:3d-4::0.666390 0.155051 0.178559 0.275432 
+DEAL:3d-4::0.280020 0.644949 0.0750311 0.157581 
+DEAL:3d-4::0.178559 0.155051 0.666390 0.275432 
+DEAL:3d-4::0.0750311 0.644949 0.280020 0.157581 
+DEAL:3d-4::
 DEAL:3d-4::face_no=3 face_orientation=false face_flip=false face_rotation=false:
 DEAL:3d-4::0.155051 0.666390 0.178559 0.275432 
 DEAL:3d-4::0.644949 0.280020 0.0750311 0.157581 
@@ -298,21 +298,21 @@ DEAL:3d-10::0.470142 0.470142 0.00000 0.0661971
 DEAL:3d-10::
 DEAL:3d-10::face_no=0 face_orientation=true face_flip=true face_rotation=false:
 DEAL:3d-10::0.333333 0.333333 0.00000 0.112500 
-DEAL:3d-10::0.101287 0.797427 0.00000 0.0629696 
 DEAL:3d-10::0.101287 0.101287 0.00000 0.0629696 
 DEAL:3d-10::0.797427 0.101287 0.00000 0.0629696 
-DEAL:3d-10::0.470142 0.0597159 0.00000 0.0661971 
+DEAL:3d-10::0.101287 0.797427 0.00000 0.0629696 
 DEAL:3d-10::0.470142 0.470142 0.00000 0.0661971 
 DEAL:3d-10::0.0597159 0.470142 0.00000 0.0661971 
+DEAL:3d-10::0.470142 0.0597159 0.00000 0.0661971 
 DEAL:3d-10::
 DEAL:3d-10::face_no=0 face_orientation=true face_flip=false face_rotation=true:
 DEAL:3d-10::0.333333 0.333333 0.00000 0.112500 
+DEAL:3d-10::0.101287 0.797427 0.00000 0.0629696 
 DEAL:3d-10::0.101287 0.101287 0.00000 0.0629696 
 DEAL:3d-10::0.797427 0.101287 0.00000 0.0629696 
-DEAL:3d-10::0.101287 0.797427 0.00000 0.0629696 
+DEAL:3d-10::0.470142 0.0597159 0.00000 0.0661971 
 DEAL:3d-10::0.470142 0.470142 0.00000 0.0661971 
 DEAL:3d-10::0.0597159 0.470142 0.00000 0.0661971 
-DEAL:3d-10::0.470142 0.0597159 0.00000 0.0661971 
 DEAL:3d-10::
 DEAL:3d-10::face_no=0 face_orientation=false face_flip=false face_rotation=false:
 DEAL:3d-10::0.333333 0.333333 0.00000 0.112500 
@@ -352,21 +352,21 @@ DEAL:3d-10::0.0597159 0.00000 0.470142 0.0661971
 DEAL:3d-10::
 DEAL:3d-10::face_no=1 face_orientation=true face_flip=true face_rotation=false:
 DEAL:3d-10::0.333333 0.00000 0.333333 0.112500 
-DEAL:3d-10::0.101287 0.00000 0.797427 0.0629696 
 DEAL:3d-10::0.797427 0.00000 0.101287 0.0629696 
 DEAL:3d-10::0.101287 0.00000 0.101287 0.0629696 
-DEAL:3d-10::0.470142 0.00000 0.0597159 0.0661971 
+DEAL:3d-10::0.101287 0.00000 0.797427 0.0629696 
 DEAL:3d-10::0.0597159 0.00000 0.470142 0.0661971 
 DEAL:3d-10::0.470142 0.00000 0.470142 0.0661971 
+DEAL:3d-10::0.470142 0.00000 0.0597159 0.0661971 
 DEAL:3d-10::
 DEAL:3d-10::face_no=1 face_orientation=true face_flip=false face_rotation=true:
 DEAL:3d-10::0.333333 0.00000 0.333333 0.112500 
+DEAL:3d-10::0.101287 0.00000 0.797427 0.0629696 
 DEAL:3d-10::0.797427 0.00000 0.101287 0.0629696 
 DEAL:3d-10::0.101287 0.00000 0.101287 0.0629696 
-DEAL:3d-10::0.101287 0.00000 0.797427 0.0629696 
+DEAL:3d-10::0.470142 0.00000 0.0597159 0.0661971 
 DEAL:3d-10::0.0597159 0.00000 0.470142 0.0661971 
 DEAL:3d-10::0.470142 0.00000 0.470142 0.0661971 
-DEAL:3d-10::0.470142 0.00000 0.0597159 0.0661971 
 DEAL:3d-10::
 DEAL:3d-10::face_no=1 face_orientation=false face_flip=false face_rotation=false:
 DEAL:3d-10::0.333333 0.00000 0.333333 0.112500 
@@ -406,21 +406,21 @@ DEAL:3d-10::0.00000 0.470142 0.470142 0.0661971
 DEAL:3d-10::
 DEAL:3d-10::face_no=2 face_orientation=true face_flip=true face_rotation=false:
 DEAL:3d-10::0.00000 0.333333 0.333333 0.112500 
-DEAL:3d-10::0.00000 0.101287 0.797427 0.0629696 
 DEAL:3d-10::0.00000 0.101287 0.101287 0.0629696 
 DEAL:3d-10::0.00000 0.797427 0.101287 0.0629696 
-DEAL:3d-10::0.00000 0.470142 0.0597159 0.0661971 
+DEAL:3d-10::0.00000 0.101287 0.797427 0.0629696 
 DEAL:3d-10::0.00000 0.470142 0.470142 0.0661971 
 DEAL:3d-10::0.00000 0.0597159 0.470142 0.0661971 
+DEAL:3d-10::0.00000 0.470142 0.0597159 0.0661971 
 DEAL:3d-10::
 DEAL:3d-10::face_no=2 face_orientation=true face_flip=false face_rotation=true:
 DEAL:3d-10::0.00000 0.333333 0.333333 0.112500 
+DEAL:3d-10::0.00000 0.101287 0.797427 0.0629696 
 DEAL:3d-10::0.00000 0.101287 0.101287 0.0629696 
 DEAL:3d-10::0.00000 0.797427 0.101287 0.0629696 
-DEAL:3d-10::0.00000 0.101287 0.797427 0.0629696 
+DEAL:3d-10::0.00000 0.470142 0.0597159 0.0661971 
 DEAL:3d-10::0.00000 0.470142 0.470142 0.0661971 
 DEAL:3d-10::0.00000 0.0597159 0.470142 0.0661971 
-DEAL:3d-10::0.00000 0.470142 0.0597159 0.0661971 
 DEAL:3d-10::
 DEAL:3d-10::face_no=2 face_orientation=false face_flip=false face_rotation=false:
 DEAL:3d-10::0.00000 0.333333 0.333333 0.112500 
@@ -460,21 +460,21 @@ DEAL:3d-10::0.470142 0.0597159 0.470142 0.114657
 DEAL:3d-10::
 DEAL:3d-10::face_no=3 face_orientation=true face_flip=true face_rotation=false:
 DEAL:3d-10::0.333333 0.333333 0.333333 0.194856 
-DEAL:3d-10::0.101287 0.101287 0.797427 0.109067 
 DEAL:3d-10::0.101287 0.797427 0.101287 0.109067 
 DEAL:3d-10::0.797427 0.101287 0.101287 0.109067 
-DEAL:3d-10::0.470142 0.470142 0.0597159 0.114657 
+DEAL:3d-10::0.101287 0.101287 0.797427 0.109067 
 DEAL:3d-10::0.470142 0.0597159 0.470142 0.114657 
 DEAL:3d-10::0.0597159 0.470142 0.470142 0.114657 
+DEAL:3d-10::0.470142 0.470142 0.0597159 0.114657 
 DEAL:3d-10::
 DEAL:3d-10::face_no=3 face_orientation=true face_flip=false face_rotation=true:
 DEAL:3d-10::0.333333 0.333333 0.333333 0.194856 
+DEAL:3d-10::0.101287 0.101287 0.797427 0.109067 
 DEAL:3d-10::0.101287 0.797427 0.101287 0.109067 
 DEAL:3d-10::0.797427 0.101287 0.101287 0.109067 
-DEAL:3d-10::0.101287 0.101287 0.797427 0.109067 
+DEAL:3d-10::0.470142 0.470142 0.0597159 0.114657 
 DEAL:3d-10::0.470142 0.0597159 0.470142 0.114657 
 DEAL:3d-10::0.0597159 0.470142 0.470142 0.114657 
-DEAL:3d-10::0.470142 0.470142 0.0597159 0.114657 
 DEAL:3d-10::
 DEAL:3d-10::face_no=3 face_orientation=false face_flip=false face_rotation=false:
 DEAL:3d-10::0.333333 0.333333 0.333333 0.194856