From: David Wells Date: Wed, 8 Nov 2017 16:30:56 +0000 (-0500) Subject: Disambiguate parallel::GridTools and GridTools. X-Git-Tag: v9.0.0-rc1~800^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F5423%2Fhead;p=dealii.git Disambiguate parallel::GridTools and GridTools. --- diff --git a/include/deal.II/distributed/tria.h b/include/deal.II/distributed/tria.h index 2c580fd6db..6d2ee6c4cf 100644 --- a/include/deal.II/distributed/tria.h +++ b/include/deal.II/distributed/tria.h @@ -704,7 +704,7 @@ namespace parallel */ virtual void add_periodicity - (const std::vector > &); + (const std::vector > &); private: diff --git a/source/distributed/shared_tria.cc b/source/distributed/shared_tria.cc index 7ffb864b7f..f435192836 100644 --- a/source/distributed/shared_tria.cc +++ b/source/distributed/shared_tria.cc @@ -106,7 +106,7 @@ namespace parallel = IteratorFilters::SubdomainEqualTo(this->my_subdomain); const std::vector::active_cell_iterator> - active_halo_layer_vector = GridTools::compute_active_cell_halo_layer (*this, predicate); + active_halo_layer_vector = dealii::GridTools::compute_active_cell_halo_layer (*this, predicate); std::set::active_cell_iterator> active_halo_layer(active_halo_layer_vector.begin(), active_halo_layer_vector.end()); @@ -132,7 +132,7 @@ namespace parallel true_level_subdomain_ids_of_cells[lvl].resize(this->n_cells(lvl)); const std::vector::cell_iterator> - level_halo_layer_vector = GridTools::compute_cell_halo_layer_on_level (*this, predicate, lvl); + level_halo_layer_vector = dealii::GridTools::compute_cell_halo_layer_on_level (*this, predicate, lvl); std::set::cell_iterator> level_halo_layer(level_halo_layer_vector.begin(), level_halo_layer_vector.end()); diff --git a/source/distributed/tria.cc b/source/distributed/tria.cc index 9116acee43..eaffda540f 100644 --- a/source/distributed/tria.cc +++ b/source/distributed/tria.cc @@ -1733,7 +1733,7 @@ namespace parallel Triangulation::setup_coarse_cell_to_p4est_tree_permutation () { DynamicSparsityPattern cell_connectivity; - GridTools::get_vertex_connectivity_of_cells (*this, cell_connectivity); + dealii::GridTools::get_vertex_connectivity_of_cells (*this, cell_connectivity); coarse_cell_to_p4est_tree_permutation.resize (this->n_cells(0)); SparsityTools:: reorder_hierarchical (cell_connectivity, @@ -3054,7 +3054,7 @@ namespace parallel #ifdef DEBUG { const std::vector locally_owned_vertices - = GridTools::get_locally_owned_vertices (*this); + = dealii::GridTools::get_locally_owned_vertices (*this); for (unsigned int i=0; i void Triangulation::add_periodicity - (const std::vector > & + (const std::vector > & periodicity_vector) { #if DEAL_II_P4EST_VERSION_GTE(0,3,4,1) @@ -3404,7 +3404,7 @@ namespace parallel Assert (this->n_levels() == 1, ExcMessage ("The triangulation is refined!")); - typedef std::vector > + typedef std::vector > FaceVector; typename FaceVector::const_iterator it, periodic_end; it = periodicity_vector.begin();