switch tests to MPI_InitFinalize (some more to come)

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

diff --git a/tests/mpi/constraint_matrix_condense_01.cc b/tests/mpi/constraint_matrix_condense_01.cc
index 206e9cae550f5b6d8aa8d65abfc1a9d44a7ffd2e..01006c6a15f565c1783e77f7d3ac667d40166469 100644 (file)
--- a/tests/mpi/constraint_matrix_condense_01.cc
+++ b/tests/mpi/constraint_matrix_condense_01.cc
@@ -76,7 +76,7 @@ void test ()
 int main(int argc, char *argv[])
 {
   Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
-  PetscInitialize(&argc,&argv,0,0);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
 
@@ -95,6 +95,6 @@ int main(int argc, char *argv[])
   else
     test();
 
-  PetscFinalize();
+  
   return 0;
 }

diff --git a/tests/mpi/ghost_02.cc b/tests/mpi/ghost_02.cc
index f4bf72c06b0b3956ecbfc06f583a9fe1f60db632..47a22bdf6a714f38c94809353565e0832195358e 100644 (file)
--- a/tests/mpi/ghost_02.cc
+++ b/tests/mpi/ghost_02.cc
@@ -93,7 +93,7 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  PetscInitialize(&argc,&argv,0,0);
+  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));
@@ -111,5 +111,5 @@ int main (int argc, char **argv)
   else
     test();
   
-  PetscFinalize();
+  
 }

diff --git a/tests/mpi/interpolate_02.cc b/tests/mpi/interpolate_02.cc
index dd18b3f8384cab4071fa311f6fa0adcab0fbb5ee..94f068e666f7db4e8a70e1a0d8ed2c0828cb95ab 100644 (file)
--- a/tests/mpi/interpolate_02.cc
+++ b/tests/mpi/interpolate_02.cc
@@ -78,7 +78,7 @@ void test()
 
 int main(int argc, char *argv[])
 {
-  PetscInitialize(&argc,&argv,0,0);
+  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));
@@ -103,5 +103,5 @@ int main(int argc, char *argv[])
       test<3>();
     }
 
-  PetscFinalize();
+  
 }

diff --git a/tests/mpi/p4est_2d_constraintmatrix_03.cc b/tests/mpi/p4est_2d_constraintmatrix_03.cc
index 94a8b655bd532edf8dc294d21c2b8494897a137d..8d147e39dd132610f494ea70572f29aa677a9583 100644 (file)
--- a/tests/mpi/p4est_2d_constraintmatrix_03.cc
+++ b/tests/mpi/p4est_2d_constraintmatrix_03.cc
@@ -223,12 +223,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);
 
@@ -249,7 +244,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_04.cc b/tests/mpi/p4est_2d_constraintmatrix_04.cc
index 9bcb2882aebb115f19bd51cc0982583aecfbd6b2..e934681168130501a3dd2a5bb9994fa7b6393241 100644 (file)
--- a/tests/mpi/p4est_2d_constraintmatrix_04.cc
+++ b/tests/mpi/p4est_2d_constraintmatrix_04.cc
@@ -325,12 +325,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);
 
@@ -351,7 +346,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_05.cc b/tests/mpi/p4est_2d_constraintmatrix_05.cc
index 4df41363d406788cb3542b9ad7e9402cadcf8e7f..7dcc1222a342fa93dc5803711d7f1a239c999334 100644 (file)
--- a/tests/mpi/p4est_2d_constraintmatrix_05.cc
+++ b/tests/mpi/p4est_2d_constraintmatrix_05.cc
@@ -95,12 +95,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);
 
@@ -121,7 +116,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_dofhandler_01.cc b/tests/mpi/p4est_2d_dofhandler_01.cc
index 8be5e601127d2cee1c947cb66922a8f046032c23..3e45bd909568540c33b452dd2b3351a2c47d317a 100644 (file)
--- a/tests/mpi/p4est_2d_dofhandler_01.cc
+++ b/tests/mpi/p4est_2d_dofhandler_01.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);
 
