From: Peter Munch Date: Thu, 8 Oct 2020 10:51:39 +0000 (+0200) Subject: Fix type of FineDoFHandlerView (again) X-Git-Tag: v9.3.0-rc1~1020^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e5f2605ba6b093bdda6668998054e87ccb424d9;p=dealii.git Fix type of FineDoFHandlerView (again) --- diff --git a/include/deal.II/multigrid/mg_transfer_global_coarsening.templates.h b/include/deal.II/multigrid/mg_transfer_global_coarsening.templates.h index b45d94aa56..ac45162ac6 100644 --- a/include/deal.II/multigrid/mg_transfer_global_coarsening.templates.h +++ b/include/deal.II/multigrid/mg_transfer_global_coarsening.templates.h @@ -350,8 +350,8 @@ namespace internal class CellIDTranslator { public: - CellIDTranslator(const types::global_dof_index n_coarse_cells, - const types::global_dof_index n_global_levels) + CellIDTranslator(const types::global_cell_index n_coarse_cells, + const types::global_cell_index n_global_levels) : n_coarse_cells(n_coarse_cells) , n_global_levels(n_global_levels) { @@ -363,7 +363,7 @@ namespace internal n_coarse_cells); } - types::global_dof_index + types::global_cell_index size() const { return n_coarse_cells * @@ -373,10 +373,10 @@ namespace internal } template - types::global_dof_index + types::global_cell_index translate(const T &cell) const { - types::global_dof_index id = 0; + types::global_cell_index id = 0; id += convert_cell_id_binary_type_to_level_coarse_cell_id( cell->id().template to_binary()); @@ -387,8 +387,8 @@ namespace internal } template - types::global_dof_index - translate(const T &cell, const types::global_dof_index i) const + types::global_cell_index + translate(const T &cell, const types::global_cell_index i) const { return (translate(cell) - tree_sizes[cell->level()]) * GeometryInfo::max_children_per_cell + @@ -396,13 +396,13 @@ namespace internal } CellId - to_cell_id(const types::global_dof_index id) const + to_cell_id(const types::global_cell_index id) const { std::vector child_indices; - types::global_dof_index id_temp = id; + types::global_cell_index id_temp = id; - types::global_dof_index level = 0; + types::global_cell_index level = 0; for (; level < n_global_levels; ++level) if (id < tree_sizes[level]) @@ -411,7 +411,7 @@ namespace internal id_temp -= tree_sizes[level]; - for (types::global_dof_index l = 0; l < level; ++l) + for (types::global_cell_index l = 0; l < level; ++l) { child_indices.push_back(id_temp % GeometryInfo::max_children_per_cell); @@ -424,9 +424,9 @@ namespace internal } private: - const types::global_dof_index n_coarse_cells; - const types::global_dof_index n_global_levels; - std::vector tree_sizes; + const types::global_cell_index n_coarse_cells; + const types::global_cell_index n_global_levels; + std::vector tree_sizes; }; template @@ -480,7 +480,7 @@ namespace internal false); Utilities::MPI::ConsensusAlgorithms::Selector< - std::pair, + std::pair, unsigned int> consensus_algorithm(process, communicator); consensus_algorithm.run(); @@ -506,7 +506,7 @@ namespace internal true); Utilities::MPI::ConsensusAlgorithms::Selector< - std::pair, + std::pair, unsigned int> consensus_algorithm(process, communicator); consensus_algorithm.run();