From 02ddd59a5d0875c0e28b87c16c29564218cc76c7 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Mon, 5 Jun 2023 11:18:04 -0400 Subject: [PATCH] Avoid a couple compiler warnings --- include/deal.II/grid/grid_reordering.h | 2 +- .../mg_transfer_global_coarsening.templates.h | 2 +- source/base/qprojector.cc | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/deal.II/grid/grid_reordering.h b/include/deal.II/grid/grid_reordering.h index 9d33c5c81f..7affe36aaf 100644 --- a/include/deal.II/grid/grid_reordering.h +++ b/include/deal.II/grid/grid_reordering.h @@ -35,7 +35,7 @@ DEAL_II_NAMESPACE_OPEN * this class. Usage of the old-style numbering is deprecated. */ template -class DEAL_II_DEPRECATED GridReordering +class GridReordering { public: /** 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 f709a3e851..e006b130fd 100644 --- a/include/deal.II/multigrid/mg_transfer_global_coarsening.templates.h +++ b/include/deal.II/multigrid/mg_transfer_global_coarsening.templates.h @@ -3857,7 +3857,7 @@ MGTwoLevelTransferNonNested>:: // on element faces or vertices and therefore, the partitioner is fine IndexSet locally_relevant_dofs(dof_handler_fine.n_dofs()); if (!this->fine_element_is_continuous && - !dof_handler_fine.get_fe().degree == 0) + dof_handler_fine.get_fe().degree != 0) locally_relevant_dofs.add_indices(global_dof_indices.begin(), global_dof_indices.end()); diff --git a/source/base/qprojector.cc b/source/base/qprojector.cc index 115534e5f7..fe01e2c5ac 100644 --- a/source/base/qprojector.cc +++ b/source/base/qprojector.cc @@ -769,11 +769,11 @@ QProjector<2>::project_to_all_faces(const ReferenceCell & reference_cell, { const auto support_points_line = [](const auto &face, const auto &orientation) -> std::vector> { - std::array, 2> vertices; - std::copy_n(face.first.begin(), face.first.size(), vertices.begin()); - const auto temp = - ReferenceCells::Line.permute_according_orientation(vertices, - orientation); + ArrayView> vertices(face.first.begin(), + face.first.size()); + const auto temp = + ReferenceCells::Line.permute_by_combined_orientation(vertices, + orientation); return std::vector>(temp.begin(), temp.begin() + face.first.size()); }; -- 2.39.5