From bd76b8867c0acf41b7bac9ba116fbc7e246d397a Mon Sep 17 00:00:00 2001 From: kronbichler Date: Thu, 6 Nov 2008 10:21:30 +0000 Subject: [PATCH] Added an MPI_InitFinalize to the files, so that at least some tests work now. git-svn-id: https://svn.dealii.org/trunk@17484 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/trilinos/01.cc | 14 ++++++++------ tests/trilinos/02.cc | 8 +++++--- tests/trilinos/03.cc | 8 +++++--- tests/trilinos/03a.cc | 10 +++++++--- tests/trilinos/03b.cc | 7 +++++-- tests/trilinos/04.cc | 8 ++++++-- tests/trilinos/05.cc | 8 ++++++-- tests/trilinos/06.cc | 8 ++++++-- tests/trilinos/07.cc | 8 ++++++-- tests/trilinos/08.cc | 8 ++++++-- tests/trilinos/09.cc | 8 ++++++-- tests/trilinos/10.cc | 8 ++++++-- tests/trilinos/11.cc | 8 ++++++-- tests/trilinos/12.cc | 8 ++++++-- tests/trilinos/13.cc | 8 ++++++-- tests/trilinos/14.cc | 8 ++++++-- tests/trilinos/15.cc | 8 ++++++-- tests/trilinos/16.cc | 8 ++++++-- tests/trilinos/17.cc | 8 ++++++-- tests/trilinos/18.cc | 8 ++++++-- tests/trilinos/19.cc | 8 ++++++-- tests/trilinos/20.cc | 8 ++++++-- tests/trilinos/21.cc | 8 ++++++-- tests/trilinos/22.cc | 8 ++++++-- tests/trilinos/23.cc | 8 ++++++-- tests/trilinos/24.cc | 8 ++++++-- tests/trilinos/25.cc | 8 ++++++-- tests/trilinos/26.cc | 8 ++++++-- tests/trilinos/27.cc | 8 ++++++-- tests/trilinos/28.cc | 8 ++++++-- tests/trilinos/29.cc | 8 ++++++-- tests/trilinos/30.cc | 8 ++++++-- tests/trilinos/31.cc | 8 ++++++-- tests/trilinos/32.cc | 8 ++++++-- tests/trilinos/33.cc | 8 ++++++-- tests/trilinos/34.cc | 8 ++++++-- tests/trilinos/35.cc | 8 ++++++-- tests/trilinos/36.cc | 8 ++++++-- tests/trilinos/37.cc | 8 ++++++-- tests/trilinos/38.cc | 8 ++++++-- tests/trilinos/39.cc | 8 ++++++-- tests/trilinos/40.cc | 8 ++++++-- tests/trilinos/41.cc | 8 ++++++-- tests/trilinos/42.cc | 8 ++++++-- tests/trilinos/43.cc | 8 ++++++-- tests/trilinos/44.cc | 8 ++++++-- tests/trilinos/45.cc | 8 ++++++-- tests/trilinos/46.cc | 8 ++++++-- tests/trilinos/47.cc | 8 ++++++-- tests/trilinos/48.cc | 8 ++++++-- tests/trilinos/49.cc | 8 ++++++-- tests/trilinos/50.cc | 8 ++++++-- tests/trilinos/51.cc | 8 ++++++-- tests/trilinos/52.cc | 8 ++++++-- tests/trilinos/53.cc | 8 ++++++-- tests/trilinos/54.cc | 8 ++++++-- tests/trilinos/55.cc | 8 ++++++-- tests/trilinos/56.cc | 8 ++++++-- tests/trilinos/57.cc | 8 ++++++-- tests/trilinos/58.cc | 8 ++++++-- tests/trilinos/59.cc | 8 ++++++-- tests/trilinos/60.cc | 8 ++++++-- tests/trilinos/61.cc | 8 ++++++-- tests/trilinos/62.cc | 8 ++++++-- tests/trilinos/63.cc | 8 ++++++-- tests/trilinos/64.cc | 8 ++++++-- tests/trilinos/65.cc | 8 ++++++-- tests/trilinos/66.cc | 8 ++++++-- tests/trilinos/67.cc | 8 ++++++-- tests/trilinos/68.cc | 8 ++++++-- tests/trilinos/69.cc | 8 ++++++-- tests/trilinos/70.cc | 8 ++++++-- tests/trilinos/block_vector_iterator_01.cc | 8 ++++++-- tests/trilinos/block_vector_iterator_02.cc | 8 ++++++-- tests/trilinos/block_vector_iterator_03.cc | 8 ++++++-- tests/trilinos/deal_solver_01.cc | 8 ++++++-- tests/trilinos/deal_solver_02.cc | 8 ++++++-- tests/trilinos/deal_solver_03.cc | 8 ++++++-- tests/trilinos/deal_solver_04.cc | 8 ++++++-- tests/trilinos/deal_solver_05.cc | 8 ++++++-- tests/trilinos/deal_solver_06.cc | 8 ++++++-- tests/trilinos/parallel_sparse_matrix_01.cc | 8 ++++++-- tests/trilinos/slowness_01.cc | 3 ++- tests/trilinos/slowness_02.cc | 3 ++- tests/trilinos/slowness_03.cc | 3 ++- tests/trilinos/slowness_04.cc | 3 ++- tests/trilinos/solver_01.cc | 8 ++++++-- tests/trilinos/solver_02.cc | 8 ++++++-- tests/trilinos/solver_03.cc | 8 ++++++-- tests/trilinos/solver_04.cc | 8 ++++++-- tests/trilinos/solver_05.cc | 8 ++++++-- tests/trilinos/solver_06.cc | 8 ++++++-- tests/trilinos/solver_07.cc | 8 ++++++-- tests/trilinos/solver_08.cc | 8 ++++++-- tests/trilinos/solver_09.cc | 8 ++++++-- tests/trilinos/solver_10.cc | 8 ++++++-- tests/trilinos/solver_11.cc | 8 ++++++-- tests/trilinos/sparse_matrix_iterator_01.cc | 8 ++++++-- tests/trilinos/sparse_matrix_vector_01.cc | 8 ++++++-- tests/trilinos/sparse_matrix_vector_02.cc | 8 ++++++-- tests/trilinos/sparse_matrix_vector_03.cc | 8 ++++++-- tests/trilinos/sparse_matrix_vector_04.cc | 8 ++++++-- tests/trilinos/sparse_matrix_vector_05.cc | 8 ++++++-- tests/trilinos/sparse_matrix_vector_06.cc | 8 ++++++-- tests/trilinos/sparse_matrix_vector_07.cc | 8 ++++++-- tests/trilinos/vector_assign_01.cc | 8 ++++++-- tests/trilinos/vector_assign_02.cc | 8 ++++++-- tests/trilinos/vector_equality_1.cc | 8 ++++++-- tests/trilinos/vector_equality_2.cc | 8 ++++++-- tests/trilinos/vector_equality_3.cc | 8 ++++++-- tests/trilinos/vector_equality_4.cc | 8 ++++++-- 111 files changed, 650 insertions(+), 225 deletions(-) diff --git a/tests/trilinos/01.cc b/tests/trilinos/01.cc index 02a0f5df50..8c5ac4294e 100644 --- a/tests/trilinos/01.cc +++ b/tests/trilinos/01.cc @@ -12,11 +12,12 @@ //---------------------------- trilinos_01.cc --------------------------- -// check setting elements in a petsc matrix using +// check setting elements in a trilinos matrix using // TrilinosWrappers::SparseMatrix::set() -#include "../tests.h" -#include +#include "../tests.h" +#include +#include #include #include @@ -30,7 +31,7 @@ void test (TrilinosWrappers::SparseMatrix &m) m.set (i,j, i*j*.5+.5); m.compress (); - + // then make sure we retrieve the same ones for (unsigned int i=0; i #include #include #include @@ -41,7 +42,6 @@ void test (TrilinosWrappers::SparseMatrix &m) } else { - Assert (m(i,j) == 0, ExcInternalError()); Assert (m.el(i,j) == 0, ExcInternalError()); } @@ -55,7 +55,9 @@ int main (int argc,char **argv) std::ofstream logfile("02/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); try { diff --git a/tests/trilinos/03.cc b/tests/trilinos/03.cc index c4b11986a7..21e7a224c1 100644 --- a/tests/trilinos/03.cc +++ b/tests/trilinos/03.cc @@ -16,7 +16,8 @@ // intermixed. this poses PETSc some problems, since one has to flush some // buffer in between these two types of operations -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -47,7 +48,6 @@ void test (TrilinosWrappers::SparseMatrix &m) } else { - Assert (m(i,j) == 0, ExcInternalError()); Assert (m.el(i,j) == 0, ExcInternalError()); } @@ -61,7 +61,9 @@ int main (int argc,char **argv) std::ofstream logfile("03/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); try { diff --git a/tests/trilinos/03a.cc b/tests/trilinos/03a.cc index b9f3369e80..c878454867 100644 --- a/tests/trilinos/03a.cc +++ b/tests/trilinos/03a.cc @@ -19,7 +19,8 @@ // in contrast to trilinos_03, we set and add the same elements here twice, to // get double the original value -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -32,6 +33,8 @@ void test (TrilinosWrappers::SparseMatrix &m) for (unsigned int j=0; j #include #include #include @@ -69,7 +70,9 @@ int main (int argc,char **argv) std::ofstream logfile("03b/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); try { diff --git a/tests/trilinos/04.cc b/tests/trilinos/04.cc index bf9bf622cf..671ad9f60d 100644 --- a/tests/trilinos/04.cc +++ b/tests/trilinos/04.cc @@ -14,7 +14,8 @@ // check querying matrix sizes -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -35,7 +36,10 @@ int main (int argc,char **argv) std::ofstream logfile("04/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/05.cc b/tests/trilinos/05.cc index 903d56e479..f0f64e80ac 100644 --- a/tests/trilinos/05.cc +++ b/tests/trilinos/05.cc @@ -15,7 +15,8 @@ // check querying the number of nonzero elements in // TrilinosWrappers::SparseMatrix -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -50,7 +51,10 @@ int main (int argc,char **argv) std::ofstream logfile("05/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/06.cc b/tests/trilinos/06.cc index cfc5530b87..8ffba06838 100644 --- a/tests/trilinos/06.cc +++ b/tests/trilinos/06.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::SparseMatrix::l1_norm -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -46,7 +47,10 @@ int main (int argc,char **argv) std::ofstream logfile("06/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/07.cc b/tests/trilinos/07.cc index cf1d666b39..3bfe0e6deb 100644 --- a/tests/trilinos/07.cc +++ b/tests/trilinos/07.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::SparseMatrix::linfty_norm -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -46,7 +47,10 @@ int main (int argc,char **argv) std::ofstream logfile("07/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/08.cc b/tests/trilinos/08.cc index 2d2f9c535e..c10af21ada 100644 --- a/tests/trilinos/08.cc +++ b/tests/trilinos/08.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::SparseMatrix::frobenius_norm -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -51,7 +52,10 @@ int main (int argc,char **argv) std::ofstream logfile("08/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/09.cc b/tests/trilinos/09.cc index 79e628d01d..985ed7df15 100644 --- a/tests/trilinos/09.cc +++ b/tests/trilinos/09.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::SparseMatrix::operator *= -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -58,7 +59,10 @@ int main (int argc,char **argv) std::ofstream logfile("09/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/10.cc b/tests/trilinos/10.cc index 43d2af75fd..7e6cba76f1 100644 --- a/tests/trilinos/10.cc +++ b/tests/trilinos/10.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::SparseMatrix::operator /= -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -58,7 +59,10 @@ int main (int argc,char **argv) std::ofstream logfile("10/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/11.cc b/tests/trilinos/11.cc index d906d06a71..b6a059dfe7 100644 --- a/tests/trilinos/11.cc +++ b/tests/trilinos/11.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::size() -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -40,7 +41,10 @@ int main (int argc,char **argv) std::ofstream logfile("11/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/12.cc b/tests/trilinos/12.cc index 50414f14db..a931c891e6 100644 --- a/tests/trilinos/12.cc +++ b/tests/trilinos/12.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::operator() in set-mode -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -53,7 +54,10 @@ int main (int argc,char **argv) std::ofstream logfile("12/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/13.cc b/tests/trilinos/13.cc index ba362f5274..692730b23e 100644 --- a/tests/trilinos/13.cc +++ b/tests/trilinos/13.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::operator() in add-mode -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -53,7 +54,10 @@ int main (int argc,char **argv) std::ofstream logfile("13/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/14.cc b/tests/trilinos/14.cc index 39f6894552..a1f3ffbb1f 100644 --- a/tests/trilinos/14.cc +++ b/tests/trilinos/14.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::operator() in set/add-mode alternatingly -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -59,7 +60,10 @@ int main (int argc,char **argv) std::ofstream logfile("14/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/15.cc b/tests/trilinos/15.cc index 19d8e8af9d..5565564b0b 100644 --- a/tests/trilinos/15.cc +++ b/tests/trilinos/15.cc @@ -15,7 +15,8 @@ // check TrilinosWrappers::Vector::operator() in set/add-mode alternatingly, but // writing to the same elements -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -56,7 +57,10 @@ int main (int argc,char **argv) std::ofstream logfile("15/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/16.cc b/tests/trilinos/16.cc index 7d869b2bc8..211487fa51 100644 --- a/tests/trilinos/16.cc +++ b/tests/trilinos/16.cc @@ -15,7 +15,8 @@ // check TrilinosWrappers::Vector::operator() in set/add-mode alternatingly, but // writing and overwriting the same elements -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -58,7 +59,10 @@ int main (int argc,char **argv) std::ofstream logfile("16/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/17.cc b/tests/trilinos/17.cc index f73f95f0a1..768efbe78c 100644 --- a/tests/trilinos/17.cc +++ b/tests/trilinos/17.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::l1_norm() -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -45,7 +46,10 @@ int main (int argc,char **argv) std::ofstream logfile("17/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/18.cc b/tests/trilinos/18.cc index b22380f1ba..c67b5bc6e7 100644 --- a/tests/trilinos/18.cc +++ b/tests/trilinos/18.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::l2_norm() -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -46,7 +47,10 @@ int main (int argc,char **argv) std::ofstream logfile("18/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/19.cc b/tests/trilinos/19.cc index ea2c7e5399..2b135fe668 100644 --- a/tests/trilinos/19.cc +++ b/tests/trilinos/19.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::linfty_norm() -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -45,7 +46,10 @@ int main (int argc,char **argv) std::ofstream logfile("19/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/20.cc b/tests/trilinos/20.cc index e416571023..b7d2e87103 100644 --- a/tests/trilinos/20.cc +++ b/tests/trilinos/20.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::operator *= -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -54,7 +55,10 @@ int main (int argc,char **argv) std::ofstream logfile("20/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/21.cc b/tests/trilinos/21.cc index 1e819ec726..0fe7b8ab1b 100644 --- a/tests/trilinos/21.cc +++ b/tests/trilinos/21.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::operator /= -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -54,7 +55,10 @@ int main (int argc,char **argv) std::ofstream logfile("21/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/22.cc b/tests/trilinos/22.cc index 0d0f1778fe..18baad7134 100644 --- a/tests/trilinos/22.cc +++ b/tests/trilinos/22.cc @@ -15,7 +15,8 @@ // check TrilinosWrappers::Vector::operator*(Vector) on two vectors that are // orthogonal -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -48,7 +49,10 @@ int main (int argc,char **argv) std::ofstream logfile("22/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/23.cc b/tests/trilinos/23.cc index 547972b4d1..cc72557858 100644 --- a/tests/trilinos/23.cc +++ b/tests/trilinos/23.cc @@ -15,7 +15,8 @@ // check TrilinosWrappers::Vector::operator*(Vector) on two vectors that are // not orthogonal -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -55,7 +56,10 @@ int main (int argc,char **argv) std::ofstream logfile("23/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/24.cc b/tests/trilinos/24.cc index d987aa00ee..b9c316cbe8 100644 --- a/tests/trilinos/24.cc +++ b/tests/trilinos/24.cc @@ -16,7 +16,8 @@ // function has since been removed, so we test for v=0 instead, although that // may be covered by one of the other tests -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -48,7 +49,10 @@ int main (int argc,char **argv) std::ofstream logfile("24/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/25.cc b/tests/trilinos/25.cc index 1dc46c11aa..c757c0780a 100644 --- a/tests/trilinos/25.cc +++ b/tests/trilinos/25.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::operator = (TrilinosScalar) with setting to zero -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -46,7 +47,10 @@ int main (int argc,char **argv) std::ofstream logfile("25/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/26.cc b/tests/trilinos/26.cc index d41cdce143..6586959a84 100644 --- a/tests/trilinos/26.cc +++ b/tests/trilinos/26.cc @@ -15,7 +15,8 @@ // check TrilinosWrappers::Vector::operator = (TrilinosScalar) with setting to a // nonzero value -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -45,7 +46,10 @@ int main (int argc,char **argv) std::ofstream logfile("26/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/27.cc b/tests/trilinos/27.cc index bc9746a300..0ab53efa1e 100644 --- a/tests/trilinos/27.cc +++ b/tests/trilinos/27.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::operator = (Vector) -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -50,7 +51,10 @@ int main (int argc,char **argv) std::ofstream logfile("27/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/28.cc b/tests/trilinos/28.cc index 2abc9660cc..06e5cae8ad 100644 --- a/tests/trilinos/28.cc +++ b/tests/trilinos/28.cc @@ -15,7 +15,8 @@ // check TrilinosWrappers::Vector::operator = (Vector), except that we don't // resize the vector to be copied to beforehand -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -52,7 +53,10 @@ int main (int argc,char **argv) std::ofstream logfile("28/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/29.cc b/tests/trilinos/29.cc index 9b39d4fdd7..e74640cae4 100644 --- a/tests/trilinos/29.cc +++ b/tests/trilinos/29.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::reinit(fast) -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -37,7 +38,10 @@ int main (int argc,char **argv) std::ofstream logfile("29/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/30.cc b/tests/trilinos/30.cc index d40004a6aa..6a350b5019 100644 --- a/tests/trilinos/30.cc +++ b/tests/trilinos/30.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::reinit(!fast) -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -45,7 +46,10 @@ int main (int argc,char **argv) std::ofstream logfile("30/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/31.cc b/tests/trilinos/31.cc index d0a1dcb293..e04fdb939c 100644 --- a/tests/trilinos/31.cc +++ b/tests/trilinos/31.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::l2_norm() -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -47,7 +48,10 @@ int main (int argc,char **argv) std::ofstream logfile("31/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/32.cc b/tests/trilinos/32.cc index 16fc8917c4..600030cd73 100644 --- a/tests/trilinos/32.cc +++ b/tests/trilinos/32.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::mean_value() -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -47,7 +48,10 @@ int main (int argc,char **argv) std::ofstream logfile("32/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/33.cc b/tests/trilinos/33.cc index 76b87d8105..c84482ffa7 100644 --- a/tests/trilinos/33.cc +++ b/tests/trilinos/33.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::lp_norm(3) -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -48,7 +49,10 @@ int main (int argc,char **argv) std::ofstream logfile("33/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/34.cc b/tests/trilinos/34.cc index d73c5aab83..bdd678f117 100644 --- a/tests/trilinos/34.cc +++ b/tests/trilinos/34.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::all_zero -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -48,7 +49,10 @@ int main (int argc,char **argv) std::ofstream logfile("34/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/35.cc b/tests/trilinos/35.cc index 2f26fc9f51..32e78b216c 100644 --- a/tests/trilinos/35.cc +++ b/tests/trilinos/35.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::operator+=(Vector) -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -64,7 +65,10 @@ int main (int argc,char **argv) std::ofstream logfile("35/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/36.cc b/tests/trilinos/36.cc index 4a2fa81a13..47150c47d9 100644 --- a/tests/trilinos/36.cc +++ b/tests/trilinos/36.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::operator-=(Vector) -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -64,7 +65,10 @@ int main (int argc,char **argv) std::ofstream logfile("36/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/37.cc b/tests/trilinos/37.cc index 007980b4b9..7418165657 100644 --- a/tests/trilinos/37.cc +++ b/tests/trilinos/37.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::add (scalar) -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -44,7 +45,10 @@ int main (int argc,char **argv) std::ofstream logfile("37/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/38.cc b/tests/trilinos/38.cc index 1f0b6eb93a..a260dd0318 100644 --- a/tests/trilinos/38.cc +++ b/tests/trilinos/38.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::add(Vector) -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -52,7 +53,10 @@ int main (int argc,char **argv) std::ofstream logfile("38/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/39.cc b/tests/trilinos/39.cc index dd92d462f7..5102866dd4 100644 --- a/tests/trilinos/39.cc +++ b/tests/trilinos/39.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::add(scalar, Vector) -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -52,7 +53,10 @@ int main (int argc,char **argv) std::ofstream logfile("39/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/40.cc b/tests/trilinos/40.cc index 391ddd23ad..e2ce534b52 100644 --- a/tests/trilinos/40.cc +++ b/tests/trilinos/40.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::add(s,V,s,V) -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -56,7 +57,10 @@ int main (int argc,char **argv) std::ofstream logfile("40/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/41.cc b/tests/trilinos/41.cc index cd8a05ae32..370afb6db0 100644 --- a/tests/trilinos/41.cc +++ b/tests/trilinos/41.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::sadd(s, Vector) -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -52,7 +53,10 @@ int main (int argc,char **argv) std::ofstream logfile("41/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/42.cc b/tests/trilinos/42.cc index 261179f05f..5ee5942bbb 100644 --- a/tests/trilinos/42.cc +++ b/tests/trilinos/42.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::sadd(scalar, scalar, Vector) -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -52,7 +53,10 @@ int main (int argc,char **argv) std::ofstream logfile("42/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/43.cc b/tests/trilinos/43.cc index afe7d29d19..436b3df948 100644 --- a/tests/trilinos/43.cc +++ b/tests/trilinos/43.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::sadd(s,s,V,s,V) -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -56,7 +57,10 @@ int main (int argc,char **argv) std::ofstream logfile("43/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/44.cc b/tests/trilinos/44.cc index 28f88bb55e..db0a53b907 100644 --- a/tests/trilinos/44.cc +++ b/tests/trilinos/44.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::sadd(s,s,V,s,V,s,V) -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -60,7 +61,10 @@ int main (int argc,char **argv) std::ofstream logfile("44/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/45.cc b/tests/trilinos/45.cc index 5eba7bc022..649a7c2b56 100644 --- a/tests/trilinos/45.cc +++ b/tests/trilinos/45.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::scale -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -52,7 +53,10 @@ int main (int argc,char **argv) std::ofstream logfile("45/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/46.cc b/tests/trilinos/46.cc index fdf1ba7f99..12fc510f23 100644 --- a/tests/trilinos/46.cc +++ b/tests/trilinos/46.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::equ (s,V) -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -52,7 +53,10 @@ int main (int argc,char **argv) std::ofstream logfile("46/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/47.cc b/tests/trilinos/47.cc index 32eb417774..7bbfce11bc 100644 --- a/tests/trilinos/47.cc +++ b/tests/trilinos/47.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::equ (s,V,s,V) -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -56,7 +57,10 @@ int main (int argc,char **argv) std::ofstream logfile("47/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/48.cc b/tests/trilinos/48.cc index 30c07869ce..2c0e95568a 100644 --- a/tests/trilinos/48.cc +++ b/tests/trilinos/48.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::ratio -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -58,7 +59,10 @@ int main (int argc,char **argv) std::ofstream logfile("48/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/49.cc b/tests/trilinos/49.cc index 4730d1fa7d..7fda29f65f 100644 --- a/tests/trilinos/49.cc +++ b/tests/trilinos/49.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::operator = (Vector) -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -49,7 +50,10 @@ int main (int argc,char **argv) std::ofstream logfile("49/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/50.cc b/tests/trilinos/50.cc index e0c0a2c39d..8179b0f25f 100644 --- a/tests/trilinos/50.cc +++ b/tests/trilinos/50.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::operator = (Vector) with T!=TrilinosScalar -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -65,7 +66,10 @@ int main (int argc,char **argv) std::ofstream logfile("50/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/51.cc b/tests/trilinos/51.cc index 84153d9b3f..e33f077322 100644 --- a/tests/trilinos/51.cc +++ b/tests/trilinos/51.cc @@ -14,7 +14,8 @@ // check copy constructor TrilinosWrappers::Vector::Vector(Vector) -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -50,7 +51,10 @@ int main (int argc,char **argv) std::ofstream logfile("51/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/52.cc b/tests/trilinos/52.cc index 5fe1e5d21b..1abbf3f57c 100644 --- a/tests/trilinos/52.cc +++ b/tests/trilinos/52.cc @@ -16,7 +16,8 @@ // TrilinosWrappers::SparseMatrix::set(). like trilinos_01, but use a different // constructor for the sparse matrix -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -56,7 +57,10 @@ int main (int argc,char **argv) std::ofstream logfile("52/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/53.cc b/tests/trilinos/53.cc index ef71214cbf..0867758044 100644 --- a/tests/trilinos/53.cc +++ b/tests/trilinos/53.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::operator() in set, and later in add-mode -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -55,7 +56,10 @@ int main (int argc,char **argv) std::ofstream logfile("53/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/54.cc b/tests/trilinos/54.cc index 8699955b81..12d88e785e 100644 --- a/tests/trilinos/54.cc +++ b/tests/trilinos/54.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::operator() in set, and later in -= mode -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -55,7 +56,10 @@ int main (int argc,char **argv) std::ofstream logfile("54/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/55.cc b/tests/trilinos/55.cc index 23831adf34..bea5d6e9c0 100644 --- a/tests/trilinos/55.cc +++ b/tests/trilinos/55.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::operator() in set, and later in *= mode -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -55,7 +56,10 @@ int main (int argc,char **argv) std::ofstream logfile("55/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/56.cc b/tests/trilinos/56.cc index 4eae42d5aa..e93cab77af 100644 --- a/tests/trilinos/56.cc +++ b/tests/trilinos/56.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::operator() in set, and later in /= mode -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -55,7 +56,10 @@ int main (int argc,char **argv) std::ofstream logfile("56/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/57.cc b/tests/trilinos/57.cc index 0180745d34..3166c77e42 100644 --- a/tests/trilinos/57.cc +++ b/tests/trilinos/57.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::is_non_zero -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -53,7 +54,10 @@ int main (int argc,char **argv) std::ofstream logfile("57/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/58.cc b/tests/trilinos/58.cc index 6290a9c541..001bd3b81c 100644 --- a/tests/trilinos/58.cc +++ b/tests/trilinos/58.cc @@ -14,7 +14,8 @@ // check ::Vector (const TrilinosWrappers::Vector &) copy constructor -#include "../tests.h" +#include "../tests.h" +#include #include #include @@ -55,7 +56,10 @@ int main (int argc,char **argv) std::ofstream logfile("58/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/59.cc b/tests/trilinos/59.cc index 7b130dd4b3..4bd71dabe3 100644 --- a/tests/trilinos/59.cc +++ b/tests/trilinos/59.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector (const ::Vector &) copy constructor -#include "../tests.h" +#include "../tests.h" +#include #include #include @@ -58,7 +59,10 @@ int main (int argc,char **argv) std::ofstream logfile("59/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/60.cc b/tests/trilinos/60.cc index f94de694a1..01e81aafb5 100644 --- a/tests/trilinos/60.cc +++ b/tests/trilinos/60.cc @@ -14,7 +14,8 @@ // check ::Vector::operator = (const TrilinosWrappers::Vector &) -#include "../tests.h" +#include "../tests.h" +#include #include #include @@ -55,7 +56,10 @@ int main (int argc,char **argv) std::ofstream logfile("60/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/61.cc b/tests/trilinos/61.cc index 01f833cb72..248f15beb0 100644 --- a/tests/trilinos/61.cc +++ b/tests/trilinos/61.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::Vector::operator = (const ::Vector &) -#include "../tests.h" +#include "../tests.h" +#include #include #include @@ -58,7 +59,10 @@ int main (int argc,char **argv) std::ofstream logfile("61/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/62.cc b/tests/trilinos/62.cc index cbb026efb2..5946d73333 100644 --- a/tests/trilinos/62.cc +++ b/tests/trilinos/62.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::MatrixBase::clear () -#include "../tests.h" +#include "../tests.h" +#include #include #include @@ -43,7 +44,10 @@ int main (int argc,char **argv) std::ofstream logfile("62/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/63.cc b/tests/trilinos/63.cc index 3ba5b3031a..04db7ad9cb 100644 --- a/tests/trilinos/63.cc +++ b/tests/trilinos/63.cc @@ -12,7 +12,8 @@ //---------------------------- trilinos_63.cc --------------------------- -#include "../tests.h" +#include "../tests.h" +#include #include #include @@ -41,7 +42,10 @@ int main (int argc,char **argv) std::ofstream logfile("63/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/64.cc b/tests/trilinos/64.cc index df2236546a..41c1f1f417 100644 --- a/tests/trilinos/64.cc +++ b/tests/trilinos/64.cc @@ -17,7 +17,8 @@ // TrilinosWrappers::MatrixBase::operator= -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -46,7 +47,10 @@ int main (int argc,char **argv) std::ofstream logfile("64/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/65.cc b/tests/trilinos/65.cc index 5b264213bb..862c98050e 100644 --- a/tests/trilinos/65.cc +++ b/tests/trilinos/65.cc @@ -15,7 +15,8 @@ // This test used to fail after upgrading to petsc 2.2.1 -#include "../tests.h" +#include "../tests.h" +#include #include #include @@ -39,7 +40,10 @@ int main (int argc,char **argv) std::ofstream logfile("65/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/66.cc b/tests/trilinos/66.cc index 58b3651c2a..e90259a056 100644 --- a/tests/trilinos/66.cc +++ b/tests/trilinos/66.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::MatrixBase::clear_row () -#include "../tests.h" +#include "../tests.h" +#include #include #include @@ -97,7 +98,10 @@ int main (int argc,char **argv) std::ofstream logfile("66/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/67.cc b/tests/trilinos/67.cc index 2afaaa5eb1..13fce014cd 100644 --- a/tests/trilinos/67.cc +++ b/tests/trilinos/67.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::MatrixBase::clear_rows () -#include "../tests.h" +#include "../tests.h" +#include #include #include @@ -103,7 +104,10 @@ int main (int argc,char **argv) std::ofstream logfile("67/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/68.cc b/tests/trilinos/68.cc index 3abb4927a0..0f37d98096 100644 --- a/tests/trilinos/68.cc +++ b/tests/trilinos/68.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::MatrixBase::clear_row () with used second argument -#include "../tests.h" +#include "../tests.h" +#include #include #include @@ -101,7 +102,10 @@ int main (int argc,char **argv) std::ofstream logfile("68/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/69.cc b/tests/trilinos/69.cc index a34547709d..8fb6a26755 100644 --- a/tests/trilinos/69.cc +++ b/tests/trilinos/69.cc @@ -14,7 +14,8 @@ // check TrilinosWrappers::MatrixBase::clear_rows () with used second argument -#include "../tests.h" +#include "../tests.h" +#include #include #include @@ -107,7 +108,10 @@ int main (int argc,char **argv) std::ofstream logfile("69/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/70.cc b/tests/trilinos/70.cc index c425a11839..8e503d06a5 100644 --- a/tests/trilinos/70.cc +++ b/tests/trilinos/70.cc @@ -14,7 +14,8 @@ // check TrilinosScalar -#include "../tests.h" +#include "../tests.h" +#include #include #include @@ -25,7 +26,10 @@ int main () std::ofstream logfile("70/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + if (typeid(TrilinosScalar)==typeid(double)) deallog << "double" << std::endl; diff --git a/tests/trilinos/block_vector_iterator_01.cc b/tests/trilinos/block_vector_iterator_01.cc index 9f9395bf80..2e4018f033 100644 --- a/tests/trilinos/block_vector_iterator_01.cc +++ b/tests/trilinos/block_vector_iterator_01.cc @@ -14,7 +14,8 @@ // make sure that block vector iterator allows reading and writing correctly -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -80,7 +81,10 @@ int main (int argc,char **argv) std::ofstream logfile("block_vector_iterator_01/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::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 5bb0025548..6fce3e1471 100644 --- a/tests/trilinos/block_vector_iterator_02.cc +++ b/tests/trilinos/block_vector_iterator_02.cc @@ -14,7 +14,8 @@ // like _01, except that we use operator[] instead of operator* -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -74,7 +75,10 @@ int main (int argc,char **argv) std::ofstream logfile("block_vector_iterator_02/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::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 07fdbfc8b3..94789b532d 100644 --- a/tests/trilinos/block_vector_iterator_03.cc +++ b/tests/trilinos/block_vector_iterator_03.cc @@ -14,7 +14,8 @@ // this test is an adaptation of lac/block_vector_iterator for PETSc block // vectors -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -325,7 +326,10 @@ int main (int argc,char **argv) logfile.precision(3); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/deal_solver_01.cc b/tests/trilinos/deal_solver_01.cc index 4469d40e5e..5b97fd0809 100644 --- a/tests/trilinos/deal_solver_01.cc +++ b/tests/trilinos/deal_solver_01.cc @@ -14,7 +14,8 @@ // test the CG solver using the Trilinos matrix and vector classes -#include "../tests.h" +#include "../tests.h" +#include #include "../lac/testmatrix.h" #include #include @@ -63,7 +64,10 @@ int main(int argc, char **argv) logfile.precision(4); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + { SolverControl control(100, 1.e-3); diff --git a/tests/trilinos/deal_solver_02.cc b/tests/trilinos/deal_solver_02.cc index 0fd4d5d9fb..327d5e1cf0 100644 --- a/tests/trilinos/deal_solver_02.cc +++ b/tests/trilinos/deal_solver_02.cc @@ -15,7 +15,8 @@ -#include "../tests.h" +#include "../tests.h" +#include #include "../lac/testmatrix.h" #include #include @@ -65,7 +66,10 @@ int main(int argc, char **argv) logfile.precision(4); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + { SolverControl control(100, 1.e-3); diff --git a/tests/trilinos/deal_solver_03.cc b/tests/trilinos/deal_solver_03.cc index 73c626761b..e9a3fe4f6f 100644 --- a/tests/trilinos/deal_solver_03.cc +++ b/tests/trilinos/deal_solver_03.cc @@ -15,7 +15,8 @@ -#include "../tests.h" +#include "../tests.h" +#include #include "../lac/testmatrix.h" #include #include @@ -65,7 +66,10 @@ int main(int argc, char **argv) logfile.precision(4); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + { SolverControl control(100, 1.e-3); diff --git a/tests/trilinos/deal_solver_04.cc b/tests/trilinos/deal_solver_04.cc index 651101cbef..d045c1255c 100644 --- a/tests/trilinos/deal_solver_04.cc +++ b/tests/trilinos/deal_solver_04.cc @@ -14,7 +14,8 @@ // test the MINRES solver using the Trilinos matrix and vector classes -#include "../tests.h" +#include "../tests.h" +#include #include "../lac/testmatrix.h" #include #include @@ -64,7 +65,10 @@ int main(int argc, char **argv) logfile.precision(4); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + { SolverControl control(100, 1.e-3); diff --git a/tests/trilinos/deal_solver_05.cc b/tests/trilinos/deal_solver_05.cc index 204530fb41..8c8c0b5359 100644 --- a/tests/trilinos/deal_solver_05.cc +++ b/tests/trilinos/deal_solver_05.cc @@ -14,7 +14,8 @@ // test the QMRS solver using the Trilinos matrix and vector classes -#include "../tests.h" +#include "../tests.h" +#include #include "../lac/testmatrix.h" #include #include @@ -63,7 +64,10 @@ int main(int argc, char **argv) logfile.precision(4); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + { SolverControl control(100, 1.e-3); diff --git a/tests/trilinos/deal_solver_06.cc b/tests/trilinos/deal_solver_06.cc index dd742d9dc6..3ff908ecd6 100644 --- a/tests/trilinos/deal_solver_06.cc +++ b/tests/trilinos/deal_solver_06.cc @@ -14,7 +14,8 @@ // test the Richardson solver using the Trilinos matrix and vector classes -#include "../tests.h" +#include "../tests.h" +#include #include "../lac/testmatrix.h" #include #include @@ -62,7 +63,10 @@ int main(int argc, char **argv) logfile.precision(4); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + { const unsigned int size = 32; diff --git a/tests/trilinos/parallel_sparse_matrix_01.cc b/tests/trilinos/parallel_sparse_matrix_01.cc index 9f3f3cda0e..0b80cc8cf2 100644 --- a/tests/trilinos/parallel_sparse_matrix_01.cc +++ b/tests/trilinos/parallel_sparse_matrix_01.cc @@ -23,7 +23,8 @@ // and with the option -log_info. All the output should say that no additional // malloc calls have been performed -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -118,7 +119,10 @@ int main (int argc,char **argv) std::ofstream logfile("sparse_matrix_01/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/slowness_01.cc b/tests/trilinos/slowness_01.cc index 292efb50c3..496e98e2db 100644 --- a/tests/trilinos/slowness_01.cc +++ b/tests/trilinos/slowness_01.cc @@ -19,7 +19,8 @@ // // the tests build the 5-point stencil matrix for a uniform grid of size N*N -#include "../tests.h" +#include "../tests.h" +#include #include #include #include diff --git a/tests/trilinos/slowness_02.cc b/tests/trilinos/slowness_02.cc index d21205e428..9156f13e71 100644 --- a/tests/trilinos/slowness_02.cc +++ b/tests/trilinos/slowness_02.cc @@ -19,7 +19,8 @@ // // the tests build the 5-point stencil matrix for a uniform grid of size N*N -#include "../tests.h" +#include "../tests.h" +#include #include #include #include diff --git a/tests/trilinos/slowness_03.cc b/tests/trilinos/slowness_03.cc index 8ed90df490..9a1cdf4934 100644 --- a/tests/trilinos/slowness_03.cc +++ b/tests/trilinos/slowness_03.cc @@ -19,7 +19,8 @@ // // the tests build the 5-point stencil matrix for a uniform grid of size N*N -#include "../tests.h" +#include "../tests.h" +#include #include #include #include diff --git a/tests/trilinos/slowness_04.cc b/tests/trilinos/slowness_04.cc index f4def4cc4b..135cbc4b5d 100644 --- a/tests/trilinos/slowness_04.cc +++ b/tests/trilinos/slowness_04.cc @@ -25,7 +25,8 @@ // matrix in a consecutive fashion, but rather according to the order of // degrees of freedom in the sequence of cells that we traverse -#include "../tests.h" +#include "../tests.h" +#include #include #include #include diff --git a/tests/trilinos/solver_01.cc b/tests/trilinos/solver_01.cc index 22e1ed7c5b..ac6774aac6 100644 --- a/tests/trilinos/solver_01.cc +++ b/tests/trilinos/solver_01.cc @@ -14,7 +14,8 @@ // test the Trilinos Richardson solver -#include "../tests.h" +#include "../tests.h" +#include #include "../lac/testmatrix.h" #include #include @@ -60,7 +61,10 @@ int main(int argc, char **argv) logfile.precision(4); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + { SolverControl control(100, 1.e-3); diff --git a/tests/trilinos/solver_02.cc b/tests/trilinos/solver_02.cc index 613d89aea6..ec6cedce98 100644 --- a/tests/trilinos/solver_02.cc +++ b/tests/trilinos/solver_02.cc @@ -14,7 +14,8 @@ // test the Trilinos Chebychev solver -#include "../tests.h" +#include "../tests.h" +#include #include "../lac/testmatrix.h" #include #include @@ -59,7 +60,10 @@ int main(int argc, char **argv) logfile.precision(4); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + { SolverControl control(100, 1.e-3); diff --git a/tests/trilinos/solver_03.cc b/tests/trilinos/solver_03.cc index f4e135edde..5fa013f82b 100644 --- a/tests/trilinos/solver_03.cc +++ b/tests/trilinos/solver_03.cc @@ -14,7 +14,8 @@ // test the Trilinos CG solver -#include "../tests.h" +#include "../tests.h" +#include #include "../lac/testmatrix.h" #include #include @@ -58,7 +59,10 @@ int main(int argc, char **argv) logfile.precision(4); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + { SolverControl control(100, 1.e-3); diff --git a/tests/trilinos/solver_04.cc b/tests/trilinos/solver_04.cc index 04b965a56b..aae751de12 100644 --- a/tests/trilinos/solver_04.cc +++ b/tests/trilinos/solver_04.cc @@ -14,7 +14,8 @@ // test the Trilinos BiCG solver -#include "../tests.h" +#include "../tests.h" +#include #include "../lac/testmatrix.h" #include #include @@ -58,7 +59,10 @@ int main(int argc, char **argv) logfile.precision(4); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + { SolverControl control(100, 1.e-3); diff --git a/tests/trilinos/solver_05.cc b/tests/trilinos/solver_05.cc index c97a80a672..d4d28b01d5 100644 --- a/tests/trilinos/solver_05.cc +++ b/tests/trilinos/solver_05.cc @@ -14,7 +14,8 @@ // test the Trilinos GMRES solver -#include "../tests.h" +#include "../tests.h" +#include #include "../lac/testmatrix.h" #include #include @@ -58,7 +59,10 @@ int main(int argc, char **argv) logfile.precision(4); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + { SolverControl control(100, 1.e-3); diff --git a/tests/trilinos/solver_06.cc b/tests/trilinos/solver_06.cc index 570093ebda..5fe5bcd489 100644 --- a/tests/trilinos/solver_06.cc +++ b/tests/trilinos/solver_06.cc @@ -14,7 +14,8 @@ // test the Trilinos Bicgstab solver -#include "../tests.h" +#include "../tests.h" +#include #include "../lac/testmatrix.h" #include #include @@ -58,7 +59,10 @@ int main(int argc, char **argv) logfile.precision(4); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + { SolverControl control(100, 1.e-3); diff --git a/tests/trilinos/solver_07.cc b/tests/trilinos/solver_07.cc index 0a89e3e4a6..74f4362acf 100644 --- a/tests/trilinos/solver_07.cc +++ b/tests/trilinos/solver_07.cc @@ -14,7 +14,8 @@ // test the Trilinos CGS solver -#include "../tests.h" +#include "../tests.h" +#include #include "../lac/testmatrix.h" #include #include @@ -58,7 +59,10 @@ int main(int argc, char **argv) logfile.precision(4); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + { SolverControl control(100, 1.e-3); diff --git a/tests/trilinos/solver_08.cc b/tests/trilinos/solver_08.cc index fbb2adf667..71f5227574 100644 --- a/tests/trilinos/solver_08.cc +++ b/tests/trilinos/solver_08.cc @@ -14,7 +14,8 @@ // test the Trilinos TFQMR solver -#include "../tests.h" +#include "../tests.h" +#include #include "../lac/testmatrix.h" #include #include @@ -58,7 +59,10 @@ int main(int argc, char **argv) logfile.precision(4); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + { SolverControl control(100, 1.e-3); diff --git a/tests/trilinos/solver_09.cc b/tests/trilinos/solver_09.cc index b4e47661d2..4e2995179d 100644 --- a/tests/trilinos/solver_09.cc +++ b/tests/trilinos/solver_09.cc @@ -18,7 +18,8 @@ -#include "../tests.h" +#include "../tests.h" +#include #include "../lac/testmatrix.h" #include #include @@ -62,7 +63,10 @@ int main(int argc, char **argv) logfile.precision(4); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + { SolverControl control(100, 1.e-3); diff --git a/tests/trilinos/solver_10.cc b/tests/trilinos/solver_10.cc index 66d59cf2dc..cb7a6ac4ae 100644 --- a/tests/trilinos/solver_10.cc +++ b/tests/trilinos/solver_10.cc @@ -14,7 +14,8 @@ // test the Trilinos CR solver -#include "../tests.h" +#include "../tests.h" +#include #include "../lac/testmatrix.h" #include #include @@ -58,7 +59,10 @@ int main(int argc, char **argv) logfile.precision(4); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + { SolverControl control(100, 1.e-3); diff --git a/tests/trilinos/solver_11.cc b/tests/trilinos/solver_11.cc index 46cc98200b..f68de16c15 100644 --- a/tests/trilinos/solver_11.cc +++ b/tests/trilinos/solver_11.cc @@ -14,7 +14,8 @@ // test the Trilinos LSQR solver -#include "../tests.h" +#include "../tests.h" +#include #include "../lac/testmatrix.h" #include #include @@ -59,7 +60,10 @@ int main(int argc, char **argv) logfile.precision(4); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + { SolverControl control(100, 1.e-3); diff --git a/tests/trilinos/sparse_matrix_iterator_01.cc b/tests/trilinos/sparse_matrix_iterator_01.cc index d8e3c29e6b..341cd27bbd 100644 --- a/tests/trilinos/sparse_matrix_iterator_01.cc +++ b/tests/trilinos/sparse_matrix_iterator_01.cc @@ -14,7 +14,8 @@ // test TrilinosWrappers::MatrixBase::const_iterator -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -44,7 +45,10 @@ int main (int argc,char **argv) std::ofstream logfile("sparse_matrix_iterator_01/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::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 bc961f0fea..cd8308bcc6 100644 --- a/tests/trilinos/sparse_matrix_vector_01.cc +++ b/tests/trilinos/sparse_matrix_vector_01.cc @@ -14,7 +14,8 @@ // check SparseMatrix::vmult -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -61,7 +62,10 @@ int main (int argc, char **argv) std::ofstream logfile("sparse_matrix_vector_01/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::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 a557d076ab..9f5b17c20a 100644 --- a/tests/trilinos/sparse_matrix_vector_02.cc +++ b/tests/trilinos/sparse_matrix_vector_02.cc @@ -14,7 +14,8 @@ // check SparseMatrix::Tvmult -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -61,7 +62,10 @@ int main (int argc, char **argv) std::ofstream logfile("sparse_matrix_vector_02/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::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 4a4e4670e4..8f6b858194 100644 --- a/tests/trilinos/sparse_matrix_vector_03.cc +++ b/tests/trilinos/sparse_matrix_vector_03.cc @@ -14,7 +14,8 @@ // check SparseMatrix::vmult_add -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -64,7 +65,10 @@ int main (int argc, char **argv) std::ofstream logfile("sparse_matrix_vector_03/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::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 48b8454bfa..edf3b7e034 100644 --- a/tests/trilinos/sparse_matrix_vector_04.cc +++ b/tests/trilinos/sparse_matrix_vector_04.cc @@ -14,7 +14,8 @@ // check SparseMatrix::Tvmult_add -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -64,7 +65,10 @@ int main (int argc, char **argv) std::ofstream logfile("sparse_matrix_vector_04/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::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 93ea33ec29..bbea123f50 100644 --- a/tests/trilinos/sparse_matrix_vector_05.cc +++ b/tests/trilinos/sparse_matrix_vector_05.cc @@ -14,7 +14,8 @@ // check SparseMatrix::matrix_scalar_product -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -67,7 +68,10 @@ int main (int argc, char **argv) std::ofstream logfile("sparse_matrix_vector_05/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::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 72b98ce265..842f1bc760 100644 --- a/tests/trilinos/sparse_matrix_vector_06.cc +++ b/tests/trilinos/sparse_matrix_vector_06.cc @@ -14,7 +14,8 @@ // check SparseMatrix::matrix_norm_square -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -59,7 +60,10 @@ int main (int argc, char **argv) std::ofstream logfile("sparse_matrix_vector_06/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::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 f0cf939a91..b860e4f89f 100644 --- a/tests/trilinos/sparse_matrix_vector_07.cc +++ b/tests/trilinos/sparse_matrix_vector_07.cc @@ -14,7 +14,8 @@ // check SparseMatrix::matrix_norm_square -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -69,7 +70,10 @@ int main (int argc, char **argv) std::ofstream logfile("sparse_matrix_vector_07/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/vector_assign_01.cc b/tests/trilinos/vector_assign_01.cc index a5b6d1dad9..b77a142d84 100644 --- a/tests/trilinos/vector_assign_01.cc +++ b/tests/trilinos/vector_assign_01.cc @@ -20,7 +20,8 @@ // // this was fixed 2004-04-05, and this test checks that it works -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -51,7 +52,10 @@ int main (int argc, char **argv) std::ofstream logfile("vector_assign_01/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/vector_assign_02.cc b/tests/trilinos/vector_assign_02.cc index 9ffa3b52e5..ac49b02033 100644 --- a/tests/trilinos/vector_assign_02.cc +++ b/tests/trilinos/vector_assign_02.cc @@ -19,7 +19,8 @@ // argument to the user-defined operator+=. This is not exciting, but since I // wrote the test to make sure it works this way, let's keep it then... -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -50,7 +51,10 @@ int main (int argc, char **argv) std::ofstream logfile("vector_assign_02/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/vector_equality_1.cc b/tests/trilinos/vector_equality_1.cc index 3089b094d0..40ab8f0755 100644 --- a/tests/trilinos/vector_equality_1.cc +++ b/tests/trilinos/vector_equality_1.cc @@ -15,7 +15,8 @@ // check TrilinosWrappers::Vector::operator==(TrilinosWrappers::Vector) for vectors that are not // equal -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -46,7 +47,10 @@ int main (int argc, char **argv) std::ofstream logfile("vector_equality_1/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/vector_equality_2.cc b/tests/trilinos/vector_equality_2.cc index 3fb91d6d94..000ca72fcf 100644 --- a/tests/trilinos/vector_equality_2.cc +++ b/tests/trilinos/vector_equality_2.cc @@ -15,7 +15,8 @@ // check TrilinosWrappers::Vector::operator==(TrilinosWrappers::Vector) for vectors that are // equal -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -48,7 +49,10 @@ int main (int argc, char **argv) std::ofstream logfile("vector_equality_2/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/vector_equality_3.cc b/tests/trilinos/vector_equality_3.cc index 9b6fccc110..89172f5043 100644 --- a/tests/trilinos/vector_equality_3.cc +++ b/tests/trilinos/vector_equality_3.cc @@ -15,7 +15,8 @@ // check TrilinosWrappers::Vector::operator!=(TrilinosWrappers::Vector) for vectors that are not // equal -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -46,7 +47,10 @@ int main (int argc, char **argv) std::ofstream logfile("vector_equality_3/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { diff --git a/tests/trilinos/vector_equality_4.cc b/tests/trilinos/vector_equality_4.cc index c2bbf3995d..46c1a826a8 100644 --- a/tests/trilinos/vector_equality_4.cc +++ b/tests/trilinos/vector_equality_4.cc @@ -15,7 +15,8 @@ // check TrilinosWrappers::Vector::operator!=(TrilinosWrappers::Vector) for vectors that are // equal -#include "../tests.h" +#include "../tests.h" +#include #include #include #include @@ -48,7 +49,10 @@ int main (int argc, char **argv) std::ofstream logfile("vector_equality_4/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); + + Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); + try { -- 2.39.5