From 02152f2d89fa22d5e1a091aa77d4631456e50544 Mon Sep 17 00:00:00 2001 From: bangerth Date: Wed, 25 Oct 2006 00:13:45 +0000 Subject: [PATCH] Tests are now fixed git-svn-id: https://svn.dealii.org/trunk@14077 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/umfpack/umfpack_04.cc | 4 +++ tests/umfpack/umfpack_04/cmp/generic | 2 +- tests/umfpack/umfpack_05.cc | 12 +++++---- tests/umfpack/umfpack_05/cmp/generic | 37 +--------------------------- 4 files changed, 13 insertions(+), 42 deletions(-) diff --git a/tests/umfpack/umfpack_04.cc b/tests/umfpack/umfpack_04.cc index 9e80a220b9..64826ce3a1 100644 --- a/tests/umfpack/umfpack_04.cc +++ b/tests/umfpack/umfpack_04.cc @@ -188,6 +188,8 @@ void test () deallog << "relative norm distance = " << x.l2_norm() / ub.l2_norm() << std::endl; + Assert (x.l2_norm() / ub.l2_norm() < 1e-12, + ExcInternalError()); deallog << "Block Sparse Factorization" << std::endl; umfpackb.factorize(Bb); @@ -202,6 +204,8 @@ void test () deallog << "relative norm distance = " << b.l2_norm() / ubb.l2_norm() << std::endl; + Assert (b.l2_norm() / ubb.l2_norm() < 1e-12, + ExcInternalError()); } diff --git a/tests/umfpack/umfpack_04/cmp/generic b/tests/umfpack/umfpack_04/cmp/generic index 4135273bda..42f346d44c 100644 --- a/tests/umfpack/umfpack_04/cmp/generic +++ b/tests/umfpack/umfpack_04/cmp/generic @@ -28,7 +28,7 @@ DEAL::Number of dofs = 669 DEAL:cg::Starting value 3.12141 DEAL:cg::Convergence step 24 value 0 DEAL:cg::Starting value 3.12141 -DEAL:cg::Convergence step 24 value 0 +DEAL:cg::Convergence step 25 value 0 DEAL::Sparse Factorization DEAL::absolute norms = 13.7931 13.7931 DEAL::relative norm distance = 0 diff --git a/tests/umfpack/umfpack_05.cc b/tests/umfpack/umfpack_05.cc index 5ef158cb7d..54495c5d3b 100644 --- a/tests/umfpack/umfpack_05.cc +++ b/tests/umfpack/umfpack_05.cc @@ -25,8 +25,6 @@ #include - -template void test () { std::vector size (2,2U); @@ -56,6 +54,12 @@ void test () ubb(i) = i; umfpackb.solve(ubb); + + for (unsigned int i=0; i<4; ++i) + Assert (std::fabs (ubb(i) - i) < 1e-12, + ExcInternalError()); + + deallog << "OK" << std::endl; } @@ -66,7 +70,5 @@ int main () deallog.depth_console(0); deallog.threshold_double(1.e-10); - test<1> (); - test<2> (); - test<3> (); + test (); } diff --git a/tests/umfpack/umfpack_05/cmp/generic b/tests/umfpack/umfpack_05/cmp/generic index 4135273bda..0fd8fc12f0 100644 --- a/tests/umfpack/umfpack_05/cmp/generic +++ b/tests/umfpack/umfpack_05/cmp/generic @@ -1,37 +1,2 @@ -DEAL::1d -DEAL::Number of dofs = 97 -DEAL:cg::Starting value 0.215517 -DEAL:cg::Convergence step 111 value 0 -DEAL:cg::Starting value 0.215517 -DEAL:cg::Convergence step 111 value 0 -DEAL::Sparse Factorization -DEAL::absolute norms = 6.45748 6.45748 -DEAL::relative norm distance = 0 -DEAL::Block Sparse Factorization -DEAL::absolute norms = 6.45748 6.45748 -DEAL::relative norm distance = 0 -DEAL::2d -DEAL::Number of dofs = 994 -DEAL:cg::Starting value 0.595296 -DEAL:cg::Convergence step 58 value 0 -DEAL:cg::Starting value 0.595296 -DEAL:cg::Convergence step 58 value 0 -DEAL::Sparse Factorization -DEAL::absolute norms = 10.0596 10.0596 -DEAL::relative norm distance = 0 -DEAL::Block Sparse Factorization -DEAL::absolute norms = 10.0596 10.0596 -DEAL::relative norm distance = 0 -DEAL::3d -DEAL::Number of dofs = 669 -DEAL:cg::Starting value 3.12141 -DEAL:cg::Convergence step 24 value 0 -DEAL:cg::Starting value 3.12141 -DEAL:cg::Convergence step 24 value 0 -DEAL::Sparse Factorization -DEAL::absolute norms = 13.7931 13.7931 -DEAL::relative norm distance = 0 -DEAL::Block Sparse Factorization -DEAL::absolute norms = 13.7931 13.7931 -DEAL::relative norm distance = 0 +DEAL::OK -- 2.39.5