From 61c56882bf85b65d212374db0367ed542ab54b9c Mon Sep 17 00:00:00 2001 From: bangerth Date: Sun, 10 Feb 2013 05:02:06 +0000 Subject: [PATCH] Update a test that now produces different output since the change that makes SparsityPattern *always* store diagonal elements. git-svn-id: https://svn.dealii.org/trunk@28305 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/bits/chunk_sparse_matrix_05a.cc | 22 +++++++++---------- .../bits/chunk_sparse_matrix_05a/cmp/generic | 6 ++--- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/tests/bits/chunk_sparse_matrix_05a.cc b/tests/bits/chunk_sparse_matrix_05a.cc index e6608cdaa8..3a48e16e15 100644 --- a/tests/bits/chunk_sparse_matrix_05a.cc +++ b/tests/bits/chunk_sparse_matrix_05a.cc @@ -1,8 +1,8 @@ //---------------------------- chunk_sparse_matrix_05a.cc --------------------------- // $Id$ -// Version: $Name$ +// Version: $Name$ // -// Copyright (C) 2004, 2005, 2008 by the deal.II authors +// Copyright (C) 2004, 2005, 2008, 2013 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -16,13 +16,13 @@ // ChunkSparseMatrix when we don't store the diagonal elements explicitly #include "../tests.h" -#include +#include #include void test (const unsigned int chunk_size) { - ChunkSparsityPattern sp (5,5,3,chunk_size,false); + ChunkSparsityPattern sp (5,5,3,chunk_size); for (unsigned int i=0; i<5; ++i) for (unsigned int j=0; j<5; ++j) if ((i+2*j+1) % 3 == 0) @@ -30,17 +30,15 @@ void test (const unsigned int chunk_size) sp.compress (); ChunkSparseMatrix m(sp); - + // first set a few entries. count how many // entries we have. note that for square // matrices we also always store the - // diagonal element, except when as above - // we set the special flag for the matrix - // sparsity pattern + // diagonal element unsigned int counter = 0; for (unsigned int i=0; i= counter, ExcInternalError()); - + deallog << "OK" << std::endl; } @@ -85,10 +83,10 @@ int main () << "Aborting!" << std::endl << "----------------------------------------------------" << std::endl; - + return 1; } - catch (...) + catch (...) { deallog << std::endl << std::endl << "----------------------------------------------------" diff --git a/tests/bits/chunk_sparse_matrix_05a/cmp/generic b/tests/bits/chunk_sparse_matrix_05a/cmp/generic index 5f8ca8feaa..1af8241656 100644 --- a/tests/bits/chunk_sparse_matrix_05a/cmp/generic +++ b/tests/bits/chunk_sparse_matrix_05a/cmp/generic @@ -1,9 +1,9 @@ -DEAL::8 +DEAL::13 DEAL::OK -DEAL::22 +DEAL::23 DEAL::OK -DEAL::24 +DEAL::25 DEAL::OK DEAL::25 DEAL::OK -- 2.39.5