From: David Wells <drwells@email.unc.edu>
Date: Sat, 1 Aug 2020 13:06:17 +0000 (-0400)
Subject: Merge pull request #10780 from peterrum/fe_face_vectors
X-Git-Tag: v9.3.0-rc1~1230
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d918f66edf73e4766e2e90f50866cf58450d0f1;p=dealii.git

Merge pull request #10780 from peterrum/fe_face_vectors

Convert all face-related data structures of FiniteElement to vectors
---

5d918f66edf73e4766e2e90f50866cf58450d0f1
diff --cc include/deal.II/fe/fe.h
index 48b0c78124,8a24356dbc..9763abf10d
--- a/include/deal.II/fe/fe.h
+++ b/include/deal.II/fe/fe.h
@@@ -3127,10 -3121,9 +3128,10 @@@ FiniteElement<dim, spacedim>::component
  template <int dim, int spacedim>
  inline std::pair<unsigned int, unsigned int>
  FiniteElement<dim, spacedim>::face_system_to_component_index(
 -  const unsigned int index) const
 +  const unsigned int index,
 +  const unsigned int) const
  {
-   AssertIndexRange(index, face_system_to_component_table.size());
+   AssertIndexRange(index, face_system_to_component_table[0].size());
  
    // in debug mode, check whether the
    // function is primitive, since
@@@ -3168,11 -3161,10 +3169,11 @@@ FiniteElement<dim, spacedim>::system_to
  template <int dim, int spacedim>
  inline std::pair<std::pair<unsigned int, unsigned int>, unsigned int>
  FiniteElement<dim, spacedim>::face_system_to_base_index(
 -  const unsigned int index) const
 +  const unsigned int index,
 +  const unsigned int) const
  {
-   AssertIndexRange(index, face_system_to_base_table.size());
-   return face_system_to_base_table[index];
+   AssertIndexRange(index, face_system_to_base_table[0].size());
+   return face_system_to_base_table[0][index];
  }
  
  
diff --cc source/fe/fe.cc
index 56b4bc3091,e46a6ef4c7..53a850375a
--- a/source/fe/fe.cc
+++ b/source/fe/fe.cc
@@@ -1074,22 -1078,22 +1085,22 @@@ FiniteElement<dim, spacedim>::get_unit_
  
  template <int dim, int spacedim>
  bool
 -FiniteElement<dim, spacedim>::has_face_support_points() const
 +FiniteElement<dim, spacedim>::has_face_support_points(const unsigned int) const
  {
-   return (unit_face_support_points.size() != 0);
+   return (unit_face_support_points[0].size() != 0);
  }
  
  
  
  template <int dim, int spacedim>
  Point<dim - 1>
 -FiniteElement<dim, spacedim>::unit_face_support_point(
 -  const unsigned int index) const
 +FiniteElement<dim, spacedim>::unit_face_support_point(const unsigned int index,
 +                                                      const unsigned int) const
  {
    AssertIndexRange(index, this->n_dofs_per_face());
-   Assert(unit_face_support_points.size() == this->n_dofs_per_face(),
+   Assert(unit_face_support_points[0].size() == this->n_dofs_per_face(),
           ExcFEHasNoSupportPoints());
-   return unit_face_support_points[index];
+   return unit_face_support_points[0][index];
  }
  
  
diff --cc source/fe/fe_system.cc
index beb8cb5a92,f0392cccaa..78d40b2ef0
--- a/source/fe/fe_system.cc
+++ b/source/fe/fe_system.cc
@@@ -2345,13 -2345,12 +2350,14 @@@ FESystem<dim, spacedim>::unit_support_p
  
  template <int dim, int spacedim>
  Point<dim - 1>
 -FESystem<dim, spacedim>::unit_face_support_point(const unsigned int index) const
 +FESystem<dim, spacedim>::unit_face_support_point(
 +  const unsigned int index,
 +  const unsigned int face_no) const
  {
    AssertIndexRange(index, this->n_dofs_per_face());
-   Assert((this->unit_face_support_points.size() == this->n_dofs_per_face()) ||
-            (this->unit_face_support_points.size() == 0),
+   Assert((this->unit_face_support_points[0].size() ==
+           this->n_dofs_per_face()) ||
+            (this->unit_face_support_points[0].size() == 0),
           (typename FiniteElement<dim, spacedim>::ExcFEHasNoSupportPoints()));
  
    // let's see whether we have the information pre-computed