From 14bff75e441bbcd928da0a51b9a2ad0b82da2305 Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Sun, 12 Dec 2021 22:58:27 +0100 Subject: [PATCH] Fix a few compile warnings --- include/deal.II/matrix_free/evaluation_kernels.h | 3 ++- include/deal.II/matrix_free/fe_evaluation.h | 16 ++++++++-------- .../deal.II/matrix_free/mapping_info.templates.h | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/include/deal.II/matrix_free/evaluation_kernels.h b/include/deal.II/matrix_free/evaluation_kernels.h index 149ba87116..1467f754cb 100644 --- a/include/deal.II/matrix_free/evaluation_kernels.h +++ b/include/deal.II/matrix_free/evaluation_kernels.h @@ -3265,7 +3265,7 @@ namespace internal const unsigned int subface_index = eval.get_subface_index(); const auto reorientate = [&](const unsigned int v, const unsigned int i) { return (dim < 3 || orientation[v] == nullptr || - subface_index < Utilities::pow(2, dim)) ? + subface_index < Utilities::pow(2U, dim)) ? i : orientation[v][i]; }; @@ -3493,6 +3493,7 @@ namespace internal if (vectorization_possible == false) { + vector_ptrs = {}; if (n_face_orientations == 1) { for (unsigned int v = 0; v < n_filled_lanes; ++v) diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h index adb254dbb7..f05d1b2ac4 100644 --- a/include/deal.II/matrix_free/fe_evaluation.h +++ b/include/deal.II/matrix_free/fe_evaluation.h @@ -7141,7 +7141,7 @@ namespace internal */ template ::value && std::is_same().begin()), @@ -7149,7 +7149,7 @@ namespace internal VectorType>::type * = nullptr> bool try_gather_evaluate_inplace( - T & phi, + EvaluatorType & phi, const VectorType & input_vector, const EvaluationFlags::EvaluationFlags evaluation_flag) { @@ -7199,14 +7199,14 @@ namespace internal */ template ::value || !std::is_same().begin()), Number *>::value, VectorType>::type * = nullptr> bool - try_gather_evaluate_inplace(T &, + try_gather_evaluate_inplace(EvaluatorType &, const VectorType &, const EvaluationFlags::EvaluationFlags) { @@ -7218,7 +7218,7 @@ namespace internal */ template ::value && std::is_same().begin()), @@ -7226,7 +7226,7 @@ namespace internal VectorType>::type * = nullptr> bool try_integrate_scatter_inplace( - T & phi, + EvaluatorType & phi, VectorType & destination, const EvaluationFlags::EvaluationFlags evaluation_flag) { @@ -7276,14 +7276,14 @@ namespace internal */ template ::value || !std::is_same().begin()), Number *>::value, VectorType>::type * = nullptr> bool - try_integrate_scatter_inplace(T, + try_integrate_scatter_inplace(EvaluatorType &, VectorType &, const EvaluationFlags::EvaluationFlags) { diff --git a/include/deal.II/matrix_free/mapping_info.templates.h b/include/deal.II/matrix_free/mapping_info.templates.h index 4b52438230..54fc917747 100644 --- a/include/deal.II/matrix_free/mapping_info.templates.h +++ b/include/deal.II/matrix_free/mapping_info.templates.h @@ -2056,7 +2056,7 @@ namespace internal { internal::MatrixFreeFunctions::FaceToCellTopology< VectorizedDouble::size()> - face_double; + face_double = {}; face_double.interior_face_no = faces[face].interior_face_no; face_double.exterior_face_no = faces[face].exterior_face_no; face_double.face_orientation = faces[face].face_orientation; -- 2.39.5