From 79c91a6004db72e0a01065566585c3e0b2dff98a Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Fri, 18 Aug 2017 20:07:42 +0200 Subject: [PATCH] More vertex_dof_offset fixes --- include/deal.II/dofs/dof_accessor.templates.h | 8 ++++---- tests/hp/hp_dof_handler.cc | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/include/deal.II/dofs/dof_accessor.templates.h b/include/deal.II/dofs/dof_accessor.templates.h index 5091855096..c1dbf5a1cb 100644 --- a/include/deal.II/dofs/dof_accessor.templates.h +++ b/include/deal.II/dofs/dof_accessor.templates.h @@ -1175,7 +1175,7 @@ namespace internal Assert (fe_index < dof_handler.finite_elements->size(), ExcInternalError()); Assert (dof_handler.vertex_dof_offsets[vertex_index] != - numbers::invalid_dof_index, + numbers::invalid_unsigned_int, ExcMessage ("This vertex is unused and has no DoFs associated with it")); // hop along the list of index @@ -1312,7 +1312,7 @@ namespace internal "this DoFHandler")); // if this vertex is unused, return 0 - if (dof_handler.vertex_dof_offsets[vertex_index] == numbers::invalid_dof_index) + if (dof_handler.vertex_dof_offsets[vertex_index] == numbers::invalid_unsigned_int) return 0; // hop along the list of index @@ -1364,7 +1364,7 @@ namespace internal // make sure we don't ask on // unused vertices Assert (dof_handler.vertex_dof_offsets[vertex_index] != - numbers::invalid_dof_index, + numbers::invalid_unsigned_int, ExcInternalError()); // hop along the list of index @@ -1424,7 +1424,7 @@ namespace internal // make sure we don't ask on // unused vertices Assert (dof_handler.vertex_dof_offsets[vertex_index] != - numbers::invalid_dof_index, + numbers::invalid_unsigned_int, ExcInternalError()); // hop along the list of index diff --git a/tests/hp/hp_dof_handler.cc b/tests/hp/hp_dof_handler.cc index a1378f4c03..4017ca418a 100644 --- a/tests/hp/hp_dof_handler.cc +++ b/tests/hp/hp_dof_handler.cc @@ -30,10 +30,7 @@ int main () { - std::ofstream logfile("output"); - logfile.precision(2); - - deallog.attach(logfile); + initlog(); const unsigned int dim=2; Triangulation tria; -- 2.39.5