From d447d43fe280a559be700d153f2854ba36865207 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 31 Jan 2017 16:26:44 -0700 Subject: [PATCH] Deprecate FiniteElement::interpolate and all its implementations. --- include/deal.II/fe/fe.h | 12 +++++++++--- include/deal.II/fe/fe_abf.h | 12 +++++++----- include/deal.II/fe/fe_bdm.h | 12 +++++++----- include/deal.II/fe/fe_dg_vector.h | 12 +++++++----- include/deal.II/fe/fe_nedelec.h | 8 ++++---- include/deal.II/fe/fe_q_bubbles.h | 26 ++++--------------------- include/deal.II/fe/fe_q_dg0.h | 26 ++++--------------------- include/deal.II/fe/fe_q_hierarchical.h | 6 +++--- include/deal.II/fe/fe_rannacher_turek.h | 19 +++++++++--------- include/deal.II/fe/fe_raviart_thomas.h | 22 +++++++++++---------- 10 files changed, 66 insertions(+), 89 deletions(-) diff --git a/include/deal.II/fe/fe.h b/include/deal.II/fe/fe.h index 95fb372ebb..65076657fa 100644 --- a/include/deal.II/fe/fe.h +++ b/include/deal.II/fe/fe.h @@ -1941,11 +1941,13 @@ public: * element has support points. In this case, the resulting coefficients are * just the values in the support points. All other elements must * reimplement it. + * + * @deprecated Use convert_support_point_values_to_nodal_values() instead. */ virtual void interpolate(std::vector &local_dofs, - const std::vector &values) const; + const std::vector &values) const DEAL_II_DEPRECATED; /** * Interpolate a set of vector values, computed in the generalized support @@ -1955,21 +1957,25 @@ public: * offset is used to determine the first component of the vector to * be interpolated. Maybe consider changing your data structures to use the * next function. + * + * @deprecated Use convert_support_point_values_to_nodal_values() instead. */ virtual void interpolate(std::vector &local_dofs, const std::vector > &values, - const unsigned int offset = 0) const; + const unsigned int offset = 0) const DEAL_II_DEPRECATED; /** * Interpolate a set of vector values, computed in the generalized support * points. + * + * @deprecated Use convert_support_point_values_to_nodal_values() instead. */ virtual void interpolate(std::vector &local_dofs, - const VectorSlice > > &values) const; + const VectorSlice > > &values) const DEAL_II_DEPRECATED; //@} diff --git a/include/deal.II/fe/fe_abf.h b/include/deal.II/fe/fe_abf.h index e5957f2b94..24e3f0b8a2 100644 --- a/include/deal.II/fe/fe_abf.h +++ b/include/deal.II/fe/fe_abf.h @@ -124,13 +124,15 @@ public: const unsigned int face_index) const; virtual void interpolate(std::vector &local_dofs, - const std::vector &values) const; + const std::vector &values) const DEAL_II_DEPRECATED; + virtual void interpolate(std::vector &local_dofs, const std::vector > &values, - const unsigned int offset = 0) const; - virtual void interpolate( - std::vector &local_dofs, - const VectorSlice > > &values) const; + const unsigned int offset = 0) const DEAL_II_DEPRECATED; + + virtual void interpolate(std::vector &local_dofs, + const VectorSlice > > &values) const DEAL_II_DEPRECATED; + virtual std::size_t memory_consumption () const; virtual FiniteElement *clone() const; diff --git a/include/deal.II/fe/fe_bdm.h b/include/deal.II/fe/fe_bdm.h index 419b0e5a2a..e64dd95172 100644 --- a/include/deal.II/fe/fe_bdm.h +++ b/include/deal.II/fe/fe_bdm.h @@ -73,13 +73,15 @@ public: virtual FiniteElement *clone () const; virtual void interpolate(std::vector &local_dofs, - const std::vector &values) const; + const std::vector &values) const DEAL_II_DEPRECATED; + virtual void interpolate(std::vector &local_dofs, const std::vector > &values, - const unsigned int offset = 0) const; - virtual void interpolate( - std::vector &local_dofs, - const VectorSlice > > &values) const; + const unsigned int offset = 0) const DEAL_II_DEPRECATED; + + virtual void interpolate(std::vector &local_dofs, + const VectorSlice > > &values) const DEAL_II_DEPRECATED; + private: /** * Only for internal use. Its full name is @p get_dofs_per_object_vector diff --git a/include/deal.II/fe/fe_dg_vector.h b/include/deal.II/fe/fe_dg_vector.h index 711b9bfcf6..516e14c03c 100644 --- a/include/deal.II/fe/fe_dg_vector.h +++ b/include/deal.II/fe/fe_dg_vector.h @@ -81,13 +81,15 @@ public: const unsigned int face_index) const; virtual void interpolate(std::vector &local_dofs, - const std::vector &values) const; + const std::vector &values) const DEAL_II_DEPRECATED; + virtual void interpolate(std::vector &local_dofs, const std::vector > &values, - const unsigned int offset = 0) const; - virtual void interpolate( - std::vector &local_dofs, - const VectorSlice > > &values) const; + const unsigned int offset = 0) const DEAL_II_DEPRECATED; + + virtual void interpolate(std::vector &local_dofs, + const VectorSlice > > &values) const DEAL_II_DEPRECATED; + virtual std::size_t memory_consumption () const; private: diff --git a/include/deal.II/fe/fe_nedelec.h b/include/deal.II/fe/fe_nedelec.h index c60b94b469..52a3b0af9d 100644 --- a/include/deal.II/fe/fe_nedelec.h +++ b/include/deal.II/fe/fe_nedelec.h @@ -256,14 +256,14 @@ public: const RefinementCase &refinement_case=RefinementCase::isotropic_refinement) const; virtual void interpolate (std::vector &local_dofs, - const std::vector &values) const; + const std::vector &values) const DEAL_II_DEPRECATED; virtual void interpolate (std::vector &local_dofs, const std::vector > &values, - const unsigned int offset = 0) const; + const unsigned int offset = 0) const DEAL_II_DEPRECATED; + virtual void interpolate (std::vector &local_dofs, - const VectorSlice > > &values) - const; + const VectorSlice > > &values) const DEAL_II_DEPRECATED; /** * Return a list of constant modes of the element. diff --git a/include/deal.II/fe/fe_q_bubbles.h b/include/deal.II/fe/fe_q_bubbles.h index 7403b36f2c..046d6fd676 100644 --- a/include/deal.II/fe/fe_q_bubbles.h +++ b/include/deal.II/fe/fe_q_bubbles.h @@ -104,33 +104,15 @@ public: */ virtual std::string get_name () const; - /** - * Interpolate a set of scalar values, computed in the generalized support - * points. - */ virtual void interpolate(std::vector &local_dofs, - const std::vector &values) const; + const std::vector &values) const DEAL_II_DEPRECATED; - /** - * Interpolate a set of vector values, computed in the generalized support - * points. - * - * Since a finite element often only interpolates part of a vector, - * offset is used to determine the first component of the vector to - * be interpolated. Maybe consider changing your data structures to use the - * next function. - */ virtual void interpolate(std::vector &local_dofs, const std::vector > &values, - const unsigned int offset = 0) const; + const unsigned int offset = 0) const DEAL_II_DEPRECATED; - /** - * Interpolate a set of vector values, computed in the generalized support - * points. - */ - virtual void interpolate( - std::vector &local_dofs, - const VectorSlice > > &values) const; + virtual void interpolate(std::vector &local_dofs, + const VectorSlice > > &values) const DEAL_II_DEPRECATED; /** * Return the matrix interpolating from the given finite element to the diff --git a/include/deal.II/fe/fe_q_dg0.h b/include/deal.II/fe/fe_q_dg0.h index 5f98ca63b7..fa3467301f 100644 --- a/include/deal.II/fe/fe_q_dg0.h +++ b/include/deal.II/fe/fe_q_dg0.h @@ -258,33 +258,15 @@ public: */ virtual std::string get_name () const; - /** - * Interpolate a set of scalar values, computed in the generalized support - * points. - */ virtual void interpolate(std::vector &local_dofs, - const std::vector &values) const; + const std::vector &values) const DEAL_II_DEPRECATED; - /** - * Interpolate a set of vector values, computed in the generalized support - * points. - * - * Since a finite element often only interpolates part of a vector, - * offset is used to determine the first component of the vector to - * be interpolated. Maybe consider changing your data structures to use the - * next function. - */ virtual void interpolate(std::vector &local_dofs, const std::vector > &values, - const unsigned int offset = 0) const; + const unsigned int offset = 0) const DEAL_II_DEPRECATED; - /** - * Interpolate a set of vector values, computed in the generalized support - * points. - */ - virtual void interpolate( - std::vector &local_dofs, - const VectorSlice > > &values) const; + virtual void interpolate(std::vector &local_dofs, + const VectorSlice > > &values) const DEAL_II_DEPRECATED; /** * Return the matrix interpolating from the given finite element to the diff --git a/include/deal.II/fe/fe_q_hierarchical.h b/include/deal.II/fe/fe_q_hierarchical.h index c4ecf65be2..1d7f5b130a 100644 --- a/include/deal.II/fe/fe_q_hierarchical.h +++ b/include/deal.II/fe/fe_q_hierarchical.h @@ -692,7 +692,7 @@ public: */ virtual void interpolate(std::vector &local_dofs, - const std::vector &values) const; + const std::vector &values) const DEAL_II_DEPRECATED; /** * This function is not implemented and throws an exception if called. @@ -701,7 +701,7 @@ public: void interpolate(std::vector &local_dofs, const std::vector > &values, - const unsigned int offset = 0) const; + const unsigned int offset = 0) const DEAL_II_DEPRECATED; /** * This function is not implemented and throws an exception if called. @@ -709,7 +709,7 @@ public: virtual void interpolate(std::vector &local_dofs, - const VectorSlice > > &values) const; + const VectorSlice > > &values) const DEAL_II_DEPRECATED; protected: diff --git a/include/deal.II/fe/fe_rannacher_turek.h b/include/deal.II/fe/fe_rannacher_turek.h index cd97b61a39..5c138583be 100644 --- a/include/deal.II/fe/fe_rannacher_turek.h +++ b/include/deal.II/fe/fe_rannacher_turek.h @@ -67,16 +67,15 @@ public: virtual std::string get_name() const; virtual FiniteElement *clone() const; - virtual void interpolate( - std::vector &local_dofs, - const std::vector &values) const; - virtual void interpolate( - std::vector &local_dofs, - const std::vector > &values, - const unsigned int offset = 0) const; - virtual void interpolate( - std::vector &local_dofs, - const VectorSlice > > &values) const; + virtual void interpolate(std::vector &local_dofs, + const std::vector &values) const DEAL_II_DEPRECATED; + + virtual void interpolate(std::vector &local_dofs, + const std::vector > &values, + const unsigned int offset = 0) const DEAL_II_DEPRECATED; + + virtual void interpolate(std::vector &local_dofs, + const VectorSlice > > &values) const DEAL_II_DEPRECATED; private: /** * Order of this element. diff --git a/include/deal.II/fe/fe_raviart_thomas.h b/include/deal.II/fe/fe_raviart_thomas.h index 2f57911839..1e76c5b4f0 100644 --- a/include/deal.II/fe/fe_raviart_thomas.h +++ b/include/deal.II/fe/fe_raviart_thomas.h @@ -129,13 +129,14 @@ public: const unsigned int face_index) const; virtual void interpolate(std::vector &local_dofs, - const std::vector &values) const; + const std::vector &values) const DEAL_II_DEPRECATED; + virtual void interpolate(std::vector &local_dofs, const std::vector > &values, - const unsigned int offset = 0) const; - virtual void interpolate( - std::vector &local_dofs, - const VectorSlice > > &values) const; + const unsigned int offset = 0) const DEAL_II_DEPRECATED; + + virtual void interpolate(std::vector &local_dofs, + const VectorSlice > > &values) const DEAL_II_DEPRECATED; /** * Return a list of constant modes of the element. This method is currently @@ -260,13 +261,14 @@ public: virtual FiniteElement *clone () const; virtual void interpolate(std::vector &local_dofs, - const std::vector &values) const; + const std::vector &values) const DEAL_II_DEPRECATED; + virtual void interpolate(std::vector &local_dofs, const std::vector > &values, - const unsigned int offset = 0) const; - virtual void interpolate( - std::vector &local_dofs, - const VectorSlice > > &values) const; + const unsigned int offset = 0) const DEAL_II_DEPRECATED; + + virtual void interpolate(std::vector &local_dofs, + const VectorSlice > > &values) const DEAL_II_DEPRECATED; virtual void get_face_interpolation_matrix (const FiniteElement &source, -- 2.39.5