From ab4735c5c3a8a633c7cb5701c89093e193c857c1 Mon Sep 17 00:00:00 2001 From: Jean-Paul Pelteret Date: Mon, 4 Jan 2016 18:10:05 +0100 Subject: [PATCH] Fixed some tests. linear_operator_08 failed when deal.II is not built with UMFPACK. There's now a switch for that. --- tests/lac/linear_operator_08.cc | 7 +- ...r_08.with_cxx11=on.with_umfpack=off.output | 86 +++++++++++++++++++ ...r_08.with_cxx11=on.with_umfpack=on.output} | 0 3 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 tests/lac/linear_operator_08.with_cxx11=on.with_umfpack=off.output rename tests/lac/{linear_operator_08.with_cxx11=on.output => linear_operator_08.with_cxx11=on.with_umfpack=on.output} (100%) diff --git a/tests/lac/linear_operator_08.cc b/tests/lac/linear_operator_08.cc index b7d0fdc977..9033e7bfb3 100644 --- a/tests/lac/linear_operator_08.cc +++ b/tests/lac/linear_operator_08.cc @@ -42,9 +42,10 @@ #include #include #include -#include #include - +#ifdef DEAL_II_WITH_UMFPACK +#include +#endif using namespace dealii; @@ -385,6 +386,7 @@ int main() const Vector b (rc); const Vector x = lo_A_inv*b; } +#ifdef DEAL_II_WITH_UMFPACK { deallog << "SparseDirectUMFPACK" << std::endl; const auto lo_A = linear_operator(A); @@ -395,6 +397,7 @@ int main() const auto lo_A_inv = linear_operator(solver); const Vector x = lo_A_inv*b; } +#endif // { // See #1673 and #1784 // deallog << "IterativeInverse" << std::endl; // diff --git a/tests/lac/linear_operator_08.with_cxx11=on.with_umfpack=off.output b/tests/lac/linear_operator_08.with_cxx11=on.with_umfpack=off.output new file mode 100644 index 0000000000..84bdb2e317 --- /dev/null +++ b/tests/lac/linear_operator_08.with_cxx11=on.with_umfpack=off.output @@ -0,0 +1,86 @@ + +DEAL::Preconditioners +DEAL:Preconditioners::PreconditionChebyshev +DEAL:Preconditioners:cg::Starting value 0.9486832981 +DEAL:Preconditioners:cg::Convergence step 1 value 0.000000000 +DEAL:Preconditioners:Exact inverse:cg::Starting value 16.88194302 +DEAL:Preconditioners:Exact inverse:cg::Convergence step 1 value 2.601335705e-15 +DEAL:Preconditioners::PreconditionIdentity +DEAL:Preconditioners:Exact inverse:cg::Starting value 16.88194302 +DEAL:Preconditioners:Exact inverse:cg::Convergence step 1 value 3.903187958e-15 +DEAL:Preconditioners::PreconditionJacobi +DEAL:Preconditioners:Exact inverse:cg::Starting value 16.88194302 +DEAL:Preconditioners:Exact inverse:cg::Convergence step 1 value 0.000000000 +DEAL:Preconditioners::PreconditionPSOR +DEAL:Preconditioners:Exact inverse:cg::Starting value 16.88194302 +DEAL:Preconditioners:Exact inverse:cg::Convergence step 1 value 0.000000000 +DEAL:Preconditioners::PreconditionRichardson +DEAL:Preconditioners:Exact inverse:cg::Starting value 16.88194302 +DEAL:Preconditioners:Exact inverse:cg::Convergence step 1 value 0.000000000 +DEAL:Preconditioners::PreconditionSelector +DEAL:Preconditioners:cg::Starting value 16.88194302 +DEAL:Preconditioners:cg::Convergence step 1 value 0.000000000 +DEAL:Preconditioners::PreconditionSOR +DEAL:Preconditioners:Exact inverse:cg::Starting value 16.88194302 +DEAL:Preconditioners:Exact inverse:cg::Convergence step 1 value 0.000000000 +DEAL:Preconditioners::PreconditionSSOR +DEAL:Preconditioners:Exact inverse:cg::Starting value 16.88194302 +DEAL:Preconditioners:Exact inverse:cg::Convergence step 1 value 0.000000000 +DEAL:Preconditioners::SparseILU +DEAL:Preconditioners:Exact inverse:cg::Starting value 16.88194302 +DEAL:Preconditioners:Exact inverse:cg::Convergence step 1 value 0.000000000 +DEAL:Preconditioners::SparseMIC +DEAL:Preconditioners:Exact inverse:cg::Starting value 16.88194302 +DEAL:Preconditioners:Exact inverse:cg::Convergence step 1 value 0.000000000 +DEAL:Preconditioners::SparseVanka +DEAL:Preconditioners:Exact inverse:cg::Starting value 16.88194302 +DEAL:Preconditioners:Exact inverse:cg::Convergence step 1 value 0.000000000 +DEAL:: +DEAL::Solvers +DEAL:Solvers::SolverBicgstab +DEAL:Solvers:Standard solver:Bicgstab::Starting value 16.88194302 +DEAL:Solvers:Standard solver:Bicgstab::Convergence step 1 value 0.000000000 +DEAL:Solvers:Linear operator:Bicgstab::Starting value 16.88194302 +DEAL:Solvers:Linear operator:Bicgstab::Convergence step 1 value 0.000000000 +DEAL:Solvers::SolverCG +DEAL:Solvers:Standard solver:cg::Starting value 16.88194302 +DEAL:Solvers:Standard solver:cg::Convergence step 1 value 0.000000000 +DEAL:Solvers:Linear operator:cg::Starting value 16.88194302 +DEAL:Solvers:Linear operator:cg::Convergence step 1 value 0.000000000 +DEAL:Solvers::SolverFGMRES +DEAL:Solvers:Standard solver:FGMRES::Starting value 16.88194302 +DEAL:Solvers:Standard solver:FGMRES::Convergence step 1 value 2.744725072e-15 +DEAL:Solvers:Linear operator:FGMRES::Starting value 16.88194302 +DEAL:Solvers:Linear operator:FGMRES::Convergence step 1 value 2.744725072e-15 +DEAL:Solvers::SolverGMRES +DEAL:Solvers:Standard solver:GMRES::Starting value 8.440971508 +DEAL:Solvers:Standard solver:GMRES::Convergence step 1 value 1.372362536e-15 +DEAL:Solvers:Linear operator:GMRES::Starting value 8.440971508 +DEAL:Solvers:Linear operator:GMRES::Convergence step 1 value 1.372362536e-15 +DEAL:Solvers::SolverMinRes +DEAL:Solvers:Standard solver:minres::Starting value 11.93733639 +DEAL:Solvers:Standard solver:minres::Convergence step 1 value 2.059168646e-15 +DEAL:Solvers:Linear operator:minres::Starting value 11.93733639 +DEAL:Solvers:Linear operator:minres::Convergence step 1 value 2.059168646e-15 +DEAL:Solvers::SolverQMRS +DEAL:Solvers:Standard solver:QMRS::Starting value 16.88194302 +DEAL:Solvers:Standard solver:QMRS::Convergence step 1 value 0.000000000 +DEAL:Solvers:Linear operator:QMRS::Starting value 16.88194302 +DEAL:Solvers:Linear operator:QMRS::Convergence step 1 value 0.000000000 +DEAL:Solvers::SolverRelaxation +DEAL:Solvers:Standard solver:Relaxation::Starting value 16.88194302 +DEAL:Solvers:Standard solver:Relaxation::Convergence step 1 value 0.000000000 +DEAL:Solvers:Linear operator:Relaxation::Starting value 16.88194302 +DEAL:Solvers:Linear operator:Relaxation::Convergence step 1 value 0.000000000 +DEAL:Solvers::SolverRichardson +DEAL:Solvers:Standard solver:Richardson::Starting value 16.88194302 +DEAL:Solvers:Standard solver:Richardson::Convergence step 1 value 0.000000000 +DEAL:Solvers:Linear operator:Richardson::Starting value 16.88194302 +DEAL:Solvers:Linear operator:Richardson::Convergence step 1 value 0.000000000 +DEAL:Solvers::SolverSelector +DEAL:Solvers:cg::Convergence step 0 value 0.000000000 +DEAL::SparseMatrix OK +DEAL::PreconditionBlockIdentity +DEAL:cg::Starting value 49.69909456 +DEAL:cg::Convergence step 1 value 0.000000000 +DEAL::BlockSparseMatrix OK diff --git a/tests/lac/linear_operator_08.with_cxx11=on.output b/tests/lac/linear_operator_08.with_cxx11=on.with_umfpack=on.output similarity index 100% rename from tests/lac/linear_operator_08.with_cxx11=on.output rename to tests/lac/linear_operator_08.with_cxx11=on.with_umfpack=on.output -- 2.39.5