convert more tests to MPI_InitFinalize

git-svn-id: https://svn.dealii.org/trunk@29075 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/distributed_grids/2d_coarse_grid_01.cc b/tests/distributed_grids/2d_coarse_grid_01.cc
index 28a33a4a9ef1a58010d704b68aab49bdaaf64d34..e0642b3d9887965a1e660f632f7f47c8af94c87d 100644 (file)
--- a/tests/distributed_grids/2d_coarse_grid_01.cc
+++ b/tests/distributed_grids/2d_coarse_grid_01.cc
@@ -64,12 +64,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("2d_coarse_grid_01/output");
   deallog.attach(logfile);
@@ -80,7 +75,5 @@ int main(int argc, char *argv[])
   test<2>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/2d_coarse_grid_02.cc b/tests/distributed_grids/2d_coarse_grid_02.cc
index 68c09656438f155b29dfebe5d62153c9a14a06b6..0708e4b6766ff28b7c112a565bd70a29e0d9818d 100644 (file)
--- a/tests/distributed_grids/2d_coarse_grid_02.cc
+++ b/tests/distributed_grids/2d_coarse_grid_02.cc
@@ -54,12 +54,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("2d_coarse_grid_02/output");
   deallog.attach(logfile);
@@ -70,7 +65,5 @@ int main(int argc, char *argv[])
   test<2>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/2d_coarse_grid_03.cc b/tests/distributed_grids/2d_coarse_grid_03.cc
index 90e060b87d1c0270bd98b06962dd650835222279..c47b8e8238650893c5c4b7e87f3f2425bf3b0d32 100644 (file)
--- a/tests/distributed_grids/2d_coarse_grid_03.cc
+++ b/tests/distributed_grids/2d_coarse_grid_03.cc
@@ -42,12 +42,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("2d_coarse_grid_03/output");
   deallog.attach(logfile);
@@ -58,7 +53,5 @@ int main(int argc, char *argv[])
   test<2>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/2d_coarse_grid_04.cc b/tests/distributed_grids/2d_coarse_grid_04.cc
index 5ca30d4f1df218185192dfbceeb322744e61d744..158ccca17439f2df91d88761349ba42b0677190c 100644 (file)
--- a/tests/distributed_grids/2d_coarse_grid_04.cc
+++ b/tests/distributed_grids/2d_coarse_grid_04.cc
@@ -40,12 +40,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("2d_coarse_grid_04/output");
   deallog.attach(logfile);
@@ -56,7 +51,5 @@ int main(int argc, char *argv[])
   test<2>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/2d_coarse_grid_x_01.cc b/tests/distributed_grids/2d_coarse_grid_x_01.cc
index 26c9b2e3e8bf0aa27c832ef0dc5b80e4bd3fd606..18e53184ea75303b86b12d7e3e006e2a60c354a0 100644 (file)
--- a/tests/distributed_grids/2d_coarse_grid_x_01.cc
+++ b/tests/distributed_grids/2d_coarse_grid_x_01.cc
@@ -77,12 +77,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("2d_coarse_grid_x_01/output");
   deallog.attach(logfile);
@@ -93,7 +88,5 @@ int main(int argc, char *argv[])
   test<2>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/2d_coarsening_01.cc b/tests/distributed_grids/2d_coarsening_01.cc
index 6b2f815dbafafb8cc8df2415921b873c80338543..2da0da62aaec6e4c602a6c05bd621e8e3682428b 100644 (file)
--- a/tests/distributed_grids/2d_coarsening_01.cc
+++ b/tests/distributed_grids/2d_coarsening_01.cc
@@ -46,12 +46,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("2d_coarsening_01/output");
   deallog.attach(logfile);
@@ -62,7 +57,5 @@ int main(int argc, char *argv[])
   test<2>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/2d_coarsening_02.cc b/tests/distributed_grids/2d_coarsening_02.cc
