From: Peter Munch Date: Thu, 5 Nov 2020 14:38:49 +0000 (+0100) Subject: Simplify simplify_categorize_by_boundary_ids X-Git-Tag: v9.3.0-rc1~931^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F11147%2Fhead;p=dealii.git Simplify simplify_categorize_by_boundary_ids --- diff --git a/include/deal.II/matrix_free/tools.h b/include/deal.II/matrix_free/tools.h index 38b2a52afa..6ff02f3950 100644 --- a/include/deal.II/matrix_free/tools.h +++ b/include/deal.II/matrix_free/tools.h @@ -40,10 +40,8 @@ namespace MatrixFreeTools */ template void - categorize_by_boundary_ids( - const Triangulation &tria, - AdditionalData & additional_data, - const unsigned int level = numbers::invalid_unsigned_int); + categorize_by_boundary_ids(const Triangulation &tria, + AdditionalData & additional_data); /** * Compute the diagonal of a linear operator (@p diagonal_global), given @@ -81,18 +79,19 @@ namespace MatrixFreeTools template void categorize_by_boundary_ids(const Triangulation &tria, - AdditionalData & additional_data, - const unsigned int level) + AdditionalData & additional_data) { // ... determine if we are on an active or a multigrid level - const bool is_mg = (level != numbers::invalid_unsigned_int); + const unsigned int level = additional_data.mg_level; + const bool is_mg = (level != numbers::invalid_unsigned_int); // ... create empty list for the category of each cell if (is_mg) - additional_data.cell_vectorization_category.resize( - std::distance(tria.begin(level), tria.end(level))); + additional_data.cell_vectorization_category.assign( + std::distance(tria.begin(level), tria.end(level)), 0); else - additional_data.cell_vectorization_category.resize(tria.n_active_cells()); + additional_data.cell_vectorization_category.assign(tria.n_active_cells(), + 0); // ... set up scaling factor std::vector factors(GeometryInfo::faces_per_cell);