From ec0d089630d349f5ce5ff7a586c54f7559fbcf4c Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Thu, 30 Jul 2015 12:54:29 -0500 Subject: [PATCH] =?utf8?q?make=20mpi/step-40.mpirun=3D=3F=20more=20robust?= --- tests/mpi/step-40.cc | 6 ++++-- tests/mpi/step-40.with_petsc=true.mpirun=10.output | 6 ++---- tests/mpi/step-40.with_petsc=true.mpirun=3.output | 6 ++---- tests/mpi/step-40.with_petsc=true.mpirun=4.output | 6 ++---- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/tests/mpi/step-40.cc b/tests/mpi/step-40.cc index fa166dfd4c..9acb5e9be4 100644 --- a/tests/mpi/step-40.cc +++ b/tests/mpi/step-40.cc @@ -252,8 +252,10 @@ namespace Step40 preconditioner(system_matrix, PETScWrappers::PreconditionBoomerAMG::AdditionalData(true)); - solver.solve (system_matrix, completely_distributed_solution, system_rhs, - preconditioner); + check_solver_within_range( + solver.solve (system_matrix, completely_distributed_solution, system_rhs, + preconditioner), + solver_control.last_step(), 10, 10); pcout << " Solved in " << solver_control.last_step() << " iterations." << std::endl; diff --git a/tests/mpi/step-40.with_petsc=true.mpirun=10.output b/tests/mpi/step-40.with_petsc=true.mpirun=10.output index 95718500c0..908c37c096 100644 --- a/tests/mpi/step-40.with_petsc=true.mpirun=10.output +++ b/tests/mpi/step-40.with_petsc=true.mpirun=10.output @@ -4,8 +4,7 @@ Cycle 0: 104+100+104+100+104+104+100+104+100+104+ Number of degrees of freedom: 4225 465+416+432+416+416+432+416+416+400+416+ -DEAL:mpi::Starting value 0.695309 -DEAL:mpi::Convergence step 10 value 0 +DEAL:mpi::Solver stopped within 10 - 10 iterations Solved in 10 iterations. Cycle 1: @@ -13,7 +12,6 @@ Cycle 1: 408+412+408+412+408+408+412+408+412+408+ Number of degrees of freedom: 16641 1729+1680+1664+1680+1632+1664+1680+1632+1648+1632+ -DEAL:mpi::Starting value 1.38018 -DEAL:mpi::Convergence step 10 value 0 +DEAL:mpi::Solver stopped within 10 - 10 iterations Solved in 10 iterations. diff --git a/tests/mpi/step-40.with_petsc=true.mpirun=3.output b/tests/mpi/step-40.with_petsc=true.mpirun=3.output index b17197bcae..bdd3598997 100644 --- a/tests/mpi/step-40.with_petsc=true.mpirun=3.output +++ b/tests/mpi/step-40.with_petsc=true.mpirun=3.output @@ -4,8 +4,7 @@ Cycle 0: 340+344+340+ Number of degrees of freedom: 4225 1453+1412+1360+ -DEAL:mpi::Starting value 0.694820 -DEAL:mpi::Convergence step 10 value 0 +DEAL:mpi::Solver stopped within 10 - 10 iterations Solved in 10 iterations. Cycle 1: @@ -13,7 +12,6 @@ Cycle 1: 1364+1368+1364+ Number of degrees of freedom: 16641 5645+5540+5456+ -DEAL:mpi::Starting value 1.38638 -DEAL:mpi::Convergence step 10 value 0 +DEAL:mpi::Solver stopped within 10 - 10 iterations Solved in 10 iterations. diff --git a/tests/mpi/step-40.with_petsc=true.mpirun=4.output b/tests/mpi/step-40.with_petsc=true.mpirun=4.output index 7f462e74be..776ec99ef4 100644 --- a/tests/mpi/step-40.with_petsc=true.mpirun=4.output +++ b/tests/mpi/step-40.with_petsc=true.mpirun=4.output @@ -4,8 +4,7 @@ Cycle 0: 256+256+256+256+ Number of degrees of freedom: 4225 1089+1056+1056+1024+ -DEAL:mpi::Starting value 0.694817 -DEAL:mpi::Convergence step 10 value 0 +DEAL:mpi::Solver stopped within 10 - 10 iterations Solved in 10 iterations. Cycle 1: @@ -13,7 +12,6 @@ Cycle 1: 1024+1024+1024+1024+ Number of degrees of freedom: 16641 4225+4160+4160+4096+ -DEAL:mpi::Starting value 1.39777 -DEAL:mpi::Convergence step 10 value 0 +DEAL:mpi::Solver stopped within 10 - 10 iterations Solved in 10 iterations. -- 2.39.5