From: Martin Kronbichler Date: Tue, 25 Feb 2025 08:10:41 +0000 (+0100) Subject: Simplify manifold use in matrix-free tests X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d00b896e04f2d9e8feadaeccc046a690d6c9c7b;p=dealii.git Simplify manifold use in matrix-free tests --- diff --git a/tests/matrix_free/assemble_matrix_01.cc b/tests/matrix_free/assemble_matrix_01.cc index 5bdf3b4057..d786bdd202 100644 --- a/tests/matrix_free/assemble_matrix_01.cc +++ b/tests/matrix_free/assemble_matrix_01.cc @@ -24,7 +24,6 @@ #include #include -#include #include #include @@ -128,16 +127,8 @@ template void test() { - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); if (dim < 3 || fe_degree < 2) tria.refine_global(1); diff --git a/tests/matrix_free/assemble_matrix_02.cc b/tests/matrix_free/assemble_matrix_02.cc index f6727aac21..8b17dc02d3 100644 --- a/tests/matrix_free/assemble_matrix_02.cc +++ b/tests/matrix_free/assemble_matrix_02.cc @@ -24,7 +24,6 @@ #include #include -#include #include #include @@ -184,16 +183,8 @@ template void test() { - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); if (dim == 2) tria.refine_global(1); diff --git a/tests/matrix_free/assemble_matrix_03.cc b/tests/matrix_free/assemble_matrix_03.cc index dc4c5043e2..eb6b812f72 100644 --- a/tests/matrix_free/assemble_matrix_03.cc +++ b/tests/matrix_free/assemble_matrix_03.cc @@ -27,7 +27,6 @@ #include #include -#include #include #include @@ -168,16 +167,8 @@ template void test() { - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); tria.refine_global(5 - dim); tria.begin(tria.n_levels() - 1)->set_refine_flag(); diff --git a/tests/matrix_free/copy_feevaluation.cc b/tests/matrix_free/copy_feevaluation.cc index 85acdf22fa..1622dc5f18 100644 --- a/tests/matrix_free/copy_feevaluation.cc +++ b/tests/matrix_free/copy_feevaluation.cc @@ -31,7 +31,6 @@ #include #include -#include #include #include @@ -131,11 +130,8 @@ template void test() { - SphericalManifold manifold; - Triangulation triangulation; + Triangulation triangulation; GridGenerator::hyper_shell(triangulation, Point(), 0.5, 1., 96, true); - triangulation.set_all_manifold_ids(0); - triangulation.set_manifold(0, manifold); triangulation.begin_active()->set_refine_flag(); triangulation.last()->set_refine_flag(); diff --git a/tests/matrix_free/get_functions_circle.cc b/tests/matrix_free/get_functions_circle.cc index b6f5aed052..73da0f3ee1 100644 --- a/tests/matrix_free/get_functions_circle.cc +++ b/tests/matrix_free/get_functions_circle.cc @@ -29,16 +29,8 @@ template void test() { - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); // refine first and last cell tria.begin(tria.n_levels() - 1)->set_refine_flag(); diff --git a/tests/matrix_free/get_functions_gl.cc b/tests/matrix_free/get_functions_gl.cc index 4330c683c2..b10893f466 100644 --- a/tests/matrix_free/get_functions_gl.cc +++ b/tests/matrix_free/get_functions_gl.cc @@ -31,16 +31,8 @@ void test() { using number = double; - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); // refine first and last cell tria.begin(tria.n_levels() - 1)->set_refine_flag(); diff --git a/tests/matrix_free/get_functions_mappingq.cc b/tests/matrix_free/get_functions_mappingq.cc index b06e1fcac1..7926f5dd10 100644 --- a/tests/matrix_free/get_functions_mappingq.cc +++ b/tests/matrix_free/get_functions_mappingq.cc @@ -30,16 +30,8 @@ void test() { using number = double; - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); // refine first and last cell tria.begin(tria.n_levels() - 1)->set_refine_flag(); diff --git a/tests/matrix_free/get_functions_notempl.cc b/tests/matrix_free/get_functions_notempl.cc index 56b02c760d..d14ecdc0d7 100644 --- a/tests/matrix_free/get_functions_notempl.cc +++ b/tests/matrix_free/get_functions_notempl.cc @@ -52,16 +52,8 @@ void test() { using number = double; - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); // refine first and last cell tria.begin(tria.n_levels() - 1)->set_refine_flag(); diff --git a/tests/matrix_free/get_functions_q_hierarchical.cc b/tests/matrix_free/get_functions_q_hierarchical.cc index 62d92148af..b1184380d5 100644 --- a/tests/matrix_free/get_functions_q_hierarchical.cc +++ b/tests/matrix_free/get_functions_q_hierarchical.cc @@ -38,16 +38,8 @@ void test() { using number = double; - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); // refine first and last cell tria.begin(tria.n_levels() - 1)->set_refine_flag(); diff --git a/tests/matrix_free/get_functions_rect.cc b/tests/matrix_free/get_functions_rect.cc index 2bcb688262..a4fbeb9bbb 100644 --- a/tests/matrix_free/get_functions_rect.cc +++ b/tests/matrix_free/get_functions_rect.cc @@ -52,16 +52,8 @@ void test() { using number = double; - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); // refine first and last cell tria.begin(tria.n_levels() - 1)->set_refine_flag(); diff --git a/tests/matrix_free/get_values_plain.cc b/tests/matrix_free/get_values_plain.cc index 6eb3d4094d..72a81a13c3 100644 --- a/tests/matrix_free/get_values_plain.cc +++ b/tests/matrix_free/get_values_plain.cc @@ -28,7 +28,6 @@ #include #include -#include #include #include @@ -151,22 +150,19 @@ template void test() { - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_shell(tria, Point(), 1., 2., 96, true); - tria.set_all_manifold_ids(0); - tria.set_manifold(0, manifold); // refine a few cells for (unsigned int i = 0; i < 11 - 3 * dim; ++i) { - typename Triangulation::active_cell_iterator cell = - tria.begin_active(), - endc = tria.end(); - unsigned int counter = 0; - for (; cell != endc; ++cell, ++counter) - if (counter % (7 - i) == 0) - cell->set_refine_flag(); + unsigned int counter = 0; + for (const auto &cell : tria.active_cell_iterators()) + { + if (counter % (7 - i) == 0) + cell->set_refine_flag(); + ++counter; + } tria.execute_coarsening_and_refinement(); } diff --git a/tests/matrix_free/integrate_functions.cc b/tests/matrix_free/integrate_functions.cc index 378af1e130..4f2d7217c5 100644 --- a/tests/matrix_free/integrate_functions.cc +++ b/tests/matrix_free/integrate_functions.cc @@ -27,7 +27,6 @@ #include #include -#include #include #include @@ -152,24 +151,14 @@ void test() { using number = double; - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); - - cell = tria.begin_active(); - for (; cell != endc; ++cell) + + for (const auto &cell : tria.active_cell_iterators()) if (cell->center().norm() < 1e-8) cell->set_refine_flag(); tria.execute_coarsening_and_refinement(); - cell = tria.begin_active(); - for (; cell != endc; ++cell) + for (const auto &cell : tria.active_cell_iterators()) if (cell->center().norm() < 0.2) cell->set_refine_flag(); tria.execute_coarsening_and_refinement(); @@ -178,14 +167,15 @@ test() tria.begin(tria.n_levels() - 1)->set_refine_flag(); tria.last()->set_refine_flag(); tria.execute_coarsening_and_refinement(); - cell = tria.begin_active(); for (unsigned int i = 0; i < 7 - 2 * dim; ++i) { - cell = tria.begin_active(); unsigned int counter = 0; - for (; cell != endc; ++cell, ++counter) - if (counter % (7 - i) == 0) - cell->set_refine_flag(); + for (const auto &cell : tria.active_cell_iterators()) + { + if (counter % (7 - i) == 0) + cell->set_refine_flag(); + ++counter; + } tria.execute_coarsening_and_refinement(); } diff --git a/tests/matrix_free/integrate_functions_hessians.cc b/tests/matrix_free/integrate_functions_hessians.cc index 0c5c93b02f..54fd25f0a3 100644 --- a/tests/matrix_free/integrate_functions_hessians.cc +++ b/tests/matrix_free/integrate_functions_hessians.cc @@ -27,7 +27,6 @@ #include #include -#include #include #include @@ -168,24 +167,14 @@ void test() { using number = double; - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); - - cell = tria.begin_active(); - for (; cell != endc; ++cell) + + for (const auto &cell : tria.active_cell_iterators()) if (cell->center().norm() < 1e-8) cell->set_refine_flag(); tria.execute_coarsening_and_refinement(); - cell = tria.begin_active(); - for (; cell != endc; ++cell) + for (const auto &cell : tria.active_cell_iterators()) if (cell->center().norm() < 0.2) cell->set_refine_flag(); tria.execute_coarsening_and_refinement(); @@ -194,14 +183,15 @@ test() tria.begin(tria.n_levels() - 1)->set_refine_flag(); tria.last()->set_refine_flag(); tria.execute_coarsening_and_refinement(); - cell = tria.begin_active(); for (unsigned int i = 0; i < 7 - 2 * dim; ++i) { - cell = tria.begin_active(); unsigned int counter = 0; - for (; cell != endc; ++cell, ++counter) - if (counter % (7 - i) == 0) - cell->set_refine_flag(); + for (const auto &cell : tria.active_cell_iterators()) + { + if (counter % (7 - i) == 0) + cell->set_refine_flag(); + ++counter; + } tria.execute_coarsening_and_refinement(); } diff --git a/tests/matrix_free/integrate_functions_multife.cc b/tests/matrix_free/integrate_functions_multife.cc index 6cc01f8cb0..47fb6cb94a 100644 --- a/tests/matrix_free/integrate_functions_multife.cc +++ b/tests/matrix_free/integrate_functions_multife.cc @@ -28,7 +28,6 @@ #include #include -#include #include #include @@ -240,24 +239,14 @@ test() { // create hyper ball geometry and refine some // cells - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); - - cell = tria.begin_active(); - for (; cell != endc; ++cell) + + for (const auto &cell : tria.active_cell_iterators()) if (cell->center().norm() < 1e-8) cell->set_refine_flag(); tria.execute_coarsening_and_refinement(); - cell = tria.begin_active(); - for (; cell != endc; ++cell) + for (const auto &cell : tria.active_cell_iterators()) if (cell->center().norm() < 0.2) cell->set_refine_flag(); tria.execute_coarsening_and_refinement(); @@ -266,14 +255,15 @@ test() tria.begin(tria.n_levels() - 1)->set_refine_flag(); tria.last()->set_refine_flag(); tria.execute_coarsening_and_refinement(); - cell = tria.begin_active(); for (unsigned int i = 0; i < 7 - 2 * dim; ++i) { - cell = tria.begin_active(); unsigned int counter = 0; - for (; cell != endc; ++cell, ++counter) - if (counter % (7 - i) == 0) - cell->set_refine_flag(); + for (const auto &cell : tria.active_cell_iterators()) + { + if (counter % (7 - i) == 0) + cell->set_refine_flag(); + ++counter; + } tria.execute_coarsening_and_refinement(); } diff --git a/tests/matrix_free/inverse_mass_01.cc b/tests/matrix_free/inverse_mass_01.cc index 4aa6e56297..a2951e18f9 100644 --- a/tests/matrix_free/inverse_mass_01.cc +++ b/tests/matrix_free/inverse_mass_01.cc @@ -25,7 +25,6 @@ #include #include -#include #include #include @@ -173,24 +172,15 @@ template void test() { - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); if (dim < 3 || fe_degree < 2) tria.refine_global(1); tria.begin(tria.n_levels() - 1)->set_refine_flag(); tria.last()->set_refine_flag(); tria.execute_coarsening_and_refinement(); - cell = tria.begin_active(); - for (; cell != endc; ++cell) + for (const auto &cell : tria.active_cell_iterators()) if (cell->center().norm() < 1e-8) cell->set_refine_flag(); tria.execute_coarsening_and_refinement(); diff --git a/tests/matrix_free/inverse_mass_03.cc b/tests/matrix_free/inverse_mass_03.cc index 25869436a0..cd0f4a0b3a 100644 --- a/tests/matrix_free/inverse_mass_03.cc +++ b/tests/matrix_free/inverse_mass_03.cc @@ -26,7 +26,6 @@ #include #include -#include #include #include @@ -188,24 +187,15 @@ template void test() { - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); if (dim < 3 || fe_degree < 2) tria.refine_global(1); tria.begin(tria.n_levels() - 1)->set_refine_flag(); tria.last()->set_refine_flag(); tria.execute_coarsening_and_refinement(); - cell = tria.begin_active(); - for (; cell != endc; ++cell) + for (const auto &cell : tria.active_cell_iterators()) if (cell->center().norm() < 1e-8) cell->set_refine_flag(); tria.execute_coarsening_and_refinement(); diff --git a/tests/matrix_free/inverse_mass_05.cc b/tests/matrix_free/inverse_mass_05.cc index bc51704c03..ab2dc3e06b 100644 --- a/tests/matrix_free/inverse_mass_05.cc +++ b/tests/matrix_free/inverse_mass_05.cc @@ -26,7 +26,6 @@ #include #include -#include #include #include @@ -174,24 +173,15 @@ template void test() { - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); if (dim < 3 || fe_degree < 2) tria.refine_global(1); tria.begin(tria.n_levels() - 1)->set_refine_flag(); tria.last()->set_refine_flag(); tria.execute_coarsening_and_refinement(); - cell = tria.begin_active(); - for (; cell != endc; ++cell) + for (const auto &cell : tria.active_cell_iterators()) if (cell->center().norm() < 1e-8) cell->set_refine_flag(); tria.execute_coarsening_and_refinement(); diff --git a/tests/matrix_free/inverse_mass_06.cc b/tests/matrix_free/inverse_mass_06.cc index b1c4158dbd..07f8fb2330 100644 --- a/tests/matrix_free/inverse_mass_06.cc +++ b/tests/matrix_free/inverse_mass_06.cc @@ -25,7 +25,6 @@ #include #include -#include #include #include @@ -165,24 +164,15 @@ template void test() { - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); if (dim < 3 || fe_degree < 2) tria.refine_global(1); tria.begin(tria.n_levels() - 1)->set_refine_flag(); tria.last()->set_refine_flag(); tria.execute_coarsening_and_refinement(); - cell = tria.begin_active(); - for (; cell != endc; ++cell) + for (const auto &cell : tria.active_cell_iterators()) if (cell->center().norm() < 1e-8) cell->set_refine_flag(); tria.execute_coarsening_and_refinement(); diff --git a/tests/matrix_free/inverse_mass_08.cc b/tests/matrix_free/inverse_mass_08.cc index 0ffa5d8597..349d626290 100644 --- a/tests/matrix_free/inverse_mass_08.cc +++ b/tests/matrix_free/inverse_mass_08.cc @@ -26,7 +26,6 @@ #include #include -#include #include #include @@ -163,14 +162,8 @@ template void test(const unsigned int fe_degree) { - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - for (const auto &cell : tria.active_cell_iterators()) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); if (dim < 3 || fe_degree < 2) tria.refine_global(1); diff --git a/tests/matrix_free/matrix_vector_04.cc b/tests/matrix_free/matrix_vector_04.cc index 74de2c40e2..dd32146878 100644 --- a/tests/matrix_free/matrix_vector_04.cc +++ b/tests/matrix_free/matrix_vector_04.cc @@ -28,11 +28,8 @@ template void test() { - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_shell(tria, Point(), 0.5, 1., 96, true); - tria.set_all_manifold_ids(0); - tria.set_manifold(0, manifold); if (dim == 2) tria.refine_global(2); diff --git a/tests/matrix_free/matrix_vector_04b.cc b/tests/matrix_free/matrix_vector_04b.cc index f2b06c95bd..e8d95823cb 100644 --- a/tests/matrix_free/matrix_vector_04b.cc +++ b/tests/matrix_free/matrix_vector_04b.cc @@ -26,11 +26,8 @@ template void test() { - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_shell(tria, Point(), 0.5, 1., 96, true); - tria.set_all_manifold_ids(0); - tria.set_manifold(0, manifold); if (dim == 2) tria.refine_global(2); diff --git a/tests/matrix_free/matrix_vector_07.cc b/tests/matrix_free/matrix_vector_07.cc index cbb2762bea..87e7491fa1 100644 --- a/tests/matrix_free/matrix_vector_07.cc +++ b/tests/matrix_free/matrix_vector_07.cc @@ -35,23 +35,13 @@ template void test() { - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); - cell = tria.begin_active(); - for (; cell != endc; ++cell) + for (const auto &cell : tria.active_cell_iterators()) if (cell->center().norm() < 1e-8) cell->set_refine_flag(); tria.execute_coarsening_and_refinement(); - cell = tria.begin_active(); - for (; cell != endc; ++cell) + for (const auto &cell : tria.active_cell_iterators()) if (cell->center().norm() < 0.2) cell->set_refine_flag(); tria.execute_coarsening_and_refinement(); @@ -63,14 +53,15 @@ test() tria.execute_coarsening_and_refinement(); tria.refine_global(4 - dim); #endif - cell = tria.begin_active(); for (unsigned int i = 0; i < 10 - 3 * dim; ++i) { - cell = tria.begin_active(); unsigned int counter = 0; - for (; cell != endc; ++cell, ++counter) - if (counter % (7 - i) == 0) - cell->set_refine_flag(); + for (const auto &cell : tria.active_cell_iterators()) + { + if (counter % (7 - i) == 0) + cell->set_refine_flag(); + ++counter; + } tria.execute_coarsening_and_refinement(); } diff --git a/tests/matrix_free/matrix_vector_14.cc b/tests/matrix_free/matrix_vector_14.cc index 3974da0ab5..48636162d0 100644 --- a/tests/matrix_free/matrix_vector_14.cc +++ b/tests/matrix_free/matrix_vector_14.cc @@ -32,23 +32,14 @@ template void test() { - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); if (dim < 3 || fe_degree < 2) tria.refine_global(1); tria.begin(tria.n_levels() - 1)->set_refine_flag(); tria.last()->set_refine_flag(); tria.execute_coarsening_and_refinement(); - cell = tria.begin_active(); - for (; cell != endc; ++cell) + for (const auto &cell : tria.active_cell_iterators()) if (cell->center().norm() < 1e-8) cell->set_refine_flag(); tria.execute_coarsening_and_refinement(); diff --git a/tests/matrix_free/matrix_vector_14_notempl.cc b/tests/matrix_free/matrix_vector_14_notempl.cc index 4739dc9046..55bdc4d2cb 100644 --- a/tests/matrix_free/matrix_vector_14_notempl.cc +++ b/tests/matrix_free/matrix_vector_14_notempl.cc @@ -29,23 +29,14 @@ template void test() { - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); if (dim < 3 || fe_degree < 2) tria.refine_global(1); tria.begin(tria.n_levels() - 1)->set_refine_flag(); tria.last()->set_refine_flag(); tria.execute_coarsening_and_refinement(); - cell = tria.begin_active(); - for (; cell != endc; ++cell) + for (const auto &cell : tria.active_cell_iterators()) if (cell->center().norm() < 1e-8) cell->set_refine_flag(); tria.execute_coarsening_and_refinement(); diff --git a/tests/matrix_free/matrix_vector_14b.cc b/tests/matrix_free/matrix_vector_14b.cc index fa705dc0af..95d507b9c2 100644 --- a/tests/matrix_free/matrix_vector_14b.cc +++ b/tests/matrix_free/matrix_vector_14b.cc @@ -29,23 +29,14 @@ template void test() { - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); if (dim < 3 || fe_degree < 2) tria.refine_global(1); tria.begin(tria.n_levels() - 1)->set_refine_flag(); tria.last()->set_refine_flag(); tria.execute_coarsening_and_refinement(); - cell = tria.begin_active(); - for (; cell != endc; ++cell) + for (const auto &cell : tria.active_cell_iterators()) if (cell->center().norm() < 1e-8) cell->set_refine_flag(); tria.execute_coarsening_and_refinement(); diff --git a/tests/matrix_free/matrix_vector_15.cc b/tests/matrix_free/matrix_vector_15.cc index bb70ef7534..cf439fd449 100644 --- a/tests/matrix_free/matrix_vector_15.cc +++ b/tests/matrix_free/matrix_vector_15.cc @@ -27,7 +27,6 @@ #include #include -#include #include #include @@ -183,24 +182,15 @@ template void test() { - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); if (dim < 3 || fe_degree < 2) tria.refine_global(1); tria.begin(tria.n_levels() - 1)->set_refine_flag(); tria.last()->set_refine_flag(); tria.execute_coarsening_and_refinement(); - cell = tria.begin_active(); - for (; cell != endc; ++cell) + for (const auto &cell : tria.active_cell_iterators()) if (cell->center().norm() < 1e-8) cell->set_refine_flag(); tria.execute_coarsening_and_refinement(); diff --git a/tests/matrix_free/matrix_vector_16.cc b/tests/matrix_free/matrix_vector_16.cc index e6455e9d43..b8588888c6 100644 --- a/tests/matrix_free/matrix_vector_16.cc +++ b/tests/matrix_free/matrix_vector_16.cc @@ -27,7 +27,6 @@ #include #include -#include #include #include @@ -189,24 +188,14 @@ template void test() { - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); - if (dim < 3 || fe_degree < 2) tria.refine_global(1); tria.begin(tria.n_levels() - 1)->set_refine_flag(); tria.last()->set_refine_flag(); tria.execute_coarsening_and_refinement(); - cell = tria.begin_active(); - for (; cell != endc; ++cell) + for (const auto &cell : tria.active_cell_iterators()) if (cell->center().norm() < 1e-8) cell->set_refine_flag(); tria.execute_coarsening_and_refinement(); diff --git a/tests/matrix_free/matrix_vector_17.cc b/tests/matrix_free/matrix_vector_17.cc index c0209fd03a..a65652d304 100644 --- a/tests/matrix_free/matrix_vector_17.cc +++ b/tests/matrix_free/matrix_vector_17.cc @@ -32,23 +32,14 @@ template void test() { - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); if (dim < 3 || fe_degree < 2) tria.refine_global(1); tria.begin(tria.n_levels() - 1)->set_refine_flag(); tria.last()->set_refine_flag(); tria.execute_coarsening_and_refinement(); - cell = tria.begin_active(); - for (; cell != endc; ++cell) + for (const auto &cell : tria.active_cell_iterators()) if (cell->center().norm() < 1e-8) cell->set_refine_flag(); tria.execute_coarsening_and_refinement(); diff --git a/tests/matrix_free/matrix_vector_curl.cc b/tests/matrix_free/matrix_vector_curl.cc index f681dfd0e9..98bee529f1 100644 --- a/tests/matrix_free/matrix_vector_curl.cc +++ b/tests/matrix_free/matrix_vector_curl.cc @@ -31,7 +31,6 @@ #include #include -#include #include #include @@ -106,16 +105,8 @@ template void test() { - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); tria.refine_global(4 - dim); // refine a few cells diff --git a/tests/matrix_free/matrix_vector_hp.cc b/tests/matrix_free/matrix_vector_hp.cc index 81d272b191..9cedcb3826 100644 --- a/tests/matrix_free/matrix_vector_hp.cc +++ b/tests/matrix_free/matrix_vector_hp.cc @@ -25,7 +25,6 @@ #include #include -#include #include @@ -92,14 +91,8 @@ void test() { using number = double; - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - for (const auto &cell : tria.active_cell_iterators()) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); tria.refine_global(1); // refine a few cells diff --git a/tests/matrix_free/matrix_vector_hp_no_template.cc b/tests/matrix_free/matrix_vector_hp_no_template.cc index 7f258fe33e..37d90c0713 100644 --- a/tests/matrix_free/matrix_vector_hp_no_template.cc +++ b/tests/matrix_free/matrix_vector_hp_no_template.cc @@ -77,28 +77,20 @@ test() return; using number = double; - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); tria.refine_global(1); // refine a few cells for (unsigned int i = 0; i < 11 - 3 * dim; ++i) { - typename Triangulation::active_cell_iterator cell = - tria.begin_active(), - endc = tria.end(); - unsigned int counter = 0; - for (; cell != endc; ++cell, ++counter) - if (counter % (7 - i) == 0) - cell->set_refine_flag(); + unsigned int counter = 0; + for (const auto &cell : tria.active_cell_iterators()) + { + if (counter % (7 - i) == 0) + cell->set_refine_flag(); + ++counter; + } tria.execute_coarsening_and_refinement(); } diff --git a/tests/matrix_free/matrix_vector_hp_parallel_01.cc b/tests/matrix_free/matrix_vector_hp_parallel_01.cc index 1621dec4cc..dc270a5149 100644 --- a/tests/matrix_free/matrix_vector_hp_parallel_01.cc +++ b/tests/matrix_free/matrix_vector_hp_parallel_01.cc @@ -29,7 +29,6 @@ #include #include -#include #include #include @@ -88,14 +87,8 @@ test() return; using number = double; - const SphericalManifold manifold; parallel::distributed::Triangulation tria(MPI_COMM_WORLD); GridGenerator::hyper_ball(tria); - for (const auto &cell : tria.active_cell_iterators()) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); tria.refine_global(1); // refine a few cells diff --git a/tests/matrix_free/matrix_vector_mg.cc b/tests/matrix_free/matrix_vector_mg.cc index 35d56c014e..f32ca508ae 100644 --- a/tests/matrix_free/matrix_vector_mg.cc +++ b/tests/matrix_free/matrix_vector_mg.cc @@ -34,17 +34,9 @@ template void test() { - const SphericalManifold manifold; - Triangulation tria( + Triangulation tria( Triangulation::limit_level_difference_at_vertices); GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); tria.refine_global(5 - dim); FE_Q fe(fe_degree); diff --git a/tests/matrix_free/matrix_vector_stokes_noflux.cc b/tests/matrix_free/matrix_vector_stokes_noflux.cc index 00487f4817..5b88acbc9b 100644 --- a/tests/matrix_free/matrix_vector_stokes_noflux.cc +++ b/tests/matrix_free/matrix_vector_stokes_noflux.cc @@ -32,7 +32,6 @@ #include #include -#include #include #include @@ -125,11 +124,8 @@ template void test() { - SphericalManifold manifold; - Triangulation triangulation; + Triangulation triangulation; GridGenerator::hyper_shell(triangulation, Point(), 0.5, 1., 96, true); - triangulation.set_all_manifold_ids(0); - triangulation.set_manifold(0, manifold); triangulation.begin_active()->set_refine_flag(); triangulation.last()->set_refine_flag(); diff --git a/tests/matrix_free/matrix_vector_stokes_notempl.cc b/tests/matrix_free/matrix_vector_stokes_notempl.cc index ea8dac3c6f..4e1230c477 100644 --- a/tests/matrix_free/matrix_vector_stokes_notempl.cc +++ b/tests/matrix_free/matrix_vector_stokes_notempl.cc @@ -29,7 +29,6 @@ #include #include -#include #include #include @@ -121,11 +120,8 @@ template void test(const unsigned int fe_degree) { - SphericalManifold manifold; - Triangulation triangulation; + Triangulation triangulation; GridGenerator::hyper_shell(triangulation, Point(), 0.5, 1., 96, true); - triangulation.set_all_manifold_ids(0); - triangulation.set_manifold(0, manifold); triangulation.begin_active()->set_refine_flag(); triangulation.last()->set_refine_flag(); diff --git a/tests/matrix_free/matrix_vector_stokes_onedof.cc b/tests/matrix_free/matrix_vector_stokes_onedof.cc index 0984a9c94b..295c6c053f 100644 --- a/tests/matrix_free/matrix_vector_stokes_onedof.cc +++ b/tests/matrix_free/matrix_vector_stokes_onedof.cc @@ -33,7 +33,6 @@ #include #include -#include #include #include @@ -132,11 +131,8 @@ template void test(const FESystem &fe) { - SphericalManifold manifold; - Triangulation triangulation; + Triangulation triangulation; GridGenerator::hyper_shell(triangulation, Point(), 0.5, 1., 96, true); - triangulation.set_all_manifold_ids(0); - triangulation.set_manifold(0, manifold); triangulation.begin_active()->set_refine_flag(); triangulation.last()->set_refine_flag(); triangulation.execute_coarsening_and_refinement(); diff --git a/tests/matrix_free/no_index_initialize.cc b/tests/matrix_free/no_index_initialize.cc index 7b06902541..3c3aec0632 100644 --- a/tests/matrix_free/no_index_initialize.cc +++ b/tests/matrix_free/no_index_initialize.cc @@ -26,7 +26,6 @@ #include #include -#include #include #include @@ -179,16 +178,8 @@ template void test() { - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); // refine first and last cell tria.begin(tria.n_levels() - 1)->set_refine_flag(); diff --git a/tests/matrix_free/quadrature_points.cc b/tests/matrix_free/quadrature_points.cc index 0c29cd525c..c5305d8d4c 100644 --- a/tests/matrix_free/quadrature_points.cc +++ b/tests/matrix_free/quadrature_points.cc @@ -26,7 +26,6 @@ #include #include -#include #include #include @@ -48,16 +47,8 @@ void test() { using number = double; - const SphericalManifold manifold; - Triangulation tria; + Triangulation tria; GridGenerator::hyper_ball(tria); - typename Triangulation::active_cell_iterator cell = tria.begin_active(), - endc = tria.end(); - for (; cell != endc; ++cell) - for (const unsigned int f : GeometryInfo::face_indices()) - if (cell->at_boundary(f)) - cell->face(f)->set_all_manifold_ids(0); - tria.set_manifold(0, manifold); tria.refine_global(5 - dim); MappingQ mapping(4);