From ffd95a85c82bac26ef75bced9161e3b294c6cbc0 Mon Sep 17 00:00:00 2001
From: Timo Heister <timo.heister@gmail.com>
Date: Thu, 23 Jul 2020 14:27:28 -0400
Subject: [PATCH] fix tests

---
 tests/base/utilities_13.cc            |  2 +-
 tests/lac/block_linear_operator_01.cc | 12 ++++++------
 tests/lac/block_linear_operator_06.cc |  2 +-
 tests/lapack/full_matrix_31.cc        | 16 ++++++++--------
 tests/lapack/full_matrix_32.cc        | 10 ++++++++--
 tests/lapack/full_matrix_33.cc        | 10 ++++++++--
 tests/lapack/full_matrix_34.cc        | 10 ++++++++--
 7 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/tests/base/utilities_13.cc b/tests/base/utilities_13.cc
index 5f6f3ed93e..d94b966538 100644
--- a/tests/base/utilities_13.cc
+++ b/tests/base/utilities_13.cc
@@ -88,7 +88,7 @@ void
 test2()
 {
   deallog << "test2:" << std::endl;
-  std::vector<std::array<std::uint64_t, 3>> points = {{5, 10, 20}};
+  std::vector<std::array<std::uint64_t, 3>> points = {{{5, 10, 20}}};
 
   const auto res = Utilities::inverse_Hilbert_space_filling_curve<3>(points, 5);
 
diff --git a/tests/lac/block_linear_operator_01.cc b/tests/lac/block_linear_operator_01.cc
index e88cf96989..4052babc68 100644
--- a/tests/lac/block_linear_operator_01.cc
+++ b/tests/lac/block_linear_operator_01.cc
@@ -112,7 +112,7 @@ main()
   auto op_b11 = linear_operator(a.block(1, 1));
 
   std::array<std::array<decltype(op_b00), 2>, 2> temp{
-    {{op_b00, op_b01}, {op_b10, op_b11}}};
+    {{{op_b00, op_b01}}, {{op_b10, op_b11}}}};
   auto op_b = block_operator<2, 2, BlockVector<double>>(temp);
 
   {
@@ -189,9 +189,9 @@ main()
   // And finally complicated block structures:
 
   std::array<std::array<decltype(op_b00), 3>, 3> temp2{
-    {{op_b00, op_b01, op_b00},
-     {op_b10, op_b11, op_b10},
-     {op_b10, op_b11, op_b10}}};
+    {{{op_b00, op_b01, op_b00}},
+     {{op_b10, op_b11, op_b10}},
+     {{op_b10, op_b11, op_b10}}}};
   auto op_upp_x_upu = block_operator<3, 3, BlockVector<double>>(temp2);
 
   op_upp_x_upu.reinit_domain_vector(u, false);
@@ -210,11 +210,11 @@ main()
   PRINTME("v", v);
 
   std::array<std::array<decltype(op_b01), 1>, 3> temp3{
-    {{op_b01}, {op_b11}, {op_b11}}};
+    {{{op_b01}}, {{op_b11}}, {{op_b11}}}};
   auto op_upp_x_p = block_operator<3, 1, BlockVector<double>>(temp3);
 
   std::array<std::array<decltype(op_b01), 3>, 1> temp4{
-    {{op_b00, op_b01, op_b00}}};
+    {{{op_b00, op_b01, op_b00}}}};
   auto op_u_x_upu = block_operator<1, 3, BlockVector<double>>(temp4);
 
   auto op_long = op_u_x_upu * transpose_operator(op_upp_x_upu) * op_upp_x_p;
diff --git a/tests/lac/block_linear_operator_06.cc b/tests/lac/block_linear_operator_06.cc
index 89c9c073ed..bcfcbf3485 100644
--- a/tests/lac/block_linear_operator_06.cc
+++ b/tests/lac/block_linear_operator_06.cc
@@ -112,7 +112,7 @@ main()
   auto op_b11 = linear_operator(a.block(1, 1));
 
   std::array<std::array<decltype(op_b00), 2>, 2> temp{
-    {{op_b00, op_b01}, {op_b10, op_b11}}};
+    {{{op_b00, op_b01}}, {{op_b10, op_b11}}}};
   auto op_b = block_operator<2, 2, BlockVector<double>>(temp);
 
   // vmult:
