From 6b929962b0308fe0a4e77c9672a6dcdc970f9e3b Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Wed, 9 Aug 2017 14:51:47 -0600 Subject: [PATCH] remove p::d::Triangulation::compute_level_vertices_with_ghost_neighbors() - never used/tested because GMG uses a different strategy to communicate DoFs fixes #4627 --- include/deal.II/distributed/tria.h | 8 ---- source/distributed/tria.cc | 63 ------------------------------ 2 files changed, 71 deletions(-) diff --git a/include/deal.II/distributed/tria.h b/include/deal.II/distributed/tria.h index 8f98907d97..4b1e00b36e 100644 --- a/include/deal.II/distributed/tria.h +++ b/include/deal.II/distributed/tria.h @@ -865,14 +865,6 @@ namespace parallel std::map > compute_vertices_with_ghost_neighbors () const; - /** - * Return a map that, for each vertex, lists all the processors whose - * subdomains are adjacent to that vertex on the given level for the - * multigrid hierarchy. Used by DoFHandler::Policy::ParallelDistributed. - */ - std::map > - compute_level_vertices_with_ghost_neighbors (const int level) const; - /** * This method returns a bit vector of length tria.n_vertices() * indicating the locally active vertices on a level, i.e., the vertices diff --git a/source/distributed/tria.cc b/source/distributed/tria.cc index 3c4b68d3df..1dd61d9292 100644 --- a/source/distributed/tria.cc +++ b/source/distributed/tria.cc @@ -3405,69 +3405,6 @@ namespace parallel - /** - * Determine the neighboring subdomains that are adjacent to each vertex - * on the given multigrid level - */ - template - std::map > - Triangulation:: - compute_level_vertices_with_ghost_neighbors (const int level) const - { - std::map > - vertices_with_ghost_neighbors; - - const std::vector locally_active_vertices = - mark_locally_active_vertices_on_level(level); - cell_iterator cell = this->begin(level), - endc = this->end(level); - for ( ; cell != endc; ++cell) - if (cell->level_subdomain_id() != dealii::numbers::artificial_subdomain_id - && cell->level_subdomain_id() != this->locally_owned_subdomain()) - for (unsigned int v=0; v::vertices_per_cell; ++v) - if (locally_active_vertices[cell->vertex_index(v)]) - vertices_with_ghost_neighbors[cell->vertex_index(v)] - .insert (cell->level_subdomain_id()); - - //now for the vertices on periodic faces - typename std::map, - std::pair, std::bitset<3> > >::const_iterator it; - - for (it = this->get_periodic_face_map().begin(); it!= this->get_periodic_face_map().end(); ++it) - { - const cell_iterator &cell_1 = it->first.first; - const unsigned int face_no_1 = it->first.second; - const cell_iterator &cell_2 = it->second.first.first; - const unsigned int face_no_2 = it->second.first.second; - const std::bitset<3> face_orientation = it->second.second; - - if (cell_1->level() == level && - cell_2->level() == level) - { - for (unsigned int v=0; v::vertices_per_cell; ++v) - { - // take possible non-standard orientation of faces into account - const unsigned int vface0 = - GeometryInfo::standard_to_real_face_vertex(v,face_orientation[0], - face_orientation[1], - face_orientation[2]); - const unsigned int idx0 = cell_1->face(face_no_1)->vertex_index(vface0); - const unsigned int idx1 = cell_2->face(face_no_2)->vertex_index(v); - if (vertices_with_ghost_neighbors.find(idx0) != vertices_with_ghost_neighbors.end()) - vertices_with_ghost_neighbors[idx1].insert(vertices_with_ghost_neighbors[idx0].begin(), - vertices_with_ghost_neighbors[idx0].end()); - if (vertices_with_ghost_neighbors.find(idx1) != vertices_with_ghost_neighbors.end()) - vertices_with_ghost_neighbors[idx0].insert(vertices_with_ghost_neighbors[idx1].begin(), - vertices_with_ghost_neighbors[idx1].end()); - } - } - } - - return vertices_with_ghost_neighbors; - } - - - template std::vector Triangulation:: -- 2.39.5