From: Jonathan Robey Date: Fri, 16 Sep 2016 17:47:52 +0000 (-0700) Subject: Modify FE_QHie to use generalized*_s_p instead X-Git-Tag: v8.5.0-rc1~661^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbe4bfe1c557d08887e32efd17c55322488a8d69;p=dealii.git Modify FE_QHie to use generalized*_s_p instead --- 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 > &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::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 > &do template -void FE_Q_Hierarchical::initialize_unit_support_points () +void FE_Q_Hierarchical::initialize_generalized_support_points () { // number of points: (degree+1)^dim unsigned int n = this->degree+1; for (unsigned int i=1; idegree+1; - this->unit_support_points.resize(n); + this->generalized_support_points.resize(n); const std::vector &index_map_inverse= this->poly_space.get_numbering_inverse(); @@ -809,14 +809,14 @@ void FE_Q_Hierarchical::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 &x_source_fe, template -void FE_Q_Hierarchical::initialize_unit_face_support_points () +void FE_Q_Hierarchical::initialize_generalized_face_support_points () { const unsigned int codim = dim-1; @@ -1636,7 +1636,7 @@ void FE_Q_Hierarchical::initialize_unit_face_support_points () for (unsigned int i=1; idegree+1; - this->unit_face_support_points.resize(n); + this->generalized_face_support_points.resize(n); Point p; @@ -1669,7 +1669,7 @@ void FE_Q_Hierarchical::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; }; }