From b8984abfe93a7de79d0ab62fb7fd689ccff28159 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Thu, 27 Jan 2022 13:31:54 -0700 Subject: [PATCH] Rename Triangulation::manifold to Triangulation::manifolds. The member variable is a std::map and generally holds multiple objects. Use the plural. --- include/deal.II/grid/tria.h | 2 +- source/grid/tria.cc | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h index 90d29f3379..3dba7a1f8d 100644 --- a/include/deal.II/grid/tria.h +++ b/include/deal.II/grid/tria.h @@ -4017,7 +4017,7 @@ private: * type FlatManifold. */ std::map>> - manifold; + manifolds; /** * Flag indicating whether anisotropic refinement took place. diff --git a/source/grid/tria.cc b/source/grid/tria.cc index d165aa24a2..0641231294 100644 --- a/source/grid/tria.cc +++ b/source/grid/tria.cc @@ -11180,7 +11180,7 @@ Triangulation::Triangulation( , faces(std::move(tria.faces)) , vertices(std::move(tria.vertices)) , vertices_used(std::move(tria.vertices_used)) - , manifold(std::move(tria.manifold)) + , manifolds(std::move(tria.manifolds)) , anisotropic_refinement(tria.anisotropic_refinement) , check_for_distorted_cells(tria.check_for_distorted_cells) , number_cache(std::move(tria.number_cache)) @@ -11209,7 +11209,7 @@ Triangulation::operator=( faces = std::move(tria.faces); vertices = std::move(tria.vertices); vertices_used = std::move(tria.vertices_used); - manifold = std::move(tria.manifold); + manifolds = std::move(tria.manifolds); anisotropic_refinement = tria.anisotropic_refinement; number_cache = tria.number_cache; vertex_to_boundary_id_map_1d = std::move(tria.vertex_to_boundary_id_map_1d); @@ -11306,7 +11306,7 @@ Triangulation::set_manifold( { AssertIndexRange(m_number, numbers::flat_manifold_id); - manifold[m_number] = manifold_object.clone(); + manifolds[m_number] = manifold_object.clone(); } @@ -11318,7 +11318,7 @@ Triangulation::reset_manifold(const types::manifold_id m_number) AssertIndexRange(m_number, numbers::flat_manifold_id); // delete the entry located at number. - manifold.erase(m_number); + manifolds.erase(m_number); } @@ -11326,7 +11326,7 @@ template void Triangulation::reset_all_manifolds() { - manifold.clear(); + manifolds.clear(); } @@ -11410,9 +11410,9 @@ Triangulation::get_manifold( { // look, if there is a manifold stored at // manifold_id number. - const auto it = manifold.find(m_number); + const auto it = manifolds.find(m_number); - if (it != manifold.end()) + if (it != manifolds.end()) { // if we have found an entry, return it return *(it->second); @@ -11507,7 +11507,7 @@ Triangulation::copy_triangulation( faces = std::make_unique( *other_tria.faces); - for (const auto &p : other_tria.manifold) + for (const auto &p : other_tria.manifolds) set_manifold(p.first, *p.second); @@ -14712,7 +14712,7 @@ Triangulation::clear_despite_subscriptions() vertices.clear(); vertices_used.clear(); - manifold.clear(); + manifolds.clear(); number_cache = internal::TriangulationImplementation::NumberCache(); } @@ -16373,7 +16373,7 @@ Triangulation::memory_consumption() const mem += MemoryConsumption::memory_consumption(*level); mem += MemoryConsumption::memory_consumption(vertices); mem += MemoryConsumption::memory_consumption(vertices_used); - mem += sizeof(manifold); + mem += sizeof(manifolds); mem += sizeof(smooth_grid); mem += MemoryConsumption::memory_consumption(number_cache); mem += sizeof(faces); -- 2.39.5