From a5e4a005fef959da83c5fb0f321a9a5404f7b1e7 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Thu, 21 Jan 2016 22:15:48 +0100 Subject: [PATCH] do not print-out iteration counts for GHEP SLEPc unit tests --- tests/slepc/solve_01.cc | 6 ++-- tests/slepc/solve_01.output | 6 ---- tests/slepc/solve_01.output.2 | 27 ----------------- tests/slepc/step-36_parallel.cc | 6 ++-- ...petsc=true.with_slepc=true.mpirun=3.output | 6 ---- ...tsc=true.with_slepc=true.mpirun=3.output.2 | 30 ------------------- ...tsc=true.with_slepc=true.mpirun=3.output.3 | 30 ------------------- 7 files changed, 8 insertions(+), 103 deletions(-) delete mode 100644 tests/slepc/solve_01.output.2 delete mode 100644 tests/slepc/step-36_parallel.with_mpi=true.with_petsc=true.with_slepc=true.mpirun=3.output.2 delete mode 100644 tests/slepc/step-36_parallel.with_mpi=true.with_petsc=true.with_slepc=true.mpirun=3.output.3 diff --git a/tests/slepc/solve_01.cc b/tests/slepc/solve_01.cc index eaacd3949c..93bcc4277a 100644 --- a/tests/slepc/solve_01.cc +++ b/tests/slepc/solve_01.cc @@ -62,8 +62,10 @@ check_solve( SolverType &solver, deallog << "Exception: " << e.get_exc_name() << std::endl; } - deallog << "Solver stopped after " << solver_control.last_step() - << " iterations" << std::endl; + // TODO make this robust on different platforms. Seems related to GHEP + // as solve_04 works ok. + //deallog << "Solver stopped after " << solver_control.last_step() + // << " iterations" << std::endl; deallog << "Eigenvalues:"; for (unsigned int i = 0; i < v.size(); i++) diff --git a/tests/slepc/solve_01.output b/tests/slepc/solve_01.output index 9208eccc98..b84705831f 100644 --- a/tests/slepc/solve_01.output +++ b/tests/slepc/solve_01.output @@ -2,26 +2,20 @@ DEAL::Size 46 Unknowns 2025 DEAL:: DEAL::Solver type: N6dealii13SLEPcWrappers17SolverKrylovSchurE -DEAL::Solver stopped after 18 iterations DEAL::Eigenvalues: 29.73524, 29.67536, 29.58873, 29.46785 DEAL:: DEAL::Solver type: N6dealii13SLEPcWrappers13SolverArnoldiE -DEAL::Solver stopped after 63 iterations DEAL::Eigenvalues: 29.73524, 29.67536, 29.58873, 29.46785 DEAL:: DEAL::Solver type: N6dealii13SLEPcWrappers13SolverLanczosE -DEAL::Solver stopped after 60 iterations DEAL::Eigenvalues: 29.73524, 29.67536, 29.58873, 29.46785 DEAL:: DEAL::Solver type: N6dealii13SLEPcWrappers25SolverGeneralizedDavidsonE -DEAL::Solver stopped after 334 iterations DEAL::Eigenvalues: 29.73524, 29.67536, 29.58873, 29.46785 DEAL:: DEAL::Solver type: N6dealii13SLEPcWrappers25SolverGeneralizedDavidsonE -DEAL::Solver stopped after 504 iterations DEAL::Eigenvalues: 29.73524, 29.67536, 29.58873, 29.46785 DEAL:: DEAL::Solver type: N6dealii13SLEPcWrappers20SolverJacobiDavidsonE -DEAL::Solver stopped after 58 iterations DEAL::Eigenvalues: 29.73524, 29.67536, 29.58873, 29.46785 DEAL:: diff --git a/tests/slepc/solve_01.output.2 b/tests/slepc/solve_01.output.2 deleted file mode 100644 index 3108abfbe8..0000000000 --- a/tests/slepc/solve_01.output.2 +++ /dev/null @@ -1,27 +0,0 @@ - -DEAL::Size 46 Unknowns 2025 -DEAL:: -DEAL::Solver type: N6dealii13SLEPcWrappers17SolverKrylovSchurE -DEAL::Solver stopped after 18 iterations -DEAL::Eigenvalues: 29.73524, 29.67536, 29.58873, 29.46785 -DEAL:: -DEAL::Solver type: N6dealii13SLEPcWrappers13SolverArnoldiE -DEAL::Solver stopped after 61 iterations -DEAL::Eigenvalues: 29.73524, 29.67536, 29.58873, 29.46785 -DEAL:: -DEAL::Solver type: N6dealii13SLEPcWrappers13SolverLanczosE -DEAL::Solver stopped after 60 iterations -DEAL::Eigenvalues: 29.73524, 29.67536, 29.58873, 29.46785 -DEAL:: -DEAL::Solver type: N6dealii13SLEPcWrappers25SolverGeneralizedDavidsonE -DEAL::Solver stopped after 334 iterations -DEAL::Eigenvalues: 29.73524, 29.67536, 29.58873, 29.46785 -DEAL:: -DEAL::Solver type: N6dealii13SLEPcWrappers25SolverGeneralizedDavidsonE -DEAL::Solver stopped after 504 iterations -DEAL::Eigenvalues: 29.73524, 29.67536, 29.58873, 29.46785 -DEAL:: -DEAL::Solver type: N6dealii13SLEPcWrappers20SolverJacobiDavidsonE -DEAL::Solver stopped after 58 iterations -DEAL::Eigenvalues: 29.73524, 29.67536, 29.58873, 29.46785 -DEAL:: diff --git a/tests/slepc/step-36_parallel.cc b/tests/slepc/step-36_parallel.cc index c7764521db..beb9b3b066 100644 --- a/tests/slepc/step-36_parallel.cc +++ b/tests/slepc/step-36_parallel.cc @@ -283,8 +283,10 @@ void test (std::string solver_name, eigenfunctions, eigenfunctions.size()); - dealii::deallog << "outer iterations: "<< solver_control.last_step ()<