@@ -107,8 +102,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_dofhandler_02.cc b/tests/mpi/p4est_2d_dofhandler_02.cc
index 3e8bded9a6cbe19ee835c521181f2790da62ed2a..3ada5930feb29110d0d41f493d2661250abd1cc0 100644 (file)
--- a/tests/mpi/p4est_2d_dofhandler_02.cc
+++ b/tests/mpi/p4est_2d_dofhandler_02.cc
@@ -95,12 +95,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);
 
@@ -121,7 +116,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_dofhandler_03.cc b/tests/mpi/p4est_2d_dofhandler_03.cc
index 1ea989642b1a2713f2c95459dbb8c09c7784de05..5e286651d9970aebaa6beb2781cd55cf256c9f43 100644 (file)
--- a/tests/mpi/p4est_2d_dofhandler_03.cc
+++ b/tests/mpi/p4est_2d_dofhandler_03.cc
@@ -114,12 +114,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);
 
@@ -140,7 +135,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_dofhandler_04.cc b/tests/mpi/p4est_2d_dofhandler_04.cc
index 8f5e05fd1b162cdb25c089cb1b448b0015652b65..c6203d8d002696e560477d139eb6416e72c33d79 100644 (file)
--- a/tests/mpi/p4est_2d_dofhandler_04.cc
+++ b/tests/mpi/p4est_2d_dofhandler_04.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/p4est_2d_dofhandler_05.cc b/tests/mpi/p4est_2d_dofhandler_05.cc
index f5926eeb0200d333c5593244d8e82e416b64d746..3a9edbc11482a3a04a8373e8ca9cc073f9733903 100644 (file)
--- a/tests/mpi/p4est_2d_dofhandler_05.cc
+++ b/tests/mpi/p4est_2d_dofhandler_05.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);
 
@@ -88,7 +83,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_ghost_01.cc b/tests/mpi/p4est_2d_ghost_01.cc
index 46b887ea0cb7bfe6e6e04a7b16cd530a72bc2ff9..f02f798d845193da24448e11833f2f7b97d71a23 100644 (file)
--- a/tests/mpi/p4est_2d_ghost_01.cc
+++ b/tests/mpi/p4est_2d_ghost_01.cc
@@ -110,12 +110,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);
 
@@ -136,8 +131,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_ghost_02.cc b/tests/mpi/p4est_2d_ghost_02.cc
index 6c63431c498873d0bf666294eb312e5d69bf3d5d..473663cbeb7803e1bef9a9927db28a804894bacf 100644 (file)
--- a/tests/mpi/p4est_2d_ghost_02.cc
+++ b/tests/mpi/p4est_2d_ghost_02.cc
@@ -112,12 +112,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);
 
@@ -138,8 +133,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_refine_01.cc b/tests/mpi/p4est_2d_refine_01.cc
index 1dd9f3bb0670b317c07df5228dc1a6416f4dc090..87d8e9b934e5265936644da1729b83e051e61ea0 100644 (file)
--- a/tests/mpi/p4est_2d_refine_01.cc
+++ b/tests/mpi/p4est_2d_refine_01.cc
@@ -76,12 +76,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,8 +97,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_refine_02.cc b/tests/mpi/p4est_2d_refine_02.cc
index 54d5dd488fbf75b24d3b16a4a24233d3ea405ba2..bd0bfb60cd4e960641d2c7ca51b879e7f709d3d6 100644 (file)
--- a/tests/mpi/p4est_2d_refine_02.cc
+++ b/tests/mpi/p4est_2d_refine_02.cc
@@ -67,12 +67,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);
 
@@ -93,8 +88,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_refine_03.cc b/tests/mpi/p4est_2d_refine_03.cc
index eeeaca44e452fa292f3c3ad82bf44fa9658b7c78..7feb0aada11bf18c1037119cff3a8493bba57d09 100644 (file)
--- a/tests/mpi/p4est_2d_refine_03.cc
+++ b/tests/mpi/p4est_2d_refine_03.cc
@@ -86,12 +86,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);
 
@@ -112,7 +107,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_renumber_01.cc b/tests/mpi/p4est_2d_renumber_01.cc
index 1d943b376d8a892e501fd3d79545bbcdf9623c34..6d017c179930613463943010f57a1b6aa9352c6e 100644 (file)
--- a/tests/mpi/p4est_2d_renumber_01.cc
+++ b/tests/mpi/p4est_2d_renumber_01.cc
@@ -114,12 +114,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);
 
