From: Bruno Turcksin Date: Mon, 29 Apr 2013 15:30:10 +0000 (+0000) Subject: Fix a bug in number of global active cells. X-Git-Tag: v8.0.0~316^2~36 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e8aa1c907acb046747a5ee3a3b833ba7ef6102c;p=dealii.git 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 090b0e43cb..ef59d652b1 100644 --- 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 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 27cb157d1f..4daf03b444 100644 --- a/deal.II/source/distributed/tria.cc +++ b/deal.II/source/distributed/tria.cc @@ -3032,7 +3032,7 @@ namespace parallel template - unsigned int + types::global_dof_index Triangulation::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());