switch more tests to MPI_InitFinalize

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

diff --git a/tests/mpi/compute_mean_value.cc b/tests/mpi/compute_mean_value.cc
index dd9d65c3e87c27078ed8ff4e631eabfdb4dd3b6b..80c057b7ec5b1ba50a331995411dadbc0dba6113 100644 (file)
--- a/tests/mpi/compute_mean_value.cc
+++ b/tests/mpi/compute_mean_value.cc
@@ -88,12 +88,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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
@@ -126,7 +121,4 @@ int main(int argc, char *argv[])
       deallog.pop();
     }
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/constraint_matrix_trilinos_bug.cc b/tests/mpi/constraint_matrix_trilinos_bug.cc
index 4f5cff468044dcbe3c3949c8838d53f10d51368a..393fbabd5c1ccaffa91a2d890fda508c46c8e3a9 100644 (file)
--- a/tests/mpi/constraint_matrix_trilinos_bug.cc
+++ b/tests/mpi/constraint_matrix_trilinos_bug.cc
@@ -187,12 +187,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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
@@ -213,7 +208,4 @@ int main(int argc, char *argv[])
   else
     test<2>();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/count_dofs_per_block_01.cc b/tests/mpi/count_dofs_per_block_01.cc
index 1d72b80e908c6f00691c0ee4c0915d4beace1a8a..3e78f68768e6f620313f4ef3e44b3698dad62619 100644 (file)
--- a/tests/mpi/count_dofs_per_block_01.cc
+++ b/tests/mpi/count_dofs_per_block_01.cc
@@ -62,12 +62,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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   if (myid == 0)
@@ -91,7 +86,4 @@ int main(int argc, char *argv[])
       test<3>();
     }
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/count_dofs_per_block_02.cc b/tests/mpi/count_dofs_per_block_02.cc
index af7269705f6e970e36aef528f5f1c14a081058d8..9278c2dd8b960c854b6739852a1be466887dbcea 100644 (file)
--- a/tests/mpi/count_dofs_per_block_02.cc
+++ b/tests/mpi/count_dofs_per_block_02.cc
@@ -105,12 +105,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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   if (myid == 0)
@@ -134,7 +129,4 @@ int main(int argc, char *argv[])
       test<3>();
     }
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/count_dofs_per_component_01.cc b/tests/mpi/count_dofs_per_component_01.cc
index 62c67c6abf35ad17dceb5c3b8eb1211ae1b26352..e5b25aa56325effc4a6871321336570a68ca70c3 100644 (file)
--- a/tests/mpi/count_dofs_per_component_01.cc
+++ b/tests/mpi/count_dofs_per_component_01.cc
@@ -71,12 +71,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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   if (myid == 0)
@@ -100,7 +95,4 @@ int main(int argc, char *argv[])
       test<3>();
     }
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/crash_01.cc b/tests/mpi/crash_01.cc
index b1808ac47468e985c2798e233d9f10d70d234139..8f4db6a28415e39af3b5bd51b428d3d9d1f93eef 100644 (file)
--- a/tests/mpi/crash_01.cc
+++ b/tests/mpi/crash_01.cc
@@ -57,13 +57,8 @@ 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);
+  
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   if (myid == 0)
     {
@@ -80,8 +75,4 @@ int main(int argc, char *argv[])
     {
       test<2>();
     }
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/crash_02.cc b/tests/mpi/crash_02.cc
index aa2ebd426cff8b8c259905eedb122b944863135e..fb97d6169278ff1cab4165e4ba0416fc917bcc39 100644 (file)
--- a/tests/mpi/crash_02.cc
+++ b/tests/mpi/crash_02.cc
@@ -52,12 +52,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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   if (myid == 0)
@@ -78,7 +73,4 @@ int main(int argc, char *argv[])
       test<2>();
     }
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/crash_03.cc b/tests/mpi/crash_03.cc
index be61fe3b19179ade1bd4d224b216eea059c82b07..8050d7925dd00d5aabeccbdc3903b0bbecdd70ad 100644 (file)
--- a/tests/mpi/crash_03.cc
+++ b/tests/mpi/crash_03.cc
@@ -82,12 +82,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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   if (myid == 0)
@@ -107,8 +102,4 @@ int main(int argc, char *argv[])
     {
       test<2>();
     }
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/crash_04.cc b/tests/mpi/crash_04.cc
index 6bc41068fc5c6a0c85b91698e40d5b1d22a1def1..652301f2b7cee66cf56e21ca03d3baf8517a1743 100644 (file)
--- a/tests/mpi/crash_04.cc
+++ b/tests/mpi/crash_04.cc
@@ -105,12 +105,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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   if (myid == 0)
@@ -131,7 +126,4 @@ int main(int argc, char *argv[])
       test<2>();
     }
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/dof_handler_number_cache.cc b/tests/mpi/dof_handler_number_cache.cc
index 32d80085d0901e20d8bb814792ecc9326d4dfc83..6b7002f64f337d6acc9c90fdab823376cafa783e 100644 (file)
--- a/tests/mpi/dof_handler_number_cache.cc
+++ b/tests/mpi/dof_handler_number_cache.cc
@@ -130,12 +130,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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   if (myid == 0)
@@ -159,7 +154,4 @@ int main(int argc, char *argv[])
       test<3>();
     }
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/extract_boundary_dofs.cc b/tests/mpi/extract_boundary_dofs.cc
index 306d81fcfe7c5d18f458d9405363089c3f8dda75..62375417baf6c03b399197a57a9aabd5d46079cc 100644 (file)
--- a/tests/mpi/extract_boundary_dofs.cc
+++ b/tests/mpi/extract_boundary_dofs.cc
@@ -59,12 +59,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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
@@ -97,7 +92,4 @@ int main(int argc, char *argv[])
       deallog.pop();
     }
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/extract_constant_modes_01.cc b/tests/mpi/extract_constant_modes_01.cc
index 95ac8f974ae320399fc68426ea925ce975e3a08a..fffc73da495d8f42ae21c98fc0f2086ca2d62eef 100644 (file)
--- a/tests/mpi/extract_constant_modes_01.cc
+++ b/tests/mpi/extract_constant_modes_01.cc
@@ -98,16 +98,10 @@ 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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
-
   deallog.push(Utilities::int_to_string(myid));
 
   if (myid == 0)