@@ -152,7 +147,4 @@ int main(int argc, char *argv[])
       deallog.pop();
     }
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/p4est_2d_renumber_02.cc b/tests/mpi/p4est_2d_renumber_02.cc
index 537fcf3d37355300d9eb8a407736672b0eb3e1e7..7b502843017ac19114cc224a0b2215f8b71e7c33 100644 (file)
--- a/tests/mpi/p4est_2d_renumber_02.cc
+++ b/tests/mpi/p4est_2d_renumber_02.cc
@@ -111,12 +111,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);
 
@@ -141,7 +136,4 @@ int main(int argc, char *argv[])
       deallog.pop();
     }
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/p4est_2d_simple.cc b/tests/mpi/p4est_2d_simple.cc
index ed6c6e033185f8e0ff131f52990f9790cb431281..3f7c087ca31a26c3a82fb2294b92a4e241c20522 100644 (file)
--- a/tests/mpi/p4est_2d_simple.cc
+++ b/tests/mpi/p4est_2d_simple.cc
@@ -79,12 +79,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,8 +97,4 @@ int main(int argc, char *argv[])
   else
     test<2>();
 
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/p4est_3d_constraintmatrix_01.cc b/tests/mpi/p4est_3d_constraintmatrix_01.cc
index 753b3a2ed92bb7657187e8edd33d7ca62687d91e..8f5a02a221144630bb3204987f4b01d31e600a06 100644 (file)
--- a/tests/mpi/p4est_3d_constraintmatrix_01.cc
+++ b/tests/mpi/p4est_3d_constraintmatrix_01.cc
@@ -101,12 +101,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);
 
@@ -127,7 +122,4 @@ int main(int argc, char *argv[])
   else
     test<3>();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/p4est_3d_constraintmatrix_02.cc b/tests/mpi/p4est_3d_constraintmatrix_02.cc
index a99940a5bf1b1f6db7f6926ec4cad6c0635f2cdb..9bc8636906ab50aad3198e76afece8ccc4f79e90 100644 (file)
--- a/tests/mpi/p4est_3d_constraintmatrix_02.cc
+++ b/tests/mpi/p4est_3d_constraintmatrix_02.cc
@@ -131,12 +131,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);
 
@@ -157,7 +152,4 @@ int main(int argc, char *argv[])
   else
     test<2>();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/p4est_3d_constraintmatrix_03.cc b/tests/mpi/p4est_3d_constraintmatrix_03.cc
index 080246484abb9a0eba91eea11df1403f070ddeea..8e87deb5a7af6229eb1e4c4cd0d9442012b1fa99 100644 (file)
--- a/tests/mpi/p4est_3d_constraintmatrix_03.cc
+++ b/tests/mpi/p4est_3d_constraintmatrix_03.cc
@@ -322,12 +322,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);
 
@@ -347,8 +342,4 @@ int main(int argc, char *argv[])
     }
   else
     test<3>();
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/p4est_3d_ghost_01.cc b/tests/mpi/p4est_3d_ghost_01.cc
index f27065b5bb57e3b777acdc54747af7bdccfb7d2b..9f0254eab901b8221a8a371d40b4e67ee01d969a 100644 (file)
--- a/tests/mpi/p4est_3d_ghost_01.cc
+++ b/tests/mpi/p4est_3d_ghost_01.cc
@@ -121,12 +121,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,8 +145,4 @@ int main(int argc, char *argv[])
   else
     test<3>();
 
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/p4est_3d_refine_01.cc b/tests/mpi/p4est_3d_refine_01.cc
index 04bbbb0443918e2463271bc39039e305917c1851..e5d1777f46a2551ab9da185e726aa3764bc50e71 100644 (file)
--- a/tests/mpi/p4est_3d_refine_01.cc
+++ b/tests/mpi/p4est_3d_refine_01.cc
@@ -115,12 +115,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);
 
