From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Sun, 4 Jan 2015 21:30:00 +0000 (-0600)
Subject: Remove deprecated constructor of MPI_InitFinalize.
X-Git-Tag: v8.3.0-rc1~563^2~14
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=753c18942fc7f0313ad54586a473bfbac8be7ed6;p=dealii.git

Remove deprecated constructor of MPI_InitFinalize.
---

diff --git a/doc/news/changes.h b/doc/news/changes.h
index cc4cbc701c..54ef64944c 100644
--- a/doc/news/changes.h
+++ b/doc/news/changes.h
@@ -96,6 +96,7 @@ inconvenience this causes.
   approach to getting notified about what happens to triangulations
   has been superseded by the signals defined by the triangulation
   class.
+- The deprecated constructor of MPI_InitFinalize
 
 <!-- ----------- GENERAL IMPROVEMENTS ----------------- -->
 
diff --git a/examples/step-31/step-31.cc b/examples/step-31/step-31.cc
index 3148a8d160..e027d6363e 100644
--- a/examples/step-31/step-31.cc
+++ b/examples/step-31/step-31.cc
@@ -1,6 +1,6 @@
 /* ---------------------------------------------------------------------
  *
- * Copyright (C) 2007 - 2013 by the deal.II authors
+ * Copyright (C) 2007 - 2013, 2015 by the deal.II authors
  *
  * This file is part of the deal.II library.
  *
@@ -2200,7 +2200,8 @@ int main (int argc, char *argv[])
 
       deallog.depth_console (0);
 
-      Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+      Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv,
+                                                           numbers::invalid_unsigned_int);
 
       BoussinesqFlowProblem<2> flow_problem;
       flow_problem.run ();
diff --git a/examples/step-41/step-41.cc b/examples/step-41/step-41.cc
index a4772394db..a9a8a685f9 100644
--- a/examples/step-41/step-41.cc
+++ b/examples/step-41/step-41.cc
@@ -1,6 +1,6 @@
 /* ---------------------------------------------------------------------
  *
- * Copyright (C) 2011 - 2013 by the deal.II authors
+ * Copyright (C) 2011 - 2013, 2015 by the deal.II authors
  *
  * This file is part of the deal.II library.
  *
@@ -668,7 +668,8 @@ int main (int argc, char *argv[])
 
       deallog.depth_console (0);
 
-      Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+      Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv,
+                                                           numbers::invalid_unsigned_int);
 
       ObstacleProblem<2> obstacle_problem;
       obstacle_problem.run ();
diff --git a/examples/step-42/step-42.cc b/examples/step-42/step-42.cc
index 8e189ebce0..93a9e600e5 100644
--- a/examples/step-42/step-42.cc
+++ b/examples/step-42/step-42.cc
@@ -1,6 +1,6 @@
 /* ---------------------------------------------------------------------
  *
- * Copyright (C) 2012 - 2014 by the deal.II authors
+ * Copyright (C) 2012 - 2015 by the deal.II authors
  *
  * This file is part of the deal.II library.
  *
@@ -2197,7 +2197,8 @@ int main (int argc, char *argv[])
         }
 
       prm.read_input(argv[1]);
-      Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+      Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv,
+                                                           numbers::invalid_unsigned_int);
       {
         PlasticityContactProblem<3> problem(prm);
         problem.run();
diff --git a/examples/step-44/step-44.cc b/examples/step-44/step-44.cc
index 42139c2662..5e32942af6 100644
--- a/examples/step-44/step-44.cc
+++ b/examples/step-44/step-44.cc
@@ -3171,7 +3171,8 @@ int main (int argc, char *argv[])
   using namespace dealii;
   using namespace Step44;
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, dealii::numbers::invalid_unsigned_int);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv,
+                                                       dealii::numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/examples/step-50/step-50.cc b/examples/step-50/step-50.cc
index 63a214da13..e4fc0ba5de 100644
--- a/examples/step-50/step-50.cc
+++ b/examples/step-50/step-50.cc
@@ -1,6 +1,6 @@
 /* ---------------------------------------------------------------------
  *
- * Copyright (C) 2003 - 2013 by the deal.II authors
+ * Copyright (C) 2003 - 2013, 2015 by the deal.II authors
  *
  * This file is part of the deal.II library.
  *
@@ -1035,7 +1035,7 @@ namespace Step50
 // in step-6:
 int main (int argc, char *argv[])
 {
-  dealii::Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  dealii::Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   try
     {
diff --git a/include/deal.II/base/mpi.h b/include/deal.II/base/mpi.h
index ecd58f2f1f..8c21bba6f0 100644
--- a/include/deal.II/base/mpi.h
+++ b/include/deal.II/base/mpi.h
@@ -267,19 +267,6 @@ namespace Utilities
     class MPI_InitFinalize
     {
     public:
-
-      /**
-       * Constructor. Takes the arguments from the command line (in case of
-       * MPI, the number of processes is specified there), and sets up a
-       * respective communicator by calling <tt>MPI_Init()</tt>. This
-       * constructor can only be called once in a program, since MPI cannot be
-       * initialized twice.
-       *
-       * This constructor sets max_num_threads to 1 (see other constructor).
-       */
-      MPI_InitFinalize (int    &argc,
-                        char ** &argv) /*DEAL_II_DEPRECATED*/;
-
       /**
        * Initialize MPI (and, if deal.II was configured to use it, PETSc) and
        * set the number of threads used by deal.II (via the underlying
diff --git a/source/base/mpi.cc b/source/base/mpi.cc
index c1bce6890e..0abcc758e8 100644
--- a/source/base/mpi.cc
+++ b/source/base/mpi.cc
@@ -394,20 +394,6 @@ namespace Utilities
 
 
 
-
-    MPI_InitFinalize::MPI_InitFinalize (int    &argc,
-                                        char ** &argv)
-      :
-      owns_mpi (true)
-    {
-      do_init(argc, argv);
-
-      // set maximum number of threads (also respecting the environment
-      // variable that the called function evaluates)
-      multithread_info.set_thread_limit(1);
-    }
-
-
     void
     MPI_InitFinalize::do_init(int    &argc,
                               char ** &argv)
diff --git a/tests/gla/vec_00.cc b/tests/gla/vec_00.cc
index 6865c101eb..8983bca517 100644
--- a/tests/gla/vec_00.cc
+++ b/tests/gla/vec_00.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2004 - 2013 by the deal.II authors
+// Copyright (C) 2004 - 2013, 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -81,7 +81,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/gla/vec_01.cc b/tests/gla/vec_01.cc
index 462d8bb6b8..b525f927e8 100644
--- a/tests/gla/vec_01.cc
+++ b/tests/gla/vec_01.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2004 - 2013 by the deal.II authors
+// Copyright (C) 2004 - 2013, 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -86,7 +86,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/gla/vec_02.cc b/tests/gla/vec_02.cc
index 30f331343c..fa803026a9 100644
--- a/tests/gla/vec_02.cc
+++ b/tests/gla/vec_02.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2004 - 2013 by the deal.II authors
+// Copyright (C) 2004 - 2013, 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -98,7 +98,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/gla/vec_all_zero_01.cc b/tests/gla/vec_all_zero_01.cc
index af65741cce..99095783fb 100644
--- a/tests/gla/vec_all_zero_01.cc
+++ b/tests/gla/vec_all_zero_01.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2004 - 2013 by the deal.II authors
+// Copyright (C) 2004 - 2013, 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -66,7 +66,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
   MPILogInitAll log;
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
diff --git a/tests/grid/cell_id_01.cc b/tests/grid/cell_id_01.cc
index 5607d73b7a..59fdaa01f1 100644
--- a/tests/grid/cell_id_01.cc
+++ b/tests/grid/cell_id_01.cc
@@ -51,7 +51,7 @@ void check (TRIA &tr)
 
 int main (int argc, char *argv[])
 {
-  // Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  // Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   initlog();
   deal_II_exceptions::disable_abort_on_exception();
diff --git a/tests/grid/cell_id_02.cc b/tests/grid/cell_id_02.cc
index 2c8f8498c2..736ba5c26a 100644
--- a/tests/grid/cell_id_02.cc
+++ b/tests/grid/cell_id_02.cc
@@ -63,7 +63,7 @@ void check (TRIA &tr)
 
 int main (int argc, char *argv[])
 {
-  // Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  // Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   initlog();
   deal_II_exceptions::disable_abort_on_exception();
diff --git a/tests/integrators/assembler_simple_matrix_03tri.cc b/tests/integrators/assembler_simple_matrix_03tri.cc
index 013db3fa00..d32382393d 100644
--- a/tests/integrators/assembler_simple_matrix_03tri.cc
+++ b/tests/integrators/assembler_simple_matrix_03tri.cc
@@ -110,7 +110,7 @@ void test(FiniteElement<dim> &fe)
 
 int main(int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
   initlog();
 
   FE_DGP<2> p0(0);
diff --git a/tests/lac/ala_01.cc b/tests/lac/ala_01.cc
index 438be2c8a5..3e87f8ce49 100644
--- a/tests/lac/ala_01.cc
+++ b/tests/lac/ala_01.cc
@@ -43,7 +43,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1);
 
   try
     {
diff --git a/tests/matrix_free/matrix_vector_10.cc b/tests/matrix_free/matrix_vector_10.cc
index ea533f1efa..e87476b490 100644
--- a/tests/matrix_free/matrix_vector_10.cc
+++ b/tests/matrix_free/matrix_vector_10.cc
@@ -198,7 +198,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv,
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv,
                                                          numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/matrix_free/matrix_vector_11.cc b/tests/matrix_free/matrix_vector_11.cc
index 60dcf5c687..73d5ad39df 100644
--- a/tests/matrix_free/matrix_vector_11.cc
+++ b/tests/matrix_free/matrix_vector_11.cc
@@ -172,7 +172,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv,
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv,
                                                          numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/matrix_free/matrix_vector_12.cc b/tests/matrix_free/matrix_vector_12.cc
index 6422ad9140..4419a63b0f 100644
--- a/tests/matrix_free/matrix_vector_12.cc
+++ b/tests/matrix_free/matrix_vector_12.cc
@@ -262,7 +262,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv,
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv,
                                                          numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/matrix_free/matrix_vector_13.cc b/tests/matrix_free/matrix_vector_13.cc
index 61e239c5ea..d5e29b42e0 100644
--- a/tests/matrix_free/matrix_vector_13.cc
+++ b/tests/matrix_free/matrix_vector_13.cc
@@ -264,7 +264,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv,
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv,
                                                          numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/matrix_free/step-48.cc b/tests/matrix_free/step-48.cc
index 4f80db329c..8377a6f161 100644
--- a/tests/matrix_free/step-48.cc
+++ b/tests/matrix_free/step-48.cc
@@ -390,7 +390,7 @@ namespace Step48
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/matrix_free/step-48c.cc b/tests/matrix_free/step-48c.cc
index 816888e801..38284c2fe9 100644
--- a/tests/matrix_free/step-48c.cc
+++ b/tests/matrix_free/step-48c.cc
@@ -361,7 +361,7 @@ namespace Step48
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/blockvec_01.cc b/tests/mpi/blockvec_01.cc
index a64324221e..d9f566f3e3 100644
--- a/tests/mpi/blockvec_01.cc
+++ b/tests/mpi/blockvec_01.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2004 - 2013 by the deal.II authors
+// Copyright (C) 2004 - 2013, 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -101,7 +101,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/collective_01.cc b/tests/mpi/collective_01.cc
index 64727bd566..6edd3a234b 100644
--- a/tests/mpi/collective_01.cc
+++ b/tests/mpi/collective_01.cc
@@ -81,7 +81,7 @@ void test()
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 #else
   (void)argc;
   (void)argv;
diff --git a/tests/mpi/collective_02.cc b/tests/mpi/collective_02.cc
index f9ed5402c8..998efa2d65 100644
--- a/tests/mpi/collective_02.cc
+++ b/tests/mpi/collective_02.cc
@@ -57,7 +57,7 @@ void test()
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 #else
   (void)argc;
   (void)argv;
diff --git a/tests/mpi/collective_02_array.cc b/tests/mpi/collective_02_array.cc
index 8b43e79faf..1fca6a9d9f 100644
--- a/tests/mpi/collective_02_array.cc
+++ b/tests/mpi/collective_02_array.cc
@@ -43,7 +43,7 @@ void test()
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 #else
   (void)argc;
   (void)argv;
diff --git a/tests/mpi/collective_02_array_in_place.cc b/tests/mpi/collective_02_array_in_place.cc
index 49f30056e7..5389523f8d 100644
--- a/tests/mpi/collective_02_array_in_place.cc
+++ b/tests/mpi/collective_02_array_in_place.cc
@@ -42,7 +42,7 @@ void test()
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 #else
   (void)argc;
   (void)argv;
diff --git a/tests/mpi/collective_02_vector.cc b/tests/mpi/collective_02_vector.cc
index f9125af7ad..f487766b75 100644
--- a/tests/mpi/collective_02_vector.cc
+++ b/tests/mpi/collective_02_vector.cc
@@ -44,7 +44,7 @@ void test()
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 #else
   (void)argc;
   (void)argv;
diff --git a/tests/mpi/collective_02_vector_in_place.cc b/tests/mpi/collective_02_vector_in_place.cc
index d56c02978d..4f83e0d8a2 100644
--- a/tests/mpi/collective_02_vector_in_place.cc
+++ b/tests/mpi/collective_02_vector_in_place.cc
@@ -43,7 +43,7 @@ void test()
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 #else
   (void)argc;
   (void)argv;
diff --git a/tests/mpi/collective_03.cc b/tests/mpi/collective_03.cc
index 15553f6e19..8becb8e77d 100644
--- a/tests/mpi/collective_03.cc
+++ b/tests/mpi/collective_03.cc
@@ -57,7 +57,7 @@ void test()
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 #else
   (void)argc;
   (void)argv;
diff --git a/tests/mpi/collective_03_array.cc b/tests/mpi/collective_03_array.cc
index 1ce22840c0..a10f72b4f4 100644
--- a/tests/mpi/collective_03_array.cc
+++ b/tests/mpi/collective_03_array.cc
@@ -43,7 +43,7 @@ void test()
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 #else
   (void)argc;
   (void)argv;
diff --git a/tests/mpi/collective_03_array_in_place.cc b/tests/mpi/collective_03_array_in_place.cc
index 9c61e2ee21..a9f022cb7f 100644
--- a/tests/mpi/collective_03_array_in_place.cc
+++ b/tests/mpi/collective_03_array_in_place.cc
@@ -42,7 +42,7 @@ void test()
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 #else
   (void)argc;
   (void)argv;
diff --git a/tests/mpi/collective_03_vector.cc b/tests/mpi/collective_03_vector.cc
index 11da0bf745..e8d4af1d36 100644
--- a/tests/mpi/collective_03_vector.cc
+++ b/tests/mpi/collective_03_vector.cc
@@ -44,7 +44,7 @@ void test()
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 #else
   (void)argc;
   (void)argv;
diff --git a/tests/mpi/collective_03_vector_in_place.cc b/tests/mpi/collective_03_vector_in_place.cc
index 716eb7f6df..a91330505a 100644
--- a/tests/mpi/collective_03_vector_in_place.cc
+++ b/tests/mpi/collective_03_vector_in_place.cc
@@ -43,7 +43,7 @@ void test()
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 #else
   (void)argc;
   (void)argv;
diff --git a/tests/mpi/distort_random_01.cc b/tests/mpi/distort_random_01.cc
index a8a7f8f89f..a0b417c150 100644
--- a/tests/mpi/distort_random_01.cc
+++ b/tests/mpi/distort_random_01.cc
@@ -69,7 +69,7 @@ void test1 (const bool keep_boundary)
 
 int main (int argc, char *argv[])
 {
-  Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
   {
diff --git a/tests/mpi/distort_random_02.cc b/tests/mpi/distort_random_02.cc
index 3c312319e9..5af4088a2b 100644
--- a/tests/mpi/distort_random_02.cc
+++ b/tests/mpi/distort_random_02.cc
@@ -81,7 +81,7 @@ void test1 (const bool keep_boundary)
 
 int main (int argc, char *argv[])
 {
-  Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
   {
diff --git a/tests/mpi/distribute_sp_01.cc b/tests/mpi/distribute_sp_01.cc
index e5ca4ae1de..b2be59d991 100644
--- a/tests/mpi/distribute_sp_01.cc
+++ b/tests/mpi/distribute_sp_01.cc
@@ -95,7 +95,7 @@ void test_mpi()
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 #else
   (void)argc;
   (void)argv;
diff --git a/tests/mpi/distribute_sp_02.cc b/tests/mpi/distribute_sp_02.cc
index 6eb96a2c59..db80ed35dd 100644
--- a/tests/mpi/distribute_sp_02.cc
+++ b/tests/mpi/distribute_sp_02.cc
@@ -155,7 +155,7 @@ void test_mpi()
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 #else
   (void)argc;
   (void)argv;
diff --git a/tests/mpi/flux_edge_01.cc b/tests/mpi/flux_edge_01.cc
index 5c28f64ce8..09f001dedb 100644
--- a/tests/mpi/flux_edge_01.cc
+++ b/tests/mpi/flux_edge_01.cc
@@ -190,7 +190,7 @@ namespace Step39
 
 int main(int argc, char *argv[])
 {
-  dealii::Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  dealii::Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
   mpi_initlog(true);
 
   using namespace dealii;
diff --git a/tests/mpi/ghost_01.cc b/tests/mpi/ghost_01.cc
index 0ab7e65e56..e62947920d 100644
--- a/tests/mpi/ghost_01.cc
+++ b/tests/mpi/ghost_01.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2004 - 2013 by the deal.II authors
+// Copyright (C) 2004 - 2013, 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -82,7 +82,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/ghost_03.cc b/tests/mpi/ghost_03.cc
index 3bd8d5942a..9728ef4154 100644
--- a/tests/mpi/ghost_03.cc
+++ b/tests/mpi/ghost_03.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2004 - 2014 by the deal.II authors
+// Copyright (C) 2004 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -92,7 +92,7 @@ int main (int argc, char **argv)
 {
   deal_II_exceptions::disable_abort_on_exception();
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/has_hanging_nodes.cc b/tests/mpi/has_hanging_nodes.cc
index ea56e44dc9..f4cbdace97 100644
--- a/tests/mpi/has_hanging_nodes.cc
+++ b/tests/mpi/has_hanging_nodes.cc
@@ -144,7 +144,7 @@ int main (int argc, char *argv[])
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
    
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
   test_int<2>(0,0);
   test_int<2>(2,0);
   test_int<2>(3,1);
diff --git a/tests/mpi/interpolate_01.cc b/tests/mpi/interpolate_01.cc
index 8eceb8b2f7..85a9366f8d 100644
--- a/tests/mpi/interpolate_01.cc
+++ b/tests/mpi/interpolate_01.cc
@@ -82,7 +82,7 @@ void test()
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 #else
   (void)argc;
   (void)argv;
diff --git a/tests/mpi/interpolate_04.cc b/tests/mpi/interpolate_04.cc
index 65e5d759b8..589bc84fbb 100644
--- a/tests/mpi/interpolate_04.cc
+++ b/tests/mpi/interpolate_04.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2009 - 2013 by the deal.II authors
+// Copyright (C) 2009 - 2013, 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -91,7 +91,7 @@ void test()
 
 int main(int argc, char *argv[])
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
diff --git a/tests/mpi/mesh_worker_01.cc b/tests/mpi/mesh_worker_01.cc
index be6c5bf62f..757cbb3a78 100644
--- a/tests/mpi/mesh_worker_01.cc
+++ b/tests/mpi/mesh_worker_01.cc
@@ -224,7 +224,7 @@ test()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
   MPILogInitAll log;
 
   test<2>();
diff --git a/tests/mpi/mesh_worker_02.cc b/tests/mpi/mesh_worker_02.cc
index cb03bc2711..ca4d8c0d17 100644
--- a/tests/mpi/mesh_worker_02.cc
+++ b/tests/mpi/mesh_worker_02.cc
@@ -190,7 +190,7 @@ test()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
   MPILogInitAll log;
 
   test<2>();
diff --git a/tests/mpi/mesh_worker_03.cc b/tests/mpi/mesh_worker_03.cc
index 7bad00aee3..3c739c5f01 100644
--- a/tests/mpi/mesh_worker_03.cc
+++ b/tests/mpi/mesh_worker_03.cc
@@ -197,7 +197,7 @@ test()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
   MPILogInitAll log;
 
   test<2>();
diff --git a/tests/mpi/mesh_worker_04.cc b/tests/mpi/mesh_worker_04.cc
index fe46ae0af2..fc5cefee92 100644
--- a/tests/mpi/mesh_worker_04.cc
+++ b/tests/mpi/mesh_worker_04.cc
@@ -182,7 +182,7 @@ test()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
   MPILogInitAll log;
 
   test<2>();
diff --git a/tests/mpi/mesh_worker_05.cc b/tests/mpi/mesh_worker_05.cc
index df4983a14d..f5cda86334 100644
--- a/tests/mpi/mesh_worker_05.cc
+++ b/tests/mpi/mesh_worker_05.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2013 by the deal.II authors
+// Copyright (C) 2000 - 2013, 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -222,7 +222,7 @@ test()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1);
   MPILogInitAll log;
 
   test<2>();
diff --git a/tests/mpi/mesh_worker_matrix_01.cc b/tests/mpi/mesh_worker_matrix_01.cc
index 5450565300..dae45b10ae 100644
--- a/tests/mpi/mesh_worker_matrix_01.cc
+++ b/tests/mpi/mesh_worker_matrix_01.cc
@@ -282,7 +282,7 @@ test(const FiniteElement<dim> &fe)
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
   MPILogInitAll log;
 
   FE_DGP<2> p0(0);
diff --git a/tests/mpi/multigrid_adaptive.cc b/tests/mpi/multigrid_adaptive.cc
index 554dbce87e..8a85487ab5 100644
--- a/tests/mpi/multigrid_adaptive.cc
+++ b/tests/mpi/multigrid_adaptive.cc
@@ -505,7 +505,7 @@ namespace Step50
 // in step-6:
 int main (int argc, char *argv[])
 {
-  dealii::Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  dealii::Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
   mpi_initlog();
 
   try
diff --git a/tests/mpi/multigrid_uniform.cc b/tests/mpi/multigrid_uniform.cc
index e0fc129849..dc91a90fb2 100644
--- a/tests/mpi/multigrid_uniform.cc
+++ b/tests/mpi/multigrid_uniform.cc
@@ -499,7 +499,7 @@ namespace Step50
 // in step-6:
 int main (int argc, char *argv[])
 {
-  dealii::Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  dealii::Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
   mpi_initlog();
 
   try
diff --git a/tests/mpi/no_flux_constraints.cc b/tests/mpi/no_flux_constraints.cc
index 1c153ce7c6..6d1e9bfff5 100644
--- a/tests/mpi/no_flux_constraints.cc
+++ b/tests/mpi/no_flux_constraints.cc
@@ -170,7 +170,7 @@ void test()
 int main(int argc, char *argv[])
 {
   {
-    Utilities::MPI::MPI_InitFinalize mpi_init (argc, argv);
+    Utilities::MPI::MPI_InitFinalize mpi_init (argc, argv, numbers::invalid_unsigned_int);
     unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
 
diff --git a/tests/mpi/no_flux_constraints_02.cc b/tests/mpi/no_flux_constraints_02.cc
index c4b0d42447..d77112e1ba 100644
--- a/tests/mpi/no_flux_constraints_02.cc
+++ b/tests/mpi/no_flux_constraints_02.cc
@@ -214,7 +214,7 @@ void test()
 int main(int argc, char *argv[])
 {
   {
-    Utilities::MPI::MPI_InitFinalize mpi_init (argc, argv);
+    Utilities::MPI::MPI_InitFinalize mpi_init (argc, argv, numbers::invalid_unsigned_int);
     unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
 
diff --git a/tests/mpi/no_flux_constraints_03.cc b/tests/mpi/no_flux_constraints_03.cc
index 2e495bb7aa..3219f4f286 100644
--- a/tests/mpi/no_flux_constraints_03.cc
+++ b/tests/mpi/no_flux_constraints_03.cc
@@ -187,7 +187,7 @@ void test()
 int main(int argc, char *argv[])
 {
   {
-    Utilities::MPI::MPI_InitFinalize mpi_init (argc, argv);
+    Utilities::MPI::MPI_InitFinalize mpi_init (argc, argv, numbers::invalid_unsigned_int);
     unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
 
diff --git a/tests/mpi/normal_flux_constraints.cc b/tests/mpi/normal_flux_constraints.cc
index 3f10993836..b0ba6de2bd 100644
--- a/tests/mpi/normal_flux_constraints.cc
+++ b/tests/mpi/normal_flux_constraints.cc
@@ -169,7 +169,7 @@ void test()
 int main(int argc, char *argv[])
 {
   {
-    Utilities::MPI::MPI_InitFinalize mpi_init (argc, argv);
+    Utilities::MPI::MPI_InitFinalize mpi_init (argc, argv, numbers::invalid_unsigned_int);
     unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
 
diff --git a/tests/mpi/p4est_3d_constraintmatrix_04.cc b/tests/mpi/p4est_3d_constraintmatrix_04.cc
index dcebe2a695..154c4e75bd 100644
--- a/tests/mpi/p4est_3d_constraintmatrix_04.cc
+++ b/tests/mpi/p4est_3d_constraintmatrix_04.cc
@@ -94,7 +94,7 @@ void test ()
 
 int main(int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
   const unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/parallel_block_vector_01.cc b/tests/mpi/parallel_block_vector_01.cc
index 102950eb69..773bd65153 100644
--- a/tests/mpi/parallel_block_vector_01.cc
+++ b/tests/mpi/parallel_block_vector_01.cc
@@ -234,7 +234,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/parallel_block_vector_02.cc b/tests/mpi/parallel_block_vector_02.cc
index c4cd2980c9..1e7fba2a2e 100644
--- a/tests/mpi/parallel_block_vector_02.cc
+++ b/tests/mpi/parallel_block_vector_02.cc
@@ -140,7 +140,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/parallel_partitioner_01.cc b/tests/mpi/parallel_partitioner_01.cc
index 55101fa272..33374f56c0 100644
--- a/tests/mpi/parallel_partitioner_01.cc
+++ b/tests/mpi/parallel_partitioner_01.cc
@@ -119,7 +119,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/parallel_partitioner_02.cc b/tests/mpi/parallel_partitioner_02.cc
index 3caab3d5ee..3be245e04a 100644
--- a/tests/mpi/parallel_partitioner_02.cc
+++ b/tests/mpi/parallel_partitioner_02.cc
@@ -92,7 +92,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/parallel_partitioner_03.cc b/tests/mpi/parallel_partitioner_03.cc
index c4f4272cf7..5757b86811 100644
--- a/tests/mpi/parallel_partitioner_03.cc
+++ b/tests/mpi/parallel_partitioner_03.cc
@@ -98,7 +98,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/parallel_partitioner_04.cc b/tests/mpi/parallel_partitioner_04.cc
index 9f3fa1b47b..836ac907ce 100644
--- a/tests/mpi/parallel_partitioner_04.cc
+++ b/tests/mpi/parallel_partitioner_04.cc
@@ -89,7 +89,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/parallel_vector_01.cc b/tests/mpi/parallel_vector_01.cc
index 21a3825bc2..e5be1713f4 100644
--- a/tests/mpi/parallel_vector_01.cc
+++ b/tests/mpi/parallel_vector_01.cc
@@ -69,7 +69,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/parallel_vector_02.cc b/tests/mpi/parallel_vector_02.cc
index e8fdd4e46e..bddfb3a852 100644
--- a/tests/mpi/parallel_vector_02.cc
+++ b/tests/mpi/parallel_vector_02.cc
@@ -80,7 +80,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/parallel_vector_03.cc b/tests/mpi/parallel_vector_03.cc
index c56b528f90..605b4adad6 100644
--- a/tests/mpi/parallel_vector_03.cc
+++ b/tests/mpi/parallel_vector_03.cc
@@ -81,7 +81,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/parallel_vector_04.cc b/tests/mpi/parallel_vector_04.cc
index 1edc6468fa..63a459ff08 100644
--- a/tests/mpi/parallel_vector_04.cc
+++ b/tests/mpi/parallel_vector_04.cc
@@ -103,7 +103,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/parallel_vector_05.cc b/tests/mpi/parallel_vector_05.cc
index c150bdb0d3..3cd52b29f5 100644
--- a/tests/mpi/parallel_vector_05.cc
+++ b/tests/mpi/parallel_vector_05.cc
@@ -72,7 +72,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/parallel_vector_06.cc b/tests/mpi/parallel_vector_06.cc
index a2c92ed494..b65e4009db 100644
--- a/tests/mpi/parallel_vector_06.cc
+++ b/tests/mpi/parallel_vector_06.cc
@@ -221,7 +221,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/parallel_vector_07.cc b/tests/mpi/parallel_vector_07.cc
index 0dabeca0b3..d49bb0fdc4 100644
--- a/tests/mpi/parallel_vector_07.cc
+++ b/tests/mpi/parallel_vector_07.cc
@@ -97,7 +97,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/parallel_vector_08.cc b/tests/mpi/parallel_vector_08.cc
index 7b6b209c8d..0480f1a2da 100644
--- a/tests/mpi/parallel_vector_08.cc
+++ b/tests/mpi/parallel_vector_08.cc
@@ -144,7 +144,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/parallel_vector_09.cc b/tests/mpi/parallel_vector_09.cc
index b57db9b344..ea8aff1721 100644
--- a/tests/mpi/parallel_vector_09.cc
+++ b/tests/mpi/parallel_vector_09.cc
@@ -118,7 +118,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/parallel_vector_10.cc b/tests/mpi/parallel_vector_10.cc
index 93c4142d15..4cfa669904 100644
--- a/tests/mpi/parallel_vector_10.cc
+++ b/tests/mpi/parallel_vector_10.cc
@@ -70,7 +70,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/parallel_vector_11.cc b/tests/mpi/parallel_vector_11.cc
index a28f121058..97445ed92d 100644
--- a/tests/mpi/parallel_vector_11.cc
+++ b/tests/mpi/parallel_vector_11.cc
@@ -165,7 +165,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/parallel_vector_12.cc b/tests/mpi/parallel_vector_12.cc
index 47cead6788..15d5bd0311 100644
--- a/tests/mpi/parallel_vector_12.cc
+++ b/tests/mpi/parallel_vector_12.cc
@@ -171,7 +171,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/parallel_vector_13.cc b/tests/mpi/parallel_vector_13.cc
index 706824c11b..472e07863d 100644
--- a/tests/mpi/parallel_vector_13.cc
+++ b/tests/mpi/parallel_vector_13.cc
@@ -94,7 +94,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/parallel_vector_14.cc b/tests/mpi/parallel_vector_14.cc
index c02f44e0be..93000bccc3 100644
--- a/tests/mpi/parallel_vector_14.cc
+++ b/tests/mpi/parallel_vector_14.cc
@@ -123,7 +123,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/parallel_vector_back_interpolate.cc b/tests/mpi/parallel_vector_back_interpolate.cc
index 355059d745..0c5aa9bd54 100644
--- a/tests/mpi/parallel_vector_back_interpolate.cc
+++ b/tests/mpi/parallel_vector_back_interpolate.cc
@@ -77,7 +77,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/parallel_vector_interpolate.cc b/tests/mpi/parallel_vector_interpolate.cc
index 79ab5b7c77..ea07ea8fd1 100644
--- a/tests/mpi/parallel_vector_interpolate.cc
+++ b/tests/mpi/parallel_vector_interpolate.cc
@@ -76,7 +76,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/petsc_01.cc b/tests/mpi/petsc_01.cc
index 5c9c4c46a1..fad1321006 100644
--- a/tests/mpi/petsc_01.cc
+++ b/tests/mpi/petsc_01.cc
@@ -83,7 +83,7 @@ void test()
 
 int main(int argc, char *argv[])
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
     {
diff --git a/tests/mpi/petsc_03.cc b/tests/mpi/petsc_03.cc
index e33e0694e7..3d9ecfa170 100644
--- a/tests/mpi/petsc_03.cc
+++ b/tests/mpi/petsc_03.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2009 - 2013 by the deal.II authors
+// Copyright (C) 2009 - 2013, 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -60,7 +60,7 @@ void test()
 
 int main(int argc, char *argv[])
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
     {
diff --git a/tests/mpi/petsc_bug_ghost_vector_01.cc b/tests/mpi/petsc_bug_ghost_vector_01.cc
index 5a600e51e6..0b1010acb2 100644
--- a/tests/mpi/petsc_bug_ghost_vector_01.cc
+++ b/tests/mpi/petsc_bug_ghost_vector_01.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2009 - 2014 by the deal.II authors
+// Copyright (C) 2009 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -244,7 +244,7 @@ void test ()
 
 int main(int argc, char *argv[])
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
     {
diff --git a/tests/mpi/point_to_point_pattern_01.cc b/tests/mpi/point_to_point_pattern_01.cc
index 4f2eecb922..19fbbe6cfc 100644
--- a/tests/mpi/point_to_point_pattern_01.cc
+++ b/tests/mpi/point_to_point_pattern_01.cc
@@ -108,7 +108,7 @@ void test_mpi()
 
 int main(int argc, char *argv[])
 {
-  Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
     {
diff --git a/tests/mpi/simple_mpi_01.cc b/tests/mpi/simple_mpi_01.cc
index ef1616f3ab..69a9c35a5d 100644
--- a/tests/mpi/simple_mpi_01.cc
+++ b/tests/mpi/simple_mpi_01.cc
@@ -65,7 +65,7 @@ void test_mpi()
 
 int main(int argc, char *argv[])
 {
-  Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
     {
diff --git a/tests/mpi/step-39.cc b/tests/mpi/step-39.cc
index eba10d11be..f1374e30de 100644
--- a/tests/mpi/step-39.cc
+++ b/tests/mpi/step-39.cc
@@ -765,7 +765,7 @@ namespace Step39
 
 int main(int argc, char *argv[])
 {
-  dealii::Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  dealii::Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
   MPILogInitAll log;
   
   using namespace dealii;
diff --git a/tests/mpi/step-40.cc b/tests/mpi/step-40.cc
index e2c01bba7a..2dbe0a0dc3 100644
--- a/tests/mpi/step-40.cc
+++ b/tests/mpi/step-40.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2009 - 2013 by the deal.II authors
+// Copyright (C) 2009 - 2013, 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -368,7 +368,7 @@ int test_mpi ()
 
 int main(int argc, char *argv[])
 {
-  Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1);
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
     {
diff --git a/tests/mpi/step-40_direct_solver.cc b/tests/mpi/step-40_direct_solver.cc
index ac81c11ea5..cc1bfbcc3a 100644
--- a/tests/mpi/step-40_direct_solver.cc
+++ b/tests/mpi/step-40_direct_solver.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2009 - 2013 by the deal.II authors
+// Copyright (C) 2009 - 2013, 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -362,7 +362,7 @@ int test_mpi ()
 
 int main(int argc, char *argv[])
 {
-  Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1);
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
     {
diff --git a/tests/mpi/torus.cc b/tests/mpi/torus.cc
index 197d3c99cb..50f2e5f453 100644
--- a/tests/mpi/torus.cc
+++ b/tests/mpi/torus.cc
@@ -67,7 +67,7 @@ DeclException1(ExcMissingCell,
 
 int main(int argc, char *argv[])
 {
-  dealii::Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  dealii::Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
   MPILogInitAll log;
   
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
diff --git a/tests/mpi/trilinos_01.cc b/tests/mpi/trilinos_01.cc
index 9cc5527a98..840b7a4d21 100644
--- a/tests/mpi/trilinos_01.cc
+++ b/tests/mpi/trilinos_01.cc
@@ -86,7 +86,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/trilinos_02.cc b/tests/mpi/trilinos_02.cc
index 2fa14d8c28..69e50604f4 100644
--- a/tests/mpi/trilinos_02.cc
+++ b/tests/mpi/trilinos_02.cc
@@ -83,7 +83,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/trilinos_bug_5609.cc b/tests/mpi/trilinos_bug_5609.cc
index acdffbe5d2..ad63341798 100644
--- a/tests/mpi/trilinos_bug_5609.cc
+++ b/tests/mpi/trilinos_bug_5609.cc
@@ -68,7 +68,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/trilinos_compress_bug.cc b/tests/mpi/trilinos_compress_bug.cc
index 9933168617..2101f5c1f1 100644
--- a/tests/mpi/trilinos_compress_bug.cc
+++ b/tests/mpi/trilinos_compress_bug.cc
@@ -92,7 +92,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/trilinos_ghost_01.cc b/tests/mpi/trilinos_ghost_01.cc
index 3bb8b6b42f..6b28f4a948 100644
--- a/tests/mpi/trilinos_ghost_01.cc
+++ b/tests/mpi/trilinos_ghost_01.cc
@@ -77,7 +77,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/trilinos_ghost_02.cc b/tests/mpi/trilinos_ghost_02.cc
index 2dc104ec53..077fc39927 100644
--- a/tests/mpi/trilinos_ghost_02.cc
+++ b/tests/mpi/trilinos_ghost_02.cc
@@ -68,7 +68,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/trilinos_ghost_03.cc b/tests/mpi/trilinos_ghost_03.cc
index a5ba8cd811..1b94265c76 100644
--- a/tests/mpi/trilinos_ghost_03.cc
+++ b/tests/mpi/trilinos_ghost_03.cc
@@ -84,7 +84,7 @@ int main (int argc, char **argv)
 {
   deal_II_exceptions::disable_abort_on_exception();
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/trilinos_ghost_03_linfty.cc b/tests/mpi/trilinos_ghost_03_linfty.cc
index aa4e814ca1..772b05e361 100644
--- a/tests/mpi/trilinos_ghost_03_linfty.cc
+++ b/tests/mpi/trilinos_ghost_03_linfty.cc
@@ -83,7 +83,7 @@ int main (int argc, char **argv)
 {
   deal_II_exceptions::disable_abort_on_exception();
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/trilinos_ghost_05.cc b/tests/mpi/trilinos_ghost_05.cc
index 77d9debc3e..e6b285f23d 100644
--- a/tests/mpi/trilinos_ghost_05.cc
+++ b/tests/mpi/trilinos_ghost_05.cc
@@ -82,7 +82,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/trilinos_matvec_01.cc b/tests/mpi/trilinos_matvec_01.cc
index d07f36a57f..5f0a732ebb 100644
--- a/tests/mpi/trilinos_matvec_01.cc
+++ b/tests/mpi/trilinos_matvec_01.cc
@@ -121,7 +121,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   const unsigned int n_procs = Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD);
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/trilinos_matvec_02.cc b/tests/mpi/trilinos_matvec_02.cc
index 851e1e6399..d4a66f1b78 100644
--- a/tests/mpi/trilinos_matvec_02.cc
+++ b/tests/mpi/trilinos_matvec_02.cc
@@ -121,7 +121,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   const unsigned int n_procs = Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD);
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/trilinos_matvec_03.cc b/tests/mpi/trilinos_matvec_03.cc
index 795f6f65f9..6eb5e7c6c3 100644
--- a/tests/mpi/trilinos_matvec_03.cc
+++ b/tests/mpi/trilinos_matvec_03.cc
@@ -143,7 +143,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   const unsigned int n_procs = Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD);
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/trilinos_sadd_01.cc b/tests/mpi/trilinos_sadd_01.cc
index 09059c8e11..b8bd9ab58f 100644
--- a/tests/mpi/trilinos_sadd_01.cc
+++ b/tests/mpi/trilinos_sadd_01.cc
@@ -84,7 +84,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
   
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/trilinos_sadd_02.cc b/tests/mpi/trilinos_sadd_02.cc
index 1734d4c553..62a0d529fc 100644
--- a/tests/mpi/trilinos_sadd_02.cc
+++ b/tests/mpi/trilinos_sadd_02.cc
@@ -97,7 +97,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
   
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/trilinos_sparse_matrix_01.cc b/tests/mpi/trilinos_sparse_matrix_01.cc
index 8645c0ccb0..5b81774386 100644
--- a/tests/mpi/trilinos_sparse_matrix_01.cc
+++ b/tests/mpi/trilinos_sparse_matrix_01.cc
@@ -116,7 +116,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   const unsigned int n_procs = Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD);
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/trilinos_sparse_matrix_mmult_01.cc b/tests/mpi/trilinos_sparse_matrix_mmult_01.cc
index 8886ffae7c..a053633d9a 100644
--- a/tests/mpi/trilinos_sparse_matrix_mmult_01.cc
+++ b/tests/mpi/trilinos_sparse_matrix_mmult_01.cc
@@ -148,7 +148,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mpi/trilinos_sparse_matrix_print_01.cc b/tests/mpi/trilinos_sparse_matrix_print_01.cc
index 290dddcf02..a22f0989a9 100644
--- a/tests/mpi/trilinos_sparse_matrix_print_01.cc
+++ b/tests/mpi/trilinos_sparse_matrix_print_01.cc
@@ -83,7 +83,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   const unsigned int n_procs = Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD);
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/trilinos_vector_reinit.cc b/tests/mpi/trilinos_vector_reinit.cc
index 38b5eb7ca2..3ddf35540c 100644
--- a/tests/mpi/trilinos_vector_reinit.cc
+++ b/tests/mpi/trilinos_vector_reinit.cc
@@ -61,7 +61,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/mumps/mumps_01.cc b/tests/mumps/mumps_01.cc
index 8a78a1dcbb..1904495e64 100644
--- a/tests/mumps/mumps_01.cc
+++ b/tests/mumps/mumps_01.cc
@@ -139,7 +139,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   initlog();
   
diff --git a/tests/mumps/mumps_02.cc b/tests/mumps/mumps_02.cc
index 68588c278c..2bfaad2829 100644
--- a/tests/mumps/mumps_02.cc
+++ b/tests/mumps/mumps_02.cc
@@ -108,7 +108,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
   
   std::ofstream logfile("output");
   deallog.attach(logfile);
diff --git a/tests/petsc/copy_to_dealvec.cc b/tests/petsc/copy_to_dealvec.cc
index 319af20847..810d2f6c85 100644
--- a/tests/petsc/copy_to_dealvec.cc
+++ b/tests/petsc/copy_to_dealvec.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2014 by the deal.II authors
+// Copyright (C) 2014, 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -99,7 +99,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/petsc/copy_to_dealvec_block.cc b/tests/petsc/copy_to_dealvec_block.cc
index c415831941..85f0cdc815 100644
--- a/tests/petsc/copy_to_dealvec_block.cc
+++ b/tests/petsc/copy_to_dealvec_block.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2014 by the deal.II authors
+// Copyright (C) 2014, 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -117,7 +117,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/trilinos/01.cc b/tests/trilinos/01.cc
index 1c838903ca..02e4655fe6 100644
--- a/tests/trilinos/01.cc
+++ b/tests/trilinos/01.cc
@@ -60,7 +60,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/02.cc b/tests/trilinos/02.cc
index 347b9c9a16..9b35dbb002 100644
--- a/tests/trilinos/02.cc
+++ b/tests/trilinos/02.cc
@@ -66,7 +66,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/03.cc b/tests/trilinos/03.cc
index 1e601e7d57..fdb2c7553b 100644
--- a/tests/trilinos/03.cc
+++ b/tests/trilinos/03.cc
@@ -74,7 +74,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/03a.cc b/tests/trilinos/03a.cc
index 91687b691e..47c0e795f1 100644
--- a/tests/trilinos/03a.cc
+++ b/tests/trilinos/03a.cc
@@ -70,7 +70,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/03b.cc b/tests/trilinos/03b.cc
index af4dde811b..7e6f37aba2 100644
--- a/tests/trilinos/03b.cc
+++ b/tests/trilinos/03b.cc
@@ -77,7 +77,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/04.cc b/tests/trilinos/04.cc
index 0087c29aac..a02795ba8e 100644
--- a/tests/trilinos/04.cc
+++ b/tests/trilinos/04.cc
@@ -41,7 +41,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/05.cc b/tests/trilinos/05.cc
index d4220fea5e..034e6d119c 100644
--- a/tests/trilinos/05.cc
+++ b/tests/trilinos/05.cc
@@ -56,7 +56,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/06.cc b/tests/trilinos/06.cc
index 937af1ae05..8b122fbb81 100644
--- a/tests/trilinos/06.cc
+++ b/tests/trilinos/06.cc
@@ -52,7 +52,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/07.cc b/tests/trilinos/07.cc
index a61f219c88..5d806d6d75 100644
--- a/tests/trilinos/07.cc
+++ b/tests/trilinos/07.cc
@@ -52,7 +52,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/08.cc b/tests/trilinos/08.cc
index f6dc4248e2..395d202bf8 100644
--- a/tests/trilinos/08.cc
+++ b/tests/trilinos/08.cc
@@ -57,7 +57,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/09.cc b/tests/trilinos/09.cc
index 1e19914d2c..c8b60f9592 100644
--- a/tests/trilinos/09.cc
+++ b/tests/trilinos/09.cc
@@ -63,7 +63,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/10.cc b/tests/trilinos/10.cc
index b58a959a53..b1ea8536c2 100644
--- a/tests/trilinos/10.cc
+++ b/tests/trilinos/10.cc
@@ -63,7 +63,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/11.cc b/tests/trilinos/11.cc
index a61057c5ba..83613362e8 100644
--- a/tests/trilinos/11.cc
+++ b/tests/trilinos/11.cc
@@ -46,7 +46,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/12.cc b/tests/trilinos/12.cc
index 7e25845f77..0a7d37df73 100644
--- a/tests/trilinos/12.cc
+++ b/tests/trilinos/12.cc
@@ -59,7 +59,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/13.cc b/tests/trilinos/13.cc
index 77d3c7fee6..a8491ec5d5 100644
--- a/tests/trilinos/13.cc
+++ b/tests/trilinos/13.cc
@@ -59,7 +59,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/14.cc b/tests/trilinos/14.cc
index a55f9f352a..91d49e6cca 100644
--- a/tests/trilinos/14.cc
+++ b/tests/trilinos/14.cc
@@ -65,7 +65,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/15.cc b/tests/trilinos/15.cc
index c479191aaf..fb00ab2e2c 100644
--- a/tests/trilinos/15.cc
+++ b/tests/trilinos/15.cc
@@ -62,7 +62,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/16.cc b/tests/trilinos/16.cc
index b328abcba6..cc7b67dad4 100644
--- a/tests/trilinos/16.cc
+++ b/tests/trilinos/16.cc
@@ -64,7 +64,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/17.cc b/tests/trilinos/17.cc
index 9e7e0b9b35..2b1db638bb 100644
--- a/tests/trilinos/17.cc
+++ b/tests/trilinos/17.cc
@@ -51,7 +51,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/18.cc b/tests/trilinos/18.cc
index e3d0e4cdb2..df67eed4e0 100644
--- a/tests/trilinos/18.cc
+++ b/tests/trilinos/18.cc
@@ -52,7 +52,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/19.cc b/tests/trilinos/19.cc
index 491d2115ca..4be5660b82 100644
--- a/tests/trilinos/19.cc
+++ b/tests/trilinos/19.cc
@@ -51,7 +51,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/20.cc b/tests/trilinos/20.cc
index cb73899139..35bc210df8 100644
--- a/tests/trilinos/20.cc
+++ b/tests/trilinos/20.cc
@@ -60,7 +60,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/21.cc b/tests/trilinos/21.cc
index e4ab59592a..9d6ac718e0 100644
--- a/tests/trilinos/21.cc
+++ b/tests/trilinos/21.cc
@@ -60,7 +60,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/22.cc b/tests/trilinos/22.cc
index b45707f783..9a992f53d7 100644
--- a/tests/trilinos/22.cc
+++ b/tests/trilinos/22.cc
@@ -54,7 +54,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/23.cc b/tests/trilinos/23.cc
index cc7d7216e6..ae6e5067ad 100644
--- a/tests/trilinos/23.cc
+++ b/tests/trilinos/23.cc
@@ -61,7 +61,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/24.cc b/tests/trilinos/24.cc
index f96eb2dc8b..ae60e521f3 100644
--- a/tests/trilinos/24.cc
+++ b/tests/trilinos/24.cc
@@ -54,7 +54,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/25.cc b/tests/trilinos/25.cc
index 4f7438790c..53badc5b36 100644
--- a/tests/trilinos/25.cc
+++ b/tests/trilinos/25.cc
@@ -52,7 +52,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/26.cc b/tests/trilinos/26.cc
index 4395071a0f..2a19ebfcb7 100644
--- a/tests/trilinos/26.cc
+++ b/tests/trilinos/26.cc
@@ -51,7 +51,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/27.cc b/tests/trilinos/27.cc
index b82ce96a8e..2ecb254c4c 100644
--- a/tests/trilinos/27.cc
+++ b/tests/trilinos/27.cc
@@ -56,7 +56,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/28.cc b/tests/trilinos/28.cc
index 77ada434a4..299ecf503e 100644
--- a/tests/trilinos/28.cc
+++ b/tests/trilinos/28.cc
@@ -58,7 +58,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/29.cc b/tests/trilinos/29.cc
index 0280439ff0..2e2dd7570a 100644
--- a/tests/trilinos/29.cc
+++ b/tests/trilinos/29.cc
@@ -43,7 +43,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/30.cc b/tests/trilinos/30.cc
index 4bba5f58f0..06845b9cb8 100644
--- a/tests/trilinos/30.cc
+++ b/tests/trilinos/30.cc
@@ -51,7 +51,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/31.cc b/tests/trilinos/31.cc
index b575647c76..9d86466c71 100644
--- a/tests/trilinos/31.cc
+++ b/tests/trilinos/31.cc
@@ -53,7 +53,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/32.cc b/tests/trilinos/32.cc
index 2d91b62544..1c3d2f474c 100644
--- a/tests/trilinos/32.cc
+++ b/tests/trilinos/32.cc
@@ -53,7 +53,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/33.cc b/tests/trilinos/33.cc
index 439733904d..916f55a02e 100644
--- a/tests/trilinos/33.cc
+++ b/tests/trilinos/33.cc
@@ -54,7 +54,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/34.cc b/tests/trilinos/34.cc
index 74e9124295..d138aa33a8 100644
--- a/tests/trilinos/34.cc
+++ b/tests/trilinos/34.cc
@@ -54,7 +54,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/35.cc b/tests/trilinos/35.cc
index d3a77088e1..2c4d0aeaa6 100644
--- a/tests/trilinos/35.cc
+++ b/tests/trilinos/35.cc
@@ -70,7 +70,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/36.cc b/tests/trilinos/36.cc
index 2597b57143..fc13983e56 100644
--- a/tests/trilinos/36.cc
+++ b/tests/trilinos/36.cc
@@ -70,7 +70,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/37.cc b/tests/trilinos/37.cc
index a1448448de..785ce8e8e8 100644
--- a/tests/trilinos/37.cc
+++ b/tests/trilinos/37.cc
@@ -50,7 +50,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/38.cc b/tests/trilinos/38.cc
index c27350d334..221c458dc6 100644
--- a/tests/trilinos/38.cc
+++ b/tests/trilinos/38.cc
@@ -58,7 +58,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/39.cc b/tests/trilinos/39.cc
index 36c1e07c01..b273ed52e4 100644
--- a/tests/trilinos/39.cc
+++ b/tests/trilinos/39.cc
@@ -58,7 +58,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/40.cc b/tests/trilinos/40.cc
index afd975f4e9..a6d30f9892 100644
--- a/tests/trilinos/40.cc
+++ b/tests/trilinos/40.cc
@@ -62,7 +62,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/41.cc b/tests/trilinos/41.cc
index 8631937875..340342b2f0 100644
--- a/tests/trilinos/41.cc
+++ b/tests/trilinos/41.cc
@@ -58,7 +58,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/42.cc b/tests/trilinos/42.cc
index 965ade9205..f34a8cfa10 100644
--- a/tests/trilinos/42.cc
+++ b/tests/trilinos/42.cc
@@ -58,7 +58,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/43.cc b/tests/trilinos/43.cc
index 1a56939e04..f82e634432 100644
--- a/tests/trilinos/43.cc
+++ b/tests/trilinos/43.cc
@@ -62,7 +62,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/44.cc b/tests/trilinos/44.cc
index dd12ec95d9..7c8539a5be 100644
--- a/tests/trilinos/44.cc
+++ b/tests/trilinos/44.cc
@@ -66,7 +66,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/45.cc b/tests/trilinos/45.cc
index 9becfd38ae..4b44715ff1 100644
--- a/tests/trilinos/45.cc
+++ b/tests/trilinos/45.cc
@@ -58,7 +58,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/46.cc b/tests/trilinos/46.cc
index e73d06b7aa..f72759ee33 100644
--- a/tests/trilinos/46.cc
+++ b/tests/trilinos/46.cc
@@ -58,7 +58,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/47.cc b/tests/trilinos/47.cc
index 6825a3e463..157e9f33e9 100644
--- a/tests/trilinos/47.cc
+++ b/tests/trilinos/47.cc
@@ -62,7 +62,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/48.cc b/tests/trilinos/48.cc
index 7667c52f25..5c1c7af690 100644
--- a/tests/trilinos/48.cc
+++ b/tests/trilinos/48.cc
@@ -64,7 +64,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/49.cc b/tests/trilinos/49.cc
index 03c01ede08..bd6be84bb4 100644
--- a/tests/trilinos/49.cc
+++ b/tests/trilinos/49.cc
@@ -55,7 +55,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/49a.cc b/tests/trilinos/49a.cc
index 873deed276..20532773d9 100644
--- a/tests/trilinos/49a.cc
+++ b/tests/trilinos/49a.cc
@@ -69,7 +69,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/49b.cc b/tests/trilinos/49b.cc
index 16acc92bb5..2340796f0f 100644
--- a/tests/trilinos/49b.cc
+++ b/tests/trilinos/49b.cc
@@ -69,7 +69,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/50.cc b/tests/trilinos/50.cc
index 0b05b2c9cd..2f62dcd260 100644
--- a/tests/trilinos/50.cc
+++ b/tests/trilinos/50.cc
@@ -71,7 +71,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/51.cc b/tests/trilinos/51.cc
index 2309b88b82..86790b47ff 100644
--- a/tests/trilinos/51.cc
+++ b/tests/trilinos/51.cc
@@ -56,7 +56,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/52.cc b/tests/trilinos/52.cc
index 8f3eafa3e3..34354889e2 100644
--- a/tests/trilinos/52.cc
+++ b/tests/trilinos/52.cc
@@ -61,7 +61,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/53.cc b/tests/trilinos/53.cc
index e407cd70d3..b002e7a4b1 100644
--- a/tests/trilinos/53.cc
+++ b/tests/trilinos/53.cc
@@ -61,7 +61,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/54.cc b/tests/trilinos/54.cc
index 9eb41771d6..09f254f52d 100644
--- a/tests/trilinos/54.cc
+++ b/tests/trilinos/54.cc
@@ -61,7 +61,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/55.cc b/tests/trilinos/55.cc
index fe3a14dd7d..56dfc57c6d 100644
--- a/tests/trilinos/55.cc
+++ b/tests/trilinos/55.cc
@@ -61,7 +61,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/56.cc b/tests/trilinos/56.cc
index 3708dc1e2f..56c8b7c44b 100644
--- a/tests/trilinos/56.cc
+++ b/tests/trilinos/56.cc
@@ -61,7 +61,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/57.cc b/tests/trilinos/57.cc
index a565f87bd1..f6150563b8 100644
--- a/tests/trilinos/57.cc
+++ b/tests/trilinos/57.cc
@@ -59,7 +59,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/58.cc b/tests/trilinos/58.cc
index a8b7bbb575..d1c92c5a1e 100644
--- a/tests/trilinos/58.cc
+++ b/tests/trilinos/58.cc
@@ -61,7 +61,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/59.cc b/tests/trilinos/59.cc
index e386f55645..c5b1b4cfed 100644
--- a/tests/trilinos/59.cc
+++ b/tests/trilinos/59.cc
@@ -64,7 +64,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/60.cc b/tests/trilinos/60.cc
index 2e19646fa5..78f9794b68 100644
--- a/tests/trilinos/60.cc
+++ b/tests/trilinos/60.cc
@@ -63,7 +63,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/61.cc b/tests/trilinos/61.cc
index 761088e65c..4bf25d0118 100644
--- a/tests/trilinos/61.cc
+++ b/tests/trilinos/61.cc
@@ -68,7 +68,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/62.cc b/tests/trilinos/62.cc
index 05285f7113..67ae09466f 100644
--- a/tests/trilinos/62.cc
+++ b/tests/trilinos/62.cc
@@ -49,7 +49,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/63.cc b/tests/trilinos/63.cc
index bd20cc064f..44e0f50593 100644
--- a/tests/trilinos/63.cc
+++ b/tests/trilinos/63.cc
@@ -47,7 +47,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/64.cc b/tests/trilinos/64.cc
index 0229091968..85ff07798b 100644
--- a/tests/trilinos/64.cc
+++ b/tests/trilinos/64.cc
@@ -52,7 +52,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/65.cc b/tests/trilinos/65.cc
index 7187a36867..836e6f611a 100644
--- a/tests/trilinos/65.cc
+++ b/tests/trilinos/65.cc
@@ -47,7 +47,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/66.cc b/tests/trilinos/66.cc
index cc3e002688..e20ea2a874 100644
--- a/tests/trilinos/66.cc
+++ b/tests/trilinos/66.cc
@@ -103,7 +103,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/67.cc b/tests/trilinos/67.cc
index b835aad56d..5f0edf2f42 100644
--- a/tests/trilinos/67.cc
+++ b/tests/trilinos/67.cc
@@ -109,7 +109,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/68.cc b/tests/trilinos/68.cc
index 71129f1066..17060a384f 100644
--- a/tests/trilinos/68.cc
+++ b/tests/trilinos/68.cc
@@ -107,7 +107,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/69.cc b/tests/trilinos/69.cc
index 4f5fe733e4..b1716916a8 100644
--- a/tests/trilinos/69.cc
+++ b/tests/trilinos/69.cc
@@ -113,7 +113,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/70.cc b/tests/trilinos/70.cc
index c96ffbd159..7cfa05dd94 100644
--- a/tests/trilinos/70.cc
+++ b/tests/trilinos/70.cc
@@ -31,7 +31,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   if (typeid(TrilinosScalar)==typeid(double))
diff --git a/tests/trilinos/add_matrices_01.cc b/tests/trilinos/add_matrices_01.cc
index b6310c6b37..fd29fad947 100644
--- a/tests/trilinos/add_matrices_01.cc
+++ b/tests/trilinos/add_matrices_01.cc
@@ -99,7 +99,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/add_matrices_02.cc b/tests/trilinos/add_matrices_02.cc
index cde54eed7a..016341b0ef 100644
--- a/tests/trilinos/add_matrices_02.cc
+++ b/tests/trilinos/add_matrices_02.cc
@@ -91,7 +91,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/add_matrices_03.cc b/tests/trilinos/add_matrices_03.cc
index 83ec24c777..3b22f1a677 100644
--- a/tests/trilinos/add_matrices_03.cc
+++ b/tests/trilinos/add_matrices_03.cc
@@ -94,7 +94,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/add_matrices_04.cc b/tests/trilinos/add_matrices_04.cc
index 0cc21083c6..0ad0f1bef0 100644
--- a/tests/trilinos/add_matrices_04.cc
+++ b/tests/trilinos/add_matrices_04.cc
@@ -68,7 +68,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/add_matrices_05.cc b/tests/trilinos/add_matrices_05.cc
index 0f1fc5bf57..c2d11b3633 100644
--- a/tests/trilinos/add_matrices_05.cc
+++ b/tests/trilinos/add_matrices_05.cc
@@ -73,7 +73,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/add_matrices_06.cc b/tests/trilinos/add_matrices_06.cc
index 117a1db946..93bfcbe7ab 100644
--- a/tests/trilinos/add_matrices_06.cc
+++ b/tests/trilinos/add_matrices_06.cc
@@ -86,7 +86,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/block_sparse_matrix_add_01.cc b/tests/trilinos/block_sparse_matrix_add_01.cc
index ab22a64f7b..6a946e5089 100644
--- a/tests/trilinos/block_sparse_matrix_add_01.cc
+++ b/tests/trilinos/block_sparse_matrix_add_01.cc
@@ -134,7 +134,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/block_sparse_matrix_set_01.cc b/tests/trilinos/block_sparse_matrix_set_01.cc
index 4fb5f0d4f2..bafcd873ae 100644
--- a/tests/trilinos/block_sparse_matrix_set_01.cc
+++ b/tests/trilinos/block_sparse_matrix_set_01.cc
@@ -135,7 +135,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/block_sparse_matrix_vector_01.cc b/tests/trilinos/block_sparse_matrix_vector_01.cc
index 5897a9e9e0..28572a326a 100644
--- a/tests/trilinos/block_sparse_matrix_vector_01.cc
+++ b/tests/trilinos/block_sparse_matrix_vector_01.cc
@@ -95,7 +95,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/block_sparse_matrix_vector_02.cc b/tests/trilinos/block_sparse_matrix_vector_02.cc
index 88e627b689..9fa07521f2 100644
--- a/tests/trilinos/block_sparse_matrix_vector_02.cc
+++ b/tests/trilinos/block_sparse_matrix_vector_02.cc
@@ -89,7 +89,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/block_sparse_matrix_vector_03.cc b/tests/trilinos/block_sparse_matrix_vector_03.cc
index effd96c4f8..df247471dd 100644
--- a/tests/trilinos/block_sparse_matrix_vector_03.cc
+++ b/tests/trilinos/block_sparse_matrix_vector_03.cc
@@ -89,7 +89,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/block_sparse_matrix_vector_04.cc b/tests/trilinos/block_sparse_matrix_vector_04.cc
index 5a44e4e7d6..2f8d966f1e 100644
--- a/tests/trilinos/block_sparse_matrix_vector_04.cc
+++ b/tests/trilinos/block_sparse_matrix_vector_04.cc
@@ -81,7 +81,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/block_vector_iterator_01.cc b/tests/trilinos/block_vector_iterator_01.cc
index e2bbacaa32..a1b521a874 100644
--- a/tests/trilinos/block_vector_iterator_01.cc
+++ b/tests/trilinos/block_vector_iterator_01.cc
@@ -90,7 +90,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/block_vector_iterator_02.cc b/tests/trilinos/block_vector_iterator_02.cc
index 579be8655e..ea5778b876 100644
--- a/tests/trilinos/block_vector_iterator_02.cc
+++ b/tests/trilinos/block_vector_iterator_02.cc
@@ -84,7 +84,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/block_vector_iterator_03.cc b/tests/trilinos/block_vector_iterator_03.cc
index f1e822579c..de1f6bf7ad 100644
--- a/tests/trilinos/block_vector_iterator_03.cc
+++ b/tests/trilinos/block_vector_iterator_03.cc
@@ -331,7 +331,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/copy_to_dealvec.cc b/tests/trilinos/copy_to_dealvec.cc
index 2445e8e38d..8dbf328412 100644
--- a/tests/trilinos/copy_to_dealvec.cc
+++ b/tests/trilinos/copy_to_dealvec.cc
@@ -99,7 +99,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/trilinos/copy_to_dealvec_block.cc b/tests/trilinos/copy_to_dealvec_block.cc
index af88d4c874..18d8301f6f 100644
--- a/tests/trilinos/copy_to_dealvec_block.cc
+++ b/tests/trilinos/copy_to_dealvec_block.cc
@@ -115,7 +115,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
   deallog.push(Utilities::int_to_string(myid));
diff --git a/tests/trilinos/deal_solver_01.cc b/tests/trilinos/deal_solver_01.cc
index b77cb5a86a..ec0ae150e6 100644
--- a/tests/trilinos/deal_solver_01.cc
+++ b/tests/trilinos/deal_solver_01.cc
@@ -71,7 +71,7 @@ int main(int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   {
diff --git a/tests/trilinos/deal_solver_02.cc b/tests/trilinos/deal_solver_02.cc
index c42605c75b..98014991b3 100644
--- a/tests/trilinos/deal_solver_02.cc
+++ b/tests/trilinos/deal_solver_02.cc
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   {
diff --git a/tests/trilinos/deal_solver_03.cc b/tests/trilinos/deal_solver_03.cc
index b62bffd74c..52f477d159 100644
--- a/tests/trilinos/deal_solver_03.cc
+++ b/tests/trilinos/deal_solver_03.cc
@@ -73,7 +73,7 @@ int main(int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   {
diff --git a/tests/trilinos/deal_solver_04.cc b/tests/trilinos/deal_solver_04.cc
index eb9c9baa58..5af9b1f76f 100644
--- a/tests/trilinos/deal_solver_04.cc
+++ b/tests/trilinos/deal_solver_04.cc
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   {
diff --git a/tests/trilinos/deal_solver_05.cc b/tests/trilinos/deal_solver_05.cc
index 7c1f701861..7013d97b76 100644
--- a/tests/trilinos/deal_solver_05.cc
+++ b/tests/trilinos/deal_solver_05.cc
@@ -71,7 +71,7 @@ int main(int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   {
diff --git a/tests/trilinos/deal_solver_06.cc b/tests/trilinos/deal_solver_06.cc
index 13fd553254..9e8a68126f 100644
--- a/tests/trilinos/deal_solver_06.cc
+++ b/tests/trilinos/deal_solver_06.cc
@@ -70,7 +70,7 @@ int main(int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   {
diff --git a/tests/trilinos/direct_solver.cc b/tests/trilinos/direct_solver.cc
index 1a5e2f5fa4..ddd6d1af84 100644
--- a/tests/trilinos/direct_solver.cc
+++ b/tests/trilinos/direct_solver.cc
@@ -297,7 +297,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/mg_transfer_prebuilt_01.cc b/tests/trilinos/mg_transfer_prebuilt_01.cc
index c01191ef4a..6a53a7dd65 100644
--- a/tests/trilinos/mg_transfer_prebuilt_01.cc
+++ b/tests/trilinos/mg_transfer_prebuilt_01.cc
@@ -142,7 +142,7 @@ void check_simple(const FiniteElement<dim> &fe)
 
 int main(int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   std::ofstream logfile("output");
   deallog << std::setprecision(6);
diff --git a/tests/trilinos/parallel_sparse_matrix_01.cc b/tests/trilinos/parallel_sparse_matrix_01.cc
index 742ace7184..0a0a39f9b6 100644
--- a/tests/trilinos/parallel_sparse_matrix_01.cc
+++ b/tests/trilinos/parallel_sparse_matrix_01.cc
@@ -111,7 +111,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/precondition.cc b/tests/trilinos/precondition.cc
index 11740b7227..f1d5a86c6d 100644
--- a/tests/trilinos/precondition.cc
+++ b/tests/trilinos/precondition.cc
@@ -384,7 +384,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-5);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/precondition_amg_dgp.cc b/tests/trilinos/precondition_amg_dgp.cc
index ace85df58f..59cf969c51 100644
--- a/tests/trilinos/precondition_amg_dgp.cc
+++ b/tests/trilinos/precondition_amg_dgp.cc
@@ -218,7 +218,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/precondition_amg_smoother.cc b/tests/trilinos/precondition_amg_smoother.cc
index 4a3e04392d..950f59bedf 100644
--- a/tests/trilinos/precondition_amg_smoother.cc
+++ b/tests/trilinos/precondition_amg_smoother.cc
@@ -266,7 +266,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/precondition_q_iso_q1.cc b/tests/trilinos/precondition_q_iso_q1.cc
index 8ca36e48e1..8b5c80926e 100644
--- a/tests/trilinos/precondition_q_iso_q1.cc
+++ b/tests/trilinos/precondition_q_iso_q1.cc
@@ -320,7 +320,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/slowness_01.cc b/tests/trilinos/slowness_01.cc
index 942733ffa1..270998e59f 100644
--- a/tests/trilinos/slowness_01.cc
+++ b/tests/trilinos/slowness_01.cc
@@ -114,7 +114,7 @@ int main (int argc,char **argv)
   deallog.attach(logfile);
   deallog.depth_console(0);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/slowness_02.cc b/tests/trilinos/slowness_02.cc
index ef367184df..007588a691 100644
--- a/tests/trilinos/slowness_02.cc
+++ b/tests/trilinos/slowness_02.cc
@@ -85,7 +85,7 @@ int main (int argc,char **argv)
   deallog.attach(logfile);
   deallog.depth_console(0);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/slowness_03.cc b/tests/trilinos/slowness_03.cc
index f57b64827f..c93c7c3cd3 100644
--- a/tests/trilinos/slowness_03.cc
+++ b/tests/trilinos/slowness_03.cc
@@ -87,7 +87,7 @@ int main (int argc,char **argv)
   deallog.attach(logfile);
   deallog.depth_console(0);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/slowness_04.cc b/tests/trilinos/slowness_04.cc
index aa7759e0a4..c4cbedbd97 100644
--- a/tests/trilinos/slowness_04.cc
+++ b/tests/trilinos/slowness_04.cc
@@ -118,7 +118,7 @@ int main (int argc,char **argv)
   deallog.attach(logfile);
   deallog.depth_console(0);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/solver_03.cc b/tests/trilinos/solver_03.cc
index f551e9ce51..305c463d1e 100644
--- a/tests/trilinos/solver_03.cc
+++ b/tests/trilinos/solver_03.cc
@@ -66,7 +66,7 @@ int main(int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   {
diff --git a/tests/trilinos/solver_05.cc b/tests/trilinos/solver_05.cc
index cb89878023..d0686bedae 100644
--- a/tests/trilinos/solver_05.cc
+++ b/tests/trilinos/solver_05.cc
@@ -66,7 +66,7 @@ int main(int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   {
diff --git a/tests/trilinos/solver_07.cc b/tests/trilinos/solver_07.cc
index b371296a29..ce61c2cd2a 100644
--- a/tests/trilinos/solver_07.cc
+++ b/tests/trilinos/solver_07.cc
@@ -66,7 +66,7 @@ int main(int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int);
 
   {
     SolverControl control(200, 1.e-3);
diff --git a/tests/trilinos/sparse_matrix_01.cc b/tests/trilinos/sparse_matrix_01.cc
index 68ba393c2e..7458de32b9 100644
--- a/tests/trilinos/sparse_matrix_01.cc
+++ b/tests/trilinos/sparse_matrix_01.cc
@@ -37,7 +37,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   IndexSet row_partitioning (3);
   IndexSet col_partitioning (4);
diff --git a/tests/trilinos/sparse_matrix_02.cc b/tests/trilinos/sparse_matrix_02.cc
index 1dcce4cc8d..d5c7c18ebd 100644
--- a/tests/trilinos/sparse_matrix_02.cc
+++ b/tests/trilinos/sparse_matrix_02.cc
@@ -29,7 +29,7 @@
 
 int main (int argc,char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   std::ofstream logfile("output");
   deallog.attach(logfile);
diff --git a/tests/trilinos/sparse_matrix_03.cc b/tests/trilinos/sparse_matrix_03.cc
index a30aaea22a..6a7e45c9ae 100644
--- a/tests/trilinos/sparse_matrix_03.cc
+++ b/tests/trilinos/sparse_matrix_03.cc
@@ -29,7 +29,7 @@
 
 int main (int argc,char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   std::ofstream logfile("output");
   deallog.attach(logfile);
diff --git a/tests/trilinos/sparse_matrix_04.cc b/tests/trilinos/sparse_matrix_04.cc
index 830e6e2a45..03b00d1eaa 100644
--- a/tests/trilinos/sparse_matrix_04.cc
+++ b/tests/trilinos/sparse_matrix_04.cc
@@ -29,7 +29,7 @@
 
 int main (int argc,char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   std::ofstream logfile("output");
   deallog.attach(logfile);
diff --git a/tests/trilinos/sparse_matrix_05.cc b/tests/trilinos/sparse_matrix_05.cc
index 0893c970e7..ad8b82540a 100644
--- a/tests/trilinos/sparse_matrix_05.cc
+++ b/tests/trilinos/sparse_matrix_05.cc
@@ -29,7 +29,7 @@
 
 int main (int argc,char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   std::ofstream logfile("output");
   deallog.attach(logfile);
diff --git a/tests/trilinos/sparse_matrix_07.cc b/tests/trilinos/sparse_matrix_07.cc
index b39e31166c..d632248229 100644
--- a/tests/trilinos/sparse_matrix_07.cc
+++ b/tests/trilinos/sparse_matrix_07.cc
@@ -29,7 +29,7 @@
 
 int main (int argc,char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   std::ofstream logfile("output");
   deallog.attach(logfile);
diff --git a/tests/trilinos/sparse_matrix_07_rectangle.cc b/tests/trilinos/sparse_matrix_07_rectangle.cc
index 215cecb5f4..257f10a6a4 100644
--- a/tests/trilinos/sparse_matrix_07_rectangle.cc
+++ b/tests/trilinos/sparse_matrix_07_rectangle.cc
@@ -29,7 +29,7 @@
 
 int main (int argc,char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   std::ofstream logfile("output");
   deallog.attach(logfile);
diff --git a/tests/trilinos/sparse_matrix_add_01.cc b/tests/trilinos/sparse_matrix_add_01.cc
index 7678a5a5fe..d5f2a4bfbb 100644
--- a/tests/trilinos/sparse_matrix_add_01.cc
+++ b/tests/trilinos/sparse_matrix_add_01.cc
@@ -94,7 +94,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/sparse_matrix_add_02.cc b/tests/trilinos/sparse_matrix_add_02.cc
index 9afde3a9d8..571138eefe 100644
--- a/tests/trilinos/sparse_matrix_add_02.cc
+++ b/tests/trilinos/sparse_matrix_add_02.cc
@@ -94,7 +94,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/sparse_matrix_copy_from_01.cc b/tests/trilinos/sparse_matrix_copy_from_01.cc
index ef54bd36e2..495800ec10 100644
--- a/tests/trilinos/sparse_matrix_copy_from_01.cc
+++ b/tests/trilinos/sparse_matrix_copy_from_01.cc
@@ -28,7 +28,7 @@
 
 int main (int argc,char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   std::ofstream logfile("output");
   deallog.attach(logfile);
diff --git a/tests/trilinos/sparse_matrix_iterator.cc b/tests/trilinos/sparse_matrix_iterator.cc
index ad4aecadc6..ac24cd0bfa 100644
--- a/tests/trilinos/sparse_matrix_iterator.cc
+++ b/tests/trilinos/sparse_matrix_iterator.cc
@@ -25,7 +25,7 @@ int main(int argc, char **argv)
   deallog.attach(logfile);
   deallog.depth_console (0);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   TrilinosWrappers::SparsityPattern pattern(4,5,2);
   pattern.add(0,2);
diff --git a/tests/trilinos/sparse_matrix_iterator_01.cc b/tests/trilinos/sparse_matrix_iterator_01.cc
index c63f21ad9b..f241e8bf7e 100644
--- a/tests/trilinos/sparse_matrix_iterator_01.cc
+++ b/tests/trilinos/sparse_matrix_iterator_01.cc
@@ -50,7 +50,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/sparse_matrix_set_01.cc b/tests/trilinos/sparse_matrix_set_01.cc
index 116e311b7a..41dbb910d4 100644
--- a/tests/trilinos/sparse_matrix_set_01.cc
+++ b/tests/trilinos/sparse_matrix_set_01.cc
@@ -90,7 +90,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/sparse_matrix_set_02.cc b/tests/trilinos/sparse_matrix_set_02.cc
index 5593bfa823..259aa72cb1 100644
--- a/tests/trilinos/sparse_matrix_set_02.cc
+++ b/tests/trilinos/sparse_matrix_set_02.cc
@@ -91,7 +91,7 @@ int main (int argc,char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/sparse_matrix_vector_01.cc b/tests/trilinos/sparse_matrix_vector_01.cc
index 882547be50..c4b992015a 100644
--- a/tests/trilinos/sparse_matrix_vector_01.cc
+++ b/tests/trilinos/sparse_matrix_vector_01.cc
@@ -67,7 +67,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/sparse_matrix_vector_02.cc b/tests/trilinos/sparse_matrix_vector_02.cc
index 4ec5f477fe..660d34ca84 100644
--- a/tests/trilinos/sparse_matrix_vector_02.cc
+++ b/tests/trilinos/sparse_matrix_vector_02.cc
@@ -67,7 +67,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/sparse_matrix_vector_03.cc b/tests/trilinos/sparse_matrix_vector_03.cc
index 5b8a610d75..5b6c102492 100644
--- a/tests/trilinos/sparse_matrix_vector_03.cc
+++ b/tests/trilinos/sparse_matrix_vector_03.cc
@@ -70,7 +70,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/sparse_matrix_vector_04.cc b/tests/trilinos/sparse_matrix_vector_04.cc
index c117189362..bc03c35351 100644
--- a/tests/trilinos/sparse_matrix_vector_04.cc
+++ b/tests/trilinos/sparse_matrix_vector_04.cc
@@ -69,7 +69,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/sparse_matrix_vector_05.cc b/tests/trilinos/sparse_matrix_vector_05.cc
index 0a99a915f0..d0399a2388 100644
--- a/tests/trilinos/sparse_matrix_vector_05.cc
+++ b/tests/trilinos/sparse_matrix_vector_05.cc
@@ -73,7 +73,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/sparse_matrix_vector_06.cc b/tests/trilinos/sparse_matrix_vector_06.cc
index ca468c20d8..2057203675 100644
--- a/tests/trilinos/sparse_matrix_vector_06.cc
+++ b/tests/trilinos/sparse_matrix_vector_06.cc
@@ -65,7 +65,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/sparse_matrix_vector_07.cc b/tests/trilinos/sparse_matrix_vector_07.cc
index 60bcaf7041..3e57d0adcd 100644
--- a/tests/trilinos/sparse_matrix_vector_07.cc
+++ b/tests/trilinos/sparse_matrix_vector_07.cc
@@ -75,7 +75,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/sparse_matrix_vector_08.cc b/tests/trilinos/sparse_matrix_vector_08.cc
index 47a953abe6..1caabdf221 100644
--- a/tests/trilinos/sparse_matrix_vector_08.cc
+++ b/tests/trilinos/sparse_matrix_vector_08.cc
@@ -73,7 +73,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/sparse_matrix_vector_09.cc b/tests/trilinos/sparse_matrix_vector_09.cc
index aca0989d86..e0662165ed 100644
--- a/tests/trilinos/sparse_matrix_vector_09.cc
+++ b/tests/trilinos/sparse_matrix_vector_09.cc
@@ -73,7 +73,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/sparse_matrix_vector_10.cc b/tests/trilinos/sparse_matrix_vector_10.cc
index ad2002018a..0ca449d0a5 100644
--- a/tests/trilinos/sparse_matrix_vector_10.cc
+++ b/tests/trilinos/sparse_matrix_vector_10.cc
@@ -74,7 +74,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/sparse_matrix_vector_11.cc b/tests/trilinos/sparse_matrix_vector_11.cc
index 2753829c7c..f414803a28 100644
--- a/tests/trilinos/sparse_matrix_vector_11.cc
+++ b/tests/trilinos/sparse_matrix_vector_11.cc
@@ -73,7 +73,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/sparsity_pattern_01.cc b/tests/trilinos/sparsity_pattern_01.cc
index 3cf5340e03..6349fbd925 100644
--- a/tests/trilinos/sparsity_pattern_01.cc
+++ b/tests/trilinos/sparsity_pattern_01.cc
@@ -22,7 +22,7 @@
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_init (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_init (argc, argv, numbers::invalid_unsigned_int);
   std::ofstream logfile("output");
   logfile.setf(std::ios::fixed);
   deallog << std::setprecision(3);
diff --git a/tests/trilinos/sparsity_pattern_02.cc b/tests/trilinos/sparsity_pattern_02.cc
index ab954828a8..b66e7bf9ed 100644
--- a/tests/trilinos/sparsity_pattern_02.cc
+++ b/tests/trilinos/sparsity_pattern_02.cc
@@ -22,7 +22,7 @@
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_init (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_init (argc, argv, numbers::invalid_unsigned_int);
   std::ofstream logfile("output");
   logfile.setf(std::ios::fixed);
   deallog << std::setprecision(3);
diff --git a/tests/trilinos/sparsity_pattern_03.cc b/tests/trilinos/sparsity_pattern_03.cc
index 000a7a6fa4..20a8c168f0 100644
--- a/tests/trilinos/sparsity_pattern_03.cc
+++ b/tests/trilinos/sparsity_pattern_03.cc
@@ -22,7 +22,7 @@
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_init (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_init (argc, argv, numbers::invalid_unsigned_int);
 
   std::ofstream logfile("output");
   logfile.setf(std::ios::fixed);
diff --git a/tests/trilinos/trilinos_64_bit_crash_01.cc b/tests/trilinos/trilinos_64_bit_crash_01.cc
index 5c99b22ca6..a618e1b8b2 100644
--- a/tests/trilinos/trilinos_64_bit_crash_01.cc
+++ b/tests/trilinos/trilinos_64_bit_crash_01.cc
@@ -56,7 +56,7 @@ int main(int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   deallog << "32bit" << std::endl;
   test<int>();
diff --git a/tests/trilinos/trilinos_sparse_matrix_iterator_01.cc b/tests/trilinos/trilinos_sparse_matrix_iterator_01.cc
index 1edd15d1b7..911cdcecab 100644
--- a/tests/trilinos/trilinos_sparse_matrix_iterator_01.cc
+++ b/tests/trilinos/trilinos_sparse_matrix_iterator_01.cc
@@ -54,7 +54,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/trilinos_sparse_matrix_iterator_02.cc b/tests/trilinos/trilinos_sparse_matrix_iterator_02.cc
index a719ec5450..5849d731a2 100644
--- a/tests/trilinos/trilinos_sparse_matrix_iterator_02.cc
+++ b/tests/trilinos/trilinos_sparse_matrix_iterator_02.cc
@@ -65,7 +65,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/trilinos_sparse_matrix_iterator_03.cc b/tests/trilinos/trilinos_sparse_matrix_iterator_03.cc
index 26cab60176..23759d4367 100644
--- a/tests/trilinos/trilinos_sparse_matrix_iterator_03.cc
+++ b/tests/trilinos/trilinos_sparse_matrix_iterator_03.cc
@@ -65,7 +65,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/trilinos_sparse_matrix_iterator_04.cc b/tests/trilinos/trilinos_sparse_matrix_iterator_04.cc
index 350610631b..2cd66403cd 100644
--- a/tests/trilinos/trilinos_sparse_matrix_iterator_04.cc
+++ b/tests/trilinos/trilinos_sparse_matrix_iterator_04.cc
@@ -64,7 +64,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/trilinos_sparse_matrix_iterator_05.cc b/tests/trilinos/trilinos_sparse_matrix_iterator_05.cc
index 408d0635ca..820211ca98 100644
--- a/tests/trilinos/trilinos_sparse_matrix_iterator_05.cc
+++ b/tests/trilinos/trilinos_sparse_matrix_iterator_05.cc
@@ -71,7 +71,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/trilinos_sparse_matrix_iterator_06.cc b/tests/trilinos/trilinos_sparse_matrix_iterator_06.cc
index 51e7245b95..e06e876cd3 100644
--- a/tests/trilinos/trilinos_sparse_matrix_iterator_06.cc
+++ b/tests/trilinos/trilinos_sparse_matrix_iterator_06.cc
@@ -71,7 +71,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/trilinos_sparse_matrix_iterator_07.cc b/tests/trilinos/trilinos_sparse_matrix_iterator_07.cc
index c9ff4c4c80..96f83352ef 100644
--- a/tests/trilinos/trilinos_sparse_matrix_iterator_07.cc
+++ b/tests/trilinos/trilinos_sparse_matrix_iterator_07.cc
@@ -71,7 +71,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/trilinos_sparse_matrix_iterator_08.cc b/tests/trilinos/trilinos_sparse_matrix_iterator_08.cc
index 3433699cec..f632b3789f 100644
--- a/tests/trilinos/trilinos_sparse_matrix_iterator_08.cc
+++ b/tests/trilinos/trilinos_sparse_matrix_iterator_08.cc
@@ -71,7 +71,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/trilinos_sparse_matrix_iterator_09.cc b/tests/trilinos/trilinos_sparse_matrix_iterator_09.cc
index c2f5face5d..5f24d3628f 100644
--- a/tests/trilinos/trilinos_sparse_matrix_iterator_09.cc
+++ b/tests/trilinos/trilinos_sparse_matrix_iterator_09.cc
@@ -55,7 +55,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/trilinos_sparse_matrix_iterator_10.cc b/tests/trilinos/trilinos_sparse_matrix_iterator_10.cc
index f669daa635..31e301f293 100644
--- a/tests/trilinos/trilinos_sparse_matrix_iterator_10.cc
+++ b/tests/trilinos/trilinos_sparse_matrix_iterator_10.cc
@@ -57,7 +57,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/trilinos_sparse_matrix_iterator_11.cc b/tests/trilinos/trilinos_sparse_matrix_iterator_11.cc
index 68c7363f76..c09313d285 100644
--- a/tests/trilinos/trilinos_sparse_matrix_iterator_11.cc
+++ b/tests/trilinos/trilinos_sparse_matrix_iterator_11.cc
@@ -65,7 +65,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/trilinos_sparse_matrix_iterator_12.cc b/tests/trilinos/trilinos_sparse_matrix_iterator_12.cc
index 752ee7b0b0..d03a4c39c6 100644
--- a/tests/trilinos/trilinos_sparse_matrix_iterator_12.cc
+++ b/tests/trilinos/trilinos_sparse_matrix_iterator_12.cc
@@ -65,7 +65,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/trilinos_sparsity_pattern.cc b/tests/trilinos/trilinos_sparsity_pattern.cc
index 3efea53363..729211e43f 100644
--- a/tests/trilinos/trilinos_sparsity_pattern.cc
+++ b/tests/trilinos/trilinos_sparsity_pattern.cc
@@ -76,7 +76,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
   try
     {
diff --git a/tests/trilinos/vector_assign_01.cc b/tests/trilinos/vector_assign_01.cc
index 196d5d4fee..bcd7aadb58 100644
--- a/tests/trilinos/vector_assign_01.cc
+++ b/tests/trilinos/vector_assign_01.cc
@@ -57,7 +57,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/vector_assign_02.cc b/tests/trilinos/vector_assign_02.cc
index 5618eb4103..7032fda948 100644
--- a/tests/trilinos/vector_assign_02.cc
+++ b/tests/trilinos/vector_assign_02.cc
@@ -56,7 +56,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/vector_equality_1.cc b/tests/trilinos/vector_equality_1.cc
index 86b87f8ef6..7838f56552 100644
--- a/tests/trilinos/vector_equality_1.cc
+++ b/tests/trilinos/vector_equality_1.cc
@@ -52,7 +52,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/vector_equality_2.cc b/tests/trilinos/vector_equality_2.cc
index e676344f2a..1327ad03e0 100644
--- a/tests/trilinos/vector_equality_2.cc
+++ b/tests/trilinos/vector_equality_2.cc
@@ -54,7 +54,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/vector_equality_3.cc b/tests/trilinos/vector_equality_3.cc
index 69e9fb84cf..53ed813f0d 100644
--- a/tests/trilinos/vector_equality_3.cc
+++ b/tests/trilinos/vector_equality_3.cc
@@ -52,7 +52,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/vector_equality_4.cc b/tests/trilinos/vector_equality_4.cc
index 426392b734..087d1ab72e 100644
--- a/tests/trilinos/vector_equality_4.cc
+++ b/tests/trilinos/vector_equality_4.cc
@@ -54,7 +54,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try
diff --git a/tests/trilinos/vector_swap_01.cc b/tests/trilinos/vector_swap_01.cc
index fda36af866..1d0fc2bd80 100644
--- a/tests/trilinos/vector_swap_01.cc
+++ b/tests/trilinos/vector_swap_01.cc
@@ -72,7 +72,7 @@ int main (int argc, char **argv)
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
 
 
   try