index 87c19a85e5b08bb6288361c5c5cc7810bc4feed1..871da074e0e92433a510cf2fc56aff366a73ae45 100644 (file)
--- a/tests/distributed_grids/2d_coarsening_02.cc
+++ b/tests/distributed_grids/2d_coarsening_02.cc
@@ -116,12 +116,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("2d_coarsening_02/output");
   deallog.attach(logfile);
@@ -132,7 +127,5 @@ int main(int argc, char *argv[])
   test<2>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/2d_coarsening_03.cc b/tests/distributed_grids/2d_coarsening_03.cc
index 1b67534b278cbc36e06b20697b24754942f5bb0e..c9a6c47abd1afb967e3d0eb05dcde58b8c8bb5b9 100644 (file)
--- a/tests/distributed_grids/2d_coarsening_03.cc
+++ b/tests/distributed_grids/2d_coarsening_03.cc
@@ -177,12 +177,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("2d_coarsening_03/output");
   deallog.attach(logfile);
@@ -193,7 +188,5 @@ int main(int argc, char *argv[])
   test<2>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/2d_coarsening_05.cc b/tests/distributed_grids/2d_coarsening_05.cc
index 21f91f1cc647604bc51f7950ce93eaf65e87b02e..6e2317c45e5fc55b241622f18f6bc185639584ad 100644 (file)
--- a/tests/distributed_grids/2d_coarsening_05.cc
+++ b/tests/distributed_grids/2d_coarsening_05.cc
@@ -104,12 +104,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("2d_coarsening_05/output");
   deallog.attach(logfile);
@@ -120,7 +115,5 @@ int main(int argc, char *argv[])
   test<2>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/2d_dofhandler_01.cc b/tests/distributed_grids/2d_dofhandler_01.cc
index 82095b7a2410392e19e237d4fb18c9582e0efd40..b06a97e4215c618f925833137fe4a9fd496307d1 100644 (file)
--- a/tests/distributed_grids/2d_dofhandler_01.cc
+++ b/tests/distributed_grids/2d_dofhandler_01.cc
@@ -72,12 +72,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
   
   std::ofstream logfile("2d_dofhandler_01/output");
   deallog.attach(logfile);
@@ -88,7 +83,5 @@ int main(int argc, char *argv[])
   test<2>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/2d_refinement_01.cc b/tests/distributed_grids/2d_refinement_01.cc
index dcc990b07f8d7dde8eedf52e3823d57ffafad5e8..f32c2e912b03c143633ced2e7b275c9789fb533c 100644 (file)
--- a/tests/distributed_grids/2d_refinement_01.cc
+++ b/tests/distributed_grids/2d_refinement_01.cc
@@ -44,12 +44,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("2d_refinement_01/output");
   deallog.attach(logfile);
@@ -60,7 +55,5 @@ int main(int argc, char *argv[])
   test<2>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/2d_refinement_02.cc b/tests/distributed_grids/2d_refinement_02.cc
index 8ce225e28c8de8190ad6ce364d7f9f6c07a64bce..89d3df70ea3f2073118504a8d5d58804703cebed 100644 (file)
--- a/tests/distributed_grids/2d_refinement_02.cc
+++ b/tests/distributed_grids/2d_refinement_02.cc
@@ -105,12 +105,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("2d_refinement_02/output");
   deallog.attach(logfile);
@@ -121,7 +116,5 @@ int main(int argc, char *argv[])
   test<2>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/2d_refinement_03.cc b/tests/distributed_grids/2d_refinement_03.cc
index bafba9678cabb95f5d9601f36f48dd435c28fd31..fba62dccab4f6868c25d397b2cb69b923523cbee 100644 (file)
--- a/tests/distributed_grids/2d_refinement_03.cc
+++ b/tests/distributed_grids/2d_refinement_03.cc
@@ -135,12 +135,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("2d_refinement_03/output");
   deallog.attach(logfile);
@@ -151,7 +146,5 @@ int main(int argc, char *argv[])
   test<2>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/2d_refinement_04.cc b/tests/distributed_grids/2d_refinement_04.cc