@@ -141,8 +136,4 @@ int main(int argc, char *argv[])
   else
     test<3>();
 
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/p4est_3d_refine_02.cc b/tests/mpi/p4est_3d_refine_02.cc
index 2fec8db309bfee96d39ff5d83bace9c0173070b3..c772479b6b0f467a2a59924d941c5a8eb3faa3ac 100644 (file)
--- a/tests/mpi/p4est_3d_refine_02.cc
+++ b/tests/mpi/p4est_3d_refine_02.cc
@@ -76,12 +76,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,8 +97,4 @@ int main(int argc, char *argv[])
   else
     test<3>();
 
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/p4est_3d_refine_03.cc b/tests/mpi/p4est_3d_refine_03.cc
index 79607559143cbb655f020b32f61ab983a70a668c..2fa5be4c96c1c333c55a9acbda6bf1eae367dcd4 100644 (file)
--- a/tests/mpi/p4est_3d_refine_03.cc
+++ b/tests/mpi/p4est_3d_refine_03.cc
@@ -73,12 +73,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);
 
@@ -99,8 +94,4 @@ int main(int argc, char *argv[])
   else
     test<3>();
 
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/p4est_3d_refine_04.cc b/tests/mpi/p4est_3d_refine_04.cc
index b69e5089fb648f012d5ff0aef6210098fe8272c1..30efe6aa372c85a13b4e1c74ee086b9dd7700709 100644 (file)
--- a/tests/mpi/p4est_3d_refine_04.cc
+++ b/tests/mpi/p4est_3d_refine_04.cc
@@ -113,12 +113,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);
 
@@ -139,8 +134,4 @@ int main(int argc, char *argv[])
   else
     test<3>();
 
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/p4est_data_out_01.cc b/tests/mpi/p4est_data_out_01.cc
index e552669d3b62ee232628db199fa1022aa88ba7d7..80c96c2146e84dd6c11b8935948404a243594060 100644 (file)
--- a/tests/mpi/p4est_data_out_01.cc
+++ b/tests/mpi/p4est_data_out_01.cc
@@ -79,12 +79,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);
 
@@ -105,7 +100,4 @@ int main(int argc, char *argv[])
   else
     test<2>();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/p4est_get_subdomain_association.cc b/tests/mpi/p4est_get_subdomain_association.cc
index 3acf723e36cac10e6492ae5e6cc94f3593db3a11..8248475e5de4c452a81fcc4daae4efefff2bc76e 100644 (file)
--- a/tests/mpi/p4est_get_subdomain_association.cc
+++ b/tests/mpi/p4est_get_subdomain_association.cc
@@ -74,12 +74,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);
 
@@ -100,7 +95,4 @@ int main(int argc, char *argv[])
   else
     test<2>();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/p4est_max_refine.cc b/tests/mpi/p4est_max_refine.cc
index e5cf1d18ffc3042c7fb86960d1e6c0a606267a52..dde67aefac401761e723406b9779f9a86955ad46 100644 (file)
--- a/tests/mpi/p4est_max_refine.cc
+++ b/tests/mpi/p4est_max_refine.cc
@@ -75,13 +75,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);
 
 
@@ -102,7 +97,4 @@ int main(int argc, char *argv[])
   else
     test<2>();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/p4est_save_01.cc b/tests/mpi/p4est_save_01.cc
index 44cb7bed53d3347170af8fdd44ee41d30b655f33..b79f172c2ce69b38a2d3f03f7ce579aa5bf9b8ee 100644 (file)
--- a/tests/mpi/p4est_save_01.cc
+++ b/tests/mpi/p4est_save_01.cc
@@ -103,14 +103,7 @@ void test()
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  PetscInitialize(&argc,&argv,0,0);
-
-//  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);
 
@@ -131,10 +124,4 @@ int main(int argc, char *argv[])
   else
     test<2>();
 
-
-#ifdef DEAL_II_WITH_MPI
-                                  //MPI_Finalize();
-  PetscFinalize();
-
-#endif
 }

diff --git a/tests/mpi/p4est_save_02.cc b/tests/mpi/p4est_save_02.cc
index 09709fa8de93291fe896f58e39329245332a8684..9bd7e49e040852c86ce1405e8bca8ec755cd3129 100644 (file)
--- a/tests/mpi/p4est_save_02.cc
+++ b/tests/mpi/p4est_save_02.cc
@@ -158,14 +158,7 @@ void test()
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  PetscInitialize(&argc,&argv,0,0);
-
-//  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);
 
