From 69864f70180833ba18e03dc6b54bc558927591e8 Mon Sep 17 00:00:00 2001 From: kanschat Date: Tue, 27 Feb 2007 05:54:48 +0000 Subject: [PATCH] test new block PSOR git-svn-id: https://svn.dealii.org/trunk@14512 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/lac/sparse_matrices.cc | 43 +- tests/lac/sparse_matrices/cmp/generic | 732 +++++++++++++------------- 2 files changed, 405 insertions(+), 370 deletions(-) diff --git a/tests/lac/sparse_matrices.cc b/tests/lac/sparse_matrices.cc index d8464ae82c..cae0de45ef 100644 --- a/tests/lac/sparse_matrices.cc +++ b/tests/lac/sparse_matrices.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2007 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -32,9 +32,11 @@ #include -#define PREC_CHECK(solver, method, precond) try \ - { solver.method (A, u, f, precond); } catch (...) {} \ - residuals.push_back(control.last_value()) +#define PREC_CHECK(solver, method, precond) \ + deallog.push(#precond); \ + try { u = 0.; solver.method (A, u, f, precond); } catch (...) {} \ + deallog.pop(); \ + residuals.push_back(control.last_value()) template void @@ -51,46 +53,63 @@ check_vmult_quadratic(std::vector& residuals, SolverControl control(10, 1.e-13, false); SolverRichardson<> rich(control, mem, .01); SolverRichardson<> prich(control, mem, 1.); + + const unsigned int block_size = (unsigned int) std::sqrt(A.n()+.3); + const unsigned int n_blocks = A.n()/block_size; + + typename PreconditionBlock::AdditionalData + data(block_size, 1.2); + std::vector perm(A.n()); + std::vector iperm(A.n()); + for (unsigned int i=0;i jacobi; jacobi.initialize(A, .5); PreconditionSOR sor; sor.initialize(A, 1.2); +// PreconditionPSOR psor; +// psor.initialize(A, perm, iperm, 1.2); PreconditionSSOR ssor; ssor.initialize(A, 1.2); - typename PreconditionBlock::AdditionalData - data((unsigned int) std::sqrt(A.n()+.3), 1.2); - PreconditionBlockJacobi block_jacobi; block_jacobi.initialize(A, data); PreconditionBlockSSOR block_ssor; block_ssor.initialize(A, data); PreconditionBlockSOR block_sor; block_sor.initialize(A, data); + PreconditionBlockSOR block_psor; + block_psor.initialize(A, data); + block_psor.set_permutation(perm, iperm); - u = 0.; f = 1.; PREC_CHECK(rich, solve, identity); PREC_CHECK(prich, solve, jacobi); PREC_CHECK(prich, solve, ssor); PREC_CHECK(prich, solve, sor); - u = 0.; +// PREC_CHECK(prich, solve, psor); PREC_CHECK(prich, solve, block_jacobi); PREC_CHECK(prich, solve, block_ssor); PREC_CHECK(prich, solve, block_sor); + PREC_CHECK(prich, solve, block_psor); - u = 0.; deallog << "Transpose" << std::endl; PREC_CHECK(rich, Tsolve, identity); PREC_CHECK(prich, Tsolve, jacobi); PREC_CHECK(prich, Tsolve, ssor); PREC_CHECK(prich, Tsolve, sor); - u = 0.; +// PREC_CHECK(prich, Tsolve, psor); PREC_CHECK(prich, Tsolve, block_jacobi); PREC_CHECK(prich, Tsolve, block_ssor); PREC_CHECK(prich, Tsolve, block_sor); + PREC_CHECK(prich, Tsolve, block_psor); deallog.pop(); } @@ -254,7 +273,7 @@ int main() { std::ofstream logfile("sparse_matrices/output"); // logfile.setf(std::ios::fixed); - logfile.precision(2); + logfile.precision(3); deallog.attach(logfile); // Switch between regression test diff --git a/tests/lac/sparse_matrices/cmp/generic b/tests/lac/sparse_matrices/cmp/generic index 4c62422580..103ce7eea3 100644 --- a/tests/lac/sparse_matrices/cmp/generic +++ b/tests/lac/sparse_matrices/cmp/generic @@ -20,337 +20,345 @@ DEAL::Final DEAL::cols: DEAL::Repeat row 2 DEAL::Irregular matrix -DEAL::0 0 0 1.0 +DEAL::0 0 0 1.00 DEAL:: 1 DEAL::cols: ,0 ,1 ,2 ,3 -DEAL::1 1 0 2.0 +DEAL::1 1 0 2.00 DEAL:: 2 DEAL::cols: ,0 -DEAL::2 2 0 3.0 +DEAL::2 2 0 3.00 DEAL:: 4 DEAL::cols: ,0 -DEAL::3 4 3 17. +DEAL::3 4 3 17.0 DEAL:: 4 DEAL::cols: -DEAL::4 4 3 17. +DEAL::4 4 3 17.0 DEAL::Final DEAL::cols: ,3 DEAL::Final DEAL::Final DEAL::cols: -DEAL:: 0 0 1.0 -DEAL:: 0 1 1.0 -DEAL:: 0 2 2.0 -DEAL:: 0 3 3.0 -DEAL:: 1 0 2.0 -DEAL:: 2 0 3.0 -DEAL:: 4 3 17. +DEAL:: 0 0 1.00 +DEAL:: 0 1 1.00 +DEAL:: 0 2 2.00 +DEAL:: 0 3 3.00 +DEAL:: 1 0 2.00 +DEAL:: 2 0 3.00 +DEAL:: 4 3 17.0 DEAL::Repeat row 2 -DEAL:: 2 0 3.0 +DEAL:: 2 0 3.00 First conjugate -0 0 4.0 -0 1 18. -0 2 32. -1 0 16. -1 1 70. -1 2 1.2e+02 -2 0 28. -2 1 1.2e+02 -2 2 2.2e+02 +0 0 4.00 +0 1 18.0 +0 2 32.0 +1 0 16.0 +1 1 70.0 +1 2 124. +2 0 28.0 +2 1 122. +2 2 216. Second conjugate -0 0 2.8e+02 -0 1 4.0e+02 -1 0 3.8e+02 -1 1 5.5e+02 +0 0 276. +0 1 402. +1 0 378. +1 1 549. DEAL::Structure DEAL::Assemble -DEAL:5-SparseMatrix:Richardson::Starting value 4.0 -DEAL:5-SparseMatrix:Richardson::Failure step 10 value 3.6 -DEAL:5-SparseMatrix:Richardson::Starting value 3.6 -DEAL:5-SparseMatrix:Richardson::Failure step 10 value 1.2 -DEAL:5-SparseMatrix:Richardson::Starting value 1.2 -DEAL:5-SparseMatrix:Richardson::Failure step 10 value 0.00061 -DEAL:5-SparseMatrix:Richardson::Starting value 0.00061 -DEAL:5-SparseMatrix:Richardson::Failure step 10 value 2.1e-07 -DEAL:5-SparseMatrix:Richardson::Starting value 4.0 -DEAL:5-SparseMatrix:Richardson::Failure step 10 value 0.0059 -DEAL:5-SparseMatrix:Richardson::Starting value 0.0059 -DEAL:5-SparseMatrix:Richardson::Failure step 10 value 0.00052 -DEAL:5-SparseMatrix:Richardson::Starting value 0.00052 -DEAL:5-SparseMatrix:Richardson::Failure step 10 value 0 +DEAL:5-SparseMatrix:identity:Richardson::Starting value 4.00 +DEAL:5-SparseMatrix:identity:Richardson::Failure step 10 value 3.55 +DEAL:5-SparseMatrix:jacobi:Richardson::Starting value 4.00 +DEAL:5-SparseMatrix:jacobi:Richardson::Failure step 10 value 1.34 +DEAL:5-SparseMatrix:ssor:Richardson::Starting value 4.00 +DEAL:5-SparseMatrix:ssor:Richardson::Failure step 10 value 0.00218 +DEAL:5-SparseMatrix:sor:Richardson::Starting value 4.00 +DEAL:5-SparseMatrix:sor:Richardson::Failure step 10 value 0.00188 +DEAL:5-SparseMatrix:block_jacobi:Richardson::Starting value 4.00 +DEAL:5-SparseMatrix:block_jacobi:Richardson::Failure step 10 value 0.00594 +DEAL:5-SparseMatrix:block_ssor:Richardson::Starting value 4.00 +DEAL:5-SparseMatrix:block_ssor:Richardson::Failure step 10 value 0.371 +DEAL:5-SparseMatrix:block_sor:Richardson::Starting value 4.00 +DEAL:5-SparseMatrix:block_sor:Richardson::Failure step 10 value 1.07e-06 +DEAL:5-SparseMatrix:block_psor:Richardson::Starting value 4.00 +DEAL:5-SparseMatrix:block_psor:Richardson::Failure step 10 value 9.25e-07 DEAL:5-SparseMatrix::Transpose -DEAL:5-SparseMatrix:RichardsonT::Starting value 4.0 -DEAL:5-SparseMatrix:RichardsonT::Failure step 10 value 3.6 -DEAL:5-SparseMatrix:RichardsonT::Starting value 3.6 -DEAL:5-SparseMatrix:RichardsonT::Failure step 10 value 1.2 -DEAL:5-SparseMatrix:RichardsonT::Starting value 1.2 -DEAL:5-SparseMatrix:RichardsonT::Failure step 10 value 0.0054 -DEAL:5-SparseMatrix:RichardsonT::Starting value 0.0054 -DEAL:5-SparseMatrix:RichardsonT::Failure step 10 value 0.00026 -DEAL:5-SparseMatrix:RichardsonT::Starting value 4.0 -DEAL:5-SparseMatrix:RichardsonT::Failure step 10 value 0.0034 -DEAL:5-SparseMatrix:RichardsonT::Starting value 0.0034 -DEAL:5-SparseMatrix:RichardsonT::Failure step 10 value 0.0041 -DEAL:5-SparseMatrix:RichardsonT::Starting value 0.0041 -DEAL:5-SparseMatrix:RichardsonT::Failure step 10 value 3.0e-05 -DEAL::GrowingVectorMemory:Overall allocated vectors: 28 +DEAL:5-SparseMatrix:identity:RichardsonT::Starting value 4.00 +DEAL:5-SparseMatrix:identity:RichardsonT::Failure step 10 value 3.55 +DEAL:5-SparseMatrix:jacobi:RichardsonT::Starting value 4.00 +DEAL:5-SparseMatrix:jacobi:RichardsonT::Failure step 10 value 1.34 +DEAL:5-SparseMatrix:ssor:RichardsonT::Starting value 4.00 +DEAL:5-SparseMatrix:ssor:RichardsonT::Failure step 10 value 0.0180 +DEAL:5-SparseMatrix:sor:RichardsonT::Starting value 4.00 +DEAL:5-SparseMatrix:sor:RichardsonT::Failure step 10 value 0.230 +DEAL:5-SparseMatrix:block_jacobi:RichardsonT::Starting value 4.00 +DEAL:5-SparseMatrix:block_jacobi:RichardsonT::Failure step 10 value 0.00341 +DEAL:5-SparseMatrix:block_ssor:RichardsonT::Starting value 4.00 +DEAL:5-SparseMatrix:block_ssor:RichardsonT::Failure step 10 value 7.92 +DEAL:5-SparseMatrix:block_sor:RichardsonT::Starting value 4.00 +DEAL:5-SparseMatrix:block_sor:RichardsonT::Failure step 10 value 0.0445 +DEAL:5-SparseMatrix:block_psor:RichardsonT::Starting value 4.00 +DEAL:5-SparseMatrix:block_psor:RichardsonT::Failure step 10 value 0.0472 +DEAL::GrowingVectorMemory:Overall allocated vectors: 32 DEAL::GrowingVectorMemory:Maximum allocated vectors: 2 -DEAL:: 0 0 5.0 -DEAL:: 0 1 -2.0 -DEAL:: 0 4 -1.0 -DEAL:: 1 1 5.0 -DEAL:: 1 0 -1.0 -DEAL:: 1 2 -2.0 -DEAL:: 1 5 -1.0 -DEAL:: 2 2 5.0 -DEAL:: 2 1 -1.0 -DEAL:: 2 3 -2.0 -DEAL:: 2 6 -1.0 -DEAL:: 3 3 5.0 -DEAL:: 3 2 -1.0 -DEAL:: 3 7 -1.0 -DEAL:: 4 4 5.0 -DEAL:: 4 0 -1.0 -DEAL:: 4 5 -2.0 -DEAL:: 4 8 -1.0 -DEAL:: 5 5 5.0 -DEAL:: 5 1 -1.0 -DEAL:: 5 4 -1.0 -DEAL:: 5 6 -2.0 -DEAL:: 5 9 -1.0 -DEAL:: 6 6 5.0 -DEAL:: 6 2 -1.0 -DEAL:: 6 5 -1.0 -DEAL:: 6 7 -2.0 -DEAL:: 6 10 -1.0 -DEAL:: 7 7 5.0 -DEAL:: 7 3 -1.0 -DEAL:: 7 6 -1.0 -DEAL:: 7 11 -1.0 -DEAL:: 8 8 5.0 -DEAL:: 8 4 -1.0 -DEAL:: 8 9 -2.0 -DEAL:: 8 12 -1.0 -DEAL:: 9 9 5.0 -DEAL:: 9 5 -1.0 -DEAL:: 9 8 -1.0 -DEAL:: 9 10 -2.0 -DEAL:: 9 13 -1.0 -DEAL:: 10 10 5.0 -DEAL:: 10 6 -1.0 -DEAL:: 10 9 -1.0 -DEAL:: 10 11 -2.0 -DEAL:: 10 14 -1.0 -DEAL:: 11 11 5.0 -DEAL:: 11 7 -1.0 -DEAL:: 11 10 -1.0 -DEAL:: 11 15 -1.0 -DEAL:: 12 12 5.0 -DEAL:: 12 8 -1.0 -DEAL:: 12 13 -2.0 -DEAL:: 13 13 5.0 -DEAL:: 13 9 -1.0 -DEAL:: 13 12 -1.0 -DEAL:: 13 14 -2.0 -DEAL:: 14 14 5.0 -DEAL:: 14 10 -1.0 -DEAL:: 14 13 -1.0 -DEAL:: 14 15 -2.0 -DEAL:: 15 15 5.0 -DEAL:: 15 11 -1.0 -DEAL:: 15 14 -1.0 +DEAL:: 0 0 5.00 +DEAL:: 0 1 -2.00 +DEAL:: 0 4 -1.00 +DEAL:: 1 1 5.00 +DEAL:: 1 0 -1.00 +DEAL:: 1 2 -2.00 +DEAL:: 1 5 -1.00 +DEAL:: 2 2 5.00 +DEAL:: 2 1 -1.00 +DEAL:: 2 3 -2.00 +DEAL:: 2 6 -1.00 +DEAL:: 3 3 5.00 +DEAL:: 3 2 -1.00 +DEAL:: 3 7 -1.00 +DEAL:: 4 4 5.00 +DEAL:: 4 0 -1.00 +DEAL:: 4 5 -2.00 +DEAL:: 4 8 -1.00 +DEAL:: 5 5 5.00 +DEAL:: 5 1 -1.00 +DEAL:: 5 4 -1.00 +DEAL:: 5 6 -2.00 +DEAL:: 5 9 -1.00 +DEAL:: 6 6 5.00 +DEAL:: 6 2 -1.00 +DEAL:: 6 5 -1.00 +DEAL:: 6 7 -2.00 +DEAL:: 6 10 -1.00 +DEAL:: 7 7 5.00 +DEAL:: 7 3 -1.00 +DEAL:: 7 6 -1.00 +DEAL:: 7 11 -1.00 +DEAL:: 8 8 5.00 +DEAL:: 8 4 -1.00 +DEAL:: 8 9 -2.00 +DEAL:: 8 12 -1.00 +DEAL:: 9 9 5.00 +DEAL:: 9 5 -1.00 +DEAL:: 9 8 -1.00 +DEAL:: 9 10 -2.00 +DEAL:: 9 13 -1.00 +DEAL:: 10 10 5.00 +DEAL:: 10 6 -1.00 +DEAL:: 10 9 -1.00 +DEAL:: 10 11 -2.00 +DEAL:: 10 14 -1.00 +DEAL:: 11 11 5.00 +DEAL:: 11 7 -1.00 +DEAL:: 11 10 -1.00 +DEAL:: 11 15 -1.00 +DEAL:: 12 12 5.00 +DEAL:: 12 8 -1.00 +DEAL:: 12 13 -2.00 +DEAL:: 13 13 5.00 +DEAL:: 13 9 -1.00 +DEAL:: 13 12 -1.00 +DEAL:: 13 14 -2.00 +DEAL:: 14 14 5.00 +DEAL:: 14 10 -1.00 +DEAL:: 14 13 -1.00 +DEAL:: 14 15 -2.00 +DEAL:: 15 15 5.00 +DEAL:: 15 11 -1.00 +DEAL:: 15 14 -1.00 DEAL::Repeat row 2 -DEAL:: 2 2 5.0 -DEAL:: 2 1 -1.0 -DEAL:: 2 3 -2.0 -DEAL:: 2 6 -1.0 +DEAL:: 2 2 5.00 +DEAL:: 2 1 -1.00 +DEAL:: 2 3 -2.00 +DEAL:: 2 6 -1.00 DEAL::Structure DEAL::Assemble -DEAL:5-BlockSparseMatrix:Richardson::Starting value 4.0 -DEAL:5-BlockSparseMatrix:Richardson::Failure step 10 value 3.6 -DEAL:5-BlockSparseMatrix:Richardson::Starting value 3.6 -DEAL:5-BlockSparseMatrix:Richardson::Failure step 10 value 1.2 -DEAL:5-BlockSparseMatrix:Richardson::Starting value 4.0 -DEAL:5-BlockSparseMatrix:Richardson::Failure step 10 value 0.0059 +DEAL:5-BlockSparseMatrix:identity:Richardson::Starting value 4.00 +DEAL:5-BlockSparseMatrix:identity:Richardson::Failure step 10 value 3.55 +DEAL:5-BlockSparseMatrix:jacobi:Richardson::Starting value 4.00 +DEAL:5-BlockSparseMatrix:jacobi:Richardson::Failure step 10 value 1.34 +DEAL:5-BlockSparseMatrix:block_jacobi:Richardson::Starting value 4.00 +DEAL:5-BlockSparseMatrix:block_jacobi:Richardson::Failure step 10 value 0.00594 DEAL:5-BlockSparseMatrix::Transpose -DEAL:5-BlockSparseMatrix:RichardsonT::Starting value 4.0 -DEAL:5-BlockSparseMatrix:RichardsonT::Failure step 10 value 3.6 -DEAL:5-BlockSparseMatrix:RichardsonT::Starting value 3.6 -DEAL:5-BlockSparseMatrix:RichardsonT::Failure step 10 value 1.2 -DEAL:5-BlockSparseMatrix:RichardsonT::Starting value 4.0 -DEAL:5-BlockSparseMatrix:RichardsonT::Failure step 10 value 0.0034 +DEAL:5-BlockSparseMatrix:identity:RichardsonT::Starting value 4.00 +DEAL:5-BlockSparseMatrix:identity:RichardsonT::Failure step 10 value 3.55 +DEAL:5-BlockSparseMatrix:jacobi:RichardsonT::Starting value 4.00 +DEAL:5-BlockSparseMatrix:jacobi:RichardsonT::Failure step 10 value 1.34 +DEAL:5-BlockSparseMatrix:block_jacobi:RichardsonT::Starting value 4.00 +DEAL:5-BlockSparseMatrix:block_jacobi:RichardsonT::Failure step 10 value 0.00341 DEAL::GrowingVectorMemory:Overall allocated vectors: 12 DEAL::GrowingVectorMemory:Maximum allocated vectors: 2 -DEAL:: 0 0 5.0 -DEAL:: 0 1 -2.0 -DEAL:: 0 4 -1.0 -DEAL:: 1 1 5.0 -DEAL:: 1 0 -1.0 -DEAL:: 1 2 -2.0 -DEAL:: 1 5 -1.0 -DEAL:: 2 2 5.0 -DEAL:: 2 1 -1.0 -DEAL:: 2 3 -2.0 -DEAL:: 2 6 -1.0 -DEAL:: 3 3 5.0 -DEAL:: 3 2 -1.0 -DEAL:: 3 7 -1.0 -DEAL:: 4 4 5.0 -DEAL:: 4 0 -1.0 -DEAL:: 4 5 -2.0 -DEAL:: 4 8 -1.0 -DEAL:: 5 5 5.0 -DEAL:: 5 1 -1.0 -DEAL:: 5 4 -1.0 -DEAL:: 5 6 -2.0 -DEAL:: 5 9 -1.0 -DEAL:: 6 6 5.0 -DEAL:: 6 2 -1.0 -DEAL:: 6 5 -1.0 -DEAL:: 6 7 -2.0 -DEAL:: 6 10 -1.0 -DEAL:: 7 7 5.0 -DEAL:: 7 3 -1.0 -DEAL:: 7 6 -1.0 -DEAL:: 7 11 -1.0 -DEAL:: 8 8 5.0 -DEAL:: 8 4 -1.0 -DEAL:: 8 9 -2.0 -DEAL:: 8 12 -1.0 -DEAL:: 9 9 5.0 -DEAL:: 9 5 -1.0 -DEAL:: 9 8 -1.0 -DEAL:: 9 10 -2.0 -DEAL:: 9 13 -1.0 -DEAL:: 10 10 5.0 -DEAL:: 10 6 -1.0 -DEAL:: 10 9 -1.0 -DEAL:: 10 11 -2.0 -DEAL:: 10 14 -1.0 -DEAL:: 11 11 5.0 -DEAL:: 11 7 -1.0 -DEAL:: 11 10 -1.0 -DEAL:: 11 15 -1.0 -DEAL:: 12 12 5.0 -DEAL:: 12 8 -1.0 -DEAL:: 12 13 -2.0 -DEAL:: 13 13 5.0 -DEAL:: 13 9 -1.0 -DEAL:: 13 12 -1.0 -DEAL:: 13 14 -2.0 -DEAL:: 14 14 5.0 -DEAL:: 14 10 -1.0 -DEAL:: 14 13 -1.0 -DEAL:: 14 15 -2.0 -DEAL:: 15 15 5.0 -DEAL:: 15 11 -1.0 -DEAL:: 15 14 -1.0 +DEAL:: 0 0 5.00 +DEAL:: 0 1 -2.00 +DEAL:: 0 4 -1.00 +DEAL:: 1 1 5.00 +DEAL:: 1 0 -1.00 +DEAL:: 1 2 -2.00 +DEAL:: 1 5 -1.00 +DEAL:: 2 2 5.00 +DEAL:: 2 1 -1.00 +DEAL:: 2 3 -2.00 +DEAL:: 2 6 -1.00 +DEAL:: 3 3 5.00 +DEAL:: 3 2 -1.00 +DEAL:: 3 7 -1.00 +DEAL:: 4 4 5.00 +DEAL:: 4 0 -1.00 +DEAL:: 4 5 -2.00 +DEAL:: 4 8 -1.00 +DEAL:: 5 5 5.00 +DEAL:: 5 1 -1.00 +DEAL:: 5 4 -1.00 +DEAL:: 5 6 -2.00 +DEAL:: 5 9 -1.00 +DEAL:: 6 6 5.00 +DEAL:: 6 2 -1.00 +DEAL:: 6 5 -1.00 +DEAL:: 6 7 -2.00 +DEAL:: 6 10 -1.00 +DEAL:: 7 7 5.00 +DEAL:: 7 3 -1.00 +DEAL:: 7 6 -1.00 +DEAL:: 7 11 -1.00 +DEAL:: 8 8 5.00 +DEAL:: 8 4 -1.00 +DEAL:: 8 9 -2.00 +DEAL:: 8 12 -1.00 +DEAL:: 9 9 5.00 +DEAL:: 9 5 -1.00 +DEAL:: 9 8 -1.00 +DEAL:: 9 10 -2.00 +DEAL:: 9 13 -1.00 +DEAL:: 10 10 5.00 +DEAL:: 10 6 -1.00 +DEAL:: 10 9 -1.00 +DEAL:: 10 11 -2.00 +DEAL:: 10 14 -1.00 +DEAL:: 11 11 5.00 +DEAL:: 11 7 -1.00 +DEAL:: 11 10 -1.00 +DEAL:: 11 15 -1.00 +DEAL:: 12 12 5.00 +DEAL:: 12 8 -1.00 +DEAL:: 12 13 -2.00 +DEAL:: 13 13 5.00 +DEAL:: 13 9 -1.00 +DEAL:: 13 12 -1.00 +DEAL:: 13 14 -2.00 +DEAL:: 14 14 5.00 +DEAL:: 14 10 -1.00 +DEAL:: 14 13 -1.00 +DEAL:: 14 15 -2.00 +DEAL:: 15 15 5.00 +DEAL:: 15 11 -1.00 +DEAL:: 15 14 -1.00 DEAL::Repeat row 2 -DEAL:: 2 2 5.0 -DEAL:: 2 1 -1.0 -DEAL:: 2 3 -2.0 -DEAL:: 2 6 -1.0 +DEAL:: 2 2 5.00 +DEAL:: 2 1 -1.00 +DEAL:: 2 3 -2.00 +DEAL:: 2 6 -1.00 DEAL::Assemble -DEAL:5-SparseMatrixEZ:Richardson::Starting value 4.0 -DEAL:5-SparseMatrixEZ:Richardson::Failure step 10 value 3.6 -DEAL:5-SparseMatrixEZ:Richardson::Starting value 3.6 -DEAL:5-SparseMatrixEZ:Richardson::Failure step 10 value 1.2 -DEAL:5-SparseMatrixEZ:Richardson::Starting value 1.2 -DEAL:5-SparseMatrixEZ:Richardson::Failure step 10 value 0.00061 -DEAL:5-SparseMatrixEZ:Richardson::Starting value 0.00061 -DEAL:5-SparseMatrixEZ:Richardson::Failure step 10 value 2.1e-07 -DEAL:5-SparseMatrixEZ:Richardson::Starting value 4.0 -DEAL:5-SparseMatrixEZ:Richardson::Failure step 10 value 0.0059 -DEAL:5-SparseMatrixEZ:Richardson::Starting value 0.0059 -DEAL:5-SparseMatrixEZ:Richardson::Failure step 10 value 0.00052 -DEAL:5-SparseMatrixEZ:Richardson::Starting value 0.00052 -DEAL:5-SparseMatrixEZ:Richardson::Failure step 10 value 0 +DEAL:5-SparseMatrixEZ:identity:Richardson::Starting value 4.00 +DEAL:5-SparseMatrixEZ:identity:Richardson::Failure step 10 value 3.55 +DEAL:5-SparseMatrixEZ:jacobi:Richardson::Starting value 4.00 +DEAL:5-SparseMatrixEZ:jacobi:Richardson::Failure step 10 value 1.34 +DEAL:5-SparseMatrixEZ:ssor:Richardson::Starting value 4.00 +DEAL:5-SparseMatrixEZ:ssor:Richardson::Failure step 10 value 0.00218 +DEAL:5-SparseMatrixEZ:sor:Richardson::Starting value 4.00 +DEAL:5-SparseMatrixEZ:sor:Richardson::Failure step 10 value 0.00188 +DEAL:5-SparseMatrixEZ:block_jacobi:Richardson::Starting value 4.00 +DEAL:5-SparseMatrixEZ:block_jacobi:Richardson::Failure step 10 value 0.00594 +DEAL:5-SparseMatrixEZ:block_ssor:Richardson::Starting value 4.00 +DEAL:5-SparseMatrixEZ:block_ssor:Richardson::Failure step 10 value 0.371 +DEAL:5-SparseMatrixEZ:block_sor:Richardson::Starting value 4.00 +DEAL:5-SparseMatrixEZ:block_sor:Richardson::Failure step 10 value 1.07e-06 +DEAL:5-SparseMatrixEZ:block_psor:Richardson::Starting value 4.00 +DEAL:5-SparseMatrixEZ:block_psor:Richardson::Failure step 10 value 9.25e-07 DEAL:5-SparseMatrixEZ::Transpose -DEAL:5-SparseMatrixEZ:RichardsonT::Starting value 4.0 -DEAL:5-SparseMatrixEZ:RichardsonT::Failure step 10 value 3.6 -DEAL:5-SparseMatrixEZ:RichardsonT::Starting value 3.6 -DEAL:5-SparseMatrixEZ:RichardsonT::Failure step 10 value 1.2 -DEAL:5-SparseMatrixEZ:RichardsonT::Starting value 1.2 -DEAL:5-SparseMatrixEZ:RichardsonT::Failure step 10 value 0.0054 -DEAL:5-SparseMatrixEZ:RichardsonT::Starting value 0.0054 -DEAL:5-SparseMatrixEZ:RichardsonT::Failure step 10 value 0.00026 -DEAL:5-SparseMatrixEZ:RichardsonT::Starting value 4.0 -DEAL:5-SparseMatrixEZ:RichardsonT::Failure step 10 value 0.0034 -DEAL:5-SparseMatrixEZ:RichardsonT::Starting value 0.0034 -DEAL:5-SparseMatrixEZ:RichardsonT::Failure step 10 value 0.0041 -DEAL:5-SparseMatrixEZ:RichardsonT::Starting value 0.0041 -DEAL:5-SparseMatrixEZ:RichardsonT::Failure step 10 value 3.0e-05 -DEAL::GrowingVectorMemory:Overall allocated vectors: 28 +DEAL:5-SparseMatrixEZ:identity:RichardsonT::Starting value 4.00 +DEAL:5-SparseMatrixEZ:identity:RichardsonT::Failure step 10 value 3.55 +DEAL:5-SparseMatrixEZ:jacobi:RichardsonT::Starting value 4.00 +DEAL:5-SparseMatrixEZ:jacobi:RichardsonT::Failure step 10 value 1.34 +DEAL:5-SparseMatrixEZ:ssor:RichardsonT::Starting value 4.00 +DEAL:5-SparseMatrixEZ:ssor:RichardsonT::Failure step 10 value 0.0180 +DEAL:5-SparseMatrixEZ:sor:RichardsonT::Starting value 4.00 +DEAL:5-SparseMatrixEZ:sor:RichardsonT::Failure step 10 value 0.230 +DEAL:5-SparseMatrixEZ:block_jacobi:RichardsonT::Starting value 4.00 +DEAL:5-SparseMatrixEZ:block_jacobi:RichardsonT::Failure step 10 value 0.00341 +DEAL:5-SparseMatrixEZ:block_ssor:RichardsonT::Starting value 4.00 +DEAL:5-SparseMatrixEZ:block_ssor:RichardsonT::Failure step 10 value 7.92 +DEAL:5-SparseMatrixEZ:block_sor:RichardsonT::Starting value 4.00 +DEAL:5-SparseMatrixEZ:block_sor:RichardsonT::Failure step 10 value 0.0445 +DEAL:5-SparseMatrixEZ:block_psor:RichardsonT::Starting value 4.00 +DEAL:5-SparseMatrixEZ:block_psor:RichardsonT::Failure step 10 value 0.0472 +DEAL::GrowingVectorMemory:Overall allocated vectors: 32 DEAL::GrowingVectorMemory:Maximum allocated vectors: 2 -DEAL:: 0 0 5.0 -DEAL:: 0 1 -2.0 -DEAL:: 0 4 -1.0 -DEAL:: 1 0 -1.0 -DEAL:: 1 1 5.0 -DEAL:: 1 2 -2.0 -DEAL:: 1 5 -1.0 -DEAL:: 2 1 -1.0 -DEAL:: 2 2 5.0 -DEAL:: 2 3 -2.0 -DEAL:: 2 6 -1.0 -DEAL:: 3 2 -1.0 -DEAL:: 3 3 5.0 -DEAL:: 3 7 -1.0 -DEAL:: 4 0 -1.0 -DEAL:: 4 4 5.0 -DEAL:: 4 5 -2.0 -DEAL:: 4 8 -1.0 -DEAL:: 5 1 -1.0 -DEAL:: 5 4 -1.0 -DEAL:: 5 5 5.0 -DEAL:: 5 6 -2.0 -DEAL:: 5 9 -1.0 -DEAL:: 6 2 -1.0 -DEAL:: 6 5 -1.0 -DEAL:: 6 6 5.0 -DEAL:: 6 7 -2.0 -DEAL:: 6 10 -1.0 -DEAL:: 7 3 -1.0 -DEAL:: 7 6 -1.0 -DEAL:: 7 7 5.0 -DEAL:: 7 11 -1.0 -DEAL:: 8 4 -1.0 -DEAL:: 8 8 5.0 -DEAL:: 8 9 -2.0 -DEAL:: 8 12 -1.0 -DEAL:: 9 5 -1.0 -DEAL:: 9 8 -1.0 -DEAL:: 9 9 5.0 -DEAL:: 9 10 -2.0 -DEAL:: 9 13 -1.0 -DEAL:: 10 6 -1.0 -DEAL:: 10 9 -1.0 -DEAL:: 10 10 5.0 -DEAL:: 10 11 -2.0 -DEAL:: 10 14 -1.0 -DEAL:: 11 7 -1.0 -DEAL:: 11 10 -1.0 -DEAL:: 11 11 5.0 -DEAL:: 11 15 -1.0 -DEAL:: 12 8 -1.0 -DEAL:: 12 12 5.0 -DEAL:: 12 13 -2.0 -DEAL:: 13 9 -1.0 -DEAL:: 13 12 -1.0 -DEAL:: 13 13 5.0 -DEAL:: 13 14 -2.0 -DEAL:: 14 10 -1.0 -DEAL:: 14 13 -1.0 -DEAL:: 14 14 5.0 -DEAL:: 14 15 -2.0 -DEAL:: 15 11 -1.0 -DEAL:: 15 14 -1.0 -DEAL:: 15 15 5.0 +DEAL:: 0 0 5.00 +DEAL:: 0 1 -2.00 +DEAL:: 0 4 -1.00 +DEAL:: 1 0 -1.00 +DEAL:: 1 1 5.00 +DEAL:: 1 2 -2.00 +DEAL:: 1 5 -1.00 +DEAL:: 2 1 -1.00 +DEAL:: 2 2 5.00 +DEAL:: 2 3 -2.00 +DEAL:: 2 6 -1.00 +DEAL:: 3 2 -1.00 +DEAL:: 3 3 5.00 +DEAL:: 3 7 -1.00 +DEAL:: 4 0 -1.00 +DEAL:: 4 4 5.00 +DEAL:: 4 5 -2.00 +DEAL:: 4 8 -1.00 +DEAL:: 5 1 -1.00 +DEAL:: 5 4 -1.00 +DEAL:: 5 5 5.00 +DEAL:: 5 6 -2.00 +DEAL:: 5 9 -1.00 +DEAL:: 6 2 -1.00 +DEAL:: 6 5 -1.00 +DEAL:: 6 6 5.00 +DEAL:: 6 7 -2.00 +DEAL:: 6 10 -1.00 +DEAL:: 7 3 -1.00 +DEAL:: 7 6 -1.00 +DEAL:: 7 7 5.00 +DEAL:: 7 11 -1.00 +DEAL:: 8 4 -1.00 +DEAL:: 8 8 5.00 +DEAL:: 8 9 -2.00 +DEAL:: 8 12 -1.00 +DEAL:: 9 5 -1.00 +DEAL:: 9 8 -1.00 +DEAL:: 9 9 5.00 +DEAL:: 9 10 -2.00 +DEAL:: 9 13 -1.00 +DEAL:: 10 6 -1.00 +DEAL:: 10 9 -1.00 +DEAL:: 10 10 5.00 +DEAL:: 10 11 -2.00 +DEAL:: 10 14 -1.00 +DEAL:: 11 7 -1.00 +DEAL:: 11 10 -1.00 +DEAL:: 11 11 5.00 +DEAL:: 11 15 -1.00 +DEAL:: 12 8 -1.00 +DEAL:: 12 12 5.00 +DEAL:: 12 13 -2.00 +DEAL:: 13 9 -1.00 +DEAL:: 13 12 -1.00 +DEAL:: 13 13 5.00 +DEAL:: 13 14 -2.00 +DEAL:: 14 10 -1.00 +DEAL:: 14 13 -1.00 +DEAL:: 14 14 5.00 +DEAL:: 14 15 -2.00 +DEAL:: 15 11 -1.00 +DEAL:: 15 14 -1.00 +DEAL:: 15 15 5.00 DEAL::Repeat row 2 -DEAL:: 2 1 -1.0 -DEAL:: 2 2 5.0 -DEAL:: 2 3 -2.0 -DEAL:: 2 6 -1.0 +DEAL:: 2 1 -1.00 +DEAL:: 2 2 5.00 +DEAL:: 2 3 -2.00 +DEAL:: 2 6 -1.00 DEAL::SparseMatrixEZ:used entries:64 DEAL::SparseMatrixEZ:allocated entries:72 DEAL::SparseMatrixEZ:reserved entries:96 @@ -360,68 +368,76 @@ DEAL::SparseMatrixEZ:entries 5 rows 4 DEAL::Matrices are equal DEAL::Structure DEAL::Assemble -DEAL:9-SparseMatrix:Richardson::Starting value 4.0 -DEAL:9-SparseMatrix:Richardson::Failure step 10 value 2.4 -DEAL:9-SparseMatrix:Richardson::Starting value 2.4 -DEAL:9-SparseMatrix:Richardson::Failure step 10 value 0.74 -DEAL:9-SparseMatrix:Richardson::Starting value 0.74 -DEAL:9-SparseMatrix:Richardson::Failure step 10 value 0.00035 -DEAL:9-SparseMatrix:Richardson::Starting value 0.00035 -DEAL:9-SparseMatrix:Richardson::Failure step 10 value 9.6e-08 -DEAL:9-SparseMatrix:Richardson::Starting value 4.0 -DEAL:9-SparseMatrix:Richardson::Failure step 10 value 0.025 -DEAL:9-SparseMatrix:Richardson::Starting value 0.025 -DEAL:9-SparseMatrix:Richardson::Failure step 10 value 0.0021 -DEAL:9-SparseMatrix:Richardson::Starting value 0.0021 -DEAL:9-SparseMatrix:Richardson::Failure step 10 value 0 +DEAL:9-SparseMatrix:identity:Richardson::Starting value 4.00 +DEAL:9-SparseMatrix:identity:Richardson::Failure step 10 value 2.41 +DEAL:9-SparseMatrix:jacobi:Richardson::Starting value 4.00 +DEAL:9-SparseMatrix:jacobi:Richardson::Failure step 10 value 1.17 +DEAL:9-SparseMatrix:ssor:Richardson::Starting value 4.00 +DEAL:9-SparseMatrix:ssor:Richardson::Failure step 10 value 0.00174 +DEAL:9-SparseMatrix:sor:Richardson::Starting value 4.00 +DEAL:9-SparseMatrix:sor:Richardson::Failure step 10 value 0.00112 +DEAL:9-SparseMatrix:block_jacobi:Richardson::Starting value 4.00 +DEAL:9-SparseMatrix:block_jacobi:Richardson::Failure step 10 value 0.0255 +DEAL:9-SparseMatrix:block_ssor:Richardson::Starting value 4.00 +DEAL:9-SparseMatrix:block_ssor:Richardson::Failure step 10 value 0.362 +DEAL:9-SparseMatrix:block_sor:Richardson::Starting value 4.00 +DEAL:9-SparseMatrix:block_sor:Richardson::Failure step 10 value 2.94e-06 +DEAL:9-SparseMatrix:block_psor:Richardson::Starting value 4.00 +DEAL:9-SparseMatrix:block_psor:Richardson::Failure step 10 value 2.09e-06 DEAL:9-SparseMatrix::Transpose -DEAL:9-SparseMatrix:RichardsonT::Starting value 4.0 -DEAL:9-SparseMatrix:RichardsonT::Failure step 10 value 2.4 -DEAL:9-SparseMatrix:RichardsonT::Starting value 2.4 -DEAL:9-SparseMatrix:RichardsonT::Failure step 10 value 0.74 -DEAL:9-SparseMatrix:RichardsonT::Starting value 0.74 -DEAL:9-SparseMatrix:RichardsonT::Failure step 10 value 0.00035 -DEAL:9-SparseMatrix:RichardsonT::Starting value 0.00035 -DEAL:9-SparseMatrix:RichardsonT::Failure step 10 value 6.4e-08 -DEAL:9-SparseMatrix:RichardsonT::Starting value 4.0 -DEAL:9-SparseMatrix:RichardsonT::Failure step 10 value 0.025 -DEAL:9-SparseMatrix:RichardsonT::Starting value 0.025 -DEAL:9-SparseMatrix:RichardsonT::Failure step 10 value 0.0021 -DEAL:9-SparseMatrix:RichardsonT::Starting value 0.0021 -DEAL:9-SparseMatrix:RichardsonT::Failure step 10 value 0 -DEAL::GrowingVectorMemory:Overall allocated vectors: 28 +DEAL:9-SparseMatrix:identity:RichardsonT::Starting value 4.00 +DEAL:9-SparseMatrix:identity:RichardsonT::Failure step 10 value 2.41 +DEAL:9-SparseMatrix:jacobi:RichardsonT::Starting value 4.00 +DEAL:9-SparseMatrix:jacobi:RichardsonT::Failure step 10 value 1.17 +DEAL:9-SparseMatrix:ssor:RichardsonT::Starting value 4.00 +DEAL:9-SparseMatrix:ssor:RichardsonT::Failure step 10 value 0.00174 +DEAL:9-SparseMatrix:sor:RichardsonT::Starting value 4.00 +DEAL:9-SparseMatrix:sor:RichardsonT::Failure step 10 value 0.00112 +DEAL:9-SparseMatrix:block_jacobi:RichardsonT::Starting value 4.00 +DEAL:9-SparseMatrix:block_jacobi:RichardsonT::Failure step 10 value 0.0255 +DEAL:9-SparseMatrix:block_ssor:RichardsonT::Starting value 4.00 +DEAL:9-SparseMatrix:block_ssor:RichardsonT::Failure step 10 value 0.362 +DEAL:9-SparseMatrix:block_sor:RichardsonT::Starting value 4.00 +DEAL:9-SparseMatrix:block_sor:RichardsonT::Failure step 10 value 2.94e-06 +DEAL:9-SparseMatrix:block_psor:RichardsonT::Starting value 4.00 +DEAL:9-SparseMatrix:block_psor:RichardsonT::Failure step 10 value 1.86e-06 +DEAL::GrowingVectorMemory:Overall allocated vectors: 32 DEAL::GrowingVectorMemory:Maximum allocated vectors: 2 DEAL::Assemble -DEAL:9-SparseMatrixEZ:Richardson::Starting value 4.0 -DEAL:9-SparseMatrixEZ:Richardson::Failure step 10 value 2.4 -DEAL:9-SparseMatrixEZ:Richardson::Starting value 2.4 -DEAL:9-SparseMatrixEZ:Richardson::Failure step 10 value 0.74 -DEAL:9-SparseMatrixEZ:Richardson::Starting value 0.74 -DEAL:9-SparseMatrixEZ:Richardson::Failure step 10 value 0.00035 -DEAL:9-SparseMatrixEZ:Richardson::Starting value 0.00035 -DEAL:9-SparseMatrixEZ:Richardson::Failure step 10 value 9.6e-08 -DEAL:9-SparseMatrixEZ:Richardson::Starting value 4.0 -DEAL:9-SparseMatrixEZ:Richardson::Failure step 10 value 0.025 -DEAL:9-SparseMatrixEZ:Richardson::Starting value 0.025 -DEAL:9-SparseMatrixEZ:Richardson::Failure step 10 value 0.0021 -DEAL:9-SparseMatrixEZ:Richardson::Starting value 0.0021 -DEAL:9-SparseMatrixEZ:Richardson::Failure step 10 value 0 +DEAL:9-SparseMatrixEZ:identity:Richardson::Starting value 4.00 +DEAL:9-SparseMatrixEZ:identity:Richardson::Failure step 10 value 2.41 +DEAL:9-SparseMatrixEZ:jacobi:Richardson::Starting value 4.00 +DEAL:9-SparseMatrixEZ:jacobi:Richardson::Failure step 10 value 1.17 +DEAL:9-SparseMatrixEZ:ssor:Richardson::Starting value 4.00 +DEAL:9-SparseMatrixEZ:ssor:Richardson::Failure step 10 value 0.00174 +DEAL:9-SparseMatrixEZ:sor:Richardson::Starting value 4.00 +DEAL:9-SparseMatrixEZ:sor:Richardson::Failure step 10 value 0.00112 +DEAL:9-SparseMatrixEZ:block_jacobi:Richardson::Starting value 4.00 +DEAL:9-SparseMatrixEZ:block_jacobi:Richardson::Failure step 10 value 0.0255 +DEAL:9-SparseMatrixEZ:block_ssor:Richardson::Starting value 4.00 +DEAL:9-SparseMatrixEZ:block_ssor:Richardson::Failure step 10 value 0.362 +DEAL:9-SparseMatrixEZ:block_sor:Richardson::Starting value 4.00 +DEAL:9-SparseMatrixEZ:block_sor:Richardson::Failure step 10 value 2.94e-06 +DEAL:9-SparseMatrixEZ:block_psor:Richardson::Starting value 4.00 +DEAL:9-SparseMatrixEZ:block_psor:Richardson::Failure step 10 value 2.09e-06 DEAL:9-SparseMatrixEZ::Transpose -DEAL:9-SparseMatrixEZ:RichardsonT::Starting value 4.0 -DEAL:9-SparseMatrixEZ:RichardsonT::Failure step 10 value 2.4 -DEAL:9-SparseMatrixEZ:RichardsonT::Starting value 2.4 -DEAL:9-SparseMatrixEZ:RichardsonT::Failure step 10 value 0.74 -DEAL:9-SparseMatrixEZ:RichardsonT::Starting value 0.74 -DEAL:9-SparseMatrixEZ:RichardsonT::Failure step 10 value 0.00035 -DEAL:9-SparseMatrixEZ:RichardsonT::Starting value 0.00035 -DEAL:9-SparseMatrixEZ:RichardsonT::Failure step 10 value 6.4e-08 -DEAL:9-SparseMatrixEZ:RichardsonT::Starting value 4.0 -DEAL:9-SparseMatrixEZ:RichardsonT::Failure step 10 value 0.025 -DEAL:9-SparseMatrixEZ:RichardsonT::Starting value 0.025 -DEAL:9-SparseMatrixEZ:RichardsonT::Failure step 10 value 0.0021 -DEAL:9-SparseMatrixEZ:RichardsonT::Starting value 0.0021 -DEAL:9-SparseMatrixEZ:RichardsonT::Failure step 10 value 0 -DEAL::GrowingVectorMemory:Overall allocated vectors: 28 +DEAL:9-SparseMatrixEZ:identity:RichardsonT::Starting value 4.00 +DEAL:9-SparseMatrixEZ:identity:RichardsonT::Failure step 10 value 2.41 +DEAL:9-SparseMatrixEZ:jacobi:RichardsonT::Starting value 4.00 +DEAL:9-SparseMatrixEZ:jacobi:RichardsonT::Failure step 10 value 1.17 +DEAL:9-SparseMatrixEZ:ssor:RichardsonT::Starting value 4.00 +DEAL:9-SparseMatrixEZ:ssor:RichardsonT::Failure step 10 value 0.00174 +DEAL:9-SparseMatrixEZ:sor:RichardsonT::Starting value 4.00 +DEAL:9-SparseMatrixEZ:sor:RichardsonT::Failure step 10 value 0.00112 +DEAL:9-SparseMatrixEZ:block_jacobi:RichardsonT::Starting value 4.00 +DEAL:9-SparseMatrixEZ:block_jacobi:RichardsonT::Failure step 10 value 0.0255 +DEAL:9-SparseMatrixEZ:block_ssor:RichardsonT::Starting value 4.00 +DEAL:9-SparseMatrixEZ:block_ssor:RichardsonT::Failure step 10 value 0.362 +DEAL:9-SparseMatrixEZ:block_sor:RichardsonT::Starting value 4.00 +DEAL:9-SparseMatrixEZ:block_sor:RichardsonT::Failure step 10 value 2.94e-06 +DEAL:9-SparseMatrixEZ:block_psor:RichardsonT::Starting value 4.00 +DEAL:9-SparseMatrixEZ:block_psor:RichardsonT::Failure step 10 value 1.86e-06 +DEAL::GrowingVectorMemory:Overall allocated vectors: 32 DEAL::GrowingVectorMemory:Maximum allocated vectors: 2 DEAL::SparseMatrixEZ:used entries:100 DEAL::SparseMatrixEZ:allocated entries:111 -- 2.39.5