From 8ecb0a75f00dec9ddf1c7115bdaa6905ce259049 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 19 Jan 2021 19:52:03 -0700 Subject: [PATCH] Adjust tests. --- tests/simplex/orientation_01.cc | 5 ++--- tests/simplex/orientation_02.cc | 14 ++++++++------ tests/simplex/unit_tangential_vectors_01.cc | 9 +++++---- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/tests/simplex/orientation_01.cc b/tests/simplex/orientation_01.cc index e27a6590e2..8b43942a72 100644 --- a/tests/simplex/orientation_01.cc +++ b/tests/simplex/orientation_01.cc @@ -33,10 +33,9 @@ test(const ReferenceCell::Type type, const unsigned int n_orientations) for (unsigned int i = 0; i < n_points; ++i) origin[i] = i; - const auto permuted = - ReferenceCell::permute_according_orientation(type, origin, o); + const auto permuted = type.permute_according_orientation(origin, o); const unsigned int origin_back = - ReferenceCell::compute_orientation(type, permuted, origin); + type.compute_orientation(permuted, origin); AssertDimension(o, origin_back); } diff --git a/tests/simplex/orientation_02.cc b/tests/simplex/orientation_02.cc index b2f6378ab7..c81eb0903f 100644 --- a/tests/simplex/orientation_02.cc +++ b/tests/simplex/orientation_02.cc @@ -43,12 +43,14 @@ test(const unsigned int orientation) } { - const auto &face = dummy.begin()->face(face_no); - const auto permuted = ReferenceCell::permute_according_orientation( - ReferenceCell::Type::Tri, - std::array{ - {face->vertex_index(0), face->vertex_index(1), face->vertex_index(2)}}, - orientation); + const auto &face = dummy.begin()->face(face_no); + const auto permuted = + ReferenceCell::Type(ReferenceCell::Type::Tri) + .permute_according_orientation( + std::array{{face->vertex_index(0), + face->vertex_index(1), + face->vertex_index(2)}}, + orientation); auto direction = cross_product_3d(vertices[permuted[1]] - vertices[permuted[0]], diff --git a/tests/simplex/unit_tangential_vectors_01.cc b/tests/simplex/unit_tangential_vectors_01.cc index 99f5a36ba4..6b705a6dac 100644 --- a/tests/simplex/unit_tangential_vectors_01.cc +++ b/tests/simplex/unit_tangential_vectors_01.cc @@ -33,12 +33,13 @@ test(const ReferenceCell::Type &reference_cell) for (const auto face_no : ReferenceCell::internal::Info::get_cell(reference_cell).face_indices()) { - deallog << reference_cell.unit_normal_vectors(face_no) << std::endl; + deallog << ReferenceCell::unit_normal_vectors(reference_cell, + face_no) + << std::endl; for (unsigned int i = 0; i < dim - 1; ++i) - deallog << ReferenceCell::unit_tangential_vectors(reference_cell, - face_no, - i) + deallog << reference_cell.template unit_tangential_vectors(face_no, + i) << std::endl; } deallog << std::endl; -- 2.39.5