More vertex_dof_offset fixes

diff --git a/include/deal.II/dofs/dof_accessor.templates.h b/include/deal.II/dofs/dof_accessor.templates.h
index 50918550967c942647d93910d034b15c7dc9fabc..c1dbf5a1cbac60ac907c2eef2eb84d286e34aee0 100644 (file)
--- 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 a1378f4c031d3c1e13a0af338e8f3d1e88bf6ed1..4017ca418afa02b3a684cac722c1d5dc843ff4e4 100644 (file)
--- 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<dim> tria;