From: Peter Munch Date: Thu, 23 Jul 2020 08:56:19 +0000 (+0200) Subject: Fix warnings X-Git-Tag: v9.3.0-rc1~1254^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=407bc2e2f3f450ea7d63efe25c2767a875d120a5;p=dealii.git Fix warnings --- diff --git a/include/deal.II/grid/reference_cell.h b/include/deal.II/grid/reference_cell.h index 06572d2a19..a17be580e2 100644 --- a/include/deal.II/grid/reference_cell.h +++ b/include/deal.II/grid/reference_cell.h @@ -491,7 +491,7 @@ namespace ReferenceCell const unsigned char face_orientation) const override { static const std::array, 3> table = { - {{0, 1}, {1, 2}, {2, 0}}}; + {{{0, 1}}, {{1, 2}}, {{2, 0}}}}; return table[face][face_orientation ? vertex : (1 - vertex)]; } @@ -650,7 +650,7 @@ namespace ReferenceCell AssertIndexRange(face, n_faces()); const static std::array, 4> table = { - {{0, 1, 2}, {0, 3, 4}, {2, 5, 3}, {1, 4, 5}}}; + {{{0, 1, 2}}, {{0, 3, 4}}, {{2, 5, 3}}, {{1, 4, 5}}}}; return table[face][standard_to_real_face_line( line, face, face_orientation)]; @@ -663,7 +663,7 @@ namespace ReferenceCell const unsigned char face_orientation) const override { static const std::array, 4> table = { - {{0, 1, 2}, {1, 0, 3}, {0, 2, 3}, {2, 1, 3}}}; + {{{0, 1, 2}}, {{1, 0, 3}}, {{0, 2, 3}}, {{2, 1, 3}}}}; return table[face][standard_to_real_face_vertex( vertex, face, face_orientation)]; diff --git a/source/base/qprojector.cc b/source/base/qprojector.cc index ccd41a6745..d9c87099c0 100644 --- a/source/base/qprojector.cc +++ b/source/base/qprojector.cc @@ -530,9 +530,9 @@ QProjector<2>::project_to_all_faces( // ... on to the faces (defined by its support points and arc length) const std::array, 2>, double>, 3> faces = { - {{{Point<2>(0.0, 0.0), Point<2>(1.0, 0.0)}, 1.0}, - {{Point<2>(1.0, 0.0), Point<2>(0.0, 1.0)}, std::sqrt(2.0)}, - {{Point<2>(0.0, 1.0), Point<2>(0.0, 0.0)}, 1.0}}}; + {{{{Point<2>(0.0, 0.0), Point<2>(1.0, 0.0)}}, 1.0}, + {{{Point<2>(1.0, 0.0), Point<2>(0.0, 1.0)}}, std::sqrt(2.0)}, + {{{Point<2>(0.0, 1.0), Point<2>(0.0, 0.0)}}, 1.0}}}; // linear polynomial to map the reference quadrature points correctly // on faces @@ -554,10 +554,10 @@ QProjector<2>::project_to_all_faces( switch (orientation) { case 0: - support_points = {face.first[1], face.first[0]}; + support_points = {{face.first[1], face.first[0]}}; break; case 1: - support_points = {face.first[0], face.first[1]}; + support_points = {{face.first[0], face.first[1]}}; break; default: Assert(false, ExcNotImplemented()); @@ -645,21 +645,21 @@ QProjector<3>::project_to_all_faces( // ... on to the faces (defined by its support points and its area) // note: the area is later not used as a scaling factor but recomputed const std::array, 3>, double>, 4> faces = { - {{{Point<3>(0.0, 0.0, 0.0), - Point<3>(1.0, 0.0, 0.0), - Point<3>(0.0, 1.0, 0.0)}, + {{{{Point<3>(0.0, 0.0, 0.0), + Point<3>(1.0, 0.0, 0.0), + Point<3>(0.0, 1.0, 0.0)}}, 0.5}, - {{Point<3>(1.0, 0.0, 0.0), - Point<3>(0.0, 0.0, 0.0), - Point<3>(0.0, 0.0, 1.0)}, + {{{Point<3>(1.0, 0.0, 0.0), + Point<3>(0.0, 0.0, 0.0), + Point<3>(0.0, 0.0, 1.0)}}, 0.5}, - {{Point<3>(0.0, 0.0, 0.0), - Point<3>(0.0, 1.0, 0.0), - Point<3>(0.0, 0.0, 1.0)}, + {{{Point<3>(0.0, 0.0, 0.0), + Point<3>(0.0, 1.0, 0.0), + Point<3>(0.0, 0.0, 1.0)}}, 0.5}, - {{Point<3>(0.0, 1.0, 0.0), - Point<3>(1.0, 0.0, 0.0), - Point<3>(0.0, 0.0, 1.0)}, + {{{Point<3>(0.0, 1.0, 0.0), + Point<3>(1.0, 0.0, 0.0), + Point<3>(0.0, 0.0, 1.0)}}, 0.5 * sqrt(3.0) /*equilateral triangle*/}}}; // linear polynomial to map the reference quadrature points correctly @@ -682,34 +682,28 @@ QProjector<3>::project_to_all_faces( switch (orientation) { case 1: - support_points = {face.first[0], - face.first[1], - face.first[2]}; + support_points = { + {face.first[0], face.first[1], face.first[2]}}; break; case 3: - support_points = {face.first[1], - face.first[0], - face.first[2]}; + support_points = { + {face.first[1], face.first[0], face.first[2]}}; break; case 5: - support_points = {face.first[2], - face.first[0], - face.first[1]}; + support_points = { + {face.first[2], face.first[0], face.first[1]}}; break; case 0: - support_points = {face.first[0], - face.first[2], - face.first[1]}; + support_points = { + {face.first[0], face.first[2], face.first[1]}}; break; case 2: - support_points = {face.first[1], - face.first[2], - face.first[0]}; + support_points = { + {face.first[1], face.first[2], face.first[0]}}; break; case 4: - support_points = {face.first[2], - face.first[1], - face.first[0]}; + support_points = { + {face.first[2], face.first[1], face.first[0]}}; break; default: Assert(false, ExcNotImplemented());