diff --git a/tests/lapack/full_matrix_31.cc b/tests/lapack/full_matrix_31.cc
index 7b4146a546..6043e12382 100644
--- a/tests/lapack/full_matrix_31.cc
+++ b/tests/lapack/full_matrix_31.cc
@@ -112,14 +112,14 @@ main()
   initlog();
   deallog.get_file_stream().precision(3);
 
-  const std::vector<std::array<unsigned int, 3>> sizes = {{3, 3, 3},
-                                                          {7, 7, 7},
-                                                          {51, 51, 51},
-                                                          {320, 320, 320},
-                                                          {3, 5, 9},
-                                                          {7, 7, 9},
-                                                          {10, 5, 10},
-                                                          {320, 320, 120}};
+  const std::vector<std::array<unsigned int, 3>> sizes = {{{3, 3, 3}},
+                                                          {{7, 7, 7}},
+                                                          {{51, 51, 51}},
+                                                          {{320, 320, 320}},
+                                                          {{3, 5, 9}},
+                                                          {{7, 7, 9}},
+                                                          {{10, 5, 10}},
+                                                          {{320, 320, 120}}};
 
   deallog.push("double");
   for (auto el : sizes)
diff --git a/tests/lapack/full_matrix_32.cc b/tests/lapack/full_matrix_32.cc
index 101f83aa88..179e5b2674 100644
--- a/tests/lapack/full_matrix_32.cc
+++ b/tests/lapack/full_matrix_32.cc
@@ -73,8 +73,14 @@ main()
   initlog();
   deallog.get_file_stream().precision(3);
 
-  const std::vector<std::array<unsigned int, 2>> sizes = {
-    {3, 3}, {7, 7}, {51, 51}, {320, 320}, {3, 9}, {9, 7}, {5, 17}, {320, 121}};
+  const std::vector<std::array<unsigned int, 2>> sizes = {{{3, 3}},
+                                                          {{7, 7}},
+                                                          {{51, 51}},
+                                                          {{320, 320}},
+                                                          {{3, 9}},
+                                                          {{9, 7}},
+                                                          {{5, 17}},
+                                                          {{320, 121}}};
 
   deallog.push("double");
   for (auto el : sizes)
diff --git a/tests/lapack/full_matrix_33.cc b/tests/lapack/full_matrix_33.cc
index 43171aa16e..4ceee59c65 100644
--- a/tests/lapack/full_matrix_33.cc
+++ b/tests/lapack/full_matrix_33.cc
@@ -74,8 +74,14 @@ main()
   initlog();
   deallog.get_file_stream().precision(3);
 
-  const std::vector<std::array<unsigned int, 2>> sizes = {
-    {3, 3}, {7, 7}, {51, 51}, {320, 320}, {3, 9}, {9, 7}, {10, 5}, {320, 120}};
+  const std::vector<std::array<unsigned int, 2>> sizes = {{{3, 3}},
+                                                          {{7, 7}},
+                                                          {{51, 51}},
+                                                          {{320, 320}},
+                                                          {{3, 9}},
+                                                          {{9, 7}},
+                                                          {{10, 5}},
+                                                          {{320, 120}}};
 
   deallog.push("double");
   for (auto el : sizes)
diff --git a/tests/lapack/full_matrix_34.cc b/tests/lapack/full_matrix_34.cc
index f3bcb3dcac..76df275224 100644
--- a/tests/lapack/full_matrix_34.cc
+++ b/tests/lapack/full_matrix_34.cc
@@ -74,8 +74,14 @@ main()
   initlog();
   deallog.get_file_stream().precision(3);
 
-  const std::vector<std::array<unsigned int, 2>> sizes = {
-    {3, 3}, {7, 7}, {51, 51}, {320, 320}, {3, 9}, {9, 7}, {10, 5}, {320, 120}};
+  const std::vector<std::array<unsigned int, 2>> sizes = {{{3, 3}},
+                                                          {{7, 7}},
+                                                          {{51, 51}},
+                                                          {{320, 320}},
+                                                          {{3, 9}},
+                                                          {{9, 7}},
+                                                          {{10, 5}},
+                                                          {{320, 120}}};
 
   deallog.push("double");
   for (auto el : sizes)
-- 
2.39.5