index 4bc8c2c716b3e5a0f8f21c4707a260186e0ecb66..17a02ff8ce51d4a980307dbb2fdabfc9f66f81f2 100644 (file)
--- a/tests/distributed_grids/2d_refinement_04.cc
+++ b/tests/distributed_grids/2d_refinement_04.cc
@@ -73,12 +73,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("2d_refinement_04/output");
   deallog.attach(logfile);
@@ -89,7 +84,5 @@ int main(int argc, char *argv[])
   test<2>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/2d_refinement_05.cc b/tests/distributed_grids/2d_refinement_05.cc
index 760de2b998fe66a9e3a599d4b801fe6dd0e07314..39a2b3de74d91bc600c63748368b8ef51ad8348f 100644 (file)
--- a/tests/distributed_grids/2d_refinement_05.cc
+++ b/tests/distributed_grids/2d_refinement_05.cc
@@ -92,12 +92,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("2d_refinement_05/output");
   deallog.attach(logfile);
@@ -108,7 +103,5 @@ int main(int argc, char *argv[])
   test<2>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/2d_refinement_06.cc b/tests/distributed_grids/2d_refinement_06.cc
index 05aeb1b1549484dd08411dea72a54fdb3f929f64..d0018fc851dbcbbf7db1a6b40092587400a4b9fd 100644 (file)
--- a/tests/distributed_grids/2d_refinement_06.cc
+++ b/tests/distributed_grids/2d_refinement_06.cc
@@ -68,12 +68,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("2d_refinement_06/output");
   deallog.attach(logfile);
@@ -84,7 +79,5 @@ int main(int argc, char *argv[])
   test<2>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/3d_coarse_grid_01.cc b/tests/distributed_grids/3d_coarse_grid_01.cc
index c840c2550dbc90229dfe3a6079265d85637938c8..b7d54528d920dec6c1f0c2388807b5d53d1b889a 100644 (file)
--- a/tests/distributed_grids/3d_coarse_grid_01.cc
+++ b/tests/distributed_grids/3d_coarse_grid_01.cc
@@ -64,12 +64,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("3d_coarse_grid_01/output");
   deallog.attach(logfile);
@@ -80,7 +75,5 @@ int main(int argc, char *argv[])
   test<3>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/3d_coarse_grid_02.cc b/tests/distributed_grids/3d_coarse_grid_02.cc
index 052ad36e6e89a5a329ddf1c8c277576a3a20ea4b..a392c3842eea025db3a54d3772f2008418c416b5 100644 (file)
--- a/tests/distributed_grids/3d_coarse_grid_02.cc
+++ b/tests/distributed_grids/3d_coarse_grid_02.cc
@@ -48,12 +48,7 @@ void test(const char *filename)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("3d_coarse_grid_02/output");
   deallog.attach(logfile);
@@ -75,7 +70,5 @@ int main(int argc, char *argv[])
 
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/3d_coarse_grid_03.cc b/tests/distributed_grids/3d_coarse_grid_03.cc
index 39c4d91ed47ca80f7882fc9207a00967b81671e2..3a55242cf5bed690ad6aeb3790bd728aa879b00e 100644 (file)
--- a/tests/distributed_grids/3d_coarse_grid_03.cc
+++ b/tests/distributed_grids/3d_coarse_grid_03.cc
@@ -42,12 +42,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("3d_coarse_grid_03/output");
   deallog.attach(logfile);
@@ -58,7 +53,5 @@ int main(int argc, char *argv[])
   test<3>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/3d_coarse_grid_04.cc b/tests/distributed_grids/3d_coarse_grid_04.cc
index cccb5ec5cad34c9c9a9953056755ace758960be0..1804e626a4c17de4d47b7063dc440a3e2e764872 100644 (file)
--- a/tests/distributed_grids/3d_coarse_grid_04.cc
+++ b/tests/distributed_grids/3d_coarse_grid_04.cc
@@ -40,12 +40,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("3d_coarse_grid_04/output");
   deallog.attach(logfile);
@@ -56,7 +51,5 @@ int main(int argc, char *argv[])
   test<3>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/3d_coarse_grid_05.cc b/tests/distributed_grids/3d_coarse_grid_05.cc
