From 832d206520e7277ae70ef70628312d88d3b33201 Mon Sep 17 00:00:00 2001 From: heister Date: Mon, 13 Aug 2012 13:38:44 +0000 Subject: [PATCH] fix my screw-up with renaming parameter names git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_3@25930 0785d39b-7218-0410-832d-ea1e28bc413d --- .../deal.II/dofs/dof_accessor.templates.h | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 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 84621a8050..2f5c092e16 100644 --- a/deal.II/include/deal.II/dofs/dof_accessor.templates.h +++ b/deal.II/include/deal.II/dofs/dof_accessor.templates.h @@ -14,6 +14,7 @@ #include +#include #include #include #include @@ -24,6 +25,7 @@ #include #include +#include DEAL_II_NAMESPACE_OPEN @@ -1162,7 +1164,7 @@ namespace internal Assert (pointer <= &dof_handler.vertex_dofs.back(), ExcInternalError()); // a fe index is always small - 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, @@ -1248,12 +1250,12 @@ namespace internal // 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 *pointer = &dof_handler.vertex_dofs[starting_offset]; + 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, @@ -1303,7 +1305,7 @@ namespace internal { 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); if (this_fe_index == numbers::invalid_unsigned_int) @@ -1356,7 +1358,7 @@ namespace internal { 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 < dof_handler.finite_elements->size(), @@ -1416,7 +1418,7 @@ namespace internal { 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 < dof_handler.finite_elements->size(), @@ -1548,7 +1550,6 @@ DoFAccessor::vertex_dof_index (const unsigned int vertex, template inline -unsigned types::global_dof_index DoFAccessor::mg_vertex_dof_index (const int level, const unsigned int vertex, const unsigned int i, const unsigned int fe_index) const { Assert (this->dof_handler != 0, ExcInvalidObject ()); @@ -2348,9 +2349,9 @@ namespace internal for (unsigned int vertex=0; vertex<2; ++vertex) for (unsigned int d=0; dset_dof_index(accessor.dof_handler->get_fe(). adjust_line_dof_index_for_line_orientation(d, accessor.line_orientation(line)), - local_dof_indices[index]); + dof_indices[index]); // now copy dof numbers into the face. for // faces with the wrong orientation, we // have already made sure that we're ok by @@ -2455,9 +2456,9 @@ namespace internal accessor.face_orientation(quad), accessor.face_flip(quad), accessor.face_rotation(quad)), - local_dof_indices[index]); + dof_indices[index]); for (unsigned int d=0; d