From: buerg Date: Mon, 13 Aug 2012 07:19:16 +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=896b201262896bde1897160df0b2ce78a04f0ef2;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@25915 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/files b/deal.II/files index 24b92accda..0f6dbc72f6 100644 --- a/deal.II/files +++ b/deal.II/files @@ -118,9 +118,9 @@ MARKUS source/lac/block_sparse_matrix_ez.cc MARKUS source/lac/block_sparsity_pattern.cc MARKUS source/lac/block_vector.cc MARKUS source/lac/chunk_sparse_matrix.cc -source/lac/chunk_sparsity_pattern.cc +MARKUS source/lac/chunk_sparsity_pattern.cc MARKUS source/lac/compressed_set_sparsity_pattern.cc -source/lac/compressed_simple_sparsity_pattern.cc +MARKUS source/lac/compressed_simple_sparsity_pattern.cc source/lac/compressed_sparsity_pattern.cc WOLFGANG source/lac/constraint_matrix.cc source/lac/full_matrix.cc @@ -372,9 +372,9 @@ MARKUS include/deal.II/lac/block_vector.h MARKUS include/deal.II/lac/block_vector.templates.h MARKUS include/deal.II/lac/chunk_sparse_matrix.h MARKUS include/deal.II/lac/chunk_sparse_matrix.templates.h -include/deal.II/lac/chunk_sparsity_pattern.h +MARKUS include/deal.II/lac/chunk_sparsity_pattern.h MARKUS include/deal.II/lac/compressed_set_sparsity_pattern.h -include/deal.II/lac/compressed_simple_sparsity_pattern.h +MARKUS include/deal.II/lac/compressed_simple_sparsity_pattern.h include/deal.II/lac/compressed_sparsity_pattern.h WOLFGANG include/deal.II/lac/constraint_matrix.h WOLFGANG include/deal.II/lac/constraint_matrix.templates.h diff --git a/deal.II/include/deal.II/lac/chunk_sparsity_pattern.h b/deal.II/include/deal.II/lac/chunk_sparsity_pattern.h index 6c5aac018d..4aa857d33d 100644 --- a/deal.II/include/deal.II/lac/chunk_sparsity_pattern.h +++ b/deal.II/include/deal.II/lac/chunk_sparsity_pattern.h @@ -133,8 +133,8 @@ class ChunkSparsityPattern : public Subscriptor * takes effect for quadratic * matrices only. */ - ChunkSparsityPattern (const unsigned int m, - const unsigned int n, + ChunkSparsityPattern (const types::global_dof_index m, + const types::global_dof_index n, const unsigned int max_chunks_per_row, const unsigned int chunk_size, const bool optimize_diagonal = true); @@ -157,8 +157,8 @@ class ChunkSparsityPattern : public Subscriptor * takes effect for quadratic * matrices only. */ - ChunkSparsityPattern (const unsigned int m, - const unsigned int n, + ChunkSparsityPattern (const types::global_dof_index m, + const types::global_dof_index n, const std::vector& row_lengths, const unsigned int chunk_size, const bool optimize_diagonal = true); @@ -176,9 +176,9 @@ class ChunkSparsityPattern : public Subscriptor * taking row and column numbers * separately. */ - ChunkSparsityPattern (const unsigned int n, - const unsigned int max_per_row, - const unsigned int chunk_size); + ChunkSparsityPattern (const types::global_dof_index n, + const unsigned int max_per_row, + const unsigned int chunk_size); /** * Initialize a quadratic matrix. @@ -194,7 +194,7 @@ class ChunkSparsityPattern : public Subscriptor * diagonal entries first in row; * see optimize_diagonal(). */ - ChunkSparsityPattern (const unsigned int m, + ChunkSparsityPattern (const types::global_dof_index m, const std::vector& row_lengths, const unsigned int chunk_size, const bool optimize_diagonal = true); @@ -225,8 +225,8 @@ class ChunkSparsityPattern : public Subscriptor * operations to the other * reinit function. */ - void reinit (const unsigned int m, - const unsigned int n, + void reinit (const types::global_dof_index m, + const types::global_dof_index n, const unsigned int max_per_row, const unsigned int chunk_size, const bool optimize_diagonal = true); @@ -256,8 +256,8 @@ class ChunkSparsityPattern : public Subscriptor * optimized access in relaxation * methods of SparseMatrix. */ - void reinit (const unsigned int m, - const unsigned int n, + void reinit (const types::global_dof_index m, + const types::global_dof_index n, const std::vector &row_lengths, const unsigned int chunk_size, const bool optimize_diagonal = true); @@ -266,8 +266,8 @@ class ChunkSparsityPattern : public Subscriptor * Same as above, but with a * VectorSlice argument instead. */ - void reinit (const unsigned int m, - const unsigned int n, + void reinit (const types::global_dof_index m, + const types::global_dof_index n, const VectorSlice > &row_lengths, const unsigned int chunk_size, const bool optimize_diagonal = true); @@ -433,8 +433,8 @@ class ChunkSparsityPattern : public Subscriptor * pairs. */ template - void copy_from (const unsigned int n_rows, - const unsigned int n_cols, + void copy_from (const types::global_dof_index n_rows, + const types::global_dof_index n_cols, const ForwardIterator begin, const ForwardIterator end, const unsigned int chunk_size, @@ -503,8 +503,8 @@ class ChunkSparsityPattern : public Subscriptor * If the entry already exists, nothing * bad happens. */ - void add (const unsigned int i, - const unsigned int j); + void add (const types::global_dof_index i, + const types::global_dof_index j); /** * Make the sparsity pattern @@ -524,26 +524,26 @@ class ChunkSparsityPattern : public Subscriptor * matrix, which equals the dimension * of the image space. */ - inline unsigned int n_rows () const; + inline types::global_dof_index n_rows () const; /** * Return number of columns of this * matrix, which equals the dimension * of the range space. */ - inline unsigned int n_cols () const; + inline 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 specific row. */ - unsigned int row_length (const unsigned int row) const; + unsigned int row_length (const types::global_dof_index row) const; /** * Compute the bandwidth of the matrix @@ -811,13 +811,13 @@ class ChunkSparsityPattern : public Subscriptor * Number of rows that this sparsity * structure shall represent. */ - unsigned int rows; + types::global_dof_index rows; /** * Number of columns that this sparsity * structure shall represent. */ - unsigned int cols; + types::global_dof_index cols; /** * The size of chunks. @@ -847,7 +847,7 @@ class ChunkSparsityPattern : public Subscriptor inline -unsigned int +types::global_dof_index ChunkSparsityPattern::n_rows () const { return rows; @@ -855,7 +855,7 @@ ChunkSparsityPattern::n_rows () const inline -unsigned int +types::global_dof_index ChunkSparsityPattern::n_cols () const { return cols; @@ -891,8 +891,8 @@ ChunkSparsityPattern::optimize_diagonal () const template void -ChunkSparsityPattern::copy_from (const unsigned int n_rows, - const unsigned int n_cols, +ChunkSparsityPattern::copy_from (const types::global_dof_index n_rows, + const types::global_dof_index n_cols, const ForwardIterator begin, const ForwardIterator end, const unsigned int chunk_size, diff --git a/deal.II/source/lac/chunk_sparsity_pattern.cc b/deal.II/source/lac/chunk_sparsity_pattern.cc index 8f2d5ad8c9..755df76541 100644 --- a/deal.II/source/lac/chunk_sparsity_pattern.cc +++ b/deal.II/source/lac/chunk_sparsity_pattern.cc @@ -42,8 +42,8 @@ ChunkSparsityPattern::ChunkSparsityPattern (const ChunkSparsityPattern &s) -ChunkSparsityPattern::ChunkSparsityPattern (const unsigned int m, - const unsigned int n, +ChunkSparsityPattern::ChunkSparsityPattern (const types::global_dof_index m, + const types::global_dof_index n, const unsigned int max_per_row, const unsigned int chunk_size, const bool optimize_diag) @@ -56,8 +56,8 @@ ChunkSparsityPattern::ChunkSparsityPattern (const unsigned int m, ChunkSparsityPattern::ChunkSparsityPattern ( - const unsigned int m, - const unsigned int n, + const types::global_dof_index m, + const types::global_dof_index n, const std::vector& row_lengths, const unsigned int chunk_size, const bool optimize_diag) @@ -69,9 +69,9 @@ ChunkSparsityPattern::ChunkSparsityPattern ( -ChunkSparsityPattern::ChunkSparsityPattern (const unsigned int n, - const unsigned int max_per_row, - const unsigned int chunk_size) +ChunkSparsityPattern::ChunkSparsityPattern (const types::global_dof_index n, + const unsigned int max_per_row, + const unsigned int chunk_size) { reinit (n, n, max_per_row, chunk_size, true); } @@ -79,7 +79,7 @@ ChunkSparsityPattern::ChunkSparsityPattern (const unsigned int n, ChunkSparsityPattern::ChunkSparsityPattern ( - const unsigned int m, + const types::global_dof_index m, const std::vector& row_lengths, const unsigned int chunk_size, const bool optimize_diag) @@ -112,8 +112,8 @@ ChunkSparsityPattern::operator = (const ChunkSparsityPattern &s) void -ChunkSparsityPattern::reinit (const unsigned int m, - const unsigned int n, +ChunkSparsityPattern::reinit (const types::global_dof_index m, + const types::global_dof_index n, const unsigned int max_per_row, const unsigned int chunk_size, const bool optimize_diag) @@ -130,8 +130,8 @@ ChunkSparsityPattern::reinit (const unsigned int m, void ChunkSparsityPattern::reinit ( - const unsigned int m, - const unsigned int n, + const types::global_dof_index m, + const types::global_dof_index n, const VectorSlice >&row_lengths, const unsigned int chunk_size, const bool optimize_diag) @@ -253,8 +253,8 @@ void ChunkSparsityPattern::copy_from (const FullMatrix &matrix, void ChunkSparsityPattern::reinit ( - const unsigned int m, - const unsigned int n, + const types::global_dof_index m, + const types::global_dof_index n, const std::vector& row_lengths, const unsigned int chunk_size, const bool optimize_diag) @@ -283,8 +283,8 @@ ChunkSparsityPattern::max_entries_per_row () const void -ChunkSparsityPattern::add (const unsigned int i, - const unsigned int j) +ChunkSparsityPattern::add (const types::global_dof_index i, + const types::global_dof_index j) { Assert (i