]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Change unsigned int to types::global_dof_index.
authorbuerg <buerg@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 11 Aug 2012 14:02:26 +0000 (14:02 +0000)
committerbuerg <buerg@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 11 Aug 2012 14:02:26 +0000 (14:02 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_3@25900 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/files
deal.II/include/deal.II/lac/block_sparse_matrix_ez.h
deal.II/include/deal.II/lac/block_sparse_matrix_ez.templates.h
deal.II/include/deal.II/lac/block_sparsity_pattern.h
deal.II/source/lac/block_sparsity_pattern.cc

index 6f6a5c61f27a2584777d064b048092a2a1de23a6..f43157b90e9408d1b50254721626e985fd1fdfd7 100644 (file)
@@ -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
index 861c95d3927307cfc873e90f5a34c47aa19d37d9..2abaf63adf6f543e5c329800ea1c6b2e8c4f4e48 100644 (file)
@@ -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<Number>::block (const unsigned int row,
 
 template <typename Number>
 inline
-unsigned int
+types::global_dof_index
 BlockSparseMatrixEZ<Number>::m () const
 {
   return n_rows();
@@ -406,7 +406,7 @@ BlockSparseMatrixEZ<Number>::m () const
 
 template <typename Number>
 inline
-unsigned int
+types::global_dof_index
 BlockSparseMatrixEZ<Number>::n () const
 {
   return n_cols();
@@ -424,7 +424,7 @@ BlockSparseMatrixEZ<Number>::set (const types::global_dof_index i,
 
   Assert (numbers::is_finite(value), ExcNumberNotFinite());
 
-  const std::pair<unsigned int,unsigned int>
+  const std::pair<unsigned int,types::global_dof_index>
     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<Number>::add (const types::global_dof_index i,
 
   Assert (numbers::is_finite(value), ExcNumberNotFinite());
 
-  const std::pair<unsigned int,unsigned int>
+  const std::pair<unsigned int,types::global_dof_index>
     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,
index ba1a910621ccf7d22832d2f84a590e7f451753da..e6af4590489e06bccf1fb20d55bce6958fc46127 100644 (file)
@@ -137,8 +137,8 @@ BlockSparseMatrixEZ<number>::collect_sizes ()
 {
   const unsigned int rows = n_block_rows();
   const unsigned int columns = n_block_cols();
-  std::vector<unsigned int> row_sizes (rows);
-  std::vector<unsigned int> col_sizes (columns);
+  std::vector<types::global_dof_index> row_sizes (rows);
+  std::vector<types::global_dof_index> col_sizes (columns);
 
                                    // first find out the row sizes
                                    // from the first block column
index bdd0d95d31583f6f8aa70b370ae035e5b3dc20b2..c292d98bc5442b0c6aa0f0a7b3ad39328e336920 100644 (file)
@@ -282,7 +282,7 @@ class BlockSparsityPatternBase : public Subscriptor
                                       * to which block <tt>(i,j)</tt> 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<SparsityPattern>
                                       */
     void reinit (const BlockIndices& row_indices,
                  const BlockIndices& col_indices,
-                 const std::vector<std::vector<unsigned int> >& row_lengths);
+                 const std::vector<std::vector<types::global_dof_index> >& row_lengths);
 
 
                                      /**
@@ -686,8 +686,8 @@ class BlockCompressedSparsityPattern : public BlockSparsityPatternBase<Compresse
                                       * and then entering the index
                                       * values.
                                       */
-    BlockCompressedSparsityPattern (const std::vector<unsigned int>& row_block_sizes,
-                                    const std::vector<unsigned int>& col_block_sizes);
+    BlockCompressedSparsityPattern (const std::vector<types::global_dof_index>& row_block_sizes,
+                                    const std::vector<types::global_dof_index>& col_block_sizes);
 
                                      /**
                                       * Initialize the pattern with
@@ -713,8 +713,8 @@ class BlockCompressedSparsityPattern : public BlockSparsityPatternBase<Compresse
                                       * <tt>row_block_sizes[i]</tt>
                                       * times <tt>col_block_sizes[j]</tt>.
                                       */
-    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<Compre
                                       * and then entering the index
                                       * values.
                                       */
-    BlockCompressedSetSparsityPattern (const std::vector<unsigned int>& row_block_sizes,
-                                       const std::vector<unsigned int>& col_block_sizes);
+    BlockCompressedSetSparsityPattern (const std::vector<types::global_dof_index>& row_block_sizes,
+                                       const std::vector<types::global_dof_index>& col_block_sizes);
 
                                      /**
                                       * Initialize the pattern with
@@ -830,8 +830,8 @@ class BlockCompressedSetSparsityPattern : public BlockSparsityPatternBase<Compre
                                       * <tt>row_block_sizes[i]</tt>
                                       * times <tt>col_block_sizes[j]</tt>.
                                       */
-    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<Com
                                       * and then entering the index
                                       * values.
                                       */
-    BlockCompressedSimpleSparsityPattern (const std::vector<unsigned int>& row_block_sizes,
-                                    const std::vector<unsigned int>& col_block_sizes);
+    BlockCompressedSimpleSparsityPattern (const std::vector<types::global_dof_index>& row_block_sizes,
+                                          const std::vector<types::global_dof_index>& col_block_sizes);
 
                                      /**
                                       * Initialize the pattern with symmetric
@@ -945,8 +945,8 @@ class BlockCompressedSimpleSparsityPattern : public BlockSparsityPatternBase<Com
                                       * <tt>row_block_sizes[i]</tt>
                                       * times <tt>col_block_sizes[j]</tt>.
                                       */
-    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<unsigned int>& row_block_sizes,
-                            const std::vector<unsigned int>& col_block_sizes);
+      BlockSparsityPattern (const std::vector<types::global_dof_index>& row_block_sizes,
+                            const std::vector<types::global_dof_index>& col_block_sizes);
 
                                      /**
                                       * Initialize the pattern with an array
@@ -1079,8 +1079,8 @@ namespace TrilinosWrappers
                                       * <tt>row_block_sizes[i]</tt>
                                       * times <tt>col_block_sizes[j]</tt>.
                                       */
-      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<SparsityPatternBase>::get_column_indices () const
 template <class SparsityPatternBase>
 inline
 void
-BlockSparsityPatternBase<SparsityPatternBase>::add (const unsigned int i,
-                                                    const unsigned int j)
+BlockSparsityPatternBase<SparsityPatternBase>::add (const types::global_dof_index i,
+                                                    const types::global_dof_index j)
 {
                                    // if you get an error here, are
                                    // you sure you called
                                    // <tt>collect_sizes()</tt> before?
-  const std::pair<unsigned int,unsigned int>
+  const std::pair<unsigned int,types::global_dof_index>
     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<SparsityPatternBase>::add (const unsigned int i,
 template <class SparsityPatternBase>
 template <typename ForwardIterator>
 void
-BlockSparsityPatternBase<SparsityPatternBase>::add_entries (const unsigned int row,
+BlockSparsityPatternBase<SparsityPatternBase>::add_entries (const types::global_dof_index row,
                                                             ForwardIterator    begin,
                                                             ForwardIterator    end,
                                                             const bool         indices_are_sorted)
@@ -1197,7 +1197,7 @@ BlockSparsityPatternBase<SparsityPatternBase>::add_entries (const unsigned int r
       counter_within_block.resize (this->n_block_cols());
     }
 
-  const unsigned int n_cols = static_cast<unsigned int>(end - begin);
+  const types::global_dof_index n_cols = static_cast<types::global_dof_index>(end - begin);
 
                                    // Resize sub-arrays to n_cols. This
                                    // is a bit wasteful, but we resize
@@ -1229,9 +1229,9 @@ BlockSparsityPatternBase<SparsityPatternBase>::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<unsigned int, unsigned int>
+      const std::pair<unsigned int, types::global_dof_index>
         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<SparsityPatternBase>::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<unsigned int,unsigned int>
+  const std::pair<unsigned int,types::global_dof_index>
     row_index = this->row_indices.global_to_local (row);
   for (unsigned int block_col=0; block_col<n_block_cols(); ++block_col)
     {
@@ -1272,13 +1272,13 @@ BlockSparsityPatternBase<SparsityPatternBase>::add_entries (const unsigned int r
 template <class SparsityPatternBase>
 inline
 bool
-BlockSparsityPatternBase<SparsityPatternBase>::exists (const unsigned int i,
-                                                       const unsigned int j) const
+BlockSparsityPatternBase<SparsityPatternBase>::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
                                    // <tt>collect_sizes()</tt> before?
-  const std::pair<unsigned int,unsigned int>
+  const std::pair<unsigned int,types::global_dof_index>
     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 <class SparsityPatternBase>
 inline
 unsigned int
 BlockSparsityPatternBase<SparsityPatternBase>::
-row_length (const unsigned int row) const
+row_length (const types::global_dof_index row) const
 {
-  const std::pair<unsigned int,unsigned int>
+  const std::pair<unsigned int,types::global_dof_index>
     row_index = row_indices.global_to_local (row);
 
   unsigned int c = 0;
index 6e7b8d77e3fb3f9ffb8a9715d9f418f67a51d2a5..0c5777135aec1d8d13fde13958729a73a6bbb48f 100644 (file)
@@ -199,12 +199,12 @@ BlockSparsityPatternBase<SparsityPatternBase>::max_entries_per_row () const
 
 
 template <class SparsityPatternBase>
-unsigned int
+types::global_dof_index
 BlockSparsityPatternBase<SparsityPatternBase>::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; r<rows; ++r)
     count += sub_objects[r][0]->n_rows();
   return count;
@@ -213,12 +213,12 @@ BlockSparsityPatternBase<SparsityPatternBase>::n_rows () const
 
 
 template <class SparsityPatternBase>
-unsigned int
+types::global_dof_index
 BlockSparsityPatternBase<SparsityPatternBase>::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; c<columns; ++c)
     count += sub_objects[0][c]->n_cols();
   return count;
@@ -359,7 +359,7 @@ void
 BlockSparsityPattern::reinit(
   const BlockIndices& rows,
   const BlockIndices& cols,
-  const std::vector<std::vector<unsigned int> >& row_lengths)
+  const std::vector<std::vector<types::global_dof_index> >& row_lengths)
 {
   AssertDimension (row_lengths.size(), cols.size());
 
@@ -367,15 +367,15 @@ BlockSparsityPattern::reinit(
   for (unsigned int j=0;j<cols.size();++j)
     for (unsigned int i=0;i<rows.size();++i)
       {
-        const unsigned int start = rows.local_to_global(i, 0);
-        const unsigned int length = rows.block_size(i);
+        const types::global_dof_index start = rows.local_to_global(i, 0);
+        const types::global_dof_index length = rows.block_size(i);
 
         if (row_lengths[j].size()==1)
           block(i,j).reinit(rows.block_size(i),
                             cols.block_size(j), row_lengths[j][0], i==j);
         else
           {
-            VectorSlice<const std::vector<unsigned int> >
+            VectorSlice<const std::vector<types::global_dof_index> >
               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<unsigned int>& row_indices,
-  const std::vector<unsigned int>& col_indices)
+  const std::vector<types::global_dof_index>& row_indices,
+  const std::vector<types::global_dof_index>& 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<CompressedSparsityPattern>::reinit(row_block_sizes.size(), col_block_sizes.size());
   for (unsigned int i=0;i<row_block_sizes.size();++i)
@@ -550,8 +550,8 @@ BlockCompressedSetSparsityPattern (
 
 BlockCompressedSetSparsityPattern::
 BlockCompressedSetSparsityPattern (
-  const std::vector<unsigned int>& row_indices,
-  const std::vector<unsigned int>& col_indices)
+  const std::vector<types::global_dof_index>& row_indices,
+  const std::vector<types::global_dof_index>& 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<CompressedSetSparsityPattern>::reinit(row_block_sizes.size(), col_block_sizes.size());
   for (unsigned int i=0;i<row_block_sizes.size();++i)
@@ -603,7 +603,7 @@ BlockCompressedSimpleSparsityPattern::BlockCompressedSimpleSparsityPattern ()
 
 BlockCompressedSimpleSparsityPattern::
 BlockCompressedSimpleSparsityPattern (const unsigned int n_rows,
-                                const unsigned int n_columns)
+                                      const unsigned int n_columns)
                 :
                 BlockSparsityPatternBase<CompressedSimpleSparsityPattern>(n_rows,
                                                                     n_columns)
@@ -612,8 +612,8 @@ BlockCompressedSimpleSparsityPattern (const unsigned int n_rows,
 
 
 BlockCompressedSimpleSparsityPattern::
-BlockCompressedSimpleSparsityPattern (const std::vector<unsigned int>& row_indices,
-                                      const std::vector<unsigned int>& col_indices)
+BlockCompressedSimpleSparsityPattern (const std::vector<types::global_dof_index>& row_indices,
+                                      const std::vector<types::global_dof_index>& col_indices)
                 :
                 BlockSparsityPatternBase<CompressedSimpleSparsityPattern>(row_indices.size(),
                                                                           col_indices.size())
@@ -643,8 +643,8 @@ BlockCompressedSimpleSparsityPattern (const std::vector<IndexSet> & 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<CompressedSimpleSparsityPattern>::
     reinit(row_block_sizes.size(), col_block_sizes.size());
@@ -689,8 +689,8 @@ namespace TrilinosWrappers
 
 
   BlockSparsityPattern::
-  BlockSparsityPattern (const std::vector<unsigned int>& row_indices,
-                        const std::vector<unsigned int>& col_indices)
+  BlockSparsityPattern (const std::vector<types::global_dof_index>& row_indices,
+                        const std::vector<types::global_dof_index>& col_indices)
                 :
                 BlockSparsityPatternBase<SparsityPattern>(row_indices.size(),
                                                           col_indices.size())
@@ -738,8 +738,8 @@ namespace TrilinosWrappers
 
 
   void
-  BlockSparsityPattern::reinit (const std::vector<unsigned int> &row_block_sizes,
-                                const std::vector<unsigned int> &col_block_sizes)
+  BlockSparsityPattern::reinit (const std::vector<types::global_dof_index> &row_block_sizes,
+                                const std::vector<types::global_dof_index> &col_block_sizes)
   {
     dealii::BlockSparsityPatternBase<SparsityPattern>::
       reinit(row_block_sizes.size(), col_block_sizes.size());

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.