From: maier Date: Thu, 28 Feb 2013 08:42:13 +0000 (+0000) Subject: Bugfix: Change DEAL_II_COMPILER_SUPPORTS_MPI -> DEAL_II_WITH_MPI in the test suite X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da8d277fd02a70549272312051f7046a5e267866;p=dealii-svn.git Bugfix: Change DEAL_II_COMPILER_SUPPORTS_MPI -> DEAL_II_WITH_MPI in the test suite git-svn-id: https://svn.dealii.org/branches/branch_cmake@28640 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 e1243f2908..28a33a4a9e 100644 --- a/tests/distributed_grids/2d_coarse_grid_01.cc +++ b/tests/distributed_grids/2d_coarse_grid_01.cc @@ -64,7 +64,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -80,7 +80,7 @@ int main(int argc, char *argv[]) test<2>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 322062a325..68c0965643 100644 --- a/tests/distributed_grids/2d_coarse_grid_02.cc +++ b/tests/distributed_grids/2d_coarse_grid_02.cc @@ -54,7 +54,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) test<2>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 4c2cdc97c5..90e060b87d 100644 --- a/tests/distributed_grids/2d_coarse_grid_03.cc +++ b/tests/distributed_grids/2d_coarse_grid_03.cc @@ -42,7 +42,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) test<2>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 8aff6ddf2b..5ca30d4f1d 100644 --- a/tests/distributed_grids/2d_coarse_grid_04.cc +++ b/tests/distributed_grids/2d_coarse_grid_04.cc @@ -40,7 +40,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -56,7 +56,7 @@ int main(int argc, char *argv[]) test<2>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 7f0667a8e6..26c9b2e3e8 100644 --- a/tests/distributed_grids/2d_coarse_grid_x_01.cc +++ b/tests/distributed_grids/2d_coarse_grid_x_01.cc @@ -77,7 +77,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -93,7 +93,7 @@ int main(int argc, char *argv[]) test<2>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 a6c7b228f3..6b2f815dba 100644 --- a/tests/distributed_grids/2d_coarsening_01.cc +++ b/tests/distributed_grids/2d_coarsening_01.cc @@ -46,7 +46,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) test<2>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 b4279f22c0..87c19a85e5 100644 --- a/tests/distributed_grids/2d_coarsening_02.cc +++ b/tests/distributed_grids/2d_coarsening_02.cc @@ -116,7 +116,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -132,7 +132,7 @@ int main(int argc, char *argv[]) test<2>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 853cd09218..1b67534b27 100644 --- a/tests/distributed_grids/2d_coarsening_03.cc +++ b/tests/distributed_grids/2d_coarsening_03.cc @@ -177,7 +177,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -193,7 +193,7 @@ int main(int argc, char *argv[]) test<2>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 f53c964994..21f91f1cc6 100644 --- a/tests/distributed_grids/2d_coarsening_05.cc +++ b/tests/distributed_grids/2d_coarsening_05.cc @@ -104,7 +104,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -120,7 +120,7 @@ int main(int argc, char *argv[]) test<2>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 08dc27ea41..82095b7a24 100644 --- a/tests/distributed_grids/2d_dofhandler_01.cc +++ b/tests/distributed_grids/2d_dofhandler_01.cc @@ -72,7 +72,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) test<2>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 e04df1beda..dcc990b07f 100644 --- a/tests/distributed_grids/2d_refinement_01.cc +++ b/tests/distributed_grids/2d_refinement_01.cc @@ -44,7 +44,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -60,7 +60,7 @@ int main(int argc, char *argv[]) test<2>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 1c29dab026..8ce225e28c 100644 --- a/tests/distributed_grids/2d_refinement_02.cc +++ b/tests/distributed_grids/2d_refinement_02.cc @@ -105,7 +105,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -121,7 +121,7 @@ int main(int argc, char *argv[]) test<2>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 ebc3b9a21b..bafba9678c 100644 --- a/tests/distributed_grids/2d_refinement_03.cc +++ b/tests/distributed_grids/2d_refinement_03.cc @@ -135,7 +135,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -151,7 +151,7 @@ int main(int argc, char *argv[]) test<2>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 9f869032b0..4bc8c2c716 100644 --- a/tests/distributed_grids/2d_refinement_04.cc +++ b/tests/distributed_grids/2d_refinement_04.cc @@ -73,7 +73,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -89,7 +89,7 @@ int main(int argc, char *argv[]) test<2>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 9cf36d422b..760de2b998 100644 --- a/tests/distributed_grids/2d_refinement_05.cc +++ b/tests/distributed_grids/2d_refinement_05.cc @@ -92,7 +92,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -108,7 +108,7 @@ int main(int argc, char *argv[]) test<2>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 10dc6049f9..05aeb1b154 100644 --- a/tests/distributed_grids/2d_refinement_06.cc +++ b/tests/distributed_grids/2d_refinement_06.cc @@ -68,7 +68,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -84,7 +84,7 @@ int main(int argc, char *argv[]) test<2>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 cd826ffab7..c840c2550d 100644 --- a/tests/distributed_grids/3d_coarse_grid_01.cc +++ b/tests/distributed_grids/3d_coarse_grid_01.cc @@ -64,7 +64,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -80,7 +80,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 5edadf021c..052ad36e6e 100644 --- a/tests/distributed_grids/3d_coarse_grid_02.cc +++ b/tests/distributed_grids/3d_coarse_grid_02.cc @@ -48,7 +48,7 @@ void test(const char *filename) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -75,7 +75,7 @@ int main(int argc, char *argv[]) deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 0e3c846659..39c4d91ed4 100644 --- a/tests/distributed_grids/3d_coarse_grid_03.cc +++ b/tests/distributed_grids/3d_coarse_grid_03.cc @@ -42,7 +42,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 e755849317..cccb5ec5ca 100644 --- a/tests/distributed_grids/3d_coarse_grid_04.cc +++ b/tests/distributed_grids/3d_coarse_grid_04.cc @@ -40,7 +40,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -56,7 +56,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 f27bdab284..9b6ec2c326 100644 --- a/tests/distributed_grids/3d_coarse_grid_05.cc +++ b/tests/distributed_grids/3d_coarse_grid_05.cc @@ -141,7 +141,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -161,7 +161,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 da333fba4c..4d6b8d3814 100644 --- a/tests/distributed_grids/3d_coarse_grid_06.cc +++ b/tests/distributed_grids/3d_coarse_grid_06.cc @@ -43,7 +43,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -59,7 +59,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 95b743a5b1..c8aec97534 100644 --- a/tests/distributed_grids/3d_coarse_grid_x_01.cc +++ b/tests/distributed_grids/3d_coarse_grid_x_01.cc @@ -77,7 +77,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -93,7 +93,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 b1a956bc12..4b745fb7b7 100644 --- a/tests/distributed_grids/3d_coarsening_01.cc +++ b/tests/distributed_grids/3d_coarsening_01.cc @@ -46,7 +46,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 de849879c9..9507281d4b 100644 --- a/tests/distributed_grids/3d_coarsening_02.cc +++ b/tests/distributed_grids/3d_coarsening_02.cc @@ -118,7 +118,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -134,7 +134,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 b426ddf523..95aaf4bea5 100644 --- a/tests/distributed_grids/3d_coarsening_03.cc +++ b/tests/distributed_grids/3d_coarsening_03.cc @@ -115,7 +115,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -131,7 +131,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 a92ad212be..8cf76c26c3 100644 --- a/tests/distributed_grids/3d_coarsening_04.cc +++ b/tests/distributed_grids/3d_coarsening_04.cc @@ -116,7 +116,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -132,7 +132,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 4f9bd557fd..20af470fc6 100644 --- a/tests/distributed_grids/3d_coarsening_05.cc +++ b/tests/distributed_grids/3d_coarsening_05.cc @@ -105,7 +105,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -121,7 +121,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 a307d41601..44edaa374a 100644 --- a/tests/distributed_grids/3d_refinement_01.cc +++ b/tests/distributed_grids/3d_refinement_01.cc @@ -44,7 +44,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -60,7 +60,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 2c406313e0..64f4fcef25 100644 --- a/tests/distributed_grids/3d_refinement_02.cc +++ b/tests/distributed_grids/3d_refinement_02.cc @@ -105,7 +105,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -121,7 +121,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 7dafd15ba2..4053960096 100644 --- a/tests/distributed_grids/3d_refinement_03.cc +++ b/tests/distributed_grids/3d_refinement_03.cc @@ -94,7 +94,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -110,7 +110,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 b24c527670..5ecc081b8d 100644 --- a/tests/distributed_grids/3d_refinement_04.cc +++ b/tests/distributed_grids/3d_refinement_04.cc @@ -73,7 +73,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -89,7 +89,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 017e527ebc..b446ffa03e 100644 --- a/tests/distributed_grids/3d_refinement_05.cc +++ b/tests/distributed_grids/3d_refinement_05.cc @@ -93,7 +93,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -109,7 +109,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 e4926cffb9..72f1c363c2 100644 --- a/tests/distributed_grids/3d_refinement_06.cc +++ b/tests/distributed_grids/3d_refinement_06.cc @@ -82,7 +82,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -98,7 +98,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 f20478c988..a9d0a1ca49 100644 --- a/tests/distributed_grids/3d_refinement_07.cc +++ b/tests/distributed_grids/3d_refinement_07.cc @@ -56,7 +56,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -72,7 +72,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 d019c350b6..f6270bd29a 100644 --- a/tests/distributed_grids/3d_refinement_08.cc +++ b/tests/distributed_grids/3d_refinement_08.cc @@ -95,7 +95,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -109,7 +109,7 @@ int main(int argc, char *argv[]) test<3>(logfile); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Finalize(); #endif } diff --git a/tests/distributed_grids/anisotropic.cc b/tests/distributed_grids/anisotropic.cc index 9f522cee74..8b62336990 100644 --- a/tests/distributed_grids/anisotropic.cc +++ b/tests/distributed_grids/anisotropic.cc @@ -50,7 +50,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -73,7 +73,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 c71b90b63d..03956767ee 100644 --- a/tests/distributed_grids/count_dofs_per_block_01.cc +++ b/tests/distributed_grids/count_dofs_per_block_01.cc @@ -105,7 +105,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -134,7 +134,7 @@ int main(int argc, char *argv[]) test<3>(); } -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 cc1ee60b5c..2b83d4a300 100644 --- a/tests/distributed_grids/count_dofs_per_component_01.cc +++ b/tests/distributed_grids/count_dofs_per_component_01.cc @@ -71,7 +71,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -100,7 +100,7 @@ int main(int argc, char *argv[]) test<3>(); } -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 7ac6578cd2..03fa3570da 100644 --- a/tests/distributed_grids/dof_handler_number_cache.cc +++ b/tests/distributed_grids/dof_handler_number_cache.cc @@ -107,7 +107,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -136,7 +136,7 @@ int main(int argc, char *argv[]) test<3>(); } -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 f9d5938bf8..f607345060 100644 --- a/tests/distributed_grids/solution_transfer_01.cc +++ b/tests/distributed_grids/solution_transfer_01.cc @@ -75,7 +75,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -94,7 +94,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 2e879286af..651b6a5cf6 100644 --- a/tests/distributed_grids/solution_transfer_02.cc +++ b/tests/distributed_grids/solution_transfer_02.cc @@ -111,7 +111,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -130,7 +130,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 7f51dfdc8c..158429e37c 100644 --- a/tests/distributed_grids/solution_transfer_03.cc +++ b/tests/distributed_grids/solution_transfer_03.cc @@ -139,7 +139,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -158,7 +158,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 b52a392755..b614384894 100644 --- a/tests/distributed_grids/solution_transfer_04.cc +++ b/tests/distributed_grids/solution_transfer_04.cc @@ -97,7 +97,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -116,7 +116,7 @@ int main(int argc, char *argv[]) test<3>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 4f03affe18..ccdf543a0f 100644 --- a/tests/distributed_grids/tria_settings_01.cc +++ b/tests/distributed_grids/tria_settings_01.cc @@ -82,7 +82,7 @@ void test(std::ostream& /*out*/) int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -98,7 +98,7 @@ int main(int argc, char *argv[]) test<2>(logfile); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 5ac6e9b43a..d0b082a51b 100644 --- a/tests/distributed_grids/update_number_cache_01.cc +++ b/tests/distributed_grids/update_number_cache_01.cc @@ -46,7 +46,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) test<2>(); deallog.pop(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Finalize(); #endif } diff --git a/tests/mpi/collective_01.cc b/tests/mpi/collective_01.cc index 95c9eadaf6..38c9aa71b0 100644 --- a/tests/mpi/collective_01.cc +++ b/tests/mpi/collective_01.cc @@ -77,7 +77,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI Utilities::MPI::MPI_InitFinalize mpi (argc, argv); #else (void)argc; diff --git a/tests/mpi/collective_02.cc b/tests/mpi/collective_02.cc index 577c5a1f17..58ce116bb9 100644 --- a/tests/mpi/collective_02.cc +++ b/tests/mpi/collective_02.cc @@ -53,7 +53,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI Utilities::MPI::MPI_InitFinalize mpi (argc, argv); #else (void)argc; diff --git a/tests/mpi/collective_02_array.cc b/tests/mpi/collective_02_array.cc index 35f9971dc3..9b56199e5b 100644 --- a/tests/mpi/collective_02_array.cc +++ b/tests/mpi/collective_02_array.cc @@ -39,7 +39,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI Utilities::MPI::MPI_InitFinalize mpi (argc, argv); #else (void)argc; diff --git a/tests/mpi/collective_03.cc b/tests/mpi/collective_03.cc index 0fa7e1eceb..9ee8135057 100644 --- a/tests/mpi/collective_03.cc +++ b/tests/mpi/collective_03.cc @@ -53,7 +53,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI Utilities::MPI::MPI_InitFinalize mpi (argc, argv); #else (void)argc; diff --git a/tests/mpi/collective_03_array.cc b/tests/mpi/collective_03_array.cc index b41551427d..992e5e3d83 100644 --- a/tests/mpi/collective_03_array.cc +++ b/tests/mpi/collective_03_array.cc @@ -39,7 +39,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI Utilities::MPI::MPI_InitFinalize mpi (argc, argv); #else (void)argc; diff --git a/tests/mpi/compute_mean_value.cc b/tests/mpi/compute_mean_value.cc index f677e27b75..dd9d65c3e8 100644 --- a/tests/mpi/compute_mean_value.cc +++ b/tests/mpi/compute_mean_value.cc @@ -88,7 +88,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -126,7 +126,7 @@ int main(int argc, char *argv[]) deallog.pop(); } -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 b01fbc5436..4f5cff4680 100644 --- a/tests/mpi/constraint_matrix_trilinos_bug.cc +++ b/tests/mpi/constraint_matrix_trilinos_bug.cc @@ -187,7 +187,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -213,7 +213,7 @@ int main(int argc, char *argv[]) else test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 28379afdf1..1d72b80e90 100644 --- a/tests/mpi/count_dofs_per_block_01.cc +++ b/tests/mpi/count_dofs_per_block_01.cc @@ -62,7 +62,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -91,7 +91,7 @@ int main(int argc, char *argv[]) test<3>(); } -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 723689fefb..af7269705f 100644 --- a/tests/mpi/count_dofs_per_block_02.cc +++ b/tests/mpi/count_dofs_per_block_02.cc @@ -105,7 +105,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -134,7 +134,7 @@ int main(int argc, char *argv[]) test<3>(); } -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 4bb0abe0ae..62c67c6abf 100644 --- a/tests/mpi/count_dofs_per_component_01.cc +++ b/tests/mpi/count_dofs_per_component_01.cc @@ -71,7 +71,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -100,7 +100,7 @@ int main(int argc, char *argv[]) test<3>(); } -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Finalize(); #endif } diff --git a/tests/mpi/crash_01.cc b/tests/mpi/crash_01.cc index 89d7ab790e..b1808ac474 100644 --- a/tests/mpi/crash_01.cc +++ b/tests/mpi/crash_01.cc @@ -57,7 +57,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -81,7 +81,7 @@ int main(int argc, char *argv[]) test<2>(); } -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Finalize(); #endif } diff --git a/tests/mpi/crash_02.cc b/tests/mpi/crash_02.cc index 360fad52b2..aa2ebd426c 100644 --- a/tests/mpi/crash_02.cc +++ b/tests/mpi/crash_02.cc @@ -52,7 +52,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -78,7 +78,7 @@ int main(int argc, char *argv[]) test<2>(); } -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Finalize(); #endif } diff --git a/tests/mpi/crash_03.cc b/tests/mpi/crash_03.cc index 376d2f77f7..be61fe3b19 100644 --- a/tests/mpi/crash_03.cc +++ b/tests/mpi/crash_03.cc @@ -82,7 +82,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -108,7 +108,7 @@ int main(int argc, char *argv[]) test<2>(); } -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Finalize(); #endif } diff --git a/tests/mpi/crash_04.cc b/tests/mpi/crash_04.cc index c2425f88a6..6bc41068fc 100644 --- a/tests/mpi/crash_04.cc +++ b/tests/mpi/crash_04.cc @@ -105,7 +105,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -131,7 +131,7 @@ int main(int argc, char *argv[]) test<2>(); } -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Finalize(); #endif } diff --git a/tests/mpi/distribute_sp_01.cc b/tests/mpi/distribute_sp_01.cc index c57cceeb02..4d7e4d74e4 100644 --- a/tests/mpi/distribute_sp_01.cc +++ b/tests/mpi/distribute_sp_01.cc @@ -91,7 +91,7 @@ void test_mpi() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI Utilities::MPI::MPI_InitFinalize mpi (argc, argv); #else (void)argc; diff --git a/tests/mpi/distribute_sp_02.cc b/tests/mpi/distribute_sp_02.cc index cb06cd4bdf..7e5aeb2a23 100644 --- a/tests/mpi/distribute_sp_02.cc +++ b/tests/mpi/distribute_sp_02.cc @@ -144,7 +144,7 @@ void test_mpi() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI Utilities::MPI::MPI_InitFinalize mpi (argc, argv); #else (void)argc; diff --git a/tests/mpi/dof_handler_number_cache.cc b/tests/mpi/dof_handler_number_cache.cc index 61aeea32bb..32d80085d0 100644 --- a/tests/mpi/dof_handler_number_cache.cc +++ b/tests/mpi/dof_handler_number_cache.cc @@ -130,7 +130,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -159,7 +159,7 @@ int main(int argc, char *argv[]) test<3>(); } -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 970d304249..306d81fcfe 100644 --- a/tests/mpi/extract_boundary_dofs.cc +++ b/tests/mpi/extract_boundary_dofs.cc @@ -59,7 +59,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -97,7 +97,7 @@ int main(int argc, char *argv[]) deallog.pop(); } -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 0115a20917..95ac8f974a 100644 --- a/tests/mpi/extract_constant_modes_01.cc +++ b/tests/mpi/extract_constant_modes_01.cc @@ -98,7 +98,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -128,7 +128,7 @@ int main(int argc, char *argv[]) deallog.pop(); } -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 5671733592..6d5fcff8a2 100644 --- a/tests/mpi/extract_locally_active_dofs.cc +++ b/tests/mpi/extract_locally_active_dofs.cc @@ -75,7 +75,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -113,7 +113,7 @@ int main(int argc, char *argv[]) deallog.pop(); } -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Finalize(); #endif } diff --git a/tests/mpi/integrate_difference.cc b/tests/mpi/integrate_difference.cc index 15939abedc..6c63b55ac3 100644 --- a/tests/mpi/integrate_difference.cc +++ b/tests/mpi/integrate_difference.cc @@ -109,7 +109,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -147,7 +147,7 @@ int main(int argc, char *argv[]) deallog.pop(); } -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Finalize(); #endif } diff --git a/tests/mpi/interpolate_01.cc b/tests/mpi/interpolate_01.cc index f4cfbd3b23..cc492b3d42 100644 --- a/tests/mpi/interpolate_01.cc +++ b/tests/mpi/interpolate_01.cc @@ -78,7 +78,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI Utilities::MPI::MPI_InitFinalize mpi (argc, argv); #else (void)argc; diff --git a/tests/mpi/interpolate_03.cc b/tests/mpi/interpolate_03.cc index 423bfcf7b9..27d7802d25 100644 --- a/tests/mpi/interpolate_03.cc +++ b/tests/mpi/interpolate_03.cc @@ -82,7 +82,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -120,7 +120,7 @@ int main(int argc, char *argv[]) deallog.pop(); } -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 bb9983b384..4cb7374704 100644 --- a/tests/mpi/is_locally_owned.cc +++ b/tests/mpi/is_locally_owned.cc @@ -81,7 +81,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -108,7 +108,7 @@ int main(int argc, char *argv[]) test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 1401ddbf73..2ea650dcef 100644 --- a/tests/mpi/make_zero_boundary_values.cc +++ b/tests/mpi/make_zero_boundary_values.cc @@ -64,7 +64,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -102,7 +102,7 @@ int main(int argc, char *argv[]) deallog.pop(); } -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 ea51ad6295..027f531d2c 100644 --- a/tests/mpi/map_dofs_to_support_points.cc +++ b/tests/mpi/map_dofs_to_support_points.cc @@ -71,7 +71,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -109,7 +109,7 @@ int main(int argc, char *argv[]) deallog.pop(); } -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Finalize(); #endif } diff --git a/tests/mpi/mg_01.cc b/tests/mpi/mg_01.cc index 346cae0682..9424fcd472 100644 --- a/tests/mpi/mg_01.cc +++ b/tests/mpi/mg_01.cc @@ -124,7 +124,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -150,7 +150,7 @@ int main(int argc, char *argv[]) else test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Finalize(); #endif } diff --git a/tests/mpi/mg_02.cc b/tests/mpi/mg_02.cc index b371f7255a..79fc94b6ed 100644 --- a/tests/mpi/mg_02.cc +++ b/tests/mpi/mg_02.cc @@ -124,7 +124,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -150,7 +150,7 @@ int main(int argc, char *argv[]) else test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Finalize(); #endif } diff --git a/tests/mpi/mg_03.cc b/tests/mpi/mg_03.cc index 2fd078beb2..734d90fd6c 100644 --- a/tests/mpi/mg_03.cc +++ b/tests/mpi/mg_03.cc @@ -125,7 +125,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -151,7 +151,7 @@ int main(int argc, char *argv[]) else test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 4b6526ab85..20481bf047 100644 --- a/tests/mpi/p4est_2d_coarse_01.cc +++ b/tests/mpi/p4est_2d_coarse_01.cc @@ -90,7 +90,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -117,7 +117,7 @@ int main(int argc, char *argv[]) test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 9b072569aa..0e78ee7dcd 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_01.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_01.cc @@ -91,7 +91,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -117,7 +117,7 @@ int main(int argc, char *argv[]) else test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 5e4948f55b..c45b793d3b 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_02.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_02.cc @@ -91,7 +91,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -117,7 +117,7 @@ int main(int argc, char *argv[]) else test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Finalize(); #endif } diff --git a/tests/mpi/p4est_2d_constraintmatrix_03.cc b/tests/mpi/p4est_2d_constraintmatrix_03.cc index fac4793724..94a8b655bd 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_03.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_03.cc @@ -223,7 +223,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -249,7 +249,7 @@ int main(int argc, char *argv[]) else test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 4508bc10fb..9bcb2882ae 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_04.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_04.cc @@ -325,7 +325,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -351,7 +351,7 @@ int main(int argc, char *argv[]) else test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 ee14d843ea..4df41363d4 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_05.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_05.cc @@ -95,7 +95,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -121,7 +121,7 @@ int main(int argc, char *argv[]) else test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 d7ba97de59..8be5e60112 100644 --- a/tests/mpi/p4est_2d_dofhandler_01.cc +++ b/tests/mpi/p4est_2d_dofhandler_01.cc @@ -82,7 +82,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -108,7 +108,7 @@ int main(int argc, char *argv[]) else test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 842de09e93..3e8bded9a6 100644 --- a/tests/mpi/p4est_2d_dofhandler_02.cc +++ b/tests/mpi/p4est_2d_dofhandler_02.cc @@ -95,7 +95,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -121,7 +121,7 @@ int main(int argc, char *argv[]) else test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 e0899ca4c1..1ea989642b 100644 --- a/tests/mpi/p4est_2d_dofhandler_03.cc +++ b/tests/mpi/p4est_2d_dofhandler_03.cc @@ -114,7 +114,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -140,7 +140,7 @@ int main(int argc, char *argv[]) else test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 f83005e7d3..8f5e05fd1b 100644 --- a/tests/mpi/p4est_2d_dofhandler_04.cc +++ b/tests/mpi/p4est_2d_dofhandler_04.cc @@ -124,7 +124,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -150,7 +150,7 @@ int main(int argc, char *argv[]) else test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 b5caac414c..f5926eeb02 100644 --- a/tests/mpi/p4est_2d_dofhandler_05.cc +++ b/tests/mpi/p4est_2d_dofhandler_05.cc @@ -62,7 +62,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) else test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 5909b120a4..46b887ea0c 100644 --- a/tests/mpi/p4est_2d_ghost_01.cc +++ b/tests/mpi/p4est_2d_ghost_01.cc @@ -110,7 +110,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -137,7 +137,7 @@ int main(int argc, char *argv[]) test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 f079de80ae..6c63431c49 100644 --- a/tests/mpi/p4est_2d_ghost_02.cc +++ b/tests/mpi/p4est_2d_ghost_02.cc @@ -112,7 +112,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -139,7 +139,7 @@ int main(int argc, char *argv[]) test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 8d4d026168..1dd9f3bb06 100644 --- a/tests/mpi/p4est_2d_refine_01.cc +++ b/tests/mpi/p4est_2d_refine_01.cc @@ -76,7 +76,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -103,7 +103,7 @@ int main(int argc, char *argv[]) test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 c295e4ccfc..54d5dd488f 100644 --- a/tests/mpi/p4est_2d_refine_02.cc +++ b/tests/mpi/p4est_2d_refine_02.cc @@ -67,7 +67,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -94,7 +94,7 @@ int main(int argc, char *argv[]) test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 2a232f525f..eeeaca44e4 100644 --- a/tests/mpi/p4est_2d_refine_03.cc +++ b/tests/mpi/p4est_2d_refine_03.cc @@ -86,7 +86,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -112,7 +112,7 @@ int main(int argc, char *argv[]) else test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 c106b4ccc7..1d943b376d 100644 --- a/tests/mpi/p4est_2d_renumber_01.cc +++ b/tests/mpi/p4est_2d_renumber_01.cc @@ -114,7 +114,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -152,7 +152,7 @@ int main(int argc, char *argv[]) deallog.pop(); } -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 b6c07eae1b..537fcf3d37 100644 --- a/tests/mpi/p4est_2d_renumber_02.cc +++ b/tests/mpi/p4est_2d_renumber_02.cc @@ -111,7 +111,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -141,7 +141,7 @@ int main(int argc, char *argv[]) deallog.pop(); } -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 af2b357266..ed6c6e0331 100644 --- a/tests/mpi/p4est_2d_simple.cc +++ b/tests/mpi/p4est_2d_simple.cc @@ -79,7 +79,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -103,7 +103,7 @@ int main(int argc, char *argv[]) test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 eb2d4d4189..753b3a2ed9 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_01.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_01.cc @@ -101,7 +101,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -127,7 +127,7 @@ int main(int argc, char *argv[]) else test<3>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 058763664f..a99940a5bf 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_02.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_02.cc @@ -131,7 +131,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -157,7 +157,7 @@ int main(int argc, char *argv[]) else test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 7aa883f1d3..080246484a 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_03.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_03.cc @@ -322,7 +322,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -348,7 +348,7 @@ int main(int argc, char *argv[]) else test<3>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 9238bcd8d5..f27065b5bb 100644 --- a/tests/mpi/p4est_3d_ghost_01.cc +++ b/tests/mpi/p4est_3d_ghost_01.cc @@ -121,7 +121,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -151,7 +151,7 @@ int main(int argc, char *argv[]) test<3>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 7505391c0f..04bbbb0443 100644 --- a/tests/mpi/p4est_3d_refine_01.cc +++ b/tests/mpi/p4est_3d_refine_01.cc @@ -115,7 +115,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -142,7 +142,7 @@ int main(int argc, char *argv[]) test<3>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 c5bfbd4905..2fec8db309 100644 --- a/tests/mpi/p4est_3d_refine_02.cc +++ b/tests/mpi/p4est_3d_refine_02.cc @@ -76,7 +76,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -103,7 +103,7 @@ int main(int argc, char *argv[]) test<3>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 af9d2c7930..7960755914 100644 --- a/tests/mpi/p4est_3d_refine_03.cc +++ b/tests/mpi/p4est_3d_refine_03.cc @@ -73,7 +73,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -100,7 +100,7 @@ int main(int argc, char *argv[]) test<3>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 3e753d56bf..b69e5089fb 100644 --- a/tests/mpi/p4est_3d_refine_04.cc +++ b/tests/mpi/p4est_3d_refine_04.cc @@ -113,7 +113,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -140,7 +140,7 @@ int main(int argc, char *argv[]) test<3>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 f8fed92128..e552669d3b 100644 --- a/tests/mpi/p4est_data_out_01.cc +++ b/tests/mpi/p4est_data_out_01.cc @@ -79,7 +79,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -105,7 +105,7 @@ int main(int argc, char *argv[]) else test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 26702ff53c..3acf723e36 100644 --- a/tests/mpi/p4est_get_subdomain_association.cc +++ b/tests/mpi/p4est_get_subdomain_association.cc @@ -74,7 +74,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -100,7 +100,7 @@ int main(int argc, char *argv[]) else test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 07526696bb..e5cf1d18ff 100644 --- a/tests/mpi/p4est_max_refine.cc +++ b/tests/mpi/p4est_max_refine.cc @@ -75,7 +75,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -102,7 +102,7 @@ int main(int argc, char *argv[]) else test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 183395474b..44cb7bed53 100644 --- a/tests/mpi/p4est_save_01.cc +++ b/tests/mpi/p4est_save_01.cc @@ -103,7 +103,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI PetscInitialize(&argc,&argv,0,0); // MPI_Init (&argc,&argv); @@ -132,7 +132,7 @@ int main(int argc, char *argv[]) test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI //MPI_Finalize(); PetscFinalize(); diff --git a/tests/mpi/p4est_save_02.cc b/tests/mpi/p4est_save_02.cc index f540228254..09709fa8de 100644 --- a/tests/mpi/p4est_save_02.cc +++ b/tests/mpi/p4est_save_02.cc @@ -158,7 +158,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI PetscInitialize(&argc,&argv,0,0); // MPI_Init (&argc,&argv); @@ -187,7 +187,7 @@ int main(int argc, char *argv[]) test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI //MPI_Finalize(); PetscFinalize(); diff --git a/tests/mpi/p4est_save_03.cc b/tests/mpi/p4est_save_03.cc index d067324124..41d5034603 100644 --- a/tests/mpi/p4est_save_03.cc +++ b/tests/mpi/p4est_save_03.cc @@ -171,7 +171,7 @@ void test() int main (int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI PetscInitialize (&argc, &argv, 0, 0); // MPI_Init (&argc,&argv); @@ -200,7 +200,7 @@ int main (int argc, char *argv[]) test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI //MPI_Finalize(); PetscFinalize(); diff --git a/tests/mpi/point_to_point_pattern_01.cc b/tests/mpi/point_to_point_pattern_01.cc index c9d641a66c..c1e6dd28f3 100644 --- a/tests/mpi/point_to_point_pattern_01.cc +++ b/tests/mpi/point_to_point_pattern_01.cc @@ -105,7 +105,7 @@ void test_mpi() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI Utilities::MPI::MPI_InitFinalize mpi (argc, argv); #else (void)argc; diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_01.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_01.cc index 7d10c4277a..382e90fbfb 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_01.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_01.cc @@ -124,7 +124,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -149,7 +149,7 @@ int main(int argc, char *argv[]) test(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 4a82d9a6e3..71826f84f6 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_02.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_02.cc @@ -134,7 +134,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -159,7 +159,7 @@ int main(int argc, char *argv[]) test(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 a2bc78a526..8d5f505096 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_03.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_03.cc @@ -113,7 +113,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -138,7 +138,7 @@ int main(int argc, char *argv[]) test(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 93e113149b..2eb21b48d2 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_04.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_04.cc @@ -131,7 +131,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -156,7 +156,7 @@ int main(int argc, char *argv[]) test(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 6bf9648901..aee20a5a28 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_05.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_05.cc @@ -128,7 +128,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -153,7 +153,7 @@ int main(int argc, char *argv[]) test(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 5a29a463fe..af06f798b2 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_06.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_06.cc @@ -146,7 +146,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -171,7 +171,7 @@ int main(int argc, char *argv[]) test(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 09572af197..115a29b2e8 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_01.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_01.cc @@ -112,7 +112,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -137,7 +137,7 @@ int main(int argc, char *argv[]) test(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 771abc8c9a..4f82555782 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_02.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_02.cc @@ -113,7 +113,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -138,7 +138,7 @@ int main(int argc, char *argv[]) test(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 af6613208b..7e44e23fe7 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_03.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_03.cc @@ -102,7 +102,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -127,7 +127,7 @@ int main(int argc, char *argv[]) test(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 3943b9017f..f2e9ebc39e 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_04.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_04.cc @@ -131,7 +131,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -156,7 +156,7 @@ int main(int argc, char *argv[]) test(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 0a4be632f1..307bc3dbe3 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_05.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_05.cc @@ -128,7 +128,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -153,7 +153,7 @@ int main(int argc, char *argv[]) test(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 f90fe67bf8..6d951deaa6 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_06.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_06.cc @@ -67,7 +67,7 @@ void test() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc,&argv); #else (void)argc; @@ -86,7 +86,7 @@ int main(int argc, char *argv[]) else test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Finalize(); #endif } diff --git a/tests/mpi/renumber_z_order_01.cc b/tests/mpi/renumber_z_order_01.cc index 360d248f73..a73cdfd12c 100644 --- a/tests/mpi/renumber_z_order_01.cc +++ b/tests/mpi/renumber_z_order_01.cc @@ -118,7 +118,7 @@ void test() int main (int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc, &argv); #else (void) argc; @@ -144,7 +144,7 @@ int main (int argc, char *argv[]) else test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 ef14241ab8..1cc055aeb6 100644 --- a/tests/mpi/renumber_z_order_02.cc +++ b/tests/mpi/renumber_z_order_02.cc @@ -125,7 +125,7 @@ void test() int main (int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI MPI_Init (&argc, &argv); #else (void) argc; @@ -151,7 +151,7 @@ int main (int argc, char *argv[]) else test<2>(); -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#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 ab62177be0..826909127e 100644 --- a/tests/mpi/simple_mpi_01.cc +++ b/tests/mpi/simple_mpi_01.cc @@ -62,7 +62,7 @@ void test_mpi() int main(int argc, char *argv[]) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI Utilities::MPI::MPI_InitFinalize mpi (argc, argv); #else (void)argc; diff --git a/tests/tests.h b/tests/tests.h index d934f20b59..b5cb18da1a 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -180,7 +180,7 @@ DEAL_II_NAMESPACE_CLOSE // the number of MPI processes std::string output_file_for_mpi (const std::string &directory) { -#ifdef DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_WITH_MPI return (directory + "/ncpu_" + Utilities::int_to_string (Utilities::MPI::n_mpi_processes (MPI_COMM_WORLD)) + "/output");