From: Wolfgang Bangerth Date: Sun, 24 Jan 2016 01:22:45 +0000 (-0600) Subject: Remove now no longer used FE_Poly::update_once/each. X-Git-Tag: v8.4.0-rc2~52^2~5 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3771c154664027d8b8912a6d3533baee7e969b6d;p=dealii.git Remove now no longer used FE_Poly::update_once/each. --- diff --git a/include/deal.II/fe/fe_poly.h b/include/deal.II/fe/fe_poly.h index acb4677afb..f8d9f7e215 100644 --- a/include/deal.II/fe/fe_poly.h +++ b/include/deal.II/fe/fe_poly.h @@ -58,12 +58,6 @@ DEAL_II_NAMESPACE_OPEN * FiniteElement classes which cannot be implemented by this class but are left * for implementation in derived classes. * - * Furthermore, this class assumes that shape functions of the FiniteElement - * under consideration do not depend on the actual shape of the cells - * in real space, i.e. update_once() includes update_values. For - * FiniteElements whose shape functions depend on the cells in real space, the - * update_once() and update_each() functions must be overloaded. - * * @todo Since nearly all functions for spacedim != dim are specialized, this * class needs cleaning up. * @@ -233,7 +227,7 @@ protected: // generate a new data object and // initialize some fields InternalData *data = new InternalData; - data->update_each = update_each(update_flags) | update_once(update_flags); // FIX: only update_each required + data->update_each = requires_update_flags(update_flags); const unsigned int n_q_points = quadrature.size(); @@ -364,52 +358,6 @@ protected: const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValues::FiniteElementRelatedData &output_data) const; - /** - * Determine the values that need to be computed on the unit cell to be able - * to compute all values required by flags. - * - * For the purpose of this function, refer to the documentation in - * FiniteElement. - * - * This class assumes that shape functions of this FiniteElement do - * not depend on the actual shape of the cells in real space. - * Therefore, the effect in this element is as follows: if - * update_values is set in flags, copy it to the result. - * All other flags of the result are cleared, since everything else must be - * computed for each cell. - */ - UpdateFlags update_once (const UpdateFlags flags) const; - - /** - * Determine the values that need to be computed on every cell to be able to - * compute all values required by flags. - * - * For the purpose of this function, refer to the documentation in - * FiniteElement. - * - * This class assumes that shape functions of this FiniteElement do - * not depend on the actual shape of the cells in real space. - * - * The effect in this element is as follows: - *
    - * - *
  • if update_gradients is set, the result will contain - * update_gradients and update_covariant_transformation. - * The latter is required to transform the gradient on the unit cell to the - * real cell. Remark, that the action required by - * update_covariant_transformation is actually performed by the - * Mapping object used in conjunction with this finite element. - * - *
  • if update_hessians is set, the result will contain - * update_hessians and update_covariant_transformation. - * The rationale is the same as above and no higher derivatives of the - * transformation are required, since we use difference quotients for the - * actual computation. - * - *
- */ - UpdateFlags update_each (const UpdateFlags flags) const; - /** * Fields of cell-independent data. * diff --git a/include/deal.II/fe/fe_poly.templates.h b/include/deal.II/fe/fe_poly.templates.h index 0de38d29b3..82ef17fb8e 100644 --- a/include/deal.II/fe/fe_poly.templates.h +++ b/include/deal.II/fe/fe_poly.templates.h @@ -184,32 +184,11 @@ FE_Poly::shape_4th_derivative_component template UpdateFlags FE_Poly::requires_update_flags (const UpdateFlags flags) const -{ - return update_once(flags) | update_each(flags); -} - - - -template -UpdateFlags -FE_Poly::update_once (const UpdateFlags flags) const -{ - // for this kind of elements, only - // the values can be precomputed - // once and for all. set this flag - // if the values are requested at - // all - return (update_default | (flags & update_values)); -} - - - -template -UpdateFlags -FE_Poly::update_each (const UpdateFlags flags) const { UpdateFlags out = update_default; + if (flags & update_values) + out |= update_values; if (flags & update_gradients) out |= update_gradients | update_covariant_transformation; if (flags & update_hessians)