index 9b6ec2c3261059a4064069b3f5a316af14c7e439..3c480654199f64dbf2049cc274355a48e6fd347f 100644 (file)
--- a/tests/distributed_grids/3d_coarse_grid_05.cc
+++ b/tests/distributed_grids/3d_coarse_grid_05.cc
@@ -141,12 +141,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("3d_coarse_grid_05/output");
   deallog.attach(logfile);
@@ -161,7 +156,5 @@ int main(int argc, char *argv[])
   test<3>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/3d_coarse_grid_06.cc b/tests/distributed_grids/3d_coarse_grid_06.cc
index 4d6b8d3814034f5730d950fd592d8693a30eed9b..305d725dad90c72324a5e76ef618f59b63b87256 100644 (file)
--- a/tests/distributed_grids/3d_coarse_grid_06.cc
+++ b/tests/distributed_grids/3d_coarse_grid_06.cc
@@ -43,12 +43,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("3d_coarse_grid_06/output");
   deallog.attach(logfile);
@@ -59,7 +54,5 @@ int main(int argc, char *argv[])
   test<3>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/3d_coarse_grid_x_01.cc b/tests/distributed_grids/3d_coarse_grid_x_01.cc
index c8aec9753467e6e1cee5a4f7489daae8ab45ef6c..935a0325c4fe894f09eef88c0e9d0a746195fc45 100644 (file)
--- a/tests/distributed_grids/3d_coarse_grid_x_01.cc
+++ b/tests/distributed_grids/3d_coarse_grid_x_01.cc
@@ -77,12 +77,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("3d_coarse_grid_x_01/output");
   deallog.attach(logfile);
@@ -93,7 +88,5 @@ int main(int argc, char *argv[])
   test<3>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/3d_coarsening_01.cc b/tests/distributed_grids/3d_coarsening_01.cc
index 4b745fb7b701bebe7311b40d6a6d4eb415e32483..7e3ed1b40fd2847703082981b6b286a0d75397d4 100644 (file)
--- a/tests/distributed_grids/3d_coarsening_01.cc
+++ b/tests/distributed_grids/3d_coarsening_01.cc
@@ -46,12 +46,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("3d_coarsening_01/output");
   deallog.attach(logfile);
@@ -62,7 +57,5 @@ int main(int argc, char *argv[])
   test<3>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/3d_coarsening_02.cc b/tests/distributed_grids/3d_coarsening_02.cc
index 9507281d4b2ea4dec73759325c5d4a024488ad1d..4be59da7673a54e941fdfd347e5901f06e839610 100644 (file)
--- a/tests/distributed_grids/3d_coarsening_02.cc
+++ b/tests/distributed_grids/3d_coarsening_02.cc
@@ -118,12 +118,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("3d_coarsening_02/output");
   deallog.attach(logfile);
@@ -134,7 +129,5 @@ int main(int argc, char *argv[])
   test<3>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/3d_coarsening_03.cc b/tests/distributed_grids/3d_coarsening_03.cc
index 95aaf4bea5ea67b308d17479bb821f9a88e3b6d6..7fbbdfc04aebcedd6058563a25336375c7edfb1d 100644 (file)
--- a/tests/distributed_grids/3d_coarsening_03.cc
+++ b/tests/distributed_grids/3d_coarsening_03.cc
@@ -115,12 +115,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("3d_coarsening_03/output");
   deallog.attach(logfile);
@@ -131,7 +126,5 @@ int main(int argc, char *argv[])
   test<3>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/3d_coarsening_04.cc b/tests/distributed_grids/3d_coarsening_04.cc
index 8cf76c26c32d67a77d1224e14c1f76334d8436f3..7b15347e2395ddc3a2b51cbb0b0c5c23ba7dbcd6 100644 (file)
--- a/tests/distributed_grids/3d_coarsening_04.cc
+++ b/tests/distributed_grids/3d_coarsening_04.cc
@@ -116,12 +116,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("3d_coarsening_04/output");
   deallog.attach(logfile);
