Merge pull request #10674 from peterrum/dofs_per_function_1

Replace FiniteElementData::dofs_per_* with FiniteElementData::n_dofs_per_*

diff --cc include/deal.II/fe/fe_base.h
Simple merge

diff --cc source/dofs/dof_handler.cc
Simple merge

diff --cc source/dofs/dof_handler_policy.cc
Simple merge

diff --cc source/dofs/dof_tools.cc
index 38afdb768f0bbecec4e227524b28be368ff41a3a,3eeb74f2fc7dec2c32d80f939b7898167c4680cf..341edb43965b71a9169851ede2b658728b77af63
--- 1/source/dofs/dof_tools.cc
--- 2/source/dofs/dof_tools.cc
+++ b/source/dofs/dof_tools.cc
@@@ -2106,10 -2108,10 +2108,10 @@@ namespace DoFTool
        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;
+             const unsigned int dofs_per_face = cell->get_fe().n_dofs_per_face();
              dofs_on_face.resize(dofs_per_face);
              cell->face(f)->get_dof_indices(dofs_on_face,
                                             cell->active_fe_index());
@@@ -2528,11 -2531,11 +2531,11 @@@
          if (interior_only)
            {
              // Exclude degrees of freedom on faces opposite to the vertex
-             exclude.resize(fe.dofs_per_cell);
+             exclude.resize(fe.n_dofs_per_cell());
              std::fill(exclude.begin(), exclude.end(), false);
-             const unsigned int dpf = fe.dofs_per_face;
+             const unsigned int dpf = fe.n_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,10 -2680,10 +2680,10 @@@
      // 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;
+           vertex_dof_count[vg] += cell->get_fe().n_dofs_per_cell();
            ++vertex_cell_count[vg];
            for (unsigned int d = 0; d < dim; ++d)
              {
@@@ -2728,10 -2731,10 +2731,10 @@@
      for (cell = dof_handler.begin(level); cell != endc; ++cell)
        {
          const FiniteElement<dim> &fe = cell->get_fe();
-         indices.resize(fe.dofs_per_cell);
+         indices.resize(fe.n_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 --cc source/dofs/dof_tools_constraints.cc
Simple merge

diff --cc source/dofs/dof_tools_sparsity.cc
index 8b9b48368464915a7e98322a360ca5a181dbec34,c7c2668fb8507c43033661d3c95443c4bf95d392..165a15ca663d8d424e4121455271f725266762ea
--- 1/source/dofs/dof_tools_sparsity.cc
--- 2/source/dofs/dof_tools_sparsity.cc
+++ b/source/dofs/dof_tools_sparsity.cc
@@@ -404,10 -404,10 +404,10 @@@ namespace DoFTool
        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;
+             const unsigned int dofs_per_face = cell->get_fe().n_dofs_per_face();
              dofs_on_this_face.resize(dofs_per_face);
              cell->face(f)->get_dof_indices(dofs_on_this_face,
                                             cell->active_fe_index());