improve tests/feinterface/*

- use -1 instead of unsigned int

diff --git a/tests/feinterface/fe_interface_values_01.cc b/tests/feinterface/fe_interface_values_01.cc
index adef34aa888662ee80ff980a2cb12fe29055d25f..13e5845ad0cdae63285288196b2da4096c6e0ee1 100644 (file)
--- a/tests/feinterface/fe_interface_values_01.cc
+++ b/tests/feinterface/fe_interface_values_01.cc
@@ -56,7 +56,8 @@ inspect_fiv(FEInterfaceValues<dim> &fiv)
       deallog << "  index " << idx << " global_dof_index:" << v << ":\n";
 
       const auto pair = fiv.interface_dof_to_dof_indices(idx);
-      deallog << "    dof indices: " << pair[0] << " | " << pair[1] << "\n";
+      deallog << "    dof indices: " << static_cast<int>(pair[0]) << " | "
+              << static_cast<int>(pair[1]) << "\n";
 
       ++idx;
     }

diff --git a/tests/feinterface/fe_interface_values_01.output b/tests/feinterface/fe_interface_values_01.output
index 263e929668ef6da9f67fb2cb273848cd1454ceba..fe5d6b158c876f506c88c2bc38059c35a6d83593 100644 (file)
--- a/tests/feinterface/fe_interface_values_01.output
+++ b/tests/feinterface/fe_interface_values_01.output
@@ -6,21 +6,21 @@ at_boundary(): 0
 n_current_interface_dofs(): 8
 interface_dof_indices: 0 1 2 3 4 5 6 7 
   index 0 global_dof_index:0:
-    dof indices: 0 | 4294967295
+    dof indices: 0 | -1
   index 1 global_dof_index:1:
-    dof indices: 1 | 4294967295
+    dof indices: 1 | -1
   index 2 global_dof_index:2:
-    dof indices: 2 | 4294967295
+    dof indices: 2 | -1
   index 3 global_dof_index:3:
-    dof indices: 3 | 4294967295
+    dof indices: 3 | -1
   index 4 global_dof_index:4:
-    dof indices: 4294967295 | 0
+    dof indices: -1 | 0
   index 5 global_dof_index:5:
-    dof indices: 4294967295 | 1
+    dof indices: -1 | 1
   index 6 global_dof_index:6:
-    dof indices: 4294967295 | 2
+    dof indices: -1 | 2
   index 7 global_dof_index:7:
-    dof indices: 4294967295 | 3
+    dof indices: -1 | 3
 
 
 DEAL::** boundary interface on cell 1 **
@@ -28,12 +28,12 @@ at_boundary(): 1
 n_current_interface_dofs(): 4
 interface_dof_indices: 4 5 6 7 
   index 0 global_dof_index:4:
-    dof indices: 0 | 4294967295
+    dof indices: 0 | -1
   index 1 global_dof_index:5:
-    dof indices: 1 | 4294967295
+    dof indices: 1 | -1
   index 2 global_dof_index:6:
-    dof indices: 2 | 4294967295
+    dof indices: 2 | -1
   index 3 global_dof_index:7:
-    dof indices: 3 | 4294967295
+    dof indices: 3 | -1
 
 

diff --git a/tests/feinterface/fe_interface_values_03.cc b/tests/feinterface/fe_interface_values_03.cc
index 01d522095bba99f6dd567e80eedd8ac3f1667740..b241abdf1b0c25e5a09cb0be006a155239596ec1 100644 (file)
--- a/tests/feinterface/fe_interface_values_03.cc
+++ b/tests/feinterface/fe_interface_values_03.cc
@@ -112,8 +112,8 @@ test(unsigned int fe_degree)
             const auto pair = fiv.interface_dof_to_dof_indices(idx);
             deallog << "  idx: " << idx
                     << " global: " << fiv.get_interface_dof_indices()[idx]
-                    << " dof indices: " << pair[0] << " | " << pair[1]
-                    << std::endl;
+                    << " dof indices: " << static_cast<int>(pair[0]) << " | "
+                    << static_cast<int>(pair[1]) << std::endl;
           }
 
         cell_vector = 0.0;

diff --git a/tests/feinterface/fe_interface_values_03.output b/tests/feinterface/fe_interface_values_03.output
index d2aac50e92bf995ab273992f9ed7e5bf70633f8f..477b2dea180aa31139be6d2dc8a091cd467045b1 100644 (file)
--- a/tests/feinterface/fe_interface_values_03.output
+++ b/tests/feinterface/fe_interface_values_03.output
@@ -1,8 +1,8 @@
 
 DEAL::FE_DGQ<2>(0)
 DEAL::qpoint 0: 1.00000 0.250000
-DEAL::  idx: 0 global: 0 dof indices: 4294967295 | 0
-DEAL::  idx: 1 global: 2 dof indices: 0 | 4294967295
+DEAL::  idx: 0 global: 0 dof indices: -1 | 0
+DEAL::  idx: 1 global: 2 dof indices: 0 | -1
 DEAL::shape_value(true): 0.00000 0.500000
 DEAL::shape_value(false): 0.500000 0.00000
 DEAL::jump(): -0.500000 0.500000
@@ -10,22 +10,22 @@ DEAL::average(): 0.250000 0.250000
 DEAL::FE_DGQ<2>(1)
 DEAL::qpoint 0: 1.00000 0.105662
 DEAL::qpoint 1: 1.00000 0.394338
-DEAL::  idx: 0 global: 0 dof indices: 4294967295 | 0
-DEAL::  idx: 1 global: 1 dof indices: 4294967295 | 1
-DEAL::  idx: 2 global: 2 dof indices: 4294967295 | 2
-DEAL::  idx: 3 global: 3 dof indices: 4294967295 | 3
-DEAL::  idx: 4 global: 8 dof indices: 0 | 4294967295
-DEAL::  idx: 5 global: 9 dof indices: 1 | 4294967295
-DEAL::  idx: 6 global: 10 dof indices: 2 | 4294967295
-DEAL::  idx: 7 global: 11 dof indices: 3 | 4294967295
+DEAL::  idx: 0 global: 0 dof indices: -1 | 0
+DEAL::  idx: 1 global: 1 dof indices: -1 | 1
+DEAL::  idx: 2 global: 2 dof indices: -1 | 2
+DEAL::  idx: 3 global: 3 dof indices: -1 | 3
+DEAL::  idx: 4 global: 8 dof indices: 0 | -1
+DEAL::  idx: 5 global: 9 dof indices: 1 | -1
+DEAL::  idx: 6 global: 10 dof indices: 2 | -1
+DEAL::  idx: 7 global: 11 dof indices: 3 | -1
 DEAL::shape_value(true): 0.00000 0.00000 0.00000 0.00000 0.00000 0.250000 0.00000 0.250000
 DEAL::shape_value(false): 0.375000 0.00000 0.125000 0.00000 0.00000 0.00000 0.00000 0.00000
 DEAL::jump(): -0.375000 0.00000 -0.125000 0.00000 0.00000 0.250000 0.00000 0.250000
 DEAL::average(): 0.187500 0.00000 0.0625000 0.00000 0.00000 0.125000 0.00000 0.125000
 DEAL::FE_DGQ<3>(0)
 DEAL::qpoint 0: 1.00000 0.250000 0.250000
-DEAL::  idx: 0 global: 0 dof indices: 4294967295 | 0
-DEAL::  idx: 1 global: 2 dof indices: 0 | 4294967295
+DEAL::  idx: 0 global: 0 dof indices: -1 | 0
+DEAL::  idx: 1 global: 2 dof indices: 0 | -1
 DEAL::shape_value(true): 0.00000 0.250000
 DEAL::shape_value(false): 0.250000 0.00000
 DEAL::jump(): -0.250000 0.250000
@@ -35,22 +35,22 @@ DEAL::qpoint 0: 1.00000 0.105662 0.105662
 DEAL::qpoint 1: 1.00000 0.394338 0.105662
 DEAL::qpoint 2: 1.00000 0.105662 0.394338
 DEAL::qpoint 3: 1.00000 0.394338 0.394338
-DEAL::  idx: 0 global: 0 dof indices: 4294967295 | 0
-DEAL::  idx: 1 global: 1 dof indices: 4294967295 | 1
-DEAL::  idx: 2 global: 2 dof indices: 4294967295 | 2
-DEAL::  idx: 3 global: 3 dof indices: 4294967295 | 3
-DEAL::  idx: 4 global: 4 dof indices: 4294967295 | 4
-DEAL::  idx: 5 global: 5 dof indices: 4294967295 | 5
-DEAL::  idx: 6 global: 6 dof indices: 4294967295 | 6
-DEAL::  idx: 7 global: 7 dof indices: 4294967295 | 7
-DEAL::  idx: 8 global: 16 dof indices: 0 | 4294967295
-DEAL::  idx: 9 global: 17 dof indices: 1 | 4294967295
-DEAL::  idx: 10 global: 18 dof indices: 2 | 4294967295
-DEAL::  idx: 11 global: 19 dof indices: 3 | 4294967295
-DEAL::  idx: 12 global: 20 dof indices: 4 | 4294967295
-DEAL::  idx: 13 global: 21 dof indices: 5 | 4294967295
-DEAL::  idx: 14 global: 22 dof indices: 6 | 4294967295
-DEAL::  idx: 15 global: 23 dof indices: 7 | 4294967295
+DEAL::  idx: 0 global: 0 dof indices: -1 | 0
+DEAL::  idx: 1 global: 1 dof indices: -1 | 1
+DEAL::  idx: 2 global: 2 dof indices: -1 | 2
+DEAL::  idx: 3 global: 3 dof indices: -1 | 3
+DEAL::  idx: 4 global: 4 dof indices: -1 | 4
+DEAL::  idx: 5 global: 5 dof indices: -1 | 5
+DEAL::  idx: 6 global: 6 dof indices: -1 | 6
+DEAL::  idx: 7 global: 7 dof indices: -1 | 7
+DEAL::  idx: 8 global: 16 dof indices: 0 | -1
+DEAL::  idx: 9 global: 17 dof indices: 1 | -1
+DEAL::  idx: 10 global: 18 dof indices: 2 | -1
+DEAL::  idx: 11 global: 19 dof indices: 3 | -1
+DEAL::  idx: 12 global: 20 dof indices: 4 | -1
+DEAL::  idx: 13 global: 21 dof indices: 5 | -1
+DEAL::  idx: 14 global: 22 dof indices: 6 | -1
+DEAL::  idx: 15 global: 23 dof indices: 7 | -1
 DEAL::shape_value(true): 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.0625000 0.00000 0.0625000 0.00000 0.0625000 0.00000 0.0625000
 DEAL::shape_value(false): 0.140625 0.00000 0.0468750 0.00000 0.0468750 0.00000 0.0156250 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000
 DEAL::jump(): -0.140625 0.00000 -0.0468750 0.00000 -0.0468750 0.00000 -0.0156250 0.00000 0.00000 0.0625000 0.00000 0.0625000 0.00000 0.0625000 0.00000 0.0625000

diff --git a/tests/feinterface/fe_interface_values_05.cc b/tests/feinterface/fe_interface_values_05.cc
index 4350c9c97f17516221b6460aefaa070039b8f9cf..4e148b3a361c5daaeae5a50eb0e4f0212c3c7362 100644 (file)
--- a/tests/feinterface/fe_interface_values_05.cc
+++ b/tests/feinterface/fe_interface_values_05.cc
@@ -56,7 +56,8 @@ inspect_fiv(FEInterfaceValues<dim> &fiv)
       deallog << "  index " << idx << " global_dof_index:" << v << ":\n";
 
       const auto pair = fiv.interface_dof_to_dof_indices(idx);
-      deallog << "    dof indices: " << pair[0] << " | " << pair[1] << "\n";
+      deallog << "    dof indices: " << static_cast<int>(pair[0]) << " | "
+              << static_cast<int>(pair[1]) << "\n";
 
       ++idx;
     }

diff --git a/tests/feinterface/fe_interface_values_05.output b/tests/feinterface/fe_interface_values_05.output
index f7814e1ad50ae01b8cf145a72e70fd8975ff73b9..48a1e9365f6c13dd9c966960f7bd821bf386d6f7 100644 (file)
--- a/tests/feinterface/fe_interface_values_05.output
+++ b/tests/feinterface/fe_interface_values_05.output
@@ -6,17 +6,17 @@ at_boundary(): 0
 n_current_interface_dofs(): 6
 interface_dof_indices: 0 1 2 3 4 5 
   index 0 global_dof_index:0:
-    dof indices: 0 | 4294967295
+    dof indices: 0 | -1
   index 1 global_dof_index:1:
     dof indices: 1 | 0
   index 2 global_dof_index:2:
-    dof indices: 2 | 4294967295
+    dof indices: 2 | -1
   index 3 global_dof_index:3:
     dof indices: 3 | 2
   index 4 global_dof_index:4:
-    dof indices: 4294967295 | 1
+    dof indices: -1 | 1
   index 5 global_dof_index:5:
-    dof indices: 4294967295 | 3
+    dof indices: -1 | 3
 
 
 DEAL::** boundary interface on cell 1 **
@@ -24,12 +24,12 @@ at_boundary(): 1
 n_current_interface_dofs(): 4
 interface_dof_indices: 1 4 3 5 
   index 0 global_dof_index:1:
-    dof indices: 0 | 4294967295
+    dof indices: 0 | -1
   index 1 global_dof_index:4:
-    dof indices: 1 | 4294967295
+    dof indices: 1 | -1
   index 2 global_dof_index:3:
-    dof indices: 2 | 4294967295
+    dof indices: 2 | -1
   index 3 global_dof_index:5:
-    dof indices: 3 | 4294967295
+    dof indices: 3 | -1
 
 

diff --git a/tests/feinterface/fe_interface_values_06.cc b/tests/feinterface/fe_interface_values_06.cc
index f0b8dfdc84cf52133df8819e9d32224af49309ae..edcdda30ada01421ff6a939d5e46d1795afe3fb2 100644 (file)
--- a/tests/feinterface/fe_interface_values_06.cc
+++ b/tests/feinterface/fe_interface_values_06.cc
@@ -113,8 +113,8 @@ test(unsigned int fe_degree)
             const auto pair = fiv.interface_dof_to_dof_indices(idx);
             deallog << "  idx: " << idx
                     << " global: " << fiv.get_interface_dof_indices()[idx]
-                    << " dof indices: " << pair[0] << " | " << pair[1]
-                    << std::endl;
+                    << " dof indices: " << static_cast<int>(pair[0]) << " | "
+                    << static_cast<int>(pair[1]) << std::endl;
           }
 
         cell_vector = 0.0;

diff --git a/tests/feinterface/fe_interface_values_06.output b/tests/feinterface/fe_interface_values_06.output
index 3e5fc1c7618677344f855fb2941313d233a9b0cb..6488c7fc32d79f1dc47562a28f6a12b6b83a93b5 100644 (file)
--- a/tests/feinterface/fe_interface_values_06.output
+++ b/tests/feinterface/fe_interface_values_06.output
@@ -3,12 +3,12 @@ DEAL::FE_Q<2>(1)
 DEAL::qpoint 0: 1.00000 0.105662
 DEAL::qpoint 1: 1.00000 0.394338
 DEAL::  idx: 0 global: 0 dof indices: 1 | 0
-DEAL::  idx: 1 global: 1 dof indices: 4294967295 | 1
-DEAL::  idx: 2 global: 2 dof indices: 4294967295 | 2
-DEAL::  idx: 3 global: 3 dof indices: 4294967295 | 3
-DEAL::  idx: 4 global: 5 dof indices: 0 | 4294967295
-DEAL::  idx: 5 global: 7 dof indices: 2 | 4294967295
-DEAL::  idx: 6 global: 8 dof indices: 3 | 4294967295
+DEAL::  idx: 1 global: 1 dof indices: -1 | 1
+DEAL::  idx: 2 global: 2 dof indices: -1 | 2
+DEAL::  idx: 3 global: 3 dof indices: -1 | 3
+DEAL::  idx: 4 global: 5 dof indices: 0 | -1
+DEAL::  idx: 5 global: 7 dof indices: 2 | -1
+DEAL::  idx: 6 global: 8 dof indices: 3 | -1
 DEAL::shape_value(true): 0.250000 0.00000 0.00000 0.00000 0.00000 0.00000 0.250000
 DEAL::shape_value(false): 0.375000 0.00000 0.125000 0.00000 0.00000 0.00000 0.00000
 DEAL::jump(): -0.125000 0.00000 -0.125000 0.00000 0.00000 0.00000 0.250000
@@ -19,20 +19,20 @@ DEAL::qpoint 1: 1.00000 0.394338 0.105662
 DEAL::qpoint 2: 1.00000 0.105662 0.394338
 DEAL::qpoint 3: 1.00000 0.394338 0.394338
 DEAL::  idx: 0 global: 0 dof indices: 1 | 0
-DEAL::  idx: 1 global: 1 dof indices: 4294967295 | 1
-DEAL::  idx: 2 global: 2 dof indices: 4294967295 | 2
-DEAL::  idx: 3 global: 3 dof indices: 4294967295 | 3
-DEAL::  idx: 4 global: 4 dof indices: 4294967295 | 4
-DEAL::  idx: 5 global: 5 dof indices: 4294967295 | 5
-DEAL::  idx: 6 global: 6 dof indices: 4294967295 | 6
-DEAL::  idx: 7 global: 7 dof indices: 4294967295 | 7
-DEAL::  idx: 8 global: 9 dof indices: 0 | 4294967295
-DEAL::  idx: 9 global: 11 dof indices: 2 | 4294967295
-DEAL::  idx: 10 global: 13 dof indices: 4 | 4294967295
-DEAL::  idx: 11 global: 15 dof indices: 6 | 4294967295
-DEAL::  idx: 12 global: 16 dof indices: 3 | 4294967295
-DEAL::  idx: 13 global: 17 dof indices: 5 | 4294967295
-DEAL::  idx: 14 global: 18 dof indices: 7 | 4294967295
+DEAL::  idx: 1 global: 1 dof indices: -1 | 1
+DEAL::  idx: 2 global: 2 dof indices: -1 | 2
+DEAL::  idx: 3 global: 3 dof indices: -1 | 3
+DEAL::  idx: 4 global: 4 dof indices: -1 | 4
+DEAL::  idx: 5 global: 5 dof indices: -1 | 5
+DEAL::  idx: 6 global: 6 dof indices: -1 | 6
+DEAL::  idx: 7 global: 7 dof indices: -1 | 7
+DEAL::  idx: 8 global: 9 dof indices: 0 | -1
+DEAL::  idx: 9 global: 11 dof indices: 2 | -1
+DEAL::  idx: 10 global: 13 dof indices: 4 | -1
+DEAL::  idx: 11 global: 15 dof indices: 6 | -1
+DEAL::  idx: 12 global: 16 dof indices: 3 | -1
+DEAL::  idx: 13 global: 17 dof indices: 5 | -1
+DEAL::  idx: 14 global: 18 dof indices: 7 | -1
 DEAL::shape_value(true): 0.0625000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.0625000 0.0625000 0.0625000
 DEAL::shape_value(false): 0.140625 0.00000 0.0468750 0.00000 0.0468750 0.00000 0.0156250 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000
 DEAL::jump(): -0.0781250 0.00000 -0.0468750 0.00000 -0.0468750 0.00000 -0.0156250 0.00000 0.00000 0.00000 0.00000 0.00000 0.0625000 0.0625000 0.0625000