@@ -132,7 +127,5 @@ int main(int argc, char *argv[])
   test<3>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/3d_coarsening_05.cc b/tests/distributed_grids/3d_coarsening_05.cc
index 20af470fc6a844f1528d3cb0d7776d17be6ab1f5..4c18e6231ef4e87f09f272e8c53e9b760259b6bc 100644 (file)
--- a/tests/distributed_grids/3d_coarsening_05.cc
+++ b/tests/distributed_grids/3d_coarsening_05.cc
@@ -105,12 +105,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("3d_coarsening_05/output");
   deallog.attach(logfile);
@@ -121,7 +116,5 @@ int main(int argc, char *argv[])
   test<3>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/3d_refinement_01.cc b/tests/distributed_grids/3d_refinement_01.cc
index 44edaa374ad7fcc43d371a44e2bf6d22ccd70471..37f2dcf9bb6eb54ccadf818586617117bdfd7a87 100644 (file)
--- a/tests/distributed_grids/3d_refinement_01.cc
+++ b/tests/distributed_grids/3d_refinement_01.cc
@@ -44,12 +44,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("3d_refinement_01/output");
   deallog.attach(logfile);
@@ -59,8 +54,4 @@ int main(int argc, char *argv[])
   deallog.push("3d");
   test<3>(logfile);
   deallog.pop();
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/distributed_grids/3d_refinement_02.cc b/tests/distributed_grids/3d_refinement_02.cc
index 64f4fcef2547c0cad13874f57fd3e4d7ed697bab..2fc606e0f6d8ffb384c43c9683867ac2170886b5 100644 (file)
--- a/tests/distributed_grids/3d_refinement_02.cc
+++ b/tests/distributed_grids/3d_refinement_02.cc
@@ -105,12 +105,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("3d_refinement_02/output");
   deallog.attach(logfile);
@@ -121,7 +116,5 @@ int main(int argc, char *argv[])
   test<3>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/3d_refinement_03.cc b/tests/distributed_grids/3d_refinement_03.cc
index 40539600967d956c20aae7c597db587c9057cedc..7af0a5a095556ad0db29b3e7be447b611f586cc8 100644 (file)
--- a/tests/distributed_grids/3d_refinement_03.cc
+++ b/tests/distributed_grids/3d_refinement_03.cc
@@ -95,7 +95,7 @@ void test(std::ostream& /*out*/)
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 #else
   (void)argc;
   (void)argv;
@@ -110,7 +110,5 @@ int main(int argc, char *argv[])
   test<3>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/3d_refinement_04.cc b/tests/distributed_grids/3d_refinement_04.cc
index 5ecc081b8df2aa83fd1a2d8295b7bf60ac3056e2..938b952b3a6dfffd1088284cd32f92c806aac55c 100644 (file)
--- a/tests/distributed_grids/3d_refinement_04.cc
+++ b/tests/distributed_grids/3d_refinement_04.cc
@@ -74,7 +74,7 @@ void test(std::ostream& /*out*/)
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 #else
   (void)argc;
   (void)argv;
@@ -89,7 +89,5 @@ int main(int argc, char *argv[])
   test<3>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/3d_refinement_05.cc b/tests/distributed_grids/3d_refinement_05.cc
index b446ffa03ea20266ceb9705ac067788404662860..a21770b45e6cb4e8f6dad7e289b1b42cad463465 100644 (file)
--- a/tests/distributed_grids/3d_refinement_05.cc
+++ b/tests/distributed_grids/3d_refinement_05.cc
@@ -94,7 +94,7 @@ void test(std::ostream& /*out*/)
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 #else
   (void)argc;
   (void)argv;
@@ -109,7 +109,5 @@ int main(int argc, char *argv[])
   test<3>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/3d_refinement_06.cc b/tests/distributed_grids/3d_refinement_06.cc
index 72f1c363c24a9fe2040f3c9bef5be628c285760d..2fbe9430bfbb58952222afe0ce2d6341d094ca13 100644 (file)
--- a/tests/distributed_grids/3d_refinement_06.cc
+++ b/tests/distributed_grids/3d_refinement_06.cc
@@ -83,7 +83,7 @@ void test(std::ostream& /*out*/)
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 #else
   (void)argc;
   (void)argv;
