From: Wolfgang Bangerth Date: Tue, 27 Jun 2017 14:48:39 +0000 (-0600) Subject: Clean up one more DoFHandlerPolicy thing. X-Git-Tag: v9.0.0-rc1~1466^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F4554%2Fhead;p=dealii.git Clean up one more DoFHandlerPolicy thing. We had a function with a funny comment suggesting that a compiler did not correctly understand the code. But the comment is wrong: when the only argument to a function that references a 'dim' or 'spacedim' template argument is of the form onst typename DoFHandler::level_cell_iterator & then 'dim' and 'spacedim' are simply not deducible. That's how C++ works. The function therefore had a dummy argument of type DoFHandler that isn't used. That's awkward, but works. But we have a way to deal with the lack of deducibility that's used elsewhere in the library namely internal::int2type. Use this approach here as well, and remove the misleading comment. --- diff --git a/source/dofs/dof_handler_policy.cc b/source/dofs/dof_handler_policy.cc index ef1cac9626..c0add2bf29 100644 --- a/source/dofs/dof_handler_policy.cc +++ b/source/dofs/dof_handler_policy.cc @@ -317,40 +317,19 @@ namespace internal /** - * Distribute dofs on the given - * cell, with new dofs starting - * with index - * @p next_free_dof. Return the - * next unused index number. + * Distribute multilevel dofs on the given cell, with new dofs starting + * with index @p next_free_dof. Return the next unused index number. * - * This function is excluded from - * the @p distribute_dofs - * function since it can not be - * implemented dimension - * independent. - * - * Note that unlike for the usual - * dofs, here all cells and not + * Note that unlike for the usual dofs, here all cells and not * only active ones are allowed. */ - - // These three function - // have an unused - // DoFHandler object as - // their first - // argument. Without it, - // the file was not - // compileable under gcc - // 4.4.5 (Debian). - template + template static unsigned int - distribute_mg_dofs_on_cell (const DoFHandler<1,spacedim> &, - typename DoFHandler<1,spacedim>::level_cell_iterator &cell, - unsigned int next_free_dof) + distribute_mg_dofs_on_cell (const typename DoFHandler::level_cell_iterator &cell, + unsigned int next_free_dof, + const internal::int2type<1> &) { - const unsigned int dim = 1; - // distribute dofs of vertices if (cell->get_fe().dofs_per_vertex > 0) for (unsigned int v=0; v::vertices_per_cell; ++v) @@ -362,8 +341,7 @@ namespace internal // has neighbor already been processed? if (neighbor->user_flag_set() && (neighbor->level() == cell->level())) - // copy dofs if the neighbor is on - // the same level (only then are + // copy dofs if the neighbor is on the same level (only then are // mg dofs the same) { if (v==0) @@ -377,13 +355,13 @@ namespace internal // next neighbor continue; - }; - }; + } + } // otherwise: create dofs newly for (unsigned int d=0; dget_fe().dofs_per_vertex; ++d) cell->set_mg_vertex_dof_index (cell->level(), v, d, next_free_dof++); - }; + } // dofs of line if (cell->get_fe().dofs_per_line > 0) @@ -397,14 +375,14 @@ namespace internal } - template + + template static unsigned int - distribute_mg_dofs_on_cell (const DoFHandler<2,spacedim> &, - typename DoFHandler<2,spacedim>::level_cell_iterator &cell, - unsigned int next_free_dof) + distribute_mg_dofs_on_cell (const typename DoFHandler::level_cell_iterator &cell, + unsigned int next_free_dof, + const internal::int2type<2> &) { - const unsigned int dim = 2; if (cell->get_fe().dofs_per_vertex > 0) // number dofs on vertices for (unsigned int vertex=0; vertex::vertices_per_cell; ++vertex) @@ -421,14 +399,13 @@ namespace internal { typename DoFHandler::line_iterator line = cell->line(side); - // distribute dofs if necessary: - // check whether line dof is already + // distribute dofs if necessary: check whether line dof is already // numbered (check only first dof) if (line->mg_dof_index(cell->level(), 0) == numbers::invalid_dof_index) // if not: distribute dofs for (unsigned int d=0; dget_fe().dofs_per_line; ++d) line->set_mg_dof_index (cell->level(), d, next_free_dof++); - }; + } // dofs of quad @@ -444,19 +421,18 @@ namespace internal } - template + + template static unsigned int - distribute_mg_dofs_on_cell (const DoFHandler<3,spacedim> &, - typename DoFHandler<3,spacedim>::level_cell_iterator &cell, - unsigned int next_free_dof) + distribute_mg_dofs_on_cell (const typename DoFHandler::level_cell_iterator &cell, + unsigned int next_free_dof, + const internal::int2type<3> &) { - const unsigned int dim = 3; if (cell->get_fe().dofs_per_vertex > 0) // number dofs on vertices for (unsigned int vertex=0; vertex::vertices_per_cell; ++vertex) - // check whether dofs for this - // vertex have been distributed + // check whether dofs for this vertex have been distributed // (only check the first dof) if (cell->mg_vertex_dof_index(cell->level(), vertex, 0) == numbers::invalid_dof_index) for (unsigned int d=0; dget_fe().dofs_per_vertex; ++d) @@ -475,7 +451,7 @@ namespace internal // if not: distribute dofs for (unsigned int d=0; dget_fe().dofs_per_line; ++d) line->set_mg_dof_index (cell->level(), d, next_free_dof++); - }; + } // for the quads if (cell->get_fe().dofs_per_quad > 0) @@ -490,7 +466,7 @@ namespace internal // if not: distribute dofs for (unsigned int d=0; dget_fe().dofs_per_quad; ++d) quad->set_mg_dof_index (cell->level(), d, next_free_dof++); - }; + } // dofs of cell @@ -499,20 +475,20 @@ namespace internal cell->set_mg_dof_index (cell->level(), d, next_free_dof++); - // note that this cell has - // been processed + // note that this cell has been processed cell->set_user_flag (); return next_free_dof; } + template static unsigned int distribute_dofs_on_level (const types::subdomain_id level_subdomain_id, DoFHandler &dof_handler, - const unsigned int level) + const unsigned int level) { const dealii::Triangulation &tria = dof_handler.get_triangulation(); @@ -520,14 +496,10 @@ namespace internal if (level>=tria.n_levels()) return 0; //this is allowed for multigrid - // Clear user flags because we will - // need them. But first we save - // them and make sure that we - // restore them later such that at - // the end of this function the - // Triangulation will be in the - // same state as it was at the - // beginning of this function. + // Clear user flags because we will need them. But first we save + // them and make sure that we restore them later such that at + // the end of this function the Triangulation will be in the + // same state as it was at the beginning of this function. std::vector user_flags; tria.save_user_flags(user_flags); const_cast &>(tria).clear_user_flags (); @@ -542,7 +514,8 @@ namespace internal || (cell->level_subdomain_id() == level_subdomain_id)) next_free_dof - = Implementation::distribute_mg_dofs_on_cell (dof_handler, cell, next_free_dof); + = Implementation::distribute_mg_dofs_on_cell (cell, next_free_dof, + internal::int2type()); // finally restore the user flags const_cast &>(tria).load_user_flags(user_flags);