Remove some GeometryInfos from dofs/dof_tools

diff --git a/source/dofs/dof_tools.cc b/source/dofs/dof_tools.cc
index 632236dcd18741a88f788286f8d2dbf8768292e5..38afdb768f0bbecec4e227524b28be368ff41a3a 100644 (file)
--- a/source/dofs/dof_tools.cc
+++ b/source/dofs/dof_tools.cc
@@ -703,7 +703,7 @@ namespace DoFTools
       // only work on cells that are either locally owned or at least ghost
       // cells
       if (cell->is_artificial() == false)
-        for (const unsigned int face : GeometryInfo<dim>::face_indices())
+        for (const unsigned int face : cell->face_indices())
           if (cell->at_boundary(face))
             if (!check_boundary_id ||
                 (boundary_ids.find(cell->face(face)->boundary_id()) !=
@@ -803,7 +803,7 @@ namespace DoFTools
     // boundary line is also part of a boundary face which we will be
     // visiting sooner or later
     for (const auto &cell : dof_handler.active_cell_iterators())
-      for (const unsigned int face : GeometryInfo<dim>::face_indices())
+      for (const unsigned int face : cell->face_indices())
         if (cell->at_boundary(face))
           if (!check_boundary_id ||
               (boundary_ids.find(cell->face(face)->boundary_id()) !=
@@ -984,7 +984,7 @@ namespace DoFTools
         for (const auto &cell : dof_handler.active_cell_iterators())
           if (!cell->is_artificial())
             {
-              for (const unsigned int face : GeometryInfo<dim>::face_indices())
+              for (const unsigned int face : cell->face_indices())
                 if (cell->face(face)->has_children())
                   {
                     const typename dealii::DoFHandler<dim,
@@ -1027,7 +1027,7 @@ namespace DoFTools
 
         for (const auto &cell : dof_handler.active_cell_iterators())
           if (!cell->is_artificial())
-            for (auto f : GeometryInfo<dim>::face_indices())
+            for (auto f : cell->face_indices())
               {
                 const typename dealii::DoFHandler<dim, spacedim>::face_iterator
                   face = cell->face(f);
@@ -2106,7 +2106,7 @@ namespace DoFTools
       cell = dof_handler.begin_active(),
       endc = dof_handler.end();
     for (; cell != endc; ++cell)
-      for (const unsigned int f : GeometryInfo<dim>::face_indices())
+      for (const unsigned int f : cell->face_indices())
         if (cell->at_boundary(f))
           {
             const unsigned int dofs_per_face = cell->get_fe().dofs_per_face;
@@ -2150,7 +2150,7 @@ namespace DoFTools
       cell = dof_handler.begin_active(),
       endc = dof_handler.end();
     for (; cell != endc; ++cell)
-      for (const unsigned int f : GeometryInfo<dim>::face_indices())
+      for (const unsigned int f : cell->face_indices())
         if (boundary_ids.find(cell->face(f)->boundary_id()) !=
             boundary_ids.end())
           {
@@ -2532,7 +2532,7 @@ namespace DoFTools
             std::fill(exclude.begin(), exclude.end(), false);
             const unsigned int dpf = fe.dofs_per_face;
 
-            for (const unsigned int face : GeometryInfo<dim>::face_indices())
+            for (const unsigned int face : cell->face_indices())
               if (cell->at_boundary(face) ||
                   cell->neighbor(face)->level() != cell->level())
                 for (unsigned int i = 0; i < dpf; ++i)
@@ -2677,7 +2677,7 @@ namespace DoFTools
     // Identify all vertices active on this level and remember some data
     // about them
     for (cell = dof_handler.begin(level); cell != endc; ++cell)
-      for (const unsigned int v : GeometryInfo<dim>::vertex_indices())
+      for (const unsigned int v : cell->vertex_indices())
         {
           const unsigned int vg = cell->vertex_index(v);
           vertex_dof_count[vg] += cell->get_fe().dofs_per_cell;
@@ -2731,7 +2731,7 @@ namespace DoFTools
         indices.resize(fe.dofs_per_cell);
         cell->get_mg_dof_indices(indices);
 
-        for (const unsigned int v : GeometryInfo<dim>::vertex_indices())
+        for (const unsigned int v : cell->vertex_indices())
           {
             const unsigned int vg    = cell->vertex_index(v);
             const unsigned int block = vertex_mapping[vg];

diff --git a/source/dofs/dof_tools_constraints.cc b/source/dofs/dof_tools_constraints.cc
index 56a98a28b2da772da491f73b9ab99c18e1210ba6..49b1186bfaf67f1ceb110a41c18524179f8c0709 100644 (file)
--- a/source/dofs/dof_tools_constraints.cc
+++ b/source/dofs/dof_tools_constraints.cc
@@ -608,7 +608,7 @@ namespace DoFTools
           if (cell->is_artificial())
             continue;
 
-          for (const unsigned int face : GeometryInfo<dim>::face_indices())
+          for (const unsigned int face : cell->face_indices())
             if (cell->face(face)->has_children())
               {
                 // in any case, faces can have at most two active fe indices,
@@ -756,7 +756,7 @@ namespace DoFTools
           if (cell->is_artificial())
             continue;
 
-          for (const unsigned int face : GeometryInfo<dim>::face_indices())
+          for (const unsigned int face : cell->face_indices())
             if (cell->face(face)->has_children())
               {
                 // first of all, make sure that we treat a case which is
@@ -1025,7 +1025,7 @@ namespace DoFTools
           if (cell->is_artificial())
             continue;
 
-          for (const unsigned int face : GeometryInfo<dim>::face_indices())
+          for (const unsigned int face : cell->face_indices())
             if (cell->face(face)->has_children())
               {
                 // first of all, make sure that we treat a case which is

diff --git a/source/dofs/dof_tools_sparsity.cc b/source/dofs/dof_tools_sparsity.cc
index a7b3bdcbbc1753263c202aafd0a45dc082462b53..8b9b48368464915a7e98322a360ca5a181dbec34 100644 (file)
--- a/source/dofs/dof_tools_sparsity.cc
+++ b/source/dofs/dof_tools_sparsity.cc
@@ -404,7 +404,7 @@ namespace DoFTools
       cell = dof.begin_active(),
       endc = dof.end();
     for (; cell != endc; ++cell)
-      for (const unsigned int f : GeometryInfo<dim>::face_indices())
+      for (const unsigned int f : cell->face_indices())
         if (cell->at_boundary(f))
           {
             const unsigned int dofs_per_face = cell->get_fe().dofs_per_face;
@@ -499,7 +499,7 @@ namespace DoFTools
       cell = dof.begin_active(),
       endc = dof.end();
     for (; cell != endc; ++cell)
-      for (const unsigned int f : GeometryInfo<dim>::face_indices())
+      for (const unsigned int f : cell->face_indices())
         if (boundary_ids.find(cell->face(f)->boundary_id()) !=
             boundary_ids.end())
           {
@@ -583,7 +583,7 @@ namespace DoFTools
                                                   sparsity,
                                                   keep_constrained_dofs);
 
-          for (const unsigned int face : GeometryInfo<dim>::face_indices())
+          for (const unsigned int face : cell->face_indices())
             {
               typename DoFHandler<dim, spacedim>::face_iterator cell_face =
                 cell->face(face);
@@ -825,8 +825,7 @@ namespace DoFTools
                                                           keep_constrained_dofs,
                                                           bool_int_dof_mask);
                   // Loop over all interior neighbors
-                  for (const unsigned int face_n :
-                       GeometryInfo<dim>::face_indices())
+                  for (const unsigned int face_n : cell->face_indices())
                     {
                       const typename DoFHandler<dim, spacedim>::face_iterator
                         cell_face = cell->face(face_n);
@@ -1164,8 +1163,7 @@ namespace DoFTools
                     bool_int_and_flux_dof_mask[cell->active_fe_index()]);
 
                   // Loop over interior faces
-                  for (const unsigned int face :
-                       GeometryInfo<dim>::face_indices())
+                  for (const unsigned int face : cell->face_indices())
                     {
                       const typename dealii::DoFHandler<dim,
                                                         spacedim>::face_iterator