From a8bca3c6fb5467f3f54e1e68c29c8f768b768313 Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Wed, 8 Mar 2017 16:05:04 +0100 Subject: [PATCH] Limit number of threads to 1 in some parallel tests. --- tests/matrix_free/parallel_multigrid.cc | 2 +- tests/matrix_free/parallel_multigrid_02.cc | 2 +- tests/matrix_free/parallel_multigrid_adaptive_01.cc | 2 +- tests/matrix_free/parallel_multigrid_adaptive_02.cc | 2 +- tests/matrix_free/parallel_multigrid_adaptive_03.cc | 2 +- tests/matrix_free/parallel_multigrid_adaptive_04.cc | 2 +- tests/matrix_free/parallel_multigrid_mf.cc | 2 +- tests/multigrid/dof_05.cc | 2 +- tests/multigrid/step-16-04.cc | 2 +- tests/multigrid/step-16-05.cc | 2 +- tests/multigrid/step-16-06.cc | 2 +- tests/multigrid/transfer_prebuilt_04.cc | 2 +- tests/trilinos/renumbering_01.cc | 2 +- tests/trilinos/sparse_matrix_mmult_01.cc | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/matrix_free/parallel_multigrid.cc b/tests/matrix_free/parallel_multigrid.cc index 5338d75164..8907a89734 100644 --- a/tests/matrix_free/parallel_multigrid.cc +++ b/tests/matrix_free/parallel_multigrid.cc @@ -416,7 +416,7 @@ void test () int main (int argc, char **argv) { - Utilities::MPI::MPI_InitFinalize mpi_init(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_init(argc, argv, 1); if (Utilities::MPI::this_mpi_process(MPI_COMM_WORLD) == 0) { diff --git a/tests/matrix_free/parallel_multigrid_02.cc b/tests/matrix_free/parallel_multigrid_02.cc index 183f0df4bc..1444804d12 100644 --- a/tests/matrix_free/parallel_multigrid_02.cc +++ b/tests/matrix_free/parallel_multigrid_02.cc @@ -236,7 +236,7 @@ void test () int main (int argc, char **argv) { - Utilities::MPI::MPI_InitFinalize mpi_init(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_init(argc, argv, 1); if (Utilities::MPI::this_mpi_process(MPI_COMM_WORLD) == 0) { diff --git a/tests/matrix_free/parallel_multigrid_adaptive_01.cc b/tests/matrix_free/parallel_multigrid_adaptive_01.cc index c6b5ee06ea..0b50c35de4 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_01.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_01.cc @@ -578,7 +578,7 @@ void test () int main (int argc, char **argv) { - Utilities::MPI::MPI_InitFinalize mpi_init(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_init(argc, argv, 1); if (Utilities::MPI::this_mpi_process(MPI_COMM_WORLD) == 0) { diff --git a/tests/matrix_free/parallel_multigrid_adaptive_02.cc b/tests/matrix_free/parallel_multigrid_adaptive_02.cc index 4bae59d981..db47b66d7c 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_02.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_02.cc @@ -305,7 +305,7 @@ void test () int main (int argc, char **argv) { - Utilities::MPI::MPI_InitFinalize mpi_init(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_init(argc, argv, 1); if (Utilities::MPI::this_mpi_process(MPI_COMM_WORLD) == 0) { diff --git a/tests/matrix_free/parallel_multigrid_adaptive_03.cc b/tests/matrix_free/parallel_multigrid_adaptive_03.cc index 5ef83e664d..b02ba242ac 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_03.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_03.cc @@ -576,7 +576,7 @@ void test () int main (int argc, char **argv) { - Utilities::MPI::MPI_InitFinalize mpi_init(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_init(argc, argv, 1); mpi_initlog(); deallog.threshold_double(1e-9); diff --git a/tests/matrix_free/parallel_multigrid_adaptive_04.cc b/tests/matrix_free/parallel_multigrid_adaptive_04.cc index 800fffae33..3209b7c575 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_04.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_04.cc @@ -305,7 +305,7 @@ void test () int main (int argc, char **argv) { - Utilities::MPI::MPI_InitFinalize mpi_init(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_init(argc, argv, 1); if (Utilities::MPI::this_mpi_process(MPI_COMM_WORLD) == 0) { diff --git a/tests/matrix_free/parallel_multigrid_mf.cc b/tests/matrix_free/parallel_multigrid_mf.cc index 1b12b6c988..6c632ccae7 100644 --- a/tests/matrix_free/parallel_multigrid_mf.cc +++ b/tests/matrix_free/parallel_multigrid_mf.cc @@ -413,7 +413,7 @@ void test () int main (int argc, char **argv) { - Utilities::MPI::MPI_InitFinalize mpi_init(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_init(argc, argv, 1); mpi_initlog(); deallog.threshold_double(1e-9); diff --git a/tests/multigrid/dof_05.cc b/tests/multigrid/dof_05.cc index 7e88eabf63..610b4229eb 100644 --- a/tests/multigrid/dof_05.cc +++ b/tests/multigrid/dof_05.cc @@ -45,7 +45,7 @@ void check() int main(int argc, char **argv) { - Utilities::MPI::MPI_InitFinalize mpi(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi(argc, argv, 1); mpi_initlog(); check<2> (); check<3> (); diff --git a/tests/multigrid/step-16-04.cc b/tests/multigrid/step-16-04.cc index 4dad17ec20..b03eacbc7d 100644 --- a/tests/multigrid/step-16-04.cc +++ b/tests/multigrid/step-16-04.cc @@ -490,7 +490,7 @@ int main (int argc, char **argv) deallog.attach(logfile); deallog.threshold_double(1.e-10); - Utilities::MPI::MPI_InitFinalize mpi(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi(argc, argv, 1); try { diff --git a/tests/multigrid/step-16-05.cc b/tests/multigrid/step-16-05.cc index d0b5bdda23..a917e2ef10 100644 --- a/tests/multigrid/step-16-05.cc +++ b/tests/multigrid/step-16-05.cc @@ -472,7 +472,7 @@ int main (int argc, char **argv) deallog.attach(logfile); deallog.threshold_double(1.e-10); - Utilities::MPI::MPI_InitFinalize mpi(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi(argc, argv, 1); try { diff --git a/tests/multigrid/step-16-06.cc b/tests/multigrid/step-16-06.cc index edc847d624..e1159f83cc 100644 --- a/tests/multigrid/step-16-06.cc +++ b/tests/multigrid/step-16-06.cc @@ -472,7 +472,7 @@ int main (int argc, char **argv) deallog.attach(logfile); deallog.threshold_double(1.e-10); - Utilities::MPI::MPI_InitFinalize mpi(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi(argc, argv, 1); try { diff --git a/tests/multigrid/transfer_prebuilt_04.cc b/tests/multigrid/transfer_prebuilt_04.cc index 25404de18f..68aa2c03b6 100644 --- a/tests/multigrid/transfer_prebuilt_04.cc +++ b/tests/multigrid/transfer_prebuilt_04.cc @@ -99,7 +99,7 @@ void check() int main(int argc, char **argv) { - Utilities::MPI::MPI_InitFinalize mpi(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi(argc, argv, 1); mpi_initlog(); check<2>(); diff --git a/tests/trilinos/renumbering_01.cc b/tests/trilinos/renumbering_01.cc index eff971860a..aec92f37ca 100644 --- a/tests/trilinos/renumbering_01.cc +++ b/tests/trilinos/renumbering_01.cc @@ -157,7 +157,7 @@ private: int main(int argc, char *argv[]) { - Utilities::MPI::MPI_InitFinalize mpi(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi(argc, argv, 1); MPILogInitAll log; Test test1(false); diff --git a/tests/trilinos/sparse_matrix_mmult_01.cc b/tests/trilinos/sparse_matrix_mmult_01.cc index 0d91008170..a9976a05ae 100644 --- a/tests/trilinos/sparse_matrix_mmult_01.cc +++ b/tests/trilinos/sparse_matrix_mmult_01.cc @@ -36,7 +36,7 @@ void out_matrix_size(const MATRIX &M, int main(int argc, char *argv[]) { - Utilities::MPI::MPI_InitFinalize mpi(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi(argc, argv, 1); initlog(); -- 2.39.5