From 4553e9df659c37530772c9a744f672a90b15cae9 Mon Sep 17 00:00:00 2001 From: turcksin Date: Wed, 6 Mar 2013 17:21:45 +0000 Subject: [PATCH] Fix some errors. Step one to six of the tutorial compile and run. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28759 0785d39b-7218-0410-832d-ea1e28bc413d --- .../deal.II/dofs/dof_accessor.templates.h | 18 +++++++++--------- .../include/deal.II/lac/constraint_matrix.h | 4 ++-- .../deal.II/lac/constraint_matrix.templates.h | 2 +- deal.II/source/multigrid/mg_tools.inst.in | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) 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 9c49af18e8..ba46025ec9 100644 --- a/deal.II/include/deal.II/dofs/dof_accessor.templates.h +++ b/deal.II/include/deal.II/dofs/dof_accessor.templates.h @@ -1193,11 +1193,11 @@ namespace internal template static - unsigned int + types::global_dof_index get_vertex_dof_index (const dealii::DoFHandler &dof_handler, - const unsigned int vertex_index, + const types::global_dof_index vertex_index, const unsigned int fe_index, - const unsigned int local_index) + const types::global_dof_index local_index) { Assert ((fe_index == dealii::DoFHandler::default_fe_index), ExcMessage ("Only the default FE index is allowed for non-hp DoFHandler objects")); @@ -1217,11 +1217,11 @@ namespace internal template static - unsigned int + types::global_dof_index get_vertex_dof_index (const dealii::hp::DoFHandler &dof_handler, - const unsigned int vertex_index, + const types::global_dof_index vertex_index, const unsigned int fe_index, - const unsigned int local_index) + const types::global_dof_index local_index) { Assert ( (fe_index != dealii::hp::DoFHandler::default_fe_index), ExcMessage ("You need to specify a FE index when working " @@ -1246,13 +1246,13 @@ namespace internal // part. trigger an exception if // we can't find a set for this // particular fe_index - const unsigned int starting_offset = dof_handler.vertex_dofs_offsets[vertex_index]; + const types::global_dof_index starting_offset = dof_handler.vertex_dofs_offsets[vertex_index]; const types::global_dof_index *pointer = &dof_handler.vertex_dofs[starting_offset]; while (true) { Assert (pointer <= &dof_handler.vertex_dofs.back(), ExcInternalError()); - Assert((*pointer)::max(), ExcInternalError()); + Assert((*pointer)::max(), ExcInternalError()); const unsigned int this_fe_index = static_cast(*pointer); Assert (this_fe_index != numbers::invalid_unsigned_int, @@ -2286,7 +2286,7 @@ DoFAccessor<0,DH<1,spacedim>, lda>::get_dof_indices ( std::vector &dof_indices, const unsigned int fe_index) const { - for (unsigned int i=0; i= lines_cache.size()) lines_cache.resize (std::max(2*static_cast(lines_cache.size()), line_index+1), - numbers::invalid_unsigned_int); + numbers::invalid_size_type); // push a new line to the end of the // list @@ -1936,7 +1936,7 @@ ConstraintMatrix::is_constrained (const size_type index) const const size_type line_index = calculate_line_index(index); return ((line_index < lines_cache.size()) && - (lines_cache[line_index] != numbers::invalid_unsigned_int)); + (lines_cache[line_index] != numbers::invalid_size_type)); } diff --git a/deal.II/include/deal.II/lac/constraint_matrix.templates.h b/deal.II/include/deal.II/lac/constraint_matrix.templates.h index 3aac17b9eb..35c6b4155a 100644 --- a/deal.II/include/deal.II/lac/constraint_matrix.templates.h +++ b/deal.II/include/deal.II/lac/constraint_matrix.templates.h @@ -2242,7 +2242,7 @@ make_sorted_row_list (const std::vector &local_dof_indices, Utilities::lower_bound(active_dofs.begin(), active_dofs.end()-i+1, new_index); - if (*it != new_index) + if (*it != new_index) active_dofs.insert(it, new_index); } } diff --git a/deal.II/source/multigrid/mg_tools.inst.in b/deal.II/source/multigrid/mg_tools.inst.in index eb1926c14b..d4d787025f 100644 --- a/deal.II/source/multigrid/mg_tools.inst.in +++ b/deal.II/source/multigrid/mg_tools.inst.in @@ -127,13 +127,13 @@ for (deal_II_dimension : DIMENSIONS) #if deal_II_dimension < 3 template void count_dofs_per_block ( const DoFHandler&, - std::vector >&, std::vector); + std::vector >&, std::vector); #endif #if deal_II_dimension == 3 template void count_dofs_per_block ( const DoFHandler<1,3>&, - std::vector >&, std::vector); + std::vector >&, std::vector); #endif \} } -- 2.39.5