From: kainan.wang Date: Wed, 3 Apr 2013 04:58:38 +0000 (+0000) Subject: Change a few places back to unsigned int, change one exception definition and fix... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9244102a2566ac039e7443c509fef5d848272ad0;p=dealii-svn.git Change a few places back to unsigned int, change one exception definition and fix an error in calling std::min git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29160 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/dofs/dof_accessor.templates.h b/deal.II/include/deal.II/dofs/dof_accessor.templates.h index 7167e97d0d..8f6a07ae0b 100644 --- a/deal.II/include/deal.II/dofs/dof_accessor.templates.h +++ b/deal.II/include/deal.II/dofs/dof_accessor.templates.h @@ -1196,9 +1196,9 @@ namespace internal static types::global_dof_index get_vertex_dof_index (const dealii::DoFHandler &dof_handler, - const types::global_dof_index vertex_index, + const unsigned int vertex_index, const unsigned int fe_index, - const types::global_dof_index local_index) + const unsigned int local_index) { Assert ((fe_index == dealii::DoFHandler::default_fe_index), ExcMessage ("Only the default FE index is allowed for non-hp DoFHandler objects")); @@ -1220,9 +1220,9 @@ namespace internal static types::global_dof_index get_vertex_dof_index (const dealii::hp::DoFHandler &dof_handler, - const types::global_dof_index vertex_index, + const unsigned int vertex_index, const unsigned int fe_index, - const types::global_dof_index local_index) + const unsigned int local_index) { Assert ( (fe_index != dealii::hp::DoFHandler::default_fe_index), ExcMessage ("You need to specify a FE index when working " diff --git a/deal.II/include/deal.II/fe/fe_base.h b/deal.II/include/deal.II/fe/fe_base.h index 0ad4a65f86..ddd8e1565d 100644 --- a/deal.II/include/deal.II/fe/fe_base.h +++ b/deal.II/include/deal.II/fe/fe_base.h @@ -206,13 +206,13 @@ public: /** * Number of degrees of freedom on a vertex. */ - const types::global_dof_index dofs_per_vertex; + const unsigned int dofs_per_vertex; /** * Number of degrees of freedom in a line; not including the degrees of * freedom on the vertices of the line. */ - const types::global_dof_index dofs_per_line; + const unsigned int dofs_per_line; /** * Number of degrees of freedom in a quadrilateral; not including the diff --git a/deal.II/include/deal.II/hp/dof_handler.h b/deal.II/include/deal.II/hp/dof_handler.h index c8dfd8f11c..16a4dde274 100644 --- a/deal.II/include/deal.II/hp/dof_handler.h +++ b/deal.II/include/deal.II/hp/dof_handler.h @@ -577,7 +577,7 @@ namespace hp * Exception */ DeclException1 (ExcNewNumbersNotConsecutive, - int, + types::global_dof_index, << "The given list of new dof indices is not consecutive: " << "the index " << arg1 << " does not exist."); /** diff --git a/deal.II/source/dofs/dof_handler.cc b/deal.II/source/dofs/dof_handler.cc index 763fd9758c..96a83d4beb 100644 --- a/deal.II/source/dofs/dof_handler.cc +++ b/deal.II/source/dofs/dof_handler.cc @@ -86,8 +86,8 @@ namespace internal unsigned int max_couplings_between_dofs (const DoFHandler<1,spacedim> &dof_handler) { - return std::min(3*dof_handler.selected_fe->dofs_per_vertex + - 2*dof_handler.selected_fe->dofs_per_line, + return std::min(static_cast(3*dof_handler.selected_fe->dofs_per_vertex + + 2*dof_handler.selected_fe->dofs_per_line), dof_handler.n_dofs()); }