]> 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 13:14:10 +0000 (13:14 +0000)
committerbuerg <buerg@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 11 Aug 2012 13:14:10 +0000 (13:14 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_3@25896 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/files
deal.II/include/deal.II/lac/compressed_set_sparsity_pattern.h
deal.II/source/lac/compressed_set_sparsity_pattern.cc

index ffc8ba1b8458d36232a61e0eceeedd7ee2003b11..c46741c8159a500a032cbc003b054f2688685c18 100644 (file)
@@ -113,7 +113,7 @@ source/hp/fe_collection.cc
 MARKUS source/hp/fe_values.cc
 source/hp/mapping_collection.cc
 source/lac/block_matrix_array.cc
-source/lac/block_sparse_matrix.cc
+MARKUS source/lac/block_sparse_matrix.cc
 source/lac/block_sparse_matrix_ez.cc
 source/lac/block_sparsity_pattern.cc
 source/lac/block_vector.cc
@@ -364,7 +364,7 @@ include/deal.II/lac/block_matrix_base.h
 include/deal.II/lac/block_matrix.h
 include/deal.II/lac/block_sparse_matrix_ez.h
 include/deal.II/lac/block_sparse_matrix_ez.templates.h
-include/deal.II/lac/block_sparse_matrix.h
+MARKUS include/deal.II/lac/block_sparse_matrix.h
 include/deal.II/lac/block_sparse_matrix.templates.h
 include/deal.II/lac/block_sparsity_pattern.h
 include/deal.II/lac/block_vector_base.h
index d0c59fbc53fa55f47a6363b8af47d6f3e26ad2a2..090ef5f6df7d4c948397eacb79127803784ecf02 100644 (file)
@@ -150,14 +150,14 @@ class CompressedSetSparsityPattern : public Subscriptor
                                       * matrix with @p m rows and
                                       * @p n columns.
                                       */
-    CompressedSetSparsityPattern (const unsigned int m,
-                                  const unsigned int n);
+    CompressedSetSparsityPattern (const types::global_dof_index m,
+                                  const types::global_dof_index n);
 
                                      /**
                                       * Initialize a square matrix of
                                       * dimension @p n.
                                       */
-    CompressedSetSparsityPattern (const unsigned int n);
+    CompressedSetSparsityPattern (const types::global_dof_index n);
 
                                      /**
                                       * Copy operator. For this the
@@ -177,8 +177,8 @@ class CompressedSetSparsityPattern : public Subscriptor
                                       * max_entries_per_row() nonzero
                                       * entries per row.
                                       */
-    void reinit (const unsigned int m,
-                 const unsigned int n);
+    void reinit (const types::global_dof_index m,
+                 const types::global_dof_index n);
 
                                      /**
                                       * Since this object is kept
@@ -213,8 +213,8 @@ class CompressedSetSparsityPattern : public Subscriptor
                                       * matrix. 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);
 
                                      /**
                                       * Add several nonzero entries to the
@@ -223,17 +223,17 @@ class CompressedSetSparsityPattern : public Subscriptor
                                       * happens.
                                       */
     template <typename ForwardIterator>
-    void add_entries (const unsigned int row,
-                      ForwardIterator    begin,
-                      ForwardIterator    end,
-                      const bool         indices_are_sorted = false);
+    void add_entries (const types::global_dof_index row,
+                      ForwardIterator               begin,
+                      ForwardIterator               end,
+                      const bool                    indices_are_sorted = false);
 
                                      /**
                                       * 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;
 
                                      /**
                                       * Make the sparsity pattern
@@ -289,19 +289,19 @@ class CompressedSetSparsityPattern : public Subscriptor
                                       * matrix, which equals the dimension
                                       * of the image space.
                                       */
-    unsigned int n_rows () const;
+    types::global_dof_index n_rows () const;
 
                                      /**
                                       * Return number of columns of this
                                       * matrix, which equals the dimension
                                       * of the range space.
                                       */
-    unsigned int n_cols () const;
+    types::global_dof_index n_cols () 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;
 
                                      /**
                                       * Return an iterator that can loop over
@@ -309,12 +309,12 @@ class CompressedSetSparsityPattern : public Subscriptor
                                       * row. Dereferencing the iterator yields
                                       * a column index.
                                       */
-    row_iterator row_begin (const unsigned int row) const;
+    row_iterator row_begin (const types::global_dof_index row) const;
 
                                      /**
                                       * End iterator for the given row.
                                       */
-    row_iterator row_end (const unsigned int row) const;
+    row_iterator row_end (const types::global_dof_index row) const;
 
 
                                      /**
@@ -357,13 +357,13 @@ class CompressedSetSparsityPattern : 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;
 
                                      /**
                                       * For each row of the matrix, store the
@@ -385,7 +385,7 @@ class CompressedSetSparsityPattern : public Subscriptor
                                           * Add the given column number to
                                           * this line.
                                           */
-        void add (const unsigned int col_num);
+        void add (const types::global_dof_index col_num);
 
                                          /**
                                           * Add the columns specified by the
@@ -417,7 +417,7 @@ CompressedSetSparsityPattern::Line::Line ()
 
 inline
 void
-CompressedSetSparsityPattern::Line::add (const unsigned int j)
+CompressedSetSparsityPattern::Line::add (const types::global_dof_index j)
 {
   entries.insert (j);
 }
@@ -436,7 +436,7 @@ CompressedSetSparsityPattern::Line::add_entries (ForwardIterator begin,
 
 
 inline
-unsigned int
+types::global_dof_index
 CompressedSetSparsityPattern::n_rows () const
 {
   return rows;
@@ -445,7 +445,7 @@ CompressedSetSparsityPattern::n_rows () const
 
 
 inline
-unsigned int
+types::global_dof_index
 CompressedSetSparsityPattern::n_cols () const
 {
   return cols;
@@ -455,8 +455,8 @@ CompressedSetSparsityPattern::n_cols () const
 
 inline
 void
-CompressedSetSparsityPattern::add (const unsigned int i,
-                                   const unsigned int j)
+CompressedSetSparsityPattern::add (const types::global_dof_index i,
+                                   const types::global_dof_index j)
 {
   Assert (i<rows, ExcIndexRange(i, 0, rows));
   Assert (j<cols, ExcIndexRange(j, 0, cols));
@@ -469,7 +469,7 @@ CompressedSetSparsityPattern::add (const unsigned int i,
 template <typename ForwardIterator>
 inline
 void
-CompressedSetSparsityPattern::add_entries (const unsigned int row,
+CompressedSetSparsityPattern::add_entries (const types::global_dof_index row,
                                            ForwardIterator begin,
                                            ForwardIterator end,
                                            const bool         /*indices_are_sorted*/)
