From 45dd6ec6ffb91093e7fe03b2c6ef2be67173cdcf Mon Sep 17 00:00:00 2001 From: buerg Date: Mon, 13 Aug 2012 07:08:07 +0000 Subject: [PATCH] Change unsigned int to types::global_dof_index. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_3@25914 0785d39b-7218-0410-832d-ea1e28bc413d --- .../include/deal.II/lac/chunk_sparse_matrix.h | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/deal.II/include/deal.II/lac/chunk_sparse_matrix.h b/deal.II/include/deal.II/lac/chunk_sparse_matrix.h index 15f2ef006a..ab5cffd342 100644 --- a/deal.II/include/deal.II/lac/chunk_sparse_matrix.h +++ b/deal.II/include/deal.II/lac/chunk_sparse_matrix.h @@ -290,7 +290,7 @@ class ChunkSparseMatrix : public virtual Subscriptor * matrix is of dimension * $m \times n$. */ - unsigned int m () const; + types::global_dof_index m () const; /** * Return the dimension of the @@ -298,7 +298,7 @@ class ChunkSparseMatrix : public virtual Subscriptor * matrix is of dimension * $m \times n$. */ - unsigned int n () const; + types::global_dof_index n () const; /** * Return the number of nonzero @@ -361,8 +361,8 @@ class ChunkSparseMatrix : public virtual Subscriptor * is allowed to store zero * values in non-existent fields. */ - void set (const unsigned int i, - const unsigned int j, + void set (const types::global_dof_index i, + const types::global_dof_index j, const number value); /** @@ -374,8 +374,8 @@ class ChunkSparseMatrix : public virtual Subscriptor * is allowed to store zero * values in non-existent fields. */ - void add (const unsigned int i, - const unsigned int j, + void add (const types::global_dof_index i, + const types::global_dof_index j, const number value); /** @@ -549,8 +549,8 @@ class ChunkSparseMatrix : public virtual Subscriptor * tailored better to a sparse matrix * structure. */ - number operator () (const unsigned int i, - const unsigned int j) const; + number operator () (const types::global_dof_index i, + const types::global_dof_index j) const; /** * This function is mostly like @@ -576,8 +576,8 @@ class ChunkSparseMatrix : public virtual Subscriptor * tailored better to a sparse matrix * structure. */ - number el (const unsigned int i, - const unsigned int j) const; + number el (const types::global_dof_index i, + const types::global_dof_index j) const; /** * Return the main diagonal @@ -596,14 +596,14 @@ class ChunkSparseMatrix : public virtual Subscriptor * involve searching for the * right column number. */ - number diag_element (const unsigned int i) const; + number diag_element (const types::global_dof_index i) const; /** * Same as above, but return a * writeable reference. You're * sure you know what you do? */ - number & diag_element (const unsigned int i); + number & diag_element (const types::global_dof_index i); //@} /** @@ -1184,8 +1184,8 @@ class ChunkSparseMatrix : public virtual Subscriptor * Return the location of entry * $(i,j)$ within the val array. */ - unsigned int compute_location (const unsigned int i, - const unsigned int j) const; + unsigned int compute_location (const types::global_dof_index i, + const types::global_dof_index j) const; // make all other sparse matrices // friends @@ -1201,7 +1201,7 @@ class ChunkSparseMatrix : public virtual Subscriptor template inline -unsigned int ChunkSparseMatrix::m () const +types::global_dof_index ChunkSparseMatrix::m () const { Assert (cols != 0, ExcNotInitialized()); return cols->rows; @@ -1210,7 +1210,7 @@ unsigned int ChunkSparseMatrix::m () const template inline -unsigned int ChunkSparseMatrix::n () const +types::global_dof_index ChunkSparseMatrix::n () const { Assert (cols != 0, ExcNotInitialized()); return cols->cols; @@ -1221,8 +1221,8 @@ unsigned int ChunkSparseMatrix::n () const template inline unsigned int -ChunkSparseMatrix::compute_location (const unsigned int i, - const unsigned int j) const +ChunkSparseMatrix::compute_location (const types::global_dof_index i, + const types::global_dof_index j) const { const unsigned int chunk_size = cols->get_chunk_size(); const unsigned int chunk_index @@ -1243,8 +1243,8 @@ ChunkSparseMatrix::compute_location (const unsigned int i, template inline -void ChunkSparseMatrix::set (const unsigned int i, - const unsigned int j, +void ChunkSparseMatrix::set (const types::global_dof_index i, + const types::global_dof_index j, const number value) { @@ -1268,8 +1268,8 @@ void ChunkSparseMatrix::set (const unsigned int i, template inline -void ChunkSparseMatrix::add (const unsigned int i, - const unsigned int j, +void ChunkSparseMatrix::add (const types::global_dof_index i, + const types::global_dof_index j, const number value) { @@ -1356,8 +1356,8 @@ ChunkSparseMatrix::operator /= (const number factor) template inline -number ChunkSparseMatrix::operator () (const unsigned int i, - const unsigned int j) const +number ChunkSparseMatrix::operator () (const types::global_dof_index i, + const types::global_dof_index j) const { Assert (cols != 0, ExcNotInitialized()); AssertThrow (compute_location(i,j) != SparsityPattern::invalid_entry, @@ -1369,8 +1369,8 @@ number ChunkSparseMatrix::operator () (const unsigned int i, template inline -number ChunkSparseMatrix::el (const unsigned int i, - const unsigned int j) const +number ChunkSparseMatrix::el (const types::global_dof_index i, + const types::global_dof_index j) const { Assert (cols != 0, ExcNotInitialized()); const unsigned int index = compute_location(i,j); @@ -1385,7 +1385,7 @@ number ChunkSparseMatrix::el (const unsigned int i, template inline -number ChunkSparseMatrix::diag_element (const unsigned int i) const +number ChunkSparseMatrix::diag_element (const types::global_dof_index i) const { Assert (cols != 0, ExcNotInitialized()); Assert (cols->optimize_diagonal(), ExcNotQuadratic()); @@ -1408,7 +1408,7 @@ number ChunkSparseMatrix::diag_element (const unsigned int i) const template inline -number & ChunkSparseMatrix::diag_element (const unsigned int i) +number & ChunkSparseMatrix::diag_element (const types::global_dof_index i) { Assert (cols != 0, ExcNotInitialized()); Assert (cols->optimize_diagonal(), ExcNotQuadratic()); -- 2.39.5