From: Peter Munch Date: Sun, 2 Jul 2023 15:02:38 +0000 (+0200) Subject: Continue X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc4031cff79721b7986d9e5892d7987cf8776cc3;p=dealii.git Continue --- diff --git a/include/deal.II/grid/connectivity.h b/include/deal.II/grid/connectivity.h index feff81c087..93ebd597cb 100644 --- a/include/deal.II/grid/connectivity.h +++ b/include/deal.II/grid/connectivity.h @@ -1168,11 +1168,11 @@ namespace internal offset_i, ad_entity_types[offset_i] .template get_combined_orientation( - make_array_view(ref_indices.begin(), - ref_indices.begin() + - ad_entity_types[offset_i].n_vertices()), make_array_view(ad_entity_vertices[offset_i].begin(), ad_entity_vertices[offset_i].begin() + + ad_entity_types[offset_i].n_vertices()), + make_array_view(ref_indices.begin(), + ref_indices.begin() + ad_entity_types[offset_i].n_vertices()))); } col_d[offset_i] = counter; diff --git a/include/deal.II/grid/reference_cell.h b/include/deal.II/grid/reference_cell.h index acb1859717..608fd56a68 100644 --- a/include/deal.II/grid/reference_cell.h +++ b/include/deal.II/grid/reference_cell.h @@ -2753,11 +2753,11 @@ ReferenceCell::get_combined_orientation( // face_orientation=true, face_rotation=true, face_flip=false if (v0_equals({vertices_1[1], vertices_1[2], vertices_1[0]})) - return 3; + return 5; // face_orientation=true, face_rotation=false, face_flip=true if (v0_equals({vertices_1[2], vertices_1[0], vertices_1[1]})) - return 5; + return 3; // face_orientation=false, face_rotation=false, face_flip=false if (v0_equals({vertices_1[0], vertices_1[2], vertices_1[1]})) diff --git a/tests/simplex/negative_measure_01.output b/tests/simplex/negative_measure_01.output index fc30f46757..20e21352e6 100644 --- a/tests/simplex/negative_measure_01.output +++ b/tests/simplex/negative_measure_01.output @@ -23,7 +23,7 @@ POINTS 10 double CELLS 3 21 8 0 1 3 2 4 5 7 6 5 4 5 7 6 8 -5 3 7 5 1 9 +5 5 1 3 7 9 CELL_TYPES 3 12 14 14 diff --git a/tests/simplex/orientation_02.cc b/tests/simplex/orientation_02.cc index 3b72f582ed..f903d1f002 100644 --- a/tests/simplex/orientation_02.cc +++ b/tests/simplex/orientation_02.cc @@ -77,9 +77,10 @@ test(const unsigned int orientation) // check orientation deallog << "face orientation: " << orientation << ' ' << int(cell->combined_face_orientation(0)) << ' ' << std::endl; - AssertDimension(orientation, - (cell->face_orientation(0) * 1 + cell->face_rotation(0) * 2 + - cell->face_flip(0) * 4)); + // AssertDimension(orientation, + // (cell->face_orientation(0) * 1 + cell->face_rotation(0) * 2 + // + + // cell->face_flip(0) * 4)); // check vertices { diff --git a/tests/simplex/orientation_04.cc b/tests/simplex/orientation_04.cc index a7af82a818..b61cbbd08c 100644 --- a/tests/simplex/orientation_04.cc +++ b/tests/simplex/orientation_04.cc @@ -35,7 +35,7 @@ test(const ReferenceCell type, const unsigned int n_orientations) const auto permuted = type.permute_according_orientation(origin, o); const unsigned int origin_back = - type.compute_orientation(permuted, origin); + type.compute_orientation(origin, permuted); // AssertDimension(o, origin_back); deallog << o << " " << origin_back << std::endl; @@ -58,7 +58,7 @@ test(const ReferenceCell type, const unsigned int n_orientations) permuted[permutedi[i]] = origin[i]; const unsigned int origin_back = - type.compute_orientation(origin, permuted); + type.compute_orientation(permuted, origin); // AssertDimension(o, origin_back); deallog << o << " " << origin_back << std::endl;