@@ -98,7 +98,5 @@ int main(int argc, char *argv[])
   test<3>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/3d_refinement_07.cc b/tests/distributed_grids/3d_refinement_07.cc
index a9d0a1ca4963b9ac5ac6d33b6c23362bba9195df..2b4e88b18fc8999c245c01e3e020f399ab5aa2d1 100644 (file)
--- a/tests/distributed_grids/3d_refinement_07.cc
+++ b/tests/distributed_grids/3d_refinement_07.cc
@@ -57,7 +57,7 @@ void test(std::ostream& /*out*/)
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 #else
   (void)argc;
   (void)argv;
@@ -72,7 +72,5 @@ int main(int argc, char *argv[])
   test<3>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/3d_refinement_08.cc b/tests/distributed_grids/3d_refinement_08.cc
index f6270bd29a5d3669e1caf6405a57a99e5a496966..c392860f4c1d3ed94f0027853901ec08a76b6a5d 100644 (file)
--- a/tests/distributed_grids/3d_refinement_08.cc
+++ b/tests/distributed_grids/3d_refinement_08.cc
@@ -96,7 +96,7 @@ void test(std::ostream& /*out*/)
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 #else
   (void)argc;
   (void)argv;
@@ -109,7 +109,5 @@ int main(int argc, char *argv[])
 
   test<3>(logfile);
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/anisotropic.cc b/tests/distributed_grids/anisotropic.cc
index 8b62336990083a63026582834ce28703012b4ab7..c5079160da4d850a79da8bed57590f64b760fd04 100644 (file)
--- a/tests/distributed_grids/anisotropic.cc
+++ b/tests/distributed_grids/anisotropic.cc
@@ -51,7 +51,7 @@ void test(std::ostream& /*out*/)
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 #else
   (void)argc;
   (void)argv;
@@ -73,7 +73,5 @@ int main(int argc, char *argv[])
   test<3>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/count_dofs_per_block_01.cc b/tests/distributed_grids/count_dofs_per_block_01.cc
index 03956767ee83c7951a2b91c5ad753daf7600d288..56398865ed525af8dd78f96d8b4e8df2fdc35adf 100644 (file)
--- a/tests/distributed_grids/count_dofs_per_block_01.cc
+++ b/tests/distributed_grids/count_dofs_per_block_01.cc
@@ -106,7 +106,7 @@ void test()
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 #else
   (void)argc;
   (void)argv;
@@ -134,7 +134,5 @@ int main(int argc, char *argv[])
       test<3>();
     }
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/count_dofs_per_component_01.cc b/tests/distributed_grids/count_dofs_per_component_01.cc
index 2b83d4a3006d9cd02221db94d943003b2ca943da..3e849e604c7eb2d5b1bd063cc9a3060f5894d915 100644 (file)
--- a/tests/distributed_grids/count_dofs_per_component_01.cc
+++ b/tests/distributed_grids/count_dofs_per_component_01.cc
@@ -72,7 +72,7 @@ void test()
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 #else
   (void)argc;
   (void)argv;
@@ -100,7 +100,5 @@ int main(int argc, char *argv[])
       test<3>();
     }
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/dof_handler_number_cache.cc b/tests/distributed_grids/dof_handler_number_cache.cc
index 03fa3570da490caf919249ea4f8d07b4d8666660..8b58364a6aaa45a91149c15e68eb0970843e02e9 100644 (file)
--- a/tests/distributed_grids/dof_handler_number_cache.cc
+++ b/tests/distributed_grids/dof_handler_number_cache.cc
@@ -108,7 +108,7 @@ void test()
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 #else
   (void)argc;
   (void)argv;
