From 498c5eb6be46485eedce31c4ac734fb3595e3961 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Sun, 9 Jul 2023 22:55:31 -0600 Subject: [PATCH] Minor updates to GridGenerator::hyper_cube_with_cylindrical_hole(). --- source/grid/grid_generator.cc | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/source/grid/grid_generator.cc b/source/grid/grid_generator.cc index 7450ec245b..2871cbbe39 100644 --- a/source/grid/grid_generator.cc +++ b/source/grid/grid_generator.cc @@ -7491,19 +7491,15 @@ namespace GridGenerator cylinder_shell(triangulation, L, inner_radius, outer_radius, 8, Nz); triangulation.set_all_manifold_ids(numbers::flat_manifold_id); - Triangulation::active_cell_iterator cell = - triangulation.begin_active(), - endc = triangulation.end(); std::vector treated_vertices(triangulation.n_vertices(), false); - for (; cell != endc; ++cell) + for (const auto &cell : triangulation.active_cell_iterators()) { for (auto f : GeometryInfo::face_indices()) if (cell->face(f)->at_boundary()) { - for (unsigned int v = 0; v < GeometryInfo::vertices_per_face; - ++v) + for (const unsigned int v : cell->vertex_indices()) { - unsigned int vv = cell->face(f)->vertex_index(v); + const unsigned int vv = cell->face(f)->vertex_index(v); if (treated_vertices[vv] == false) { treated_vertices[vv] = true; @@ -7537,15 +7533,14 @@ namespace GridGenerator } } double eps = 1e-3 * outer_radius; - cell = triangulation.begin_active(); - for (; cell != endc; ++cell) + for (const auto &cell : triangulation.active_cell_iterators()) { - for (auto f : GeometryInfo::face_indices()) + for (const unsigned int f : GeometryInfo::face_indices()) if (cell->face(f)->at_boundary()) { - double dx = cell->face(f)->center()(0); - double dy = cell->face(f)->center()(1); - double dz = cell->face(f)->center()(2); + const double dx = cell->face(f)->center()(0); + const double dy = cell->face(f)->center()(1); + const double dz = cell->face(f)->center()(2); if (colorize) { @@ -7575,9 +7570,9 @@ namespace GridGenerator } else { - Point c = cell->face(f)->center(); - c(2) = 0; - double d = c.norm(); + Point c = cell->face(f)->center(); + c(2) = 0; + const double d = c.norm(); if (d - inner_radius < 0) { cell->face(f)->set_all_boundary_ids(1); -- 2.39.5