From: buerg Date: Sat, 11 Aug 2012 14:02:26 +0000 (+0000) Subject: Change unsigned int to types::global_dof_index. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94f9d2a504421a0e0773f7ed42b8d4e71915df0b;p=dealii-svn.git Change unsigned int to types::global_dof_index. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_3@25900 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/files b/deal.II/files index 6f6a5c61f2..f43157b90e 100644 --- a/deal.II/files +++ b/deal.II/files @@ -116,7 +116,7 @@ source/lac/block_matrix_array.cc MARKUS source/lac/block_sparse_matrix.cc MARKUS source/lac/block_sparse_matrix_ez.cc MARKUS source/lac/block_sparsity_pattern.cc -source/lac/block_vector.cc +MARKUS source/lac/block_vector.cc source/lac/chunk_sparse_matrix.cc source/lac/chunk_sparsity_pattern.cc MARKUS source/lac/compressed_set_sparsity_pattern.cc @@ -367,9 +367,9 @@ MARKUS include/deal.II/lac/block_sparse_matrix_ez.templates.h MARKUS include/deal.II/lac/block_sparse_matrix.h MARKUS include/deal.II/lac/block_sparse_matrix.templates.h MARKUS include/deal.II/lac/block_sparsity_pattern.h -include/deal.II/lac/block_vector_base.h -include/deal.II/lac/block_vector.h -include/deal.II/lac/block_vector.templates.h +MARKUS include/deal.II/lac/block_vector_base.h +MARKUS include/deal.II/lac/block_vector.h +MARKUS include/deal.II/lac/block_vector.templates.h include/deal.II/lac/chunk_sparse_matrix.h include/deal.II/lac/chunk_sparse_matrix.templates.h include/deal.II/lac/chunk_sparsity_pattern.h diff --git a/deal.II/include/deal.II/lac/block_sparse_matrix_ez.h b/deal.II/include/deal.II/lac/block_sparse_matrix_ez.h index 861c95d392..2abaf63adf 100644 --- a/deal.II/include/deal.II/lac/block_sparse_matrix_ez.h +++ b/deal.II/include/deal.II/lac/block_sparse_matrix_ez.h @@ -189,7 +189,7 @@ class BlockSparseMatrixEZ : public Subscriptor * space. It is the sum of rows * of the rows of sub-matrices. */ - unsigned int n_rows () const; + types::global_dof_index n_rows () const; /** * Return number of columns of @@ -199,7 +199,7 @@ class BlockSparseMatrixEZ : public Subscriptor * columns of the columns of * sub-matrices. */ - unsigned int n_cols () const; + types::global_dof_index n_cols () const; /** * Return the dimension of the @@ -396,7 +396,7 @@ BlockSparseMatrixEZ::block (const unsigned int row, template inline -unsigned int +types::global_dof_index BlockSparseMatrixEZ::m () const { return n_rows(); @@ -406,7 +406,7 @@ BlockSparseMatrixEZ::m () const template inline -unsigned int +types::global_dof_index BlockSparseMatrixEZ::n () const { return n_cols(); @@ -424,7 +424,7 @@ BlockSparseMatrixEZ::set (const types::global_dof_index i, Assert (numbers::is_finite(value), ExcNumberNotFinite()); - const std::pair + const std::pair row_index = row_indices.global_to_local (i), col_index = column_indices.global_to_local (j); block(row_index.first,col_index.first).set (row_index.second, @@ -444,7 +444,7 @@ BlockSparseMatrixEZ::add (const types::global_dof_index i, Assert (numbers::is_finite(value), ExcNumberNotFinite()); - const std::pair + const std::pair row_index = row_indices.global_to_local (i), col_index = column_indices.global_to_local (j); block(row_index.first,col_index.first).add (row_index.second, diff --git a/deal.II/include/deal.II/lac/block_sparse_matrix_ez.templates.h b/deal.II/include/deal.II/lac/block_sparse_matrix_ez.templates.h index ba1a910621..e6af459048 100644 --- a/deal.II/include/deal.II/lac/block_sparse_matrix_ez.templates.h +++ b/deal.II/include/deal.II/lac/block_sparse_matrix_ez.templates.h @@ -137,8 +137,8 @@ BlockSparseMatrixEZ::collect_sizes () { const unsigned int rows = n_block_rows(); const unsigned int columns = n_block_cols(); - std::vector row_sizes (rows); - std::vector col_sizes (columns); + std::vector row_sizes (rows); + std::vector col_sizes (columns); // first find out the row sizes // from the first block column diff --git a/deal.II/include/deal.II/lac/block_sparsity_pattern.h b/deal.II/include/deal.II/lac/block_sparsity_pattern.h index bdd0d95d31..c292d98bc5 100644 --- a/deal.II/include/deal.II/lac/block_sparsity_pattern.h +++ b/deal.II/include/deal.II/lac/block_sparsity_pattern.h @@ -282,7 +282,7 @@ class BlockSparsityPatternBase : public Subscriptor * to which block (i,j) belongs * and then relays to that block. */ - void add (const unsigned int i, const unsigned int j); + void add (const types::global_dof_index i, const types::global_dof_index j); /** * Add several nonzero entries to the @@ -313,7 +313,7 @@ class BlockSparsityPatternBase : public Subscriptor * of the (block-)rows of * sub-matrices. */ - unsigned int n_rows () const; + types::global_dof_index n_rows () const; /** * Return number of columns of @@ -323,13 +323,13 @@ class BlockSparsityPatternBase : public Subscriptor * columns of the (block-)columns * of sub-matrices. */ - unsigned int n_cols () const; + types::global_dof_index n_cols () const; /** * Check if a value at a certain * position may be non-zero. */ - bool exists (const unsigned int i, const unsigned int j) const; + bool exists (const types::global_dof_index i, const types::global_dof_index j) const; /** * Number of entries in a @@ -337,7 +337,7 @@ class BlockSparsityPatternBase : public Subscriptor * all the blocks that form this * row. */ - unsigned int row_length (const unsigned int row) const; + unsigned int row_length (const types::global_dof_index row) const; /** * Return the number of nonzero @@ -535,7 +535,7 @@ class BlockSparsityPattern : public BlockSparsityPatternBase */ void reinit (const BlockIndices& row_indices, const BlockIndices& col_indices, - const std::vector >& row_lengths); + const std::vector >& row_lengths); /** @@ -686,8 +686,8 @@ class BlockCompressedSparsityPattern : public BlockSparsityPatternBase& row_block_sizes, - const std::vector& col_block_sizes); + BlockCompressedSparsityPattern (const std::vector& row_block_sizes, + const std::vector& col_block_sizes); /** * Initialize the pattern with @@ -713,8 +713,8 @@ class BlockCompressedSparsityPattern : public BlockSparsityPatternBaserow_block_sizes[i] * times col_block_sizes[j]. */ - void reinit (const std::vector< unsigned int > &row_block_sizes, - const std::vector< unsigned int > &col_block_sizes); + void reinit (const std::vector< types::global_dof_index > &row_block_sizes, + const std::vector< types::global_dof_index > &col_block_sizes); /** * Resize the matrix to a tensor @@ -803,8 +803,8 @@ class BlockCompressedSetSparsityPattern : public BlockSparsityPatternBase& row_block_sizes, - const std::vector& col_block_sizes); + BlockCompressedSetSparsityPattern (const std::vector& row_block_sizes, + const std::vector& col_block_sizes); /** * Initialize the pattern with @@ -830,8 +830,8 @@ class BlockCompressedSetSparsityPattern : public BlockSparsityPatternBaserow_block_sizes[i] * times col_block_sizes[j]. */ - void reinit (const std::vector< unsigned int > &row_block_sizes, - const std::vector< unsigned int > &col_block_sizes); + void reinit (const std::vector< types::global_dof_index > &row_block_sizes, + const std::vector< types::global_dof_index > &col_block_sizes); /** * Resize the matrix to a tensor @@ -913,8 +913,8 @@ class BlockCompressedSimpleSparsityPattern : public BlockSparsityPatternBase& row_block_sizes, - const std::vector& col_block_sizes); + BlockCompressedSimpleSparsityPattern (const std::vector& row_block_sizes, + const std::vector& col_block_sizes); /** * Initialize the pattern with symmetric @@ -945,8 +945,8 @@ class BlockCompressedSimpleSparsityPattern : public BlockSparsityPatternBaserow_block_sizes[i] * times col_block_sizes[j]. */ - void reinit (const std::vector< unsigned int > &row_block_sizes, - const std::vector< unsigned int > &col_block_sizes); + void reinit (const std::vector< types::global_dof_index > &row_block_sizes, + const std::vector< types::global_dof_index > &col_block_sizes); /** * Resize the pattern with symmetric @@ -1031,8 +1031,8 @@ namespace TrilinosWrappers * and then entering the index * values. */ - BlockSparsityPattern (const std::vector& row_block_sizes, - const std::vector& col_block_sizes); + BlockSparsityPattern (const std::vector& row_block_sizes, + const std::vector& col_block_sizes); /** * Initialize the pattern with an array @@ -1079,8 +1079,8 @@ namespace TrilinosWrappers * row_block_sizes[i] * times col_block_sizes[j]. */ - void reinit (const std::vector< unsigned int > &row_block_sizes, - const std::vector< unsigned int > &col_block_sizes); + void reinit (const std::vector< types::global_dof_index > &row_block_sizes, + const std::vector< types::global_dof_index > &col_block_sizes); /** * Resize the matrix to a square tensor @@ -1167,13 +1167,13 @@ BlockSparsityPatternBase::get_column_indices () const template inline void -BlockSparsityPatternBase::add (const unsigned int i, - const unsigned int j) +BlockSparsityPatternBase::add (const types::global_dof_index i, + const types::global_dof_index j) { // if you get an error here, are // you sure you called // collect_sizes() before? - const std::pair + const std::pair row_index = row_indices.global_to_local (i), col_index = column_indices.global_to_local (j); sub_objects[row_index.first][col_index.first]->add (row_index.second, @@ -1185,7 +1185,7 @@ BlockSparsityPatternBase::add (const unsigned int i, template template void -BlockSparsityPatternBase::add_entries (const unsigned int row, +BlockSparsityPatternBase::add_entries (const types::global_dof_index row, ForwardIterator begin, ForwardIterator end, const bool indices_are_sorted) @@ -1197,7 +1197,7 @@ BlockSparsityPatternBase::add_entries (const unsigned int r counter_within_block.resize (this->n_block_cols()); } - const unsigned int n_cols = static_cast(end - begin); + const types::global_dof_index n_cols = static_cast(end - begin); // Resize sub-arrays to n_cols. This // is a bit wasteful, but we resize @@ -1229,9 +1229,9 @@ BlockSparsityPatternBase::add_entries (const unsigned int r // comes from an element matrix). for (ForwardIterator it = begin; it != end; ++it) { - const unsigned int col = *it; + const types::global_dof_index col = *it; - const std::pair + const std::pair col_index = this->column_indices.global_to_local(col); const unsigned int local_index = counter_within_block[col_index.first]++; @@ -1253,7 +1253,7 @@ BlockSparsityPatternBase::add_entries (const unsigned int r // where we should start reading out // data. Now let's write the data into // the individual blocks! - const std::pair + const std::pair row_index = this->row_indices.global_to_local (row); for (unsigned int block_col=0; block_col::add_entries (const unsigned int r template inline bool -BlockSparsityPatternBase::exists (const unsigned int i, - const unsigned int j) const +BlockSparsityPatternBase::exists (const types::global_dof_index i, + const types::global_dof_index j) const { // if you get an error here, are // you sure you called // collect_sizes() before? - const std::pair + const std::pair row_index = row_indices.global_to_local (i), col_index = column_indices.global_to_local (j); return sub_objects[row_index.first][col_index.first]->exists (row_index.second, @@ -1291,9 +1291,9 @@ template inline unsigned int BlockSparsityPatternBase:: -row_length (const unsigned int row) const +row_length (const types::global_dof_index row) const { - const std::pair + const std::pair row_index = row_indices.global_to_local (row); unsigned int c = 0; diff --git a/deal.II/source/lac/block_sparsity_pattern.cc b/deal.II/source/lac/block_sparsity_pattern.cc index 6e7b8d77e3..0c5777135a 100644 --- a/deal.II/source/lac/block_sparsity_pattern.cc +++ b/deal.II/source/lac/block_sparsity_pattern.cc @@ -199,12 +199,12 @@ BlockSparsityPatternBase::max_entries_per_row () const template -unsigned int +types::global_dof_index BlockSparsityPatternBase::n_rows () const { // only count in first column, since // all rows should be equivalent - unsigned int count = 0; + types::global_dof_index count = 0; for (unsigned int r=0; rn_rows(); return count; @@ -213,12 +213,12 @@ BlockSparsityPatternBase::n_rows () const template -unsigned int +types::global_dof_index BlockSparsityPatternBase::n_cols () const { // only count in first row, since // all rows should be equivalent - unsigned int count = 0; + types::global_dof_index count = 0; for (unsigned int c=0; cn_cols(); return count; @@ -359,7 +359,7 @@ void BlockSparsityPattern::reinit( const BlockIndices& rows, const BlockIndices& cols, - const std::vector >& row_lengths) + const std::vector >& row_lengths) { AssertDimension (row_lengths.size(), cols.size()); @@ -367,15 +367,15 @@ BlockSparsityPattern::reinit( for (unsigned int j=0;j > + VectorSlice > block_rows(row_lengths[j], start, length); block(i,j).reinit(rows.block_size(i), cols.block_size(j), @@ -487,8 +487,8 @@ BlockCompressedSparsityPattern ( BlockCompressedSparsityPattern:: BlockCompressedSparsityPattern ( - const std::vector& row_indices, - const std::vector& col_indices) + const std::vector& row_indices, + const std::vector& col_indices) { reinit(row_indices, col_indices); } @@ -505,8 +505,8 @@ BlockCompressedSparsityPattern ( void BlockCompressedSparsityPattern::reinit ( - const std::vector< unsigned int > &row_block_sizes, - const std::vector< unsigned int > &col_block_sizes) + const std::vector< types::global_dof_index > &row_block_sizes, + const std::vector< types::global_dof_index > &col_block_sizes) { BlockSparsityPatternBase::reinit(row_block_sizes.size(), col_block_sizes.size()); for (unsigned int i=0;i& row_indices, - const std::vector& col_indices) + const std::vector& row_indices, + const std::vector& col_indices) { reinit(row_indices, col_indices); } @@ -568,8 +568,8 @@ BlockCompressedSetSparsityPattern ( void BlockCompressedSetSparsityPattern::reinit ( - const std::vector< unsigned int > &row_block_sizes, - const std::vector< unsigned int > &col_block_sizes) + const std::vector< types::global_dof_index > &row_block_sizes, + const std::vector< types::global_dof_index > &col_block_sizes) { BlockSparsityPatternBase::reinit(row_block_sizes.size(), col_block_sizes.size()); for (unsigned int i=0;i(n_rows, n_columns) @@ -612,8 +612,8 @@ BlockCompressedSimpleSparsityPattern (const unsigned int n_rows, BlockCompressedSimpleSparsityPattern:: -BlockCompressedSimpleSparsityPattern (const std::vector& row_indices, - const std::vector& col_indices) +BlockCompressedSimpleSparsityPattern (const std::vector& row_indices, + const std::vector& col_indices) : BlockSparsityPatternBase(row_indices.size(), col_indices.size()) @@ -643,8 +643,8 @@ BlockCompressedSimpleSparsityPattern (const std::vector & partitioning void BlockCompressedSimpleSparsityPattern::reinit ( - const std::vector< unsigned int > &row_block_sizes, - const std::vector< unsigned int > &col_block_sizes) + const std::vector< types::global_dof_index > &row_block_sizes, + const std::vector< types::global_dof_index > &col_block_sizes) { BlockSparsityPatternBase:: reinit(row_block_sizes.size(), col_block_sizes.size()); @@ -689,8 +689,8 @@ namespace TrilinosWrappers BlockSparsityPattern:: - BlockSparsityPattern (const std::vector& row_indices, - const std::vector& col_indices) + BlockSparsityPattern (const std::vector& row_indices, + const std::vector& col_indices) : BlockSparsityPatternBase(row_indices.size(), col_indices.size()) @@ -738,8 +738,8 @@ namespace TrilinosWrappers void - BlockSparsityPattern::reinit (const std::vector &row_block_sizes, - const std::vector &col_block_sizes) + BlockSparsityPattern::reinit (const std::vector &row_block_sizes, + const std::vector &col_block_sizes) { dealii::BlockSparsityPatternBase:: reinit(row_block_sizes.size(), col_block_sizes.size());