@@ -127,8 +121,4 @@ int main(int argc, char *argv[])
       test<2>();
       deallog.pop();
     }
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/extract_locally_active_dofs.cc b/tests/mpi/extract_locally_active_dofs.cc
index 6d5fcff8a2c38981874a0be0ea7fedc25f27fdab..8a7855a426cd412cf1ee56622ec86519ec47a68c 100644 (file)
--- a/tests/mpi/extract_locally_active_dofs.cc
+++ b/tests/mpi/extract_locally_active_dofs.cc
@@ -75,12 +75,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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
@@ -113,7 +108,4 @@ int main(int argc, char *argv[])
       deallog.pop();
     }
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/integrate_difference.cc b/tests/mpi/integrate_difference.cc
index 6c63b55ac3f3c99d408f1a7ab174c0b3207d9095..640a5a1b2b146d1979d5f49b977dc0c30952fcf0 100644 (file)
--- a/tests/mpi/integrate_difference.cc
+++ b/tests/mpi/integrate_difference.cc
@@ -109,12 +109,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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
@@ -147,7 +142,4 @@ int main(int argc, char *argv[])
       deallog.pop();
     }
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/interpolate_03.cc b/tests/mpi/interpolate_03.cc
index c41a2236eb61f1e9aa33f9b2e5f4b6254bf5cee9..25c8533c0d64c0d001fd74d3a1d99d1af7fea81a 100644 (file)
--- a/tests/mpi/interpolate_03.cc
+++ b/tests/mpi/interpolate_03.cc
@@ -81,12 +81,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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
@@ -119,7 +114,4 @@ int main(int argc, char *argv[])
       deallog.pop();
     }
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/is_locally_owned.cc b/tests/mpi/is_locally_owned.cc
index 4cb737470408fbdf7c2c7212465f7edc9015b11f..f5294654240a935d3454c0cdea73ffdc1df15d24 100644 (file)
--- a/tests/mpi/is_locally_owned.cc
+++ b/tests/mpi/is_locally_owned.cc
@@ -81,12 +81,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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
@@ -106,9 +101,5 @@ int main(int argc, char *argv[])
     }
   else
     test<2>();