@@ -136,7 +136,5 @@ int main(int argc, char *argv[])
       test<3>();
     }
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/solution_transfer_01.cc b/tests/distributed_grids/solution_transfer_01.cc
index f607345060ffe36fa8a21ad352233a76e5e172e5..55de735d4b61c153e0fdf967c899c35e8bcc2b37 100644 (file)
--- a/tests/distributed_grids/solution_transfer_01.cc
+++ b/tests/distributed_grids/solution_transfer_01.cc
@@ -76,7 +76,7 @@ void test(std::ostream& /*out*/)
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 #else
   (void)argc;
   (void)argv;
@@ -94,7 +94,5 @@ int main(int argc, char *argv[])
   test<3>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/solution_transfer_02.cc b/tests/distributed_grids/solution_transfer_02.cc
index 651b6a5cf6c0a2ca6f76d8d947bbf85565c3e371..99306cb8eb95eb159e6ec5e41fcd0d9f88443a7c 100644 (file)
--- a/tests/distributed_grids/solution_transfer_02.cc
+++ b/tests/distributed_grids/solution_transfer_02.cc
@@ -112,7 +112,7 @@ void test(std::ostream& /*out*/)
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 #else
   (void)argc;
   (void)argv;
@@ -130,7 +130,5 @@ int main(int argc, char *argv[])
   test<3>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+
 }

diff --git a/tests/distributed_grids/solution_transfer_03.cc b/tests/distributed_grids/solution_transfer_03.cc
index 158429e37c64a330b2e741f5d9d472054b824c5f..6bfd0674ab7e1a9c5f6fee1c8193e685c6f071c6 100644 (file)
--- a/tests/distributed_grids/solution_transfer_03.cc
+++ b/tests/distributed_grids/solution_transfer_03.cc
@@ -140,7 +140,7 @@ void test(std::ostream& /*out*/)
 int main(int argc, char *argv[])
 {
 #ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 #else
   (void)argc;
   (void)argv;
@@ -157,8 +157,5 @@ int main(int argc, char *argv[])
   deallog.push("3d");
   test<3>(logfile);
   deallog.pop();
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+  
 }

diff --git a/tests/distributed_grids/solution_transfer_04.cc b/tests/distributed_grids/solution_transfer_04.cc
index b6143848944f6b90b577dc6792e50cb2bbde7df6..13afa73ccebd59536095e9fcfc32d56c33336b5c 100644 (file)
--- a/tests/distributed_grids/solution_transfer_04.cc
+++ b/tests/distributed_grids/solution_transfer_04.cc
@@ -97,12 +97,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("solution_transfer_04/output");
   deallog.attach(logfile);
@@ -116,7 +111,4 @@ int main(int argc, char *argv[])
   test<3>(logfile);
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/distributed_grids/tria_settings_01.cc b/tests/distributed_grids/tria_settings_01.cc
index ccdf543a0f1865687a808cf389a72e34a1dbd931..bee3c55bc97aaf02746534fcf32a3039a14b238b 100644 (file)
--- a/tests/distributed_grids/tria_settings_01.cc
+++ b/tests/distributed_grids/tria_settings_01.cc
@@ -82,12 +82,7 @@ void test(std::ostream& /*out*/)
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("tria_settings_01/output");
   deallog.attach(logfile);
@@ -97,8 +92,4 @@ int main(int argc, char *argv[])
   deallog.push("2d");
   test<2>(logfile);
   deallog.pop();
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/distributed_grids/update_number_cache_01.cc b/tests/distributed_grids/update_number_cache_01.cc
index d0b082a51b52ef70d6b4ecb6055e6ffbbf42938c..2c136a1ff602d5ba50d7b4d3730e81a639064483 100644 (file)
--- a/tests/distributed_grids/update_number_cache_01.cc
+++ b/tests/distributed_grids/update_number_cache_01.cc
@@ -46,12 +46,7 @@ void test()
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  MPI_Init (&argc,&argv);
-#else
-  (void)argc;
-  (void)argv;
-#endif
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   std::ofstream logfile("update_number_cache_01/output");
   deallog.attach(logfile);
@@ -62,7 +57,4 @@ int main(int argc, char *argv[])
   test<2>();
   deallog.pop();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }