From: Wolfgang Bangerth Date: Wed, 6 Jan 2010 10:05:16 +0000 (+0000) Subject: Fix output. Run one more test. X-Git-Tag: v8.0.0~6686 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=deb92c854d35831a877153abe0925c7f38b40684;p=dealii.git Fix output. Run one more test. git-svn-id: https://svn.dealii.org/trunk@20304 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/lac/Makefile b/tests/lac/Makefile index 9f3bf3e058..4bee926842 100644 --- a/tests/lac/Makefile +++ b/tests/lac/Makefile @@ -1,6 +1,6 @@ ############################################################ # $Id$ -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by the deal.II authors +# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors ############################################################ ############################################################ @@ -16,7 +16,7 @@ libraries = $(lib-lac.g) \ libraries_o = $(lib-lac.o) \ $(lib-base.o) -default: run-tests +default: run-tests ############################################################ @@ -35,7 +35,7 @@ tests_x = vector-vector vector_memory \ constraints_inhomogeneous \ constraint_graph_zero \ sparse_matrices matrices \ - block_sparsity_pattern_01 \ + block_sparsity_pattern_* \ block_indices \ block_vector \ block_vector_* \ diff --git a/tests/lac/block_sparsity_pattern_02.cc b/tests/lac/block_sparsity_pattern_02.cc index af0c294b0d..5ad8aebf91 100644 --- a/tests/lac/block_sparsity_pattern_02.cc +++ b/tests/lac/block_sparsity_pattern_02.cc @@ -1,8 +1,8 @@ //---------------------------------------------------------------------- // $Id$ -// Version: $Name$ +// Version: $Name$ // -// Copyright (C) 2006, 2008 by the deal.II authors +// Copyright (C) 2006, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -12,7 +12,9 @@ //---------------------------------------------------------------------- -// Test reinit(BlockIndices...) +// BlockSparsityPattern::copy_from only copied n_block_rows x +// n_block_rows blocks, forgetting any additional columns there may +// have been (or trying to copy columns that aren't there #include "../tests.h" @@ -24,14 +26,13 @@ int main() { - std::ofstream logfile("block_sparsity_pattern_01/output"); + std::ofstream logfile("block_sparsity_pattern_02/output"); logfile.setf(std::ios::fixed); deallog << std::setprecision(2); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); - BlockSparsityPattern sparsity; std::vector row_blocks(4); row_blocks[0] = 4; row_blocks[1] = 5; @@ -41,38 +42,14 @@ int main() col_blocks[0] = 2; col_blocks[1] = 3; col_blocks[2] = 2; - BlockIndices rows(row_blocks); - BlockIndices cols(col_blocks); - std::vector > - row_length(cols.size(), - std::vector(rows.total_size())); - for (unsigned int jb=0;jb