From: Wolfgang Bangerth Date: Sun, 21 Aug 2011 04:14:20 +0000 (+0000) Subject: When saying X-Git-Tag: v8.0.0~3614 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=734fd143ffaa18128d463a99ba26b9615a594d8d;p=dealii.git When saying backward = backward; this statement rarely does what one intended. Use this->backward = backward; instead. git-svn-id: https://svn.dealii.org/trunk@24154 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/source/lac/block_matrix_array.cc b/deal.II/source/lac/block_matrix_array.cc index 1837af7d94..31d931781b 100644 --- a/deal.II/source/lac/block_matrix_array.cc +++ b/deal.II/source/lac/block_matrix_array.cc @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------- // $Id$ // -// Copyright (C) 2005, 2006, 2008, 2010 by the deal.II authors +// Copyright (C) 2005, 2006, 2008, 2010, 2011 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -126,10 +126,10 @@ BlockMatrixArray::vmult_add (BlockVector& dst, typename VectorMemory >::Pointer p_aux(mem); Vector& aux = *p_aux; - + typename std::vector::const_iterator m = entries.begin(); typename std::vector::const_iterator end = entries.end(); - + for (; m != end ; ++m) { aux.reinit(dst.block(m->row)); @@ -169,10 +169,10 @@ BlockMatrixArray::Tvmult_add (BlockVector& dst, typename std::vector::const_iterator m = entries.begin(); typename std::vector::const_iterator end = entries.end(); - + typename VectorMemory >::Pointer p_aux(mem); Vector& aux = *p_aux; - + for (; m != end ; ++m) { aux.reinit(dst.block(m->col)); @@ -212,12 +212,12 @@ BlockMatrixArray::matrix_scalar_product ( typename VectorMemory >::Pointer p_aux(mem); Vector& aux = *p_aux; - + typename std::vector::const_iterator m; typename std::vector::const_iterator end = entries.end(); number result = 0.; - + for (unsigned int i=0;i::initialize( bool backward) { BlockMatrixArray::initialize(n_block_rows, n_block_rows, memory); - backward = backward; + this->backward = backward; } @@ -329,12 +329,12 @@ BlockTrianglePrecondition::do_row ( end = this->entries.end(); std::vector::Entry>::const_iterator> diagonals; - + typename VectorMemory >::Pointer p_aux(mem); Vector& aux = *p_aux; - + aux.reinit(dst.block(row_num), true); - + // Loop over all entries, since // they are not ordered by rows. for (; m != end ; ++m) @@ -436,7 +436,7 @@ BlockTrianglePrecondition::vmult ( for (unsigned int i=0; i