@@ -186,10 +179,4 @@ int main(int argc, char *argv[])
   else
     test<2>();
 
-
-#ifdef DEAL_II_WITH_MPI
-                                  //MPI_Finalize();
-  PetscFinalize();
-
-#endif
 }

diff --git a/tests/mpi/p4est_save_03.cc b/tests/mpi/p4est_save_03.cc
index 41d5034603a644f96a4a2d6c6a682037686c98bd..015d3ef1db52a3c1a0be5d6435ba2de6f1f3030a 100644 (file)
--- a/tests/mpi/p4est_save_03.cc
+++ b/tests/mpi/p4est_save_03.cc
@@ -171,15 +171,8 @@ void test()
 
 int main (int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
-  PetscInitialize (&argc, &argv, 0, 0);
-
-//  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);
 
 
@@ -199,10 +192,4 @@ int main (int argc, char *argv[])
   else
     test<2>();
 
-
-#ifdef DEAL_II_WITH_MPI
-  //MPI_Finalize();
-  PetscFinalize();
-
-#endif
 }

diff --git a/tests/mpi/petsc_02.cc b/tests/mpi/petsc_02.cc
index 4de69e5d56c554c2c75a72068d1c45c6ce782d6b..9bbd2d42000ce8742d26a7f8f3a04474c02eca0a 100644 (file)
--- a/tests/mpi/petsc_02.cc
+++ b/tests/mpi/petsc_02.cc
@@ -59,7 +59,7 @@ void test()
 
 int main(int argc, char *argv[])
 {
-  PetscInitialize(&argc,&argv,0,0);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
     {
@@ -73,5 +73,5 @@ int main(int argc, char *argv[])
   else
     test();
 
-  PetscFinalize();
+  
 }

diff --git a/tests/mpi/point_to_point_pattern_01.cc b/tests/mpi/point_to_point_pattern_01.cc
index c1e6dd28f3afdf9dcb8290e02c55c88009c8c19a..c28c7fd050762d5446bbc5ecdfc1883c42fa0ba6 100644 (file)
--- a/tests/mpi/point_to_point_pattern_01.cc
+++ b/tests/mpi/point_to_point_pattern_01.cc
@@ -105,14 +105,7 @@ void test_mpi()
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
   Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
-#else
-  (void)argc;
-  (void)argv;
-  compile_time_error;
-
-#endif
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
     {

diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_01.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_01.cc
index 382e90fbfb3c6584e9c7ce18abbe0ced7289f8fc..8cdb8bdcaf3288839ecead4a2b29475f161321f1 100644 (file)
--- a/tests/mpi/refine_and_coarsen_fixed_fraction_01.cc
+++ b/tests/mpi/refine_and_coarsen_fixed_fraction_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);
 
@@ -148,8 +143,4 @@ int main(int argc, char *argv[])
   else
     test();
 
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_02.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_02.cc
index 71826f84f64be7f17260fabf2b97ef4d1fc25f2f..50cb091223dff5256853ebd992490fd0ce851b4e 100644 (file)
--- a/tests/mpi/refine_and_coarsen_fixed_fraction_02.cc
+++ b/tests/mpi/refine_and_coarsen_fixed_fraction_02.cc
@@ -134,12 +134,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);
 
@@ -158,8 +153,4 @@ int main(int argc, char *argv[])
   else
     test();
 
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_03.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_03.cc
index 8d5f505096801105c1f63dee2bee2d042e02ae11..103390ad3c9358938cd506bf1cbc4cc9b7c4580d 100644 (file)
--- a/tests/mpi/refine_and_coarsen_fixed_fraction_03.cc
+++ b/tests/mpi/refine_and_coarsen_fixed_fraction_03.cc
@@ -113,12 +113,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);
 
@@ -137,8 +132,4 @@ int main(int argc, char *argv[])
   else
     test();
 
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_04.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_04.cc
index 2eb21b48d29aecabed5e01c916fa235a7ebc4681..65695a8b804487641f227116c240f23cedf6e1df 100644 (file)
--- a/tests/mpi/refine_and_coarsen_fixed_fraction_04.cc
+++ b/tests/mpi/refine_and_coarsen_fixed_fraction_04.cc
@@ -131,12 +131,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);
 
