From c575b70d932a525274dfdf0194155f0922cb8459 Mon Sep 17 00:00:00 2001 From: David Wells Date: Mon, 7 Jun 2021 14:12:12 -0400 Subject: [PATCH] Fix another GCC11 warning. --- source/fe/fe_simplex_p.cc | 44 +++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/source/fe/fe_simplex_p.cc b/source/fe/fe_simplex_p.cc index 684ce3c73f..ca7851bbc6 100644 --- a/source/fe/fe_simplex_p.cc +++ b/source/fe/fe_simplex_p.cc @@ -35,26 +35,38 @@ namespace std::vector get_dpo_vector_fe_p(const unsigned int dim, const unsigned int degree) { - std::vector dpo(dim + 1, 0U); + Assert(degree == 1 || degree == 2, ExcNotImplemented()); - if (degree == 1) - { - // one dof at each vertex - dpo[0] = 1; - } - else if (degree == 2) - { - // one dof at each vertex and in the middle of each line - dpo[0] = 1; - dpo[1] = 1; - dpo[2] = 0; - } - else + switch (dim) { - Assert(false, ExcNotImplemented()); + case 1: + switch (degree) + { + case 1: + return {1, 0}; + case 2: + return {1, 1}; + } + case 2: + switch (degree) + { + case 1: + return {1, 0, 0}; + case 2: + return {1, 1, 0}; + } + case 3: + switch (degree) + { + case 1: + return {1, 0, 0, 0}; + case 2: + return {1, 1, 0, 0}; + } } - return dpo; + Assert(false, ExcNotImplemented()); + return {}; } /** -- 2.39.5