From cbe4bfe1c557d08887e32efd17c55322488a8d69 Mon Sep 17 00:00:00 2001
From: Jonathan Robey <class4kayaker@gmail.com>
Date: Fri, 16 Sep 2016 10:47:52 -0700
Subject: [PATCH] Modify FE_QHie to use generalized*_s_p instead

---
 include/deal.II/fe/fe_q_hierarchical.h | 10 +++++-----
 source/fe/fe_q_hierarchical.cc         | 18 +++++++++---------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/deal.II/fe/fe_q_hierarchical.h b/include/deal.II/fe/fe_q_hierarchical.h
index d9a7c3b85c..27da060145 100644
--- a/include/deal.II/fe/fe_q_hierarchical.h
+++ b/include/deal.II/fe/fe_q_hierarchical.h
@@ -789,16 +789,16 @@ private:
                                              const std::vector<FullMatrix<double> > &dofs_subcell);
 
   /**
-   * Initialize the @p unit_support_points field of the FiniteElement class.
+   * Initialize the @p generalized_support_points field of the FiniteElement class.
    * Called from the constructor.
    */
-  void initialize_unit_support_points ();
+  void initialize_generalized_support_points ();
 
   /**
-   * Initialize the @p unit_face_support_points field of the FiniteElement
+   * Initialize the @p generalized_face_support_points field of the FiniteElement
    * class. Called from the constructor.
    */
-  void initialize_unit_face_support_points ();
+  void initialize_generalized_face_support_points ();
 
   /**
    * Mapping from lexicographic to shape function numbering on first face.
@@ -819,7 +819,7 @@ private:
 /* -------------- declaration of explicit specializations ------------- */
 
 template <>
-void FE_Q_Hierarchical<1>::initialize_unit_face_support_points ();
+void FE_Q_Hierarchical<1>::initialize_generalized_face_support_points ();
 
 template <>
 bool
diff --git a/source/fe/fe_q_hierarchical.cc b/source/fe/fe_q_hierarchical.cc
index f146a71825..d52124f377 100644
--- a/source/fe/fe_q_hierarchical.cc
+++ b/source/fe/fe_q_hierarchical.cc
@@ -99,8 +99,8 @@ FE_Q_Hierarchical<dim>::FE_Q_Hierarchical (const unsigned int degree)
 
   // finally fill in support points
   // on cell and face
-  initialize_unit_support_points ();
-  initialize_unit_face_support_points ();
+  initialize_generalized_support_points ();
+  initialize_generalized_face_support_points ();
 }
 
 
@@ -740,14 +740,14 @@ initialize_embedding_and_restriction (const std::vector<FullMatrix<double> > &do
 
 
 template <int dim>
-void FE_Q_Hierarchical<dim>::initialize_unit_support_points ()
+void FE_Q_Hierarchical<dim>::initialize_generalized_support_points ()
 {
   // number of points: (degree+1)^dim
   unsigned int n = this->degree+1;
   for (unsigned int i=1; i<dim; ++i)
     n *= this->degree+1;
 
-  this->unit_support_points.resize(n);
+  this->generalized_support_points.resize(n);
 
   const std::vector<unsigned int> &index_map_inverse=
     this->poly_space.get_numbering_inverse();
@@ -809,14 +809,14 @@ void FE_Q_Hierarchical<dim>::initialize_unit_support_points ()
               else
                 p(2) = .5;
             }
-          this->unit_support_points[index_map_inverse[k++]] = p;
+          this->generalized_support_points[index_map_inverse[k++]] = p;
         };
 }
 
 
 
 template <>
-void FE_Q_Hierarchical<1>::initialize_unit_face_support_points ()
+void FE_Q_Hierarchical<1>::initialize_generalized_face_support_points ()
 {
   // no faces in 1d, so nothing to do
 }
@@ -1627,7 +1627,7 @@ get_subface_interpolation_matrix (const FiniteElement<dim> &x_source_fe,
 
 
 template <int dim>
-void FE_Q_Hierarchical<dim>::initialize_unit_face_support_points ()
+void FE_Q_Hierarchical<dim>::initialize_generalized_face_support_points ()
 {
   const unsigned int codim = dim-1;
 
@@ -1636,7 +1636,7 @@ void FE_Q_Hierarchical<dim>::initialize_unit_face_support_points ()
   for (unsigned int i=1; i<codim; ++i)
     n *= this->degree+1;
 
-  this->unit_face_support_points.resize(n);
+  this->generalized_face_support_points.resize(n);
 
   Point<codim> p;
 
@@ -1669,7 +1669,7 @@ void FE_Q_Hierarchical<dim>::initialize_unit_face_support_points ()
               else
                 p(2) = .5;
             }
-          this->unit_face_support_points[face_renumber[k++]] = p;
+          this->generalized_face_support_points[face_renumber[k++]] = p;
         };
 }
 
-- 
2.39.5