From: wolf Date: Thu, 6 Mar 2003 14:45:49 +0000 (+0000) Subject: Clarify names of parameters. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ca36682a6797651ed35646d44eb0b35243f3ae1;p=dealii-svn.git Clarify names of parameters. git-svn-id: https://svn.dealii.org/trunk@7269 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/lac/include/lac/block_sparsity_pattern.h b/deal.II/lac/include/lac/block_sparsity_pattern.h index cac00b158b..d741be8839 100644 --- a/deal.II/lac/include/lac/block_sparsity_pattern.h +++ b/deal.II/lac/include/lac/block_sparsity_pattern.h @@ -97,8 +97,8 @@ class BlockSparsityPatternBase : public Subscriptor * to call @p{collect_sizes} after * you assign them sizes. */ - BlockSparsityPatternBase (const unsigned int n_rows, - const unsigned int n_columns); + BlockSparsityPatternBase (const unsigned int n_block_rows, + const unsigned int n_block_columns); /** * Copy constructor. This @@ -119,17 +119,18 @@ class BlockSparsityPatternBase : public Subscriptor ~BlockSparsityPatternBase (); /** - * Resize the matrix. This - * deletes all blocks and replaces - * them by unitialized ones, - * i.e. ones for which also the - * sizes are not yet set. You - * have to do that by calling the - * @p{reinit} functions of the - * blocks themselves. Do not - * forget to call - * @p{collect_sizes} after that on - * this object. + * Resize the matrix, by setting + * the number of block rows and + * columns. This deletes all + * blocks and replaces them by + * unitialized ones, i.e. ones + * for which also the sizes are + * not yet set. You have to do + * that by calling the @p{reinit} + * functions of the blocks + * themselves. Do not forget to + * call @p{collect_sizes} after + * that on this object. * * The reason that you have to * set sizes of the blocks @@ -143,8 +144,8 @@ class BlockSparsityPatternBase : public Subscriptor * user call whatever function * she desires. */ - void reinit (const unsigned int n_rows, - const unsigned int n_columns); + void reinit (const unsigned int n_block_rows, + const unsigned int n_block_columns); /** * Copy operator. For this the diff --git a/deal.II/lac/source/block_sparsity_pattern.cc b/deal.II/lac/source/block_sparsity_pattern.cc index d273fd4f47..316639cbd2 100644 --- a/deal.II/lac/source/block_sparsity_pattern.cc +++ b/deal.II/lac/source/block_sparsity_pattern.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2002 by the deal authors +// Copyright (C) 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -27,20 +27,21 @@ BlockSparsityPatternBase::BlockSparsityPatternBase () template BlockSparsityPatternBase:: -BlockSparsityPatternBase (const unsigned int r, - const unsigned int c) +BlockSparsityPatternBase (const unsigned int n_block_rows, + const unsigned int n_block_columns) : rows (0), columns (0) { - reinit (r,c); + reinit (n_block_rows, n_block_columns); } template -BlockSparsityPatternBase::BlockSparsityPatternBase ( - const BlockSparsityPatternBase& s) : +BlockSparsityPatternBase:: +BlockSparsityPatternBase (const BlockSparsityPatternBase &s) + : Subscriptor () { Assert(s.rows==0, ExcInvalidConstructorCall()); @@ -63,8 +64,9 @@ BlockSparsityPatternBase::~BlockSparsityPatternBase () template void -BlockSparsityPatternBase::reinit (const unsigned int r, - const unsigned int c) +BlockSparsityPatternBase:: +reinit (const unsigned int n_block_rows, + const unsigned int n_block_columns) { // delete previous content for (unsigned int i=0; i::reinit (const unsigned int r, sub_objects.clear (); // set new sizes - rows = r; - columns = c; + rows = n_block_rows; + columns = n_block_columns; sub_objects.reinit (rows, columns); // allocate new objects