@@ -483,7 +483,7 @@ CompressedSetSparsityPattern::add_entries (const unsigned int row,
 
 inline
 unsigned int
-CompressedSetSparsityPattern::row_length (const unsigned int row) const
+CompressedSetSparsityPattern::row_length (const types::global_dof_index row) const
 {
   Assert (row < n_rows(), ExcIndexRange (row, 0, n_rows()));
 
@@ -494,7 +494,7 @@ CompressedSetSparsityPattern::row_length (const unsigned int row) const
 
 inline
 CompressedSetSparsityPattern::row_iterator
-CompressedSetSparsityPattern::row_begin (const unsigned int row) const
+CompressedSetSparsityPattern::row_begin (const types::global_dof_index row) const
 {
   return (lines[row].entries.begin ());
 }
@@ -503,7 +503,7 @@ CompressedSetSparsityPattern::row_begin (const unsigned int row) const
 
 inline
 CompressedSetSparsityPattern::row_iterator
-CompressedSetSparsityPattern::row_end (const unsigned int row) const
+CompressedSetSparsityPattern::row_end (const types::global_dof_index row) const
 {
   return (lines[row].entries.end ());
 }
index 952f57c2610a51a560afa66ae214a377b994900d..64f817e3fc1ad22b36d17bc77ad57a4a25804e27 100644 (file)
@@ -46,8 +46,8 @@ CompressedSetSparsityPattern (const CompressedSetSparsityPattern &s)
 
 
 
-CompressedSetSparsityPattern::CompressedSetSparsityPattern (const unsigned int m,
-                                                      const unsigned int n)
+CompressedSetSparsityPattern::CompressedSetSparsityPattern (const types::global_dof_index m,
+                                                            const types::global_dof_index n)
                 :
                 rows(0),
                 cols(0)
@@ -57,7 +57,7 @@ CompressedSetSparsityPattern::CompressedSetSparsityPattern (const unsigned int m
 
 
 
-CompressedSetSparsityPattern::CompressedSetSparsityPattern (const unsigned int n)
+CompressedSetSparsityPattern::CompressedSetSparsityPattern (const types::global_dof_index n)
                 :
                 rows(0),
                 cols(0)
@@ -82,8 +82,8 @@ CompressedSetSparsityPattern::operator = (const CompressedSetSparsityPattern &s)
 
 
 void
-CompressedSetSparsityPattern::reinit (const unsigned int m,
-                                   const unsigned int n)
+CompressedSetSparsityPattern::reinit (const types::global_dof_index m,
+                                      const types::global_dof_index n)
 {
   rows = m;
   cols = n;
@@ -123,8 +123,8 @@ CompressedSetSparsityPattern::max_entries_per_row () const
 
 
 bool
-CompressedSetSparsityPattern::exists (const unsigned int i,
-                                   const unsigned int j) const
+CompressedSetSparsityPattern::exists (const types::global_dof_index i,
+                                      const types::global_dof_index j) const
 {
   Assert (i<rows, ExcIndexRange(i, 0, rows));
   Assert (j<cols, ExcIndexRange(j, 0, cols));

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.