@@ -155,8 +150,4 @@ int main(int argc, char *argv[])
   else
     test();
 
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_05.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_05.cc
index aee20a5a2818bbed9004d531daadd6f80f8e29ad..15ac20e454ea74ce0f14015fd5c734119406262e 100644 (file)
--- a/tests/mpi/refine_and_coarsen_fixed_fraction_05.cc
+++ b/tests/mpi/refine_and_coarsen_fixed_fraction_05.cc
@@ -128,12 +128,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);
 
@@ -152,8 +147,4 @@ int main(int argc, char *argv[])
   else
     test();
 
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_06.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_06.cc
index af06f798b2159038d92c08fe90652cdf7cd5666f..68b6c0832c1983e0772ba76cac8db8263b3b3959 100644 (file)
--- a/tests/mpi/refine_and_coarsen_fixed_fraction_06.cc
+++ b/tests/mpi/refine_and_coarsen_fixed_fraction_06.cc
@@ -146,12 +146,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);
 
@@ -170,8 +165,4 @@ int main(int argc, char *argv[])
   else
     test();
 
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/refine_and_coarsen_fixed_number_01.cc b/tests/mpi/refine_and_coarsen_fixed_number_01.cc
index 115a29b2e85f7fbcc48f731d46a89dae99b9f2e4..4c59db72e08f904fce8adb0557bbcc73df3eff31 100644 (file)
--- a/tests/mpi/refine_and_coarsen_fixed_number_01.cc
+++ b/tests/mpi/refine_and_coarsen_fixed_number_01.cc
@@ -112,12 +112,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);
 
@@ -136,8 +131,4 @@ int main(int argc, char *argv[])
   else
     test();
 
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/refine_and_coarsen_fixed_number_02.cc b/tests/mpi/refine_and_coarsen_fixed_number_02.cc
index 4f82555782e05fa2662d8918d6fc7dffd3184e7a..730b31a7ccfa143f4e6e0ff81ec0315930100982 100644 (file)
--- a/tests/mpi/refine_and_coarsen_fixed_number_02.cc
+++ b/tests/mpi/refine_and_coarsen_fixed_number_02.cc
@@ -113,12 +113,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);
 
@@ -137,8 +132,4 @@ int main(int argc, char *argv[])
   else
     test();
 
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/refine_and_coarsen_fixed_number_03.cc b/tests/mpi/refine_and_coarsen_fixed_number_03.cc
index 7e44e23fe725af246863310cf69429d75843647b..770bbbf09e43e5dff04b8ca93d3682cca036c654 100644 (file)
--- a/tests/mpi/refine_and_coarsen_fixed_number_03.cc
+++ b/tests/mpi/refine_and_coarsen_fixed_number_03.cc
@@ -102,12 +102,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,8 +121,4 @@ int main(int argc, char *argv[])
   else
     test();
 
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/refine_and_coarsen_fixed_number_04.cc b/tests/mpi/refine_and_coarsen_fixed_number_04.cc
index f2e9ebc39e3b402baefcf2a1153b477853eb4a54..abf349080979ef7043b9a3cd3c62fe208c39ff86 100644 (file)
--- a/tests/mpi/refine_and_coarsen_fixed_number_04.cc
+++ b/tests/mpi/refine_and_coarsen_fixed_number_04.cc
@@ -131,12 +131,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);
 
@@ -155,8 +150,4 @@ int main(int argc, char *argv[])
   else
     test();
 
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/refine_and_coarsen_fixed_number_05.cc b/tests/mpi/refine_and_coarsen_fixed_number_05.cc
index 307bc3dbe33fd865a1164b08bd5a2df7475e33c3..06b7db2c3c36dfd742f6858a0247d2cddcf88a0b 100644 (file)
--- a/tests/mpi/refine_and_coarsen_fixed_number_05.cc
+++ b/tests/mpi/refine_and_coarsen_fixed_number_05.cc
@@ -128,12 +128,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);
 
