Avoid using std::cout in a test.

This is problematic on misconfigured MPI implementations that print
warnings for one reason or another every time they are run (e.g., the
default MPI implementation on Ubuntu 16.04).

It is easy enough in this case to do the normal thing and print
everything to deallog.

diff --git a/tests/mpi/petsc_step-27.cc b/tests/mpi/petsc_step-27.cc
index f461b06a80916ea8ad39e35faecc52cc77f674bf..8698ae97079f851735a99876f676004a6aadca57 100644 (file)
--- a/tests/mpi/petsc_step-27.cc
+++ b/tests/mpi/petsc_step-27.cc
@@ -171,7 +171,7 @@ namespace Step27
     , triangulation(mpi_communicator)
     , dof_handler(triangulation)
     , max_degree(dim <= 2 ? 7 : 5)
-    , pcout(std::cout,
+    , pcout(deallog.get_file_stream(),
             (Utilities::MPI::this_mpi_process(mpi_communicator) == 0))
   {
     for (unsigned int degree = 2; degree <= max_degree; ++degree)
@@ -329,10 +329,13 @@ namespace Step27
     LA::MPI::Vector completely_distributed_solution(locally_owned_dofs,
                                                     mpi_communicator);
 
-    SolverControl solver_control(system_rhs.size(),
-                                 1e-8 * system_rhs.l2_norm());
-    //                           ^~~~
-    // Loss of precision with a factor of 1e-12 with Trilinos
+    SolverControl solver_control(
+      system_rhs.size(),
+      1e-8 * system_rhs.l2_norm(),
+      // ^~~~
+      // Loss of precision with a factor of 1e-12 with Trilinos
+      false,
+      false);
     LA::SolverCG cg(solver_control, mpi_communicator);
 
     LA::MPI::PreconditionAMG                 preconditioner;
@@ -340,13 +343,10 @@ namespace Step27
     data.symmetric_operator = true;
     preconditioner.initialize(system_matrix, data);
 
-    check_solver_within_range(cg.solve(system_matrix,
-                                       completely_distributed_solution,
-                                       system_rhs,
-                                       preconditioner),
-                              solver_control.last_step(),
-                              5,
-                              40);
+    cg.solve(system_matrix,
+             completely_distributed_solution,
+             system_rhs,
+             preconditioner);
 
     pcout << "   Solved in " << solver_control.last_step() << " iterations."
           << std::endl;
@@ -476,6 +476,9 @@ main(int argc, char *argv[])
       using namespace Step27;
 
       Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
+      // This is the right choice (e.g., vs. mpi_initlog()) since the test
+      // uses ConditionalOStream
+      initlog();
 
       LaplaceProblem<2> laplace_problem;
       laplace_problem.run();

diff --git a/tests/mpi/petsc_step-27.with_p4est=true.with_petsc_with_hypre=true.with_petsc_with_complex=false.mpirun=1.output b/tests/mpi/petsc_step-27.with_p4est=true.with_petsc_with_hypre=true.with_petsc_with_complex=false.mpirun=1.output
index 52edf0d8d40d0c66b4fc44ada5c848fd2a2e04ab..be5f4938429a71046edd8ff294656f6955c53f73 100644 (file)
--- a/tests/mpi/petsc_step-27.with_p4est=true.with_petsc_with_hypre=true.with_petsc_with_complex=false.mpirun=1.output
+++ b/tests/mpi/petsc_step-27.with_p4est=true.with_petsc_with_hypre=true.with_petsc_with_complex=false.mpirun=1.output
@@ -1,3 +1,4 @@
+
 Cycle 0:
    Number of active cells      : 768
    Number of degrees of freedom: 3264

diff --git a/tests/mpi/petsc_step-27.with_p4est=true.with_petsc_with_hypre=true.with_petsc_with_complex=false.mpirun=1.output.petsc3.13.0 b/tests/mpi/petsc_step-27.with_p4est=true.with_petsc_with_hypre=true.with_petsc_with_complex=false.mpirun=1.output.petsc3.13.0
index 7eaee5e81b36c1d53362c4788506cc6595e265bc..2f32ca4174da1fbff35a6811504c958399fb1470 100644 (file)
--- a/tests/mpi/petsc_step-27.with_p4est=true.with_petsc_with_hypre=true.with_petsc_with_complex=false.mpirun=1.output.petsc3.13.0
+++ b/tests/mpi/petsc_step-27.with_p4est=true.with_petsc_with_hypre=true.with_petsc_with_complex=false.mpirun=1.output.petsc3.13.0
@@ -1,3 +1,4 @@
+
 Cycle 0:
    Number of active cells      : 768
    Number of degrees of freedom: 3264

diff --git a/tests/mpi/petsc_step-27.with_p4est=true.with_petsc_with_hypre=true.with_petsc_with_complex=false.mpirun=2.output b/tests/mpi/petsc_step-27.with_p4est=true.with_petsc_with_hypre=true.with_petsc_with_complex=false.mpirun=2.output
index 23fc8f3d1777e79601f983e19ca787c340c2bdf6..ac1b76564879e1dd5090ce3c775b22e99f34fa25 100644 (file)
--- a/tests/mpi/petsc_step-27.with_p4est=true.with_petsc_with_hypre=true.with_petsc_with_complex=false.mpirun=2.output
+++ b/tests/mpi/petsc_step-27.with_p4est=true.with_petsc_with_hypre=true.with_petsc_with_complex=false.mpirun=2.output
@@ -1,3 +1,4 @@
+
 Cycle 0:
    Number of active cells      : 768
    Number of degrees of freedom: 3264

diff --git a/tests/mpi/petsc_step-27.with_p4est=true.with_petsc_with_hypre=true.with_petsc_with_complex=false.mpirun=2.output.petsc3.13.0 b/tests/mpi/petsc_step-27.with_p4est=true.with_petsc_with_hypre=true.with_petsc_with_complex=false.mpirun=2.output.petsc3.13.0
index cdefeaa01bc6a3345cbd3950cf194e4e0b4f936b..6863e7044368fa2e77ccb5869df6991aa3be1099 100644 (file)
--- a/tests/mpi/petsc_step-27.with_p4est=true.with_petsc_with_hypre=true.with_petsc_with_complex=false.mpirun=2.output.petsc3.13.0
+++ b/tests/mpi/petsc_step-27.with_p4est=true.with_petsc_with_hypre=true.with_petsc_with_complex=false.mpirun=2.output.petsc3.13.0
@@ -1,3 +1,4 @@
+
 Cycle 0:
    Number of active cells      : 768
    Number of degrees of freedom: 3264