Fix a bug in number of global active cells.

git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29398 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/include/deal.II/distributed/tria.h b/deal.II/include/deal.II/distributed/tria.h
index 090b0e43cbb0b43941c6dc175ff3b00abe5c890a..ef59d652b11c0d2c696722dc1ecec79a1bb65a91 100644 (file)
--- a/deal.II/include/deal.II/distributed/tria.h
+++ b/deal.II/include/deal.II/distributed/tria.h
@@ -538,7 +538,7 @@ namespace parallel
        * of active cells in the
        * distributed triangulation.
        */
-      unsigned int n_global_active_cells () const;
+      types::global_dof_index n_global_active_cells () const;
 
       /**
        * Returns the global maximum level. This may be bigger than n_levels.
@@ -730,7 +730,7 @@ namespace parallel
       struct NumberCache
       {
         std::vector<unsigned int> n_locally_owned_active_cells;
-        unsigned int              n_global_active_cells;
+        types::global_dof_index   n_global_active_cells;
         unsigned int              n_global_levels;
       };
 
@@ -929,7 +929,7 @@ namespace parallel
        * of active cells in the
        * distributed triangulation.
        */
-      unsigned int n_global_active_cells () const;
+      types::global_dof_index n_global_active_cells () const;
       virtual unsigned int n_global_levels () const;
 
       /**

diff --git a/deal.II/source/distributed/tria.cc b/deal.II/source/distributed/tria.cc
index 27cb157d1f1fb7298fe2bf5d1d3c848239c1d9fb..4daf03b4449ab617fd5d23ba0d5f48c944855e0b 100644 (file)
--- a/deal.II/source/distributed/tria.cc
+++ b/deal.II/source/distributed/tria.cc
@@ -3032,7 +3032,7 @@ namespace parallel
 
 
     template <int dim, int spacedim>
-    unsigned int
+    types::global_dof_index
     Triangulation<dim,spacedim>::n_global_active_cells () const
     {
       return number_cache.n_global_active_cells;
@@ -3293,7 +3293,7 @@ namespace parallel
 
 
     template <>
-    unsigned int
+    types::global_dof_index
     Triangulation<1,1>::n_global_active_cells () const
     {
       Assert (false, ExcNotImplemented());
@@ -3351,7 +3351,7 @@ namespace parallel
 
 
     template <>
-    unsigned int
+    types::global_dof_index
     Triangulation<1,2>::n_global_active_cells () const
     {
       Assert (false, ExcNotImplemented());
@@ -3401,7 +3401,7 @@ namespace parallel
 
 
     template <>
-    unsigned int
+    types::global_dof_index
     Triangulation<1,3>::n_global_active_cells () const
     {
       Assert (false, ExcNotImplemented());