@@ -152,8 +147,4 @@ int main(int argc, char *argv[])
   else
     test();
 
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/refine_and_coarsen_fixed_number_06.cc b/tests/mpi/refine_and_coarsen_fixed_number_06.cc
index 6d951deaa6a102cf6a5923e76e15f1a94486a277..93fc4d14225ad84bfdac52332bccd3fe5118a0ad 100644 (file)
--- a/tests/mpi/refine_and_coarsen_fixed_number_06.cc
+++ b/tests/mpi/refine_and_coarsen_fixed_number_06.cc
@@ -67,12 +67,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);
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
     {
@@ -86,7 +81,4 @@ int main(int argc, char *argv[])
   else
     test<2>();
 
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/refinement_listener_01.cc b/tests/mpi/refinement_listener_01.cc
index 38cc730408425f2e2782aca4c93e6d618aa2f287..ad08be796e8d600d0f2bfbca0e6100a04361b5fa 100644 (file)
--- a/tests/mpi/refinement_listener_01.cc
+++ b/tests/mpi/refinement_listener_01.cc
@@ -82,12 +82,7 @@ void test()
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_COMPILER_SUPPORTS_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,8 +101,4 @@ int main(int argc, char *argv[])
   else
     test();
 
-
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/refinement_listener_02.cc b/tests/mpi/refinement_listener_02.cc
index e90b0613abe8feda6aa211c6c7271ee8b7cae8f3..c48a1b033b99a80937373fd212883c04a914a624 100644 (file)
--- a/tests/mpi/refinement_listener_02.cc
+++ b/tests/mpi/refinement_listener_02.cc
@@ -85,12 +85,7 @@ void test()
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_COMPILER_SUPPORTS_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,8 +104,4 @@ int main(int argc, char *argv[])
   else
     test();
 
-
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/renumber_z_order_01.cc b/tests/mpi/renumber_z_order_01.cc
index a73cdfd12ca676f759bd059dbf3bee83d7b48ddb..cb9e5d33d0b4a7e4eafe25c18c6392f45de67e82 100644 (file)
--- a/tests/mpi/renumber_z_order_01.cc
+++ b/tests/mpi/renumber_z_order_01.cc
@@ -118,12 +118,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);
 
@@ -143,8 +138,4 @@ int main (int argc, char *argv[])
     }
   else
     test<2>();
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/renumber_z_order_02.cc b/tests/mpi/renumber_z_order_02.cc
index 1cc055aeb64524e044ff875bd60cf3aead0c65de..3547bb9ecebdfb17a244c00e357fd55d66708f52 100644 (file)
--- a/tests/mpi/renumber_z_order_02.cc
+++ b/tests/mpi/renumber_z_order_02.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);
 
@@ -150,8 +145,4 @@ int main (int argc, char *argv[])
     }
   else
     test<2>();
-
-#ifdef DEAL_II_WITH_MPI
-  MPI_Finalize();
-#endif
 }

diff --git a/tests/mpi/simple_mpi_01.cc b/tests/mpi/simple_mpi_01.cc
index 826909127e464434803fb864dd8c08b869a948a1..95b3b84f4b898bc7e417183fee9eef0ea714a910 100644 (file)
--- a/tests/mpi/simple_mpi_01.cc
+++ b/tests/mpi/simple_mpi_01.cc
@@ -62,14 +62,7 @@ void test_mpi()
 
 int main(int argc, char *argv[])
 {
-#ifdef DEAL_II_WITH_MPI
   Utilities::MPI::MPI_InitFinalize mpi (argc, argv);
-#else
-  (void)argc;
-  (void)argv;
-  compile_time_error;
-
-#endif
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
     {

diff --git a/tests/mpi/solution_transfer_01.cc b/tests/mpi/solution_transfer_01.cc
index 3336900e5f8e3866eb3d7958c7b08179b58fd8c1..26c800becec9462f9f7ab41b68693e61c3c79427 100644 (file)
--- a/tests/mpi/solution_transfer_01.cc
+++ b/tests/mpi/solution_transfer_01.cc
@@ -99,7 +99,7 @@ void test()
 
 int main(int argc, char *argv[])
 {
-  PetscInitialize(&argc,&argv,0,0);
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
 
 
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
@@ -127,5 +127,5 @@ int main(int argc, char *argv[])
       test<3>();
     }
 
-  PetscFinalize();
+  
 }