-
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
+  
 }

diff --git a/tests/mpi/make_zero_boundary_values.cc b/tests/mpi/make_zero_boundary_values.cc
index 2ea650dcefd8be87df4b486fca135614e80e6123..d4620934111a7c0cd60c5df712769d4a22580e2b 100644 (file)
--- a/tests/mpi/make_zero_boundary_values.cc
+++ b/tests/mpi/make_zero_boundary_values.cc
@@ -64,12 +64,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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
@@ -102,7 +97,4 @@ int main(int argc, char *argv[])
       deallog.pop();
     }
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/map_dofs_to_support_points.cc b/tests/mpi/map_dofs_to_support_points.cc
index 027f531d2c432bffe8523b31a5f096ca646f3bb8..fce981619e6d66c08f8e72e4dd24a77f799a8792 100644 (file)
--- a/tests/mpi/map_dofs_to_support_points.cc
+++ b/tests/mpi/map_dofs_to_support_points.cc
@@ -71,12 +71,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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
@@ -109,7 +104,4 @@ int main(int argc, char *argv[])
       deallog.pop();
     }
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/mg_01.cc b/tests/mpi/mg_01.cc
index 9424fcd472b1b572d058962c705127563cdeb411..e9654a9df9d2f374e8d03aab2b6c51658d870f59 100644 (file)
--- a/tests/mpi/mg_01.cc
+++ b/tests/mpi/mg_01.cc
@@ -124,12 +124,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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
@@ -150,7 +145,4 @@ int main(int argc, char *argv[])
   else
     test<2>();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/mg_02.cc b/tests/mpi/mg_02.cc
index 79fc94b6ed8039c6f2dc91b75bfa545b2a93cb10..8e9938372bf70c985033f73347f9a7cb98dbb82d 100644 (file)
--- a/tests/mpi/mg_02.cc
+++ b/tests/mpi/mg_02.cc
@@ -124,12 +124,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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
@@ -150,7 +145,4 @@ int main(int argc, char *argv[])
   else
     test<2>();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/mg_03.cc b/tests/mpi/mg_03.cc
index 734d90fd6c77fd1ac2965eef0e2b2dfe805f5f6e..3a14741b6508c6009fabeb8a4c77a0062c0afa54 100644 (file)
--- a/tests/mpi/mg_03.cc
+++ b/tests/mpi/mg_03.cc
@@ -125,12 +125,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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
@@ -151,7 +146,4 @@ int main(int argc, char *argv[])
   else
     test<2>();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/p4est_2d_coarse_01.cc b/tests/mpi/p4est_2d_coarse_01.cc
index 20481bf0478b471171b151fb785bf6c708868379..ca4bf381e7e9be2d7592f3f0c278a5dc53787c8b 100644 (file)
--- a/tests/mpi/p4est_2d_coarse_01.cc
+++ b/tests/mpi/p4est_2d_coarse_01.cc
@@ -90,12 +90,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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
@@ -116,8 +111,4 @@ int main(int argc, char *argv[])
   else
     test<2>();
 
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/p4est_2d_constraintmatrix_01.cc b/tests/mpi/p4est_2d_constraintmatrix_01.cc
index 0e78ee7dcd1a649e21bff2e3012d3009a7d9733b..943cc4192529eaa8e9a8530301023a3224b38c7c 100644 (file)
--- a/tests/mpi/p4est_2d_constraintmatrix_01.cc
+++ b/tests/mpi/p4est_2d_constraintmatrix_01.cc
@@ -91,12 +91,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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
@@ -117,7 +112,4 @@ int main(int argc, char *argv[])
   else
     test<2>();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/p4est_2d_constraintmatrix_02.cc b/tests/mpi/p4est_2d_constraintmatrix_02.cc
index c45b793d3bec8e569b4430f2b2ac32982a4b7bd4..5df85c62137509d7b8d7e0e5b23559736bdc2e7b 100644 (file)
--- a/tests/mpi/p4est_2d_constraintmatrix_02.cc
+++ b/tests/mpi/p4est_2d_constraintmatrix_02.cc
@@ -91,12 +91,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);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
@@ -117,7 +112,4 @@ int main(int argc, char *argv[])
   else
     test<2>();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }