From 4ea21acb2ccba2cfbc90ce91424992db5423216a Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Tue, 4 Jul 2023 17:42:00 -0500 Subject: [PATCH] Tests: add forgotten namespace, fix typo in includes --- tests/bits/q_points.cc | 4 ++-- tests/grid/grid_invert.cc | 4 ++-- tests/grid/mesh_3d.h | 6 +++--- tests/grid/subcelldata.cc | 4 ++-- tests/lac/constraints.cc | 10 +++++----- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/bits/q_points.cc b/tests/bits/q_points.cc index c4623fa595..1cd4330121 100644 --- a/tests/bits/q_points.cc +++ b/tests/bits/q_points.cc @@ -36,7 +36,7 @@ #include "../tests.h" -#include "../tests/test_grids.h" +#include "../test_grids.h" void create_two_cubes(Triangulation<3> &coarse_grid) @@ -69,7 +69,7 @@ create_two_cubes(Triangulation<3> &coarse_grid) // finally generate a triangulation // out of this - reorder_old_to_new_style(cells); + TestGrids::reorder_old_to_new_style(cells); GridTools::consistently_order_cells(cells); coarse_grid.create_triangulation(vertices, cells, SubCellData()); } diff --git a/tests/grid/grid_invert.cc b/tests/grid/grid_invert.cc index 1e3876a2f2..735b0b9375 100644 --- a/tests/grid/grid_invert.cc +++ b/tests/grid/grid_invert.cc @@ -24,7 +24,7 @@ #include "../tests.h" -#include "../tests/test_grids.h" +#include "../test_grids.h" template void @@ -58,7 +58,7 @@ test(bool second_case = false) SubCellData subcelldata; - reorder_old_to_new_style(cells); + TestGrids::reorder_old_to_new_style(cells); GridTools::invert_all_negative_measure_cells(vertices, cells); Triangulation tria; diff --git a/tests/grid/mesh_3d.h b/tests/grid/mesh_3d.h index 513eb8a10c..d6db1a00a3 100644 --- a/tests/grid/mesh_3d.h +++ b/tests/grid/mesh_3d.h @@ -20,7 +20,7 @@ #include "../tests.h" -#include "../tests/test_grids.h" +#include "../test_grids.h" // generate two cubes that are attached to each other in a way so that // the edges are all ok, but the normals of the common face don't @@ -59,7 +59,7 @@ create_two_cubes(Triangulation<3> &coarse_grid) // finally generate a triangulation // out of this // if necessary, convert to new-style format - reorder_old_to_new_style(cells); + TestGrids::reorder_old_to_new_style(cells); GridTools::consistently_order_cells(cells); coarse_grid.create_triangulation(vertices, cells, SubCellData()); } @@ -158,7 +158,7 @@ create_L_shape(Triangulation<3> &coarse_grid) // finally generate a triangulation // out of this - reorder_old_to_new_style(cells); + TestGrids::reorder_old_to_new_style(cells); GridTools::consistently_order_cells(cells); coarse_grid.create_triangulation(vertices, cells, SubCellData()); } diff --git a/tests/grid/subcelldata.cc b/tests/grid/subcelldata.cc index adbc0936dd..c6e82efd90 100644 --- a/tests/grid/subcelldata.cc +++ b/tests/grid/subcelldata.cc @@ -22,7 +22,7 @@ #include "../tests.h" -#include "../tests/test_grids.h" +#include "../test_grids.h" static unsigned subcells[6][4] = {{0, 1, 2, 3}, @@ -94,7 +94,7 @@ test() } } - reorder_old_to_new_style(cells); + TestGrids::reorder_old_to_new_style(cells); Triangulation tria; tria.create_triangulation(vertices, cells, subcelldata); diff --git a/tests/lac/constraints.cc b/tests/lac/constraints.cc index 8caeab4995..d07a5f09f5 100644 --- a/tests/lac/constraints.cc +++ b/tests/lac/constraints.cc @@ -36,7 +36,7 @@ #include "../tests.h" -#include "../tests/test_grids.h" +#include "../test_grids.h" @@ -74,7 +74,7 @@ make_tria(Triangulation<3> &tria, int step) cells[0].material_id = 0; cells[1].material_id = 0; - reorder_old_to_new_style(cells); + TestGrids::reorder_old_to_new_style(cells); tria.create_triangulation(std::vector>(&vertices[0], &vertices[12]), cells, @@ -118,7 +118,7 @@ make_tria(Triangulation<3> &tria, int step) cells[0].material_id = 0; cells[1].material_id = 0; - reorder_old_to_new_style(cells); + TestGrids::reorder_old_to_new_style(cells); tria.create_triangulation(std::vector>(&vertices[0], &vertices[12]), cells, @@ -162,7 +162,7 @@ make_tria(Triangulation<3> &tria, int step) cells[0].material_id = 0; cells[1].material_id = 0; - reorder_old_to_new_style(cells); + TestGrids::reorder_old_to_new_style(cells); tria.create_triangulation(std::vector>(&vertices[0], &vertices[12]), cells, @@ -220,7 +220,7 @@ make_tria(Triangulation<3> &tria, int step) cells[2].material_id = 0; cells[3].material_id = 0; - reorder_old_to_new_style(cells); + TestGrids::reorder_old_to_new_style(cells); tria.create_triangulation(std::vector>(&vertices[0], &vertices[18]), cells, -- 2.39.5