From dabb7aa73953e0284e1f0f1c31ea0e3c3b4fe21d Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 25 Jan 2010 00:46:45 +0000 Subject: [PATCH] Better tolerances. git-svn-id: https://svn.dealii.org/trunk@20438 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/umfpack/umfpack_03.cc | 22 +++++++++++----------- tests/umfpack/umfpack_08.cc | 30 +++++++++++++++--------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/tests/umfpack/umfpack_03.cc b/tests/umfpack/umfpack_03.cc index 4d969a1992..12d15c9a41 100644 --- a/tests/umfpack/umfpack_03.cc +++ b/tests/umfpack/umfpack_03.cc @@ -1,8 +1,8 @@ //---------------------------------------------------------------------- // $Id$ -// Version: $Name$ +// Version: $Name$ // -// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -42,8 +42,8 @@ template void test () { deallog << dim << 'd' << std::endl; - - Triangulation tria; + + Triangulation tria; GridGenerator::hyper_cube (tria,0,1); tria.refine_global (1); @@ -56,19 +56,19 @@ void test () FE_Q fe (1); DoFHandler dof_handler (tria); dof_handler.distribute_dofs (fe); - + deallog << "Number of dofs = " << dof_handler.n_dofs() << std::endl; - + SparsityPattern sparsity_pattern; sparsity_pattern.reinit (dof_handler.n_dofs(), dof_handler.n_dofs(), dof_handler.max_couplings_between_dofs()); DoFTools::make_sparsity_pattern (dof_handler, sparsity_pattern); sparsity_pattern.compress (); - + SparseMatrix B; - B.reinit (sparsity_pattern); - + B.reinit (sparsity_pattern); + QGauss qr (2); MatrixTools::create_mass_matrix (dof_handler, qr, B); @@ -88,7 +88,7 @@ void test () if (p->column() != p->row()) Assert (B(p->row(),p->column()) != B(p->column(),p->row()), ExcInternalError()); - + // for a number of different solution // vectors, make up a matching rhs vector // and check what the UMFPACK solver finds @@ -123,7 +123,7 @@ int main () std::ofstream logfile("umfpack_03/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-9); + deallog.threshold_double(1.e-8); test<1> (); test<2> (); diff --git a/tests/umfpack/umfpack_08.cc b/tests/umfpack/umfpack_08.cc index fd591f9f9b..8509e5d506 100644 --- a/tests/umfpack/umfpack_08.cc +++ b/tests/umfpack/umfpack_08.cc @@ -1,8 +1,8 @@ //---------------------------------------------------------------------- // $Id$ -// Version: $Name$ +// Version: $Name$ // -// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -44,8 +44,8 @@ template void test () { deallog << dim << 'd' << std::endl; - - Triangulation tria; + + Triangulation tria; GridGenerator::hyper_cube (tria,0,1); tria.refine_global (1); @@ -58,9 +58,9 @@ void test () FE_Q fe (1); DoFHandler dof_handler (tria); dof_handler.distribute_dofs (fe); - + deallog << "Number of dofs = " << dof_handler.n_dofs() << std::endl; - + BlockSparsityPattern sparsity_pattern; sparsity_pattern.reinit (3, 3); for (unsigned int i=0; i<3; ++i) @@ -76,10 +76,10 @@ void test () sparsity_pattern.collect_sizes(); DoFTools::make_sparsity_pattern (dof_handler, sparsity_pattern); sparsity_pattern.compress (); - + BlockSparseMatrix B; - B.reinit (sparsity_pattern); - + B.reinit (sparsity_pattern); + { // for some reason, we can't // create block matrices directly @@ -90,10 +90,10 @@ void test () dof_handler.max_couplings_between_dofs()); DoFTools::make_sparsity_pattern (dof_handler, xsparsity_pattern); xsparsity_pattern.compress (); - + SparseMatrix xB; - xB.reinit (xsparsity_pattern); - + xB.reinit (xsparsity_pattern); + QGauss qr (2); MatrixTools::create_mass_matrix (dof_handler, qr, xB); @@ -118,8 +118,8 @@ void test () for (SparseMatrix::const_iterator i = xB.begin(); i != xB.end(); ++i) B.set (i->row(), i->column(), i->value()); } - - + + // for a number of different solution // vectors, make up a matching rhs vector // and check what the UMFPACK solver finds @@ -163,7 +163,7 @@ int main () std::ofstream logfile("umfpack_08/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-9); + deallog.threshold_double(1.e-8); test<1> (); test<2> (); -- 2.39.5