From: Wolfgang Bangerth Date: Tue, 25 Apr 2017 21:21:37 +0000 (-0600) Subject: Remove deprecated function FEValuesBase::get_normal_vectors(). X-Git-Tag: v9.0.0-rc1~1645^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47deb73cd09688e9b23c76ccd7a4a7cb026d9168;p=dealii.git Remove deprecated function FEValuesBase::get_normal_vectors(). At the same time, recreate it with a different return type. --- diff --git a/include/deal.II/fe/fe_values.h b/include/deal.II/fe/fe_values.h index 7e52a0ea39..564685705f 100644 --- a/include/deal.II/fe/fe_values.h +++ b/include/deal.II/fe/fe_values.h @@ -2406,27 +2406,19 @@ public: * * @dealiiRequiresUpdateFlags{update_normal_vectors} * - * @note This function should really be named get_normal_vectors(), but this - * function already exists with a different return type that returns a - * vector of Point objects, rather than a vector of Tensor objects. This is - * a historical accident, but can not be fixed in a backward compatible - * style. That said, the get_normal_vectors() function is now deprecated, - * will be removed in the next version, and the current function will then - * be renamed. + * @deprecated Use get_normal_vectors() instead, which returns the exact + * same thing. */ - const std::vector > &get_all_normal_vectors () const; + const std::vector > &get_all_normal_vectors () const DEAL_II_DEPRECATED; /** - * Return the normal vectors at the quadrature points as a vector of Point - * objects. This function is deprecated because normal vectors are correctly - * represented by rank-1 Tensor objects, not Point objects. Use - * get_all_normal_vectors() instead. + * Return the normal vectors at the quadrature points. For a face, these are + * the outward normal vectors to the cell. For a cell of codimension one, + * the orientation is given by the numbering of vertices. * * @dealiiRequiresUpdateFlags{update_normal_vectors} - * - * @deprecated */ - std::vector > get_normal_vectors () const DEAL_II_DEPRECATED; + const std::vector > &get_normal_vectors () const; /** * Transform a set of vectors, one for each quadrature point. The diff --git a/source/fe/fe_values.cc b/source/fe/fe_values.cc index a0ec6532a0..8b0b59f345 100644 --- a/source/fe/fe_values.cc +++ b/source/fe/fe_values.cc @@ -3375,24 +3375,19 @@ FEValuesBase::get_all_normal_vectors () const { Assert (this->update_flags & update_normal_vectors, (typename FEValuesBase::ExcAccessToUninitializedField("update_normal_vectors"))); - return this->mapping_output.normal_vectors; + return get_normal_vectors(); } template -std::vector > +const std::vector > & FEValuesBase::get_normal_vectors () const { Assert (this->update_flags & update_normal_vectors, (typename FEValuesBase::ExcAccessToUninitializedField("update_normal_vectors"))); - // copy things into a vector of Points, then return that - std::vector > tmp (this->mapping_output.normal_vectors.size()); - for (unsigned int q=0; qmapping_output.normal_vectors.size(); ++q) - tmp[q] = Point(this->mapping_output.normal_vectors[q]); - - return tmp; + return this->mapping_output.normal_vectors; }