From: kainan.wang Date: Tue, 2 Apr 2013 23:27:33 +0000 (+0000) Subject: Resolve some exception problem X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ea1449533c10b71e760ea6da243c3d0d4261973;p=dealii-svn.git Resolve some exception problem git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29158 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/base/partitioner.h b/deal.II/include/deal.II/base/partitioner.h index 736a238499..c1862ef9dc 100644 --- a/deal.II/include/deal.II/base/partitioner.h +++ b/deal.II/include/deal.II/base/partitioner.h @@ -284,7 +284,8 @@ namespace Utilities * Exception */ DeclException2 (ExcIndexNotPresent, - unsigned int, unsigned int, + types::global_dof_index, + unsigned int, << "Global index " << arg1 << " neither owned nor ghost on proc " << arg2); diff --git a/deal.II/include/deal.II/dofs/block_info.h b/deal.II/include/deal.II/dofs/block_info.h index b428e19ee2..ccd162ac03 100644 --- a/deal.II/include/deal.II/dofs/block_info.h +++ b/deal.II/include/deal.II/dofs/block_info.h @@ -158,7 +158,7 @@ public: * in the standard local * numbering of DoFAccessor. */ - types::global_dof_index renumber (const types::global_dof_index i) const; + types::global_dof_index renumber (const unsigned int i) const; /** * The number of base elements. @@ -259,7 +259,7 @@ BlockInfo::level (const unsigned int l) const inline -types::global_dof_index BlockInfo::renumber (const types::global_dof_index i) const +types::global_dof_index BlockInfo::renumber (const unsigned int i) const { AssertIndexRange(i, local_renumbering.size()); return local_renumbering[i];