From 08efe784e8efc1f0a59aa7933990d6f686125cb0 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 26 Sep 2011 13:53:32 +0000 Subject: [PATCH] Move Utilities::System::MPI_InitFinalize to Utilities::MPI::MPI_InitFinalize. git-svn-id: https://svn.dealii.org/trunk@24425 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/doc/news/changes.h | 7 +- deal.II/examples/step-31/step-31.cc | 4 +- deal.II/examples/step-32/step-32.cc | 2 +- deal.II/include/deal.II/base/utilities.h | 129 ++++++++++--------- tests/mpi/collective_01.cc | 2 +- tests/mpi/collective_02.cc | 2 +- tests/mpi/distribute_sp_01.cc | 2 +- tests/mpi/interpolate_01.cc | 2 +- tests/mpi/no_flux_constraints.cc | 2 +- tests/mpi/no_flux_constraints_02.cc | 2 +- tests/mpi/no_flux_constraints_03.cc | 2 +- tests/mpi/p4est_3d_constraintmatrix_04.cc | 2 +- tests/mpi/point_to_point_pattern_01.cc | 2 +- tests/mpi/simple_mpi_01.cc | 2 +- tests/mpi/trilinos_compress_bug.cc | 2 +- tests/mpi/trilinos_ghost_01.cc | 2 +- tests/mpi/trilinos_ghost_02.cc | 2 +- tests/mpi/trilinos_ghost_03.cc | 2 +- tests/mpi/trilinos_ghost_03_linfty.cc | 2 +- tests/mpi/trilinos_ghost_04.cc | 2 +- tests/mpi/trilinos_ghost_05.cc | 2 +- tests/mpi/trilinos_sparse_matrix_mmult_01.cc | 2 +- tests/mpi/trilinos_sparse_matrix_print_01.cc | 2 +- tests/mpi/trilinos_vector_reinit.cc | 2 +- tests/trilinos/01.cc | 2 +- tests/trilinos/02.cc | 2 +- tests/trilinos/03.cc | 2 +- tests/trilinos/03a.cc | 2 +- tests/trilinos/03b.cc | 2 +- tests/trilinos/04.cc | 2 +- tests/trilinos/05.cc | 2 +- tests/trilinos/06.cc | 2 +- tests/trilinos/07.cc | 2 +- tests/trilinos/08.cc | 2 +- tests/trilinos/09.cc | 2 +- tests/trilinos/10.cc | 2 +- tests/trilinos/11.cc | 2 +- tests/trilinos/12.cc | 2 +- tests/trilinos/13.cc | 2 +- tests/trilinos/14.cc | 2 +- tests/trilinos/15.cc | 2 +- tests/trilinos/16.cc | 2 +- tests/trilinos/17.cc | 2 +- tests/trilinos/18.cc | 2 +- tests/trilinos/19.cc | 2 +- tests/trilinos/20.cc | 2 +- tests/trilinos/21.cc | 2 +- tests/trilinos/22.cc | 2 +- tests/trilinos/23.cc | 2 +- tests/trilinos/24.cc | 2 +- tests/trilinos/25.cc | 2 +- tests/trilinos/26.cc | 2 +- tests/trilinos/27.cc | 2 +- tests/trilinos/28.cc | 2 +- tests/trilinos/29.cc | 2 +- tests/trilinos/30.cc | 2 +- tests/trilinos/31.cc | 2 +- tests/trilinos/32.cc | 2 +- tests/trilinos/33.cc | 2 +- tests/trilinos/34.cc | 2 +- tests/trilinos/35.cc | 2 +- tests/trilinos/36.cc | 2 +- tests/trilinos/37.cc | 2 +- tests/trilinos/38.cc | 2 +- tests/trilinos/39.cc | 2 +- tests/trilinos/40.cc | 2 +- tests/trilinos/41.cc | 2 +- tests/trilinos/42.cc | 2 +- tests/trilinos/43.cc | 2 +- tests/trilinos/44.cc | 2 +- tests/trilinos/45.cc | 2 +- tests/trilinos/46.cc | 2 +- tests/trilinos/47.cc | 2 +- tests/trilinos/48.cc | 2 +- tests/trilinos/49.cc | 2 +- tests/trilinos/49a.cc | 2 +- tests/trilinos/49b.cc | 2 +- tests/trilinos/50.cc | 2 +- tests/trilinos/51.cc | 2 +- tests/trilinos/52.cc | 2 +- tests/trilinos/53.cc | 2 +- tests/trilinos/54.cc | 2 +- tests/trilinos/55.cc | 2 +- tests/trilinos/56.cc | 2 +- tests/trilinos/57.cc | 2 +- tests/trilinos/58.cc | 2 +- tests/trilinos/59.cc | 2 +- tests/trilinos/60.cc | 2 +- tests/trilinos/61.cc | 2 +- tests/trilinos/62.cc | 2 +- tests/trilinos/63.cc | 2 +- tests/trilinos/64.cc | 2 +- tests/trilinos/65.cc | 2 +- tests/trilinos/66.cc | 2 +- tests/trilinos/67.cc | 2 +- tests/trilinos/68.cc | 2 +- tests/trilinos/69.cc | 2 +- tests/trilinos/70.cc | 2 +- tests/trilinos/block_sparse_matrix_add_01.cc | 2 +- tests/trilinos/block_sparse_matrix_set_01.cc | 2 +- tests/trilinos/block_vector_iterator_01.cc | 2 +- tests/trilinos/block_vector_iterator_02.cc | 2 +- tests/trilinos/block_vector_iterator_03.cc | 2 +- tests/trilinos/deal_solver_01.cc | 2 +- tests/trilinos/deal_solver_02.cc | 2 +- tests/trilinos/deal_solver_03.cc | 2 +- tests/trilinos/deal_solver_04.cc | 2 +- tests/trilinos/deal_solver_05.cc | 2 +- tests/trilinos/deal_solver_06.cc | 2 +- tests/trilinos/parallel_sparse_matrix_01.cc | 2 +- tests/trilinos/slowness_01.cc | 2 +- tests/trilinos/slowness_02.cc | 2 +- tests/trilinos/slowness_03.cc | 2 +- tests/trilinos/slowness_04.cc | 2 +- tests/trilinos/solver_03.cc | 2 +- tests/trilinos/solver_05.cc | 2 +- tests/trilinos/solver_07.cc | 2 +- tests/trilinos/sparse_matrix_01.cc | 2 +- tests/trilinos/sparse_matrix_add_01.cc | 2 +- tests/trilinos/sparse_matrix_add_02.cc | 2 +- tests/trilinos/sparse_matrix_iterator_01.cc | 2 +- tests/trilinos/sparse_matrix_set_01.cc | 2 +- tests/trilinos/sparse_matrix_set_02.cc | 2 +- tests/trilinos/sparse_matrix_vector_01.cc | 2 +- tests/trilinos/sparse_matrix_vector_02.cc | 2 +- tests/trilinos/sparse_matrix_vector_03.cc | 2 +- tests/trilinos/sparse_matrix_vector_04.cc | 2 +- tests/trilinos/sparse_matrix_vector_05.cc | 2 +- tests/trilinos/sparse_matrix_vector_06.cc | 2 +- tests/trilinos/sparse_matrix_vector_07.cc | 2 +- tests/trilinos/sparsity_pattern_01.cc | 2 +- tests/trilinos/sparsity_pattern_02.cc | 2 +- tests/trilinos/sparsity_pattern_03.cc | 2 +- tests/trilinos/vector_assign_01.cc | 2 +- tests/trilinos/vector_assign_02.cc | 2 +- tests/trilinos/vector_equality_1.cc | 2 +- tests/trilinos/vector_equality_2.cc | 2 +- tests/trilinos/vector_equality_3.cc | 2 +- tests/trilinos/vector_equality_4.cc | 2 +- 139 files changed, 211 insertions(+), 201 deletions(-) diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h index 03d7736143..6ddd79ea74 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -113,8 +113,11 @@ is now Utilities::MPI::compute_point_to_point_communication_pattern; Utilities::System::duplicate_communicator is now Utilities::MPI::duplicate_communicator; Utilities::System::calculate_collective_mpi_min_max_avg -is now Utilities::MPI::min_max_avg. -In addition, some of the arguments of these functions have changed. +is now Utilities::MPI::min_max_avg; +Utilities::System::MPI_InitFinalize +is now Utilities::MPI::MPI_InitFinalize. +In addition, some of the arguments of these functions or classes +have changed.
The previous functions should still be available, though their use is now deprecated. diff --git a/deal.II/examples/step-31/step-31.cc b/deal.II/examples/step-31/step-31.cc index 5013603427..2a49256f5f 100644 --- a/deal.II/examples/step-31/step-31.cc +++ b/deal.II/examples/step-31/step-31.cc @@ -2893,7 +2893,7 @@ namespace Step31 // MPI. Nevertheless, Trilinos wants the MPI // system to be initialized. We do that be // creating an object of type - // Utilities::System::MPI_InitFinalize that + // Utilities::MPI::MPI_InitFinalize that // initializes MPI (if available) using the // arguments given to main() (i.e., // argc and argv) @@ -2908,7 +2908,7 @@ int main (int argc, char *argv[]) deallog.depth_console (0); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); BoussinesqFlowProblem<2> flow_problem; flow_problem.run (); diff --git a/deal.II/examples/step-32/step-32.cc b/deal.II/examples/step-32/step-32.cc index 6cba888b1a..8699c5845f 100644 --- a/deal.II/examples/step-32/step-32.cc +++ b/deal.II/examples/step-32/step-32.cc @@ -3951,7 +3951,7 @@ int main (int argc, char *argv[]) using namespace Step32; using namespace dealii; - Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); try { diff --git a/deal.II/include/deal.II/base/utilities.h b/deal.II/include/deal.II/base/utilities.h index 6847264976..9e008a48c0 100644 --- a/deal.II/include/deal.II/base/utilities.h +++ b/deal.II/include/deal.II/base/utilities.h @@ -386,7 +386,7 @@ namespace Utilities /** * Data structure to store the result of - * calculate_collective_mpi_min_max_avg. + * min_max_avg(). */ struct MinMaxAvg { @@ -405,13 +405,75 @@ namespace Utilities * on the given MPI communicator @param * mpi_communicator . Each processor's * value is given in @param my_value and - * the result will be returned in @param + * the result will be returned in @p * result . The result is available on all * machines. */ MinMaxAvg min_max_avg (const double my_value, const MPI_Comm &mpi_communicator); + + + + /** + * A class that is used to initialize the + * MPI system at the beginning of a + * program and to shut it down again at + * the end. + * + * If a program uses MPI one would + * typically just create an object of + * this type at the beginning of + * main(). The constructor + * of this class then runs + * MPI_Init() with the given + * arguments. At the end of the program, + * the compiler will invoke the + * destructor of this object which in + * turns calls MPI_Finalize + * to shut down the MPI system. + * + * This class is used in step-32, for example. + */ + class MPI_InitFinalize + { + public: + /** + * Constructor. Takes the arguments + * from the command line (in case of + * MPI, the number of processes is + * specified there), and sets up a + * respective communicator by calling + * MPI_Init(). This + * constructor can only be called once + * in a program, since MPI cannot be + * initialized twice. + */ + MPI_InitFinalize (int &argc, + char** &argv); + + /** + * Destructor. Calls + * MPI_Finalize() in + * case this class owns the MPI + * process. + */ + ~MPI_InitFinalize(); + + private: + /** + * This flag tells the class + * whether it owns the MPI + * process (i.e., it has been + * constructed using the + * argc/argv input, or it has + * been copied). In the former + * case, the command + * MPI_Finalize() will + * be called at destruction. + */ + const bool owns_mpi; + }; } /** * A namespace for utility functions that @@ -563,69 +625,14 @@ namespace Utilities const double my_value, MinMaxAvg & result); - /** @} */ - - /** - * A class that is used to initialize the - * MPI system at the beginning of a - * program and to shut it down again at - * the end. - * - * If a program uses MPI one would - * typically just create an object of - * this type at the beginning of - * main(). The constructor - * of this class then runs - * MPI_Init() with the given - * arguments. At the end of the program, - * the compiler will invoke the - * destructor of this object which in - * turns calls MPI_Finalize - * to shut down the MPI system. + * An alias for Utilities::MPI::MPI_InitFinalize. * - * This class is used in @ref step_32 - * "step-32", for example. + * @deprecated */ - class MPI_InitFinalize - { - public: - /** - * Constructor. Takes the arguments - * from the command line (in case of - * MPI, the number of processes is - * specified there), and sets up a - * respective communicator by calling - * MPI_Init(). This - * constructor can only be called once - * in a program, since MPI cannot be - * initialized twice. - */ - MPI_InitFinalize (int &argc, - char** &argv); - - /** - * Destructor. Calls - * MPI_Finalize() in - * case this class owns the MPI - * process. - */ - ~MPI_InitFinalize(); + using Utilities::MPI::MPI_InitFinalize; - private: - /** - * This flag tells the class - * whether it owns the MPI - * process (i.e., it has been - * constructed using the - * argc/argv input, or it has - * been copied). In the former - * case, the command - * MPI_Finalize() will - * be called at destruction. - */ - const bool owns_mpi; - }; + /** @} */ } diff --git a/tests/mpi/collective_01.cc b/tests/mpi/collective_01.cc index 9aa85ff371..95c9eadaf6 100644 --- a/tests/mpi/collective_01.cc +++ b/tests/mpi/collective_01.cc @@ -78,7 +78,7 @@ void test() int main(int argc, char *argv[]) { #ifdef DEAL_II_COMPILER_SUPPORTS_MPI - Utilities::System::MPI_InitFinalize mpi (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi (argc, argv); #else (void)argc; (void)argv; diff --git a/tests/mpi/collective_02.cc b/tests/mpi/collective_02.cc index b37b0c37d1..d053862530 100644 --- a/tests/mpi/collective_02.cc +++ b/tests/mpi/collective_02.cc @@ -50,7 +50,7 @@ void test() int main(int argc, char *argv[]) { #ifdef DEAL_II_COMPILER_SUPPORTS_MPI - Utilities::System::MPI_InitFinalize mpi (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi (argc, argv); #else (void)argc; (void)argv; diff --git a/tests/mpi/distribute_sp_01.cc b/tests/mpi/distribute_sp_01.cc index 21ab6ebb1e..c57cceeb02 100644 --- a/tests/mpi/distribute_sp_01.cc +++ b/tests/mpi/distribute_sp_01.cc @@ -92,7 +92,7 @@ void test_mpi() int main(int argc, char *argv[]) { #ifdef DEAL_II_COMPILER_SUPPORTS_MPI - Utilities::System::MPI_InitFinalize mpi (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi (argc, argv); #else (void)argc; (void)argv; diff --git a/tests/mpi/interpolate_01.cc b/tests/mpi/interpolate_01.cc index a32030d19e..e3acadf822 100644 --- a/tests/mpi/interpolate_01.cc +++ b/tests/mpi/interpolate_01.cc @@ -79,7 +79,7 @@ void test() int main(int argc, char *argv[]) { #ifdef DEAL_II_COMPILER_SUPPORTS_MPI - Utilities::System::MPI_InitFinalize mpi (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi (argc, argv); #else (void)argc; (void)argv; diff --git a/tests/mpi/no_flux_constraints.cc b/tests/mpi/no_flux_constraints.cc index 03779140cb..06038b07e7 100644 --- a/tests/mpi/no_flux_constraints.cc +++ b/tests/mpi/no_flux_constraints.cc @@ -167,7 +167,7 @@ void test() int main(int argc, char *argv[]) { { - Utilities::System::MPI_InitFinalize mpi_init (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_init (argc, argv); unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); diff --git a/tests/mpi/no_flux_constraints_02.cc b/tests/mpi/no_flux_constraints_02.cc index 4547a6569f..1feed297c7 100644 --- a/tests/mpi/no_flux_constraints_02.cc +++ b/tests/mpi/no_flux_constraints_02.cc @@ -202,7 +202,7 @@ void test() int main(int argc, char *argv[]) { { - Utilities::System::MPI_InitFinalize mpi_init (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_init (argc, argv); unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); diff --git a/tests/mpi/no_flux_constraints_03.cc b/tests/mpi/no_flux_constraints_03.cc index c7aadf82b9..36fd5acc39 100644 --- a/tests/mpi/no_flux_constraints_03.cc +++ b/tests/mpi/no_flux_constraints_03.cc @@ -173,7 +173,7 @@ void test() int main(int argc, char *argv[]) { { - Utilities::System::MPI_InitFinalize mpi_init (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_init (argc, argv); unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); diff --git a/tests/mpi/p4est_3d_constraintmatrix_04.cc b/tests/mpi/p4est_3d_constraintmatrix_04.cc index 28f41d9490..6eb6116554 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_04.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_04.cc @@ -91,7 +91,7 @@ void test () int main(int argc, char** argv) { - Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); const unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); deallog.push(Utilities::int_to_string(myid)); diff --git a/tests/mpi/point_to_point_pattern_01.cc b/tests/mpi/point_to_point_pattern_01.cc index af5ce58319..c9d641a66c 100644 --- a/tests/mpi/point_to_point_pattern_01.cc +++ b/tests/mpi/point_to_point_pattern_01.cc @@ -106,7 +106,7 @@ void test_mpi() int main(int argc, char *argv[]) { #ifdef DEAL_II_COMPILER_SUPPORTS_MPI - Utilities::System::MPI_InitFinalize mpi (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi (argc, argv); #else (void)argc; (void)argv; diff --git a/tests/mpi/simple_mpi_01.cc b/tests/mpi/simple_mpi_01.cc index ccb9e9a042..ab62177be0 100644 --- a/tests/mpi/simple_mpi_01.cc +++ b/tests/mpi/simple_mpi_01.cc @@ -63,7 +63,7 @@ void test_mpi() int main(int argc, char *argv[]) { #ifdef DEAL_II_COMPILER_SUPPORTS_MPI - Utilities::System::MPI_InitFinalize mpi (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi (argc, argv); #else (void)argc; (void)argv; diff --git a/tests/mpi/trilinos_compress_bug.cc b/tests/mpi/trilinos_compress_bug.cc index fcf912dad9..87b171e5ea 100644 --- a/tests/mpi/trilinos_compress_bug.cc +++ b/tests/mpi/trilinos_compress_bug.cc @@ -89,7 +89,7 @@ void test () int main (int argc, char **argv) { - Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); deallog.push(Utilities::int_to_string(myid)); diff --git a/tests/mpi/trilinos_ghost_01.cc b/tests/mpi/trilinos_ghost_01.cc index b31462140f..cbc2f52508 100644 --- a/tests/mpi/trilinos_ghost_01.cc +++ b/tests/mpi/trilinos_ghost_01.cc @@ -75,7 +75,7 @@ void test () int main (int argc, char **argv) { - Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); deallog.push(Utilities::int_to_string(myid)); diff --git a/tests/mpi/trilinos_ghost_02.cc b/tests/mpi/trilinos_ghost_02.cc index 8d07f85fa7..cddbf6d610 100644 --- a/tests/mpi/trilinos_ghost_02.cc +++ b/tests/mpi/trilinos_ghost_02.cc @@ -65,7 +65,7 @@ void test () int main (int argc, char **argv) { - Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); deallog.push(Utilities::int_to_string(myid)); diff --git a/tests/mpi/trilinos_ghost_03.cc b/tests/mpi/trilinos_ghost_03.cc index bdae6fbac4..0d29fade50 100644 --- a/tests/mpi/trilinos_ghost_03.cc +++ b/tests/mpi/trilinos_ghost_03.cc @@ -72,7 +72,7 @@ void test () int main (int argc, char **argv) { - Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); deallog.push(Utilities::int_to_string(myid)); diff --git a/tests/mpi/trilinos_ghost_03_linfty.cc b/tests/mpi/trilinos_ghost_03_linfty.cc index 8788326f59..d553a18cbc 100644 --- a/tests/mpi/trilinos_ghost_03_linfty.cc +++ b/tests/mpi/trilinos_ghost_03_linfty.cc @@ -79,7 +79,7 @@ void test () int main (int argc, char **argv) { - Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); deallog.push(Utilities::int_to_string(myid)); diff --git a/tests/mpi/trilinos_ghost_04.cc b/tests/mpi/trilinos_ghost_04.cc index aa61d0c8b9..857c8cb0ab 100644 --- a/tests/mpi/trilinos_ghost_04.cc +++ b/tests/mpi/trilinos_ghost_04.cc @@ -75,7 +75,7 @@ void test () int main (int argc, char **argv) { - Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); deallog.push(Utilities::int_to_string(myid)); diff --git a/tests/mpi/trilinos_ghost_05.cc b/tests/mpi/trilinos_ghost_05.cc index 7b554c9314..6fde269be7 100644 --- a/tests/mpi/trilinos_ghost_05.cc +++ b/tests/mpi/trilinos_ghost_05.cc @@ -80,7 +80,7 @@ void test () int main (int argc, char **argv) { - Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); deallog.push(Utilities::int_to_string(myid)); diff --git a/tests/mpi/trilinos_sparse_matrix_mmult_01.cc b/tests/mpi/trilinos_sparse_matrix_mmult_01.cc index a2a3344ca0..7a8bcc6117 100644 --- a/tests/mpi/trilinos_sparse_matrix_mmult_01.cc +++ b/tests/mpi/trilinos_sparse_matrix_mmult_01.cc @@ -146,7 +146,7 @@ void test () int main (int argc, char **argv) { - Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); deallog.push(Utilities::int_to_string(myid)); diff --git a/tests/mpi/trilinos_sparse_matrix_print_01.cc b/tests/mpi/trilinos_sparse_matrix_print_01.cc index 537d7b98d7..51933e753e 100644 --- a/tests/mpi/trilinos_sparse_matrix_print_01.cc +++ b/tests/mpi/trilinos_sparse_matrix_print_01.cc @@ -80,7 +80,7 @@ void test () int main (int argc, char **argv) { - Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); const unsigned int n_procs = Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD); unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); diff --git a/tests/mpi/trilinos_vector_reinit.cc b/tests/mpi/trilinos_vector_reinit.cc index 09fcbe8546..df999b16ea 100644 --- a/tests/mpi/trilinos_vector_reinit.cc +++ b/tests/mpi/trilinos_vector_reinit.cc @@ -58,7 +58,7 @@ void test () int main (int argc, char **argv) { - Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); deallog.push(Utilities::int_to_string(myid)); diff --git a/tests/trilinos/01.cc b/tests/trilinos/01.cc index 7fffa7c98e..975fe2c9be 100644 --- a/tests/trilinos/01.cc +++ b/tests/trilinos/01.cc @@ -57,7 +57,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try { diff --git a/tests/trilinos/02.cc b/tests/trilinos/02.cc index 8f468034a1..b1b00888f5 100644 --- a/tests/trilinos/02.cc +++ b/tests/trilinos/02.cc @@ -63,7 +63,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try { diff --git a/tests/trilinos/03.cc b/tests/trilinos/03.cc index aff7fac8af..8267734ce2 100644 --- a/tests/trilinos/03.cc +++ b/tests/trilinos/03.cc @@ -71,7 +71,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try { diff --git a/tests/trilinos/03a.cc b/tests/trilinos/03a.cc index fd96dac49a..5d28964d17 100644 --- a/tests/trilinos/03a.cc +++ b/tests/trilinos/03a.cc @@ -67,7 +67,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try { diff --git a/tests/trilinos/03b.cc b/tests/trilinos/03b.cc index 26876250af..bc9be3616c 100644 --- a/tests/trilinos/03b.cc +++ b/tests/trilinos/03b.cc @@ -74,7 +74,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try { diff --git a/tests/trilinos/04.cc b/tests/trilinos/04.cc index 5dd6c3e5c9..18cc2f8971 100644 --- a/tests/trilinos/04.cc +++ b/tests/trilinos/04.cc @@ -38,7 +38,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/05.cc b/tests/trilinos/05.cc index e17b933cb8..ec14b4ca79 100644 --- a/tests/trilinos/05.cc +++ b/tests/trilinos/05.cc @@ -53,7 +53,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/06.cc b/tests/trilinos/06.cc index 8b40234ff7..38256f2f8e 100644 --- a/tests/trilinos/06.cc +++ b/tests/trilinos/06.cc @@ -49,7 +49,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/07.cc b/tests/trilinos/07.cc index 419bd5d857..f925a401ab 100644 --- a/tests/trilinos/07.cc +++ b/tests/trilinos/07.cc @@ -49,7 +49,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/08.cc b/tests/trilinos/08.cc index 83802b966e..7e497ecd55 100644 --- a/tests/trilinos/08.cc +++ b/tests/trilinos/08.cc @@ -54,7 +54,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/09.cc b/tests/trilinos/09.cc index 595b1c1ae8..5360e9691c 100644 --- a/tests/trilinos/09.cc +++ b/tests/trilinos/09.cc @@ -60,7 +60,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/10.cc b/tests/trilinos/10.cc index 5cb7c7f0ef..25adfb00a2 100644 --- a/tests/trilinos/10.cc +++ b/tests/trilinos/10.cc @@ -60,7 +60,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/11.cc b/tests/trilinos/11.cc index b6b17d4e19..8b374a93bf 100644 --- a/tests/trilinos/11.cc +++ b/tests/trilinos/11.cc @@ -43,7 +43,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/12.cc b/tests/trilinos/12.cc index 355d4a222f..aa2f1802c0 100644 --- a/tests/trilinos/12.cc +++ b/tests/trilinos/12.cc @@ -56,7 +56,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/13.cc b/tests/trilinos/13.cc index 3df5a74eca..dd4cd5dc58 100644 --- a/tests/trilinos/13.cc +++ b/tests/trilinos/13.cc @@ -56,7 +56,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/14.cc b/tests/trilinos/14.cc index a73088bc0a..e11e02f303 100644 --- a/tests/trilinos/14.cc +++ b/tests/trilinos/14.cc @@ -62,7 +62,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/15.cc b/tests/trilinos/15.cc index b99cde12ee..27024ca533 100644 --- a/tests/trilinos/15.cc +++ b/tests/trilinos/15.cc @@ -59,7 +59,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/16.cc b/tests/trilinos/16.cc index caf02aa764..cb29a33dc2 100644 --- a/tests/trilinos/16.cc +++ b/tests/trilinos/16.cc @@ -61,7 +61,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/17.cc b/tests/trilinos/17.cc index 86aa9b05a3..f53337dc99 100644 --- a/tests/trilinos/17.cc +++ b/tests/trilinos/17.cc @@ -48,7 +48,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/18.cc b/tests/trilinos/18.cc index 70471dd2d7..11f2702bec 100644 --- a/tests/trilinos/18.cc +++ b/tests/trilinos/18.cc @@ -49,7 +49,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/19.cc b/tests/trilinos/19.cc index 1e97eccc20..02d7ab5ade 100644 --- a/tests/trilinos/19.cc +++ b/tests/trilinos/19.cc @@ -48,7 +48,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/20.cc b/tests/trilinos/20.cc index ed5b77840f..5ce0013512 100644 --- a/tests/trilinos/20.cc +++ b/tests/trilinos/20.cc @@ -57,7 +57,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/21.cc b/tests/trilinos/21.cc index 46fd72835b..c2f8597ba6 100644 --- a/tests/trilinos/21.cc +++ b/tests/trilinos/21.cc @@ -57,7 +57,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/22.cc b/tests/trilinos/22.cc index dd068a4325..029edd5e83 100644 --- a/tests/trilinos/22.cc +++ b/tests/trilinos/22.cc @@ -51,7 +51,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/23.cc b/tests/trilinos/23.cc index 6683cdabfc..b31374955c 100644 --- a/tests/trilinos/23.cc +++ b/tests/trilinos/23.cc @@ -58,7 +58,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/24.cc b/tests/trilinos/24.cc index 795085fd96..b63341f5ef 100644 --- a/tests/trilinos/24.cc +++ b/tests/trilinos/24.cc @@ -51,7 +51,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/25.cc b/tests/trilinos/25.cc index a14e0885a8..ee59c13854 100644 --- a/tests/trilinos/25.cc +++ b/tests/trilinos/25.cc @@ -49,7 +49,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/26.cc b/tests/trilinos/26.cc index 111be3c86f..3aea5c0087 100644 --- a/tests/trilinos/26.cc +++ b/tests/trilinos/26.cc @@ -48,7 +48,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/27.cc b/tests/trilinos/27.cc index 48ec921c38..dcfdc6d4c5 100644 --- a/tests/trilinos/27.cc +++ b/tests/trilinos/27.cc @@ -53,7 +53,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/28.cc b/tests/trilinos/28.cc index 187418a193..871045dc4e 100644 --- a/tests/trilinos/28.cc +++ b/tests/trilinos/28.cc @@ -55,7 +55,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/29.cc b/tests/trilinos/29.cc index 10009a54b3..4d97c66079 100644 --- a/tests/trilinos/29.cc +++ b/tests/trilinos/29.cc @@ -40,7 +40,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/30.cc b/tests/trilinos/30.cc index 8d58646d1f..df25e06463 100644 --- a/tests/trilinos/30.cc +++ b/tests/trilinos/30.cc @@ -48,7 +48,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/31.cc b/tests/trilinos/31.cc index cf70411719..482fb1a2b5 100644 --- a/tests/trilinos/31.cc +++ b/tests/trilinos/31.cc @@ -50,7 +50,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/32.cc b/tests/trilinos/32.cc index 5a2bad91c7..3a6c71c2af 100644 --- a/tests/trilinos/32.cc +++ b/tests/trilinos/32.cc @@ -50,7 +50,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/33.cc b/tests/trilinos/33.cc index 3106c2e2f3..e3db9c56d4 100644 --- a/tests/trilinos/33.cc +++ b/tests/trilinos/33.cc @@ -51,7 +51,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/34.cc b/tests/trilinos/34.cc index db6917de52..bd4251a067 100644 --- a/tests/trilinos/34.cc +++ b/tests/trilinos/34.cc @@ -51,7 +51,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/35.cc b/tests/trilinos/35.cc index 94ae2b0401..61abb6b0e3 100644 --- a/tests/trilinos/35.cc +++ b/tests/trilinos/35.cc @@ -67,7 +67,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/36.cc b/tests/trilinos/36.cc index e0d19ad7fe..8904cc5297 100644 --- a/tests/trilinos/36.cc +++ b/tests/trilinos/36.cc @@ -67,7 +67,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/37.cc b/tests/trilinos/37.cc index 3249953802..d68dc14b3a 100644 --- a/tests/trilinos/37.cc +++ b/tests/trilinos/37.cc @@ -47,7 +47,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/38.cc b/tests/trilinos/38.cc index 2b002d9b74..214be877a1 100644 --- a/tests/trilinos/38.cc +++ b/tests/trilinos/38.cc @@ -55,7 +55,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/39.cc b/tests/trilinos/39.cc index 907b00a648..c9b61bd45b 100644 --- a/tests/trilinos/39.cc +++ b/tests/trilinos/39.cc @@ -55,7 +55,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/40.cc b/tests/trilinos/40.cc index ebf558bbd4..232b378e5c 100644 --- a/tests/trilinos/40.cc +++ b/tests/trilinos/40.cc @@ -59,7 +59,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/41.cc b/tests/trilinos/41.cc index 9f13bd8b87..771cfeb3b7 100644 --- a/tests/trilinos/41.cc +++ b/tests/trilinos/41.cc @@ -55,7 +55,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/42.cc b/tests/trilinos/42.cc index 9b5cc03315..e43e395fa3 100644 --- a/tests/trilinos/42.cc +++ b/tests/trilinos/42.cc @@ -55,7 +55,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/43.cc b/tests/trilinos/43.cc index ce51000396..242f4d477a 100644 --- a/tests/trilinos/43.cc +++ b/tests/trilinos/43.cc @@ -59,7 +59,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/44.cc b/tests/trilinos/44.cc index 2e9b6a3571..f2b0a8eefd 100644 --- a/tests/trilinos/44.cc +++ b/tests/trilinos/44.cc @@ -63,7 +63,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/45.cc b/tests/trilinos/45.cc index f439acf398..eba5b00983 100644 --- a/tests/trilinos/45.cc +++ b/tests/trilinos/45.cc @@ -55,7 +55,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/46.cc b/tests/trilinos/46.cc index 1c3629cde0..22b9b13238 100644 --- a/tests/trilinos/46.cc +++ b/tests/trilinos/46.cc @@ -55,7 +55,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/47.cc b/tests/trilinos/47.cc index d543a70aa4..12a64bf459 100644 --- a/tests/trilinos/47.cc +++ b/tests/trilinos/47.cc @@ -59,7 +59,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/48.cc b/tests/trilinos/48.cc index 4a2617ca1b..13acf10a1b 100644 --- a/tests/trilinos/48.cc +++ b/tests/trilinos/48.cc @@ -61,7 +61,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/49.cc b/tests/trilinos/49.cc index 48736585e5..608b3f4289 100644 --- a/tests/trilinos/49.cc +++ b/tests/trilinos/49.cc @@ -52,7 +52,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/49a.cc b/tests/trilinos/49a.cc index 2f7dad1890..37b0da5966 100644 --- a/tests/trilinos/49a.cc +++ b/tests/trilinos/49a.cc @@ -66,7 +66,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/49b.cc b/tests/trilinos/49b.cc index 80c721ea72..22f08a0290 100644 --- a/tests/trilinos/49b.cc +++ b/tests/trilinos/49b.cc @@ -66,7 +66,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/50.cc b/tests/trilinos/50.cc index 8698ef1b92..919c7f49ca 100644 --- a/tests/trilinos/50.cc +++ b/tests/trilinos/50.cc @@ -68,7 +68,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/51.cc b/tests/trilinos/51.cc index 1996478cce..c5d7c35e8f 100644 --- a/tests/trilinos/51.cc +++ b/tests/trilinos/51.cc @@ -53,7 +53,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/52.cc b/tests/trilinos/52.cc index c371ed9349..629051d70b 100644 --- a/tests/trilinos/52.cc +++ b/tests/trilinos/52.cc @@ -58,7 +58,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/53.cc b/tests/trilinos/53.cc index d5e287f6bf..55f5289054 100644 --- a/tests/trilinos/53.cc +++ b/tests/trilinos/53.cc @@ -58,7 +58,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/54.cc b/tests/trilinos/54.cc index ace4ad0efe..5e55d3595a 100644 --- a/tests/trilinos/54.cc +++ b/tests/trilinos/54.cc @@ -58,7 +58,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/55.cc b/tests/trilinos/55.cc index 43da2f2bdb..6043a79714 100644 --- a/tests/trilinos/55.cc +++ b/tests/trilinos/55.cc @@ -58,7 +58,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/56.cc b/tests/trilinos/56.cc index 304c1cf9f0..1c9a960fc8 100644 --- a/tests/trilinos/56.cc +++ b/tests/trilinos/56.cc @@ -58,7 +58,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/57.cc b/tests/trilinos/57.cc index 4688756a33..ea7c0b7e98 100644 --- a/tests/trilinos/57.cc +++ b/tests/trilinos/57.cc @@ -56,7 +56,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/58.cc b/tests/trilinos/58.cc index 143f992268..603e22ea1a 100644 --- a/tests/trilinos/58.cc +++ b/tests/trilinos/58.cc @@ -58,7 +58,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/59.cc b/tests/trilinos/59.cc index 8d994273a8..0f460e94e8 100644 --- a/tests/trilinos/59.cc +++ b/tests/trilinos/59.cc @@ -61,7 +61,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/60.cc b/tests/trilinos/60.cc index bb337cf61f..e77219946f 100644 --- a/tests/trilinos/60.cc +++ b/tests/trilinos/60.cc @@ -58,7 +58,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/61.cc b/tests/trilinos/61.cc index 8e7a58bc68..952eabaf44 100644 --- a/tests/trilinos/61.cc +++ b/tests/trilinos/61.cc @@ -61,7 +61,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/62.cc b/tests/trilinos/62.cc index ffb7a21ead..0c96d84a87 100644 --- a/tests/trilinos/62.cc +++ b/tests/trilinos/62.cc @@ -46,7 +46,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/63.cc b/tests/trilinos/63.cc index 22f8e312ef..4bb251063f 100644 --- a/tests/trilinos/63.cc +++ b/tests/trilinos/63.cc @@ -44,7 +44,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/64.cc b/tests/trilinos/64.cc index ea155a7505..1b7b9addb0 100644 --- a/tests/trilinos/64.cc +++ b/tests/trilinos/64.cc @@ -49,7 +49,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/65.cc b/tests/trilinos/65.cc index 78c6f26a8f..3c61d1b109 100644 --- a/tests/trilinos/65.cc +++ b/tests/trilinos/65.cc @@ -43,7 +43,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/66.cc b/tests/trilinos/66.cc index d7973e08fb..be6d44ffc5 100644 --- a/tests/trilinos/66.cc +++ b/tests/trilinos/66.cc @@ -100,7 +100,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/67.cc b/tests/trilinos/67.cc index 820279790c..09745e2e76 100644 --- a/tests/trilinos/67.cc +++ b/tests/trilinos/67.cc @@ -106,7 +106,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/68.cc b/tests/trilinos/68.cc index 7affbeaef0..8716e81e71 100644 --- a/tests/trilinos/68.cc +++ b/tests/trilinos/68.cc @@ -104,7 +104,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/69.cc b/tests/trilinos/69.cc index 642c06d6ed..fce91f9230 100644 --- a/tests/trilinos/69.cc +++ b/tests/trilinos/69.cc @@ -110,7 +110,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/70.cc b/tests/trilinos/70.cc index 3a7357fe2c..7b1386ff7f 100644 --- a/tests/trilinos/70.cc +++ b/tests/trilinos/70.cc @@ -28,7 +28,7 @@ int main (int argc, char** argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); if (typeid(TrilinosScalar)==typeid(double)) diff --git a/tests/trilinos/block_sparse_matrix_add_01.cc b/tests/trilinos/block_sparse_matrix_add_01.cc index 18263ef84a..01b85b6a32 100644 --- a/tests/trilinos/block_sparse_matrix_add_01.cc +++ b/tests/trilinos/block_sparse_matrix_add_01.cc @@ -131,7 +131,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try { diff --git a/tests/trilinos/block_sparse_matrix_set_01.cc b/tests/trilinos/block_sparse_matrix_set_01.cc index d0b06d5b7a..c71610f152 100644 --- a/tests/trilinos/block_sparse_matrix_set_01.cc +++ b/tests/trilinos/block_sparse_matrix_set_01.cc @@ -132,7 +132,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try { diff --git a/tests/trilinos/block_vector_iterator_01.cc b/tests/trilinos/block_vector_iterator_01.cc index eb15603239..40010e2d99 100644 --- a/tests/trilinos/block_vector_iterator_01.cc +++ b/tests/trilinos/block_vector_iterator_01.cc @@ -87,7 +87,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/block_vector_iterator_02.cc b/tests/trilinos/block_vector_iterator_02.cc index 5e73a20d82..73771676c3 100644 --- a/tests/trilinos/block_vector_iterator_02.cc +++ b/tests/trilinos/block_vector_iterator_02.cc @@ -81,7 +81,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/block_vector_iterator_03.cc b/tests/trilinos/block_vector_iterator_03.cc index 657408bae0..12f955dc6b 100644 --- a/tests/trilinos/block_vector_iterator_03.cc +++ b/tests/trilinos/block_vector_iterator_03.cc @@ -328,7 +328,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/deal_solver_01.cc b/tests/trilinos/deal_solver_01.cc index ec3ca6e263..57c280e6fd 100644 --- a/tests/trilinos/deal_solver_01.cc +++ b/tests/trilinos/deal_solver_01.cc @@ -66,7 +66,7 @@ int main(int argc, char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); { diff --git a/tests/trilinos/deal_solver_02.cc b/tests/trilinos/deal_solver_02.cc index 832e4a54e6..f294c944b8 100644 --- a/tests/trilinos/deal_solver_02.cc +++ b/tests/trilinos/deal_solver_02.cc @@ -68,7 +68,7 @@ int main(int argc, char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); { diff --git a/tests/trilinos/deal_solver_03.cc b/tests/trilinos/deal_solver_03.cc index ef10411d53..cd6a820e08 100644 --- a/tests/trilinos/deal_solver_03.cc +++ b/tests/trilinos/deal_solver_03.cc @@ -68,7 +68,7 @@ int main(int argc, char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); { diff --git a/tests/trilinos/deal_solver_04.cc b/tests/trilinos/deal_solver_04.cc index 47daa704cd..e9e64cc722 100644 --- a/tests/trilinos/deal_solver_04.cc +++ b/tests/trilinos/deal_solver_04.cc @@ -67,7 +67,7 @@ int main(int argc, char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); { diff --git a/tests/trilinos/deal_solver_05.cc b/tests/trilinos/deal_solver_05.cc index ae687df869..0b4d77587b 100644 --- a/tests/trilinos/deal_solver_05.cc +++ b/tests/trilinos/deal_solver_05.cc @@ -66,7 +66,7 @@ int main(int argc, char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); { diff --git a/tests/trilinos/deal_solver_06.cc b/tests/trilinos/deal_solver_06.cc index 8e09f72de6..8c9ed100b0 100644 --- a/tests/trilinos/deal_solver_06.cc +++ b/tests/trilinos/deal_solver_06.cc @@ -65,7 +65,7 @@ int main(int argc, char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); { diff --git a/tests/trilinos/parallel_sparse_matrix_01.cc b/tests/trilinos/parallel_sparse_matrix_01.cc index f636e729e4..cfd78a1c8a 100644 --- a/tests/trilinos/parallel_sparse_matrix_01.cc +++ b/tests/trilinos/parallel_sparse_matrix_01.cc @@ -106,7 +106,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/slowness_01.cc b/tests/trilinos/slowness_01.cc index 1259de1937..eb79d3f63c 100644 --- a/tests/trilinos/slowness_01.cc +++ b/tests/trilinos/slowness_01.cc @@ -111,7 +111,7 @@ int main (int argc,char **argv) deallog.attach(logfile); deallog.depth_console(0); - Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); try { diff --git a/tests/trilinos/slowness_02.cc b/tests/trilinos/slowness_02.cc index 17bb9edb0f..fd8c1a0dc8 100644 --- a/tests/trilinos/slowness_02.cc +++ b/tests/trilinos/slowness_02.cc @@ -82,7 +82,7 @@ int main (int argc,char **argv) deallog.attach(logfile); deallog.depth_console(0); - Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); try { diff --git a/tests/trilinos/slowness_03.cc b/tests/trilinos/slowness_03.cc index cd49121491..86aaf7c955 100644 --- a/tests/trilinos/slowness_03.cc +++ b/tests/trilinos/slowness_03.cc @@ -83,7 +83,7 @@ int main (int argc,char **argv) deallog.attach(logfile); deallog.depth_console(0); - Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); try { diff --git a/tests/trilinos/slowness_04.cc b/tests/trilinos/slowness_04.cc index 0f565ccd93..963dc75a82 100644 --- a/tests/trilinos/slowness_04.cc +++ b/tests/trilinos/slowness_04.cc @@ -114,7 +114,7 @@ int main (int argc,char **argv) deallog.attach(logfile); deallog.depth_console(0); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try { diff --git a/tests/trilinos/solver_03.cc b/tests/trilinos/solver_03.cc index bac9952c81..56b121d7b8 100644 --- a/tests/trilinos/solver_03.cc +++ b/tests/trilinos/solver_03.cc @@ -61,7 +61,7 @@ int main(int argc, char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); { diff --git a/tests/trilinos/solver_05.cc b/tests/trilinos/solver_05.cc index e2a9641fd7..8284891c42 100644 --- a/tests/trilinos/solver_05.cc +++ b/tests/trilinos/solver_05.cc @@ -61,7 +61,7 @@ int main(int argc, char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); { diff --git a/tests/trilinos/solver_07.cc b/tests/trilinos/solver_07.cc index 3712227c39..04274ec2fb 100644 --- a/tests/trilinos/solver_07.cc +++ b/tests/trilinos/solver_07.cc @@ -61,7 +61,7 @@ int main(int argc, char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization(argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); { SolverControl control(200, 1.e-3); diff --git a/tests/trilinos/sparse_matrix_01.cc b/tests/trilinos/sparse_matrix_01.cc index 1aa656fee5..51dfe84e5e 100644 --- a/tests/trilinos/sparse_matrix_01.cc +++ b/tests/trilinos/sparse_matrix_01.cc @@ -34,7 +34,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); IndexSet row_partitioning (3); IndexSet col_partitioning (4); diff --git a/tests/trilinos/sparse_matrix_add_01.cc b/tests/trilinos/sparse_matrix_add_01.cc index e22aa3dec9..04ffb49891 100644 --- a/tests/trilinos/sparse_matrix_add_01.cc +++ b/tests/trilinos/sparse_matrix_add_01.cc @@ -91,7 +91,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try { diff --git a/tests/trilinos/sparse_matrix_add_02.cc b/tests/trilinos/sparse_matrix_add_02.cc index ab1b3cf1d9..090fc2225a 100644 --- a/tests/trilinos/sparse_matrix_add_02.cc +++ b/tests/trilinos/sparse_matrix_add_02.cc @@ -91,7 +91,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try { diff --git a/tests/trilinos/sparse_matrix_iterator_01.cc b/tests/trilinos/sparse_matrix_iterator_01.cc index 03d7a1127d..55d7fd9b10 100644 --- a/tests/trilinos/sparse_matrix_iterator_01.cc +++ b/tests/trilinos/sparse_matrix_iterator_01.cc @@ -47,7 +47,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/sparse_matrix_set_01.cc b/tests/trilinos/sparse_matrix_set_01.cc index 8882e974e0..d204009651 100644 --- a/tests/trilinos/sparse_matrix_set_01.cc +++ b/tests/trilinos/sparse_matrix_set_01.cc @@ -87,7 +87,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try { diff --git a/tests/trilinos/sparse_matrix_set_02.cc b/tests/trilinos/sparse_matrix_set_02.cc index 4bd2555f2c..7c8d405cfc 100644 --- a/tests/trilinos/sparse_matrix_set_02.cc +++ b/tests/trilinos/sparse_matrix_set_02.cc @@ -88,7 +88,7 @@ int main (int argc,char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try { diff --git a/tests/trilinos/sparse_matrix_vector_01.cc b/tests/trilinos/sparse_matrix_vector_01.cc index 7f99048460..45e4296c81 100644 --- a/tests/trilinos/sparse_matrix_vector_01.cc +++ b/tests/trilinos/sparse_matrix_vector_01.cc @@ -64,7 +64,7 @@ int main (int argc, char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/sparse_matrix_vector_02.cc b/tests/trilinos/sparse_matrix_vector_02.cc index 6c53eaf3ea..86f8c2fb03 100644 --- a/tests/trilinos/sparse_matrix_vector_02.cc +++ b/tests/trilinos/sparse_matrix_vector_02.cc @@ -64,7 +64,7 @@ int main (int argc, char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/sparse_matrix_vector_03.cc b/tests/trilinos/sparse_matrix_vector_03.cc index ef89486e55..30703dc146 100644 --- a/tests/trilinos/sparse_matrix_vector_03.cc +++ b/tests/trilinos/sparse_matrix_vector_03.cc @@ -67,7 +67,7 @@ int main (int argc, char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/sparse_matrix_vector_04.cc b/tests/trilinos/sparse_matrix_vector_04.cc index 0eea79f31f..938c0997eb 100644 --- a/tests/trilinos/sparse_matrix_vector_04.cc +++ b/tests/trilinos/sparse_matrix_vector_04.cc @@ -66,7 +66,7 @@ int main (int argc, char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/sparse_matrix_vector_05.cc b/tests/trilinos/sparse_matrix_vector_05.cc index a8fa45b4ee..53c29cbf87 100644 --- a/tests/trilinos/sparse_matrix_vector_05.cc +++ b/tests/trilinos/sparse_matrix_vector_05.cc @@ -70,7 +70,7 @@ int main (int argc, char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/sparse_matrix_vector_06.cc b/tests/trilinos/sparse_matrix_vector_06.cc index 8a126c42e0..a88b9b2491 100644 --- a/tests/trilinos/sparse_matrix_vector_06.cc +++ b/tests/trilinos/sparse_matrix_vector_06.cc @@ -62,7 +62,7 @@ int main (int argc, char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/sparse_matrix_vector_07.cc b/tests/trilinos/sparse_matrix_vector_07.cc index 7304bb8fc5..8015338e33 100644 --- a/tests/trilinos/sparse_matrix_vector_07.cc +++ b/tests/trilinos/sparse_matrix_vector_07.cc @@ -72,7 +72,7 @@ int main (int argc, char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/sparsity_pattern_01.cc b/tests/trilinos/sparsity_pattern_01.cc index 7d18ea67c0..18189386fc 100644 --- a/tests/trilinos/sparsity_pattern_01.cc +++ b/tests/trilinos/sparsity_pattern_01.cc @@ -19,7 +19,7 @@ int main (int argc, char** argv) { - Utilities::System::MPI_InitFinalize mpi_init (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_init (argc, argv); std::ofstream logfile("sparsity_pattern_01/output"); logfile.setf(std::ios::fixed); deallog << std::setprecision(3); diff --git a/tests/trilinos/sparsity_pattern_02.cc b/tests/trilinos/sparsity_pattern_02.cc index ab95998bf9..572bca5e74 100644 --- a/tests/trilinos/sparsity_pattern_02.cc +++ b/tests/trilinos/sparsity_pattern_02.cc @@ -19,7 +19,7 @@ int main (int argc, char** argv) { - Utilities::System::MPI_InitFinalize mpi_init (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_init (argc, argv); std::ofstream logfile("sparsity_pattern_02/output"); logfile.setf(std::ios::fixed); deallog << std::setprecision(3); diff --git a/tests/trilinos/sparsity_pattern_03.cc b/tests/trilinos/sparsity_pattern_03.cc index 3c3af1fcc1..07cc5a260c 100644 --- a/tests/trilinos/sparsity_pattern_03.cc +++ b/tests/trilinos/sparsity_pattern_03.cc @@ -19,7 +19,7 @@ int main (int argc, char** argv) { - Utilities::System::MPI_InitFinalize mpi_init (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_init (argc, argv); std::ofstream logfile("sparsity_pattern_03/output"); logfile.setf(std::ios::fixed); diff --git a/tests/trilinos/vector_assign_01.cc b/tests/trilinos/vector_assign_01.cc index ad7289ef95..86aa52cb7d 100644 --- a/tests/trilinos/vector_assign_01.cc +++ b/tests/trilinos/vector_assign_01.cc @@ -54,7 +54,7 @@ int main (int argc, char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/vector_assign_02.cc b/tests/trilinos/vector_assign_02.cc index 947bf16519..06dde6dcce 100644 --- a/tests/trilinos/vector_assign_02.cc +++ b/tests/trilinos/vector_assign_02.cc @@ -53,7 +53,7 @@ int main (int argc, char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/vector_equality_1.cc b/tests/trilinos/vector_equality_1.cc index d362793353..be1cddd02a 100644 --- a/tests/trilinos/vector_equality_1.cc +++ b/tests/trilinos/vector_equality_1.cc @@ -49,7 +49,7 @@ int main (int argc, char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/vector_equality_2.cc b/tests/trilinos/vector_equality_2.cc index e56350e473..7bb6b3cbe3 100644 --- a/tests/trilinos/vector_equality_2.cc +++ b/tests/trilinos/vector_equality_2.cc @@ -51,7 +51,7 @@ int main (int argc, char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/vector_equality_3.cc b/tests/trilinos/vector_equality_3.cc index f8aa4a1497..fb3e2fbfa4 100644 --- a/tests/trilinos/vector_equality_3.cc +++ b/tests/trilinos/vector_equality_3.cc @@ -49,7 +49,7 @@ int main (int argc, char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try diff --git a/tests/trilinos/vector_equality_4.cc b/tests/trilinos/vector_equality_4.cc index dfdc8f03c0..d985b55cdf 100644 --- a/tests/trilinos/vector_equality_4.cc +++ b/tests/trilinos/vector_equality_4.cc @@ -51,7 +51,7 @@ int main (int argc, char **argv) deallog.depth_console(0); deallog.threshold_double(1.e-10); - Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); try -- 2.39.5