From 37cb16f58d4b1590a211f59b2dbbbdf0365a0196 Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Wed, 4 Dec 2013 15:47:16 +0000 Subject: [PATCH] Output error instead of throwing an assertion in order to see the output when it is wrong. Desired output is -inf. git-svn-id: https://svn.dealii.org/trunk@31877 0785d39b-7218-0410-832d-ea1e28bc413d --- .../deal.II/assemble_block_matrix_parallel.cc | 14 ++++---------- .../assemble_block_matrix_parallel.output | 18 ++++++++++++------ tests/deal.II/assemble_matrix_parallel.cc | 6 ++---- tests/deal.II/assemble_matrix_parallel.output | 18 ++++++++++++------ 4 files changed, 30 insertions(+), 26 deletions(-) diff --git a/tests/deal.II/assemble_block_matrix_parallel.cc b/tests/deal.II/assemble_block_matrix_parallel.cc index 8279d75034..2e20166c55 100644 --- a/tests/deal.II/assemble_block_matrix_parallel.cc +++ b/tests/deal.II/assemble_block_matrix_parallel.cc @@ -382,20 +382,14 @@ void LaplaceProblem::assemble_test () test_matrix.add(-1, reference_matrix); + double frobenius_norm = 0; for (unsigned int i=0; i<2; ++i) for (unsigned int j=0; j<2; ++j) - { - const double frobenius_norm = test_matrix.block(i,j).frobenius_norm(); + frobenius_norm += test_matrix.block(i,j).frobenius_norm(); - // the data should add up exactly (unfortunately, there is some roundoff due - // to the cell similarity detection, but there should not be any similarity - // for the hypershell geometry) - AssertThrow(frobenius_norm == 0., ExcInternalError()); - } + deallog << "log error in matrix norm: " << std::log(frobenius_norm) << std::endl; test_rhs.add(-1., reference_rhs); - AssertThrow(test_rhs.l2_norm() == 0., ExcInternalError()); - - deallog << "OK" << std::endl; + deallog << "log error in vector norm: " << std::log(test_rhs.l2_norm()) << std::endl; } diff --git a/tests/deal.II/assemble_block_matrix_parallel.output b/tests/deal.II/assemble_block_matrix_parallel.output index 43fb2379a9..9d2e50eecf 100644 --- a/tests/deal.II/assemble_block_matrix_parallel.output +++ b/tests/deal.II/assemble_block_matrix_parallel.output @@ -1,7 +1,13 @@ -DEAL:2d::OK -DEAL:2d::OK -DEAL:2d::OK -DEAL:3d::OK -DEAL:3d::OK -DEAL:3d::OK +DEAL:2d::log error in matrix norm: -inf +DEAL:2d::log error in vector norm: -inf +DEAL:2d::log error in matrix norm: -inf +DEAL:2d::log error in vector norm: -inf +DEAL:2d::log error in matrix norm: -inf +DEAL:2d::log error in vector norm: -inf +DEAL:3d::log error in matrix norm: -inf +DEAL:3d::log error in vector norm: -inf +DEAL:3d::log error in matrix norm: -inf +DEAL:3d::log error in vector norm: -inf +DEAL:3d::log error in matrix norm: -inf +DEAL:3d::log error in vector norm: -inf diff --git a/tests/deal.II/assemble_matrix_parallel.cc b/tests/deal.II/assemble_matrix_parallel.cc index 240d03e3ad..e0c511089f 100644 --- a/tests/deal.II/assemble_matrix_parallel.cc +++ b/tests/deal.II/assemble_matrix_parallel.cc @@ -384,11 +384,9 @@ void LaplaceProblem::assemble_test () // the data should add up exactly (unfortunately, there is some roundoff due // to the cell similarity detection, but there should not be any similarity // for the hypershell geometry) - AssertThrow(frobenius_norm == 0., ExcInternalError()); + deallog << "log error in matrix norm: " << std::log(frobenius_norm) << std::endl; test_rhs.add(-1., reference_rhs); - AssertThrow(test_rhs.l2_norm() == 0., ExcInternalError()); - - deallog << "OK" << std::endl; + deallog << "log error in vector norm: " << std::log(test_rhs.l2_norm()) << std::endl; } diff --git a/tests/deal.II/assemble_matrix_parallel.output b/tests/deal.II/assemble_matrix_parallel.output index 43fb2379a9..9d2e50eecf 100644 --- a/tests/deal.II/assemble_matrix_parallel.output +++ b/tests/deal.II/assemble_matrix_parallel.output @@ -1,7 +1,13 @@ -DEAL:2d::OK -DEAL:2d::OK -DEAL:2d::OK -DEAL:3d::OK -DEAL:3d::OK -DEAL:3d::OK +DEAL:2d::log error in matrix norm: -inf +DEAL:2d::log error in vector norm: -inf +DEAL:2d::log error in matrix norm: -inf +DEAL:2d::log error in vector norm: -inf +DEAL:2d::log error in matrix norm: -inf +DEAL:2d::log error in vector norm: -inf +DEAL:3d::log error in matrix norm: -inf +DEAL:3d::log error in vector norm: -inf +DEAL:3d::log error in matrix norm: -inf +DEAL:3d::log error in vector norm: -inf +DEAL:3d::log error in matrix norm: -inf +DEAL:3d::log error in vector norm: -inf -- 2.39.5