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 acb4677afb53707023d656d87cb838b40b29bed7..f8d9f7e2150994301170f949d1ccfc5fe15c831d 100644 (file)
--- 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 <em>not</em> depend on the actual shape of the cells
- * in real space, i.e. update_once() includes <tt>update_values</tt>. 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<dim,spacedim>::InternalDataBase        &fe_internal,
                           dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
 
-  /**
-   * Determine the values that need to be computed on the unit cell to be able
-   * to compute all values required by <tt>flags</tt>.
-   *
-   * For the purpose of this function, refer to the documentation in
-   * FiniteElement.
-   *
-   * This class assumes that shape functions of this FiniteElement do
-   * <em>not</em> depend on the actual shape of the cells in real space.
-   * Therefore, the effect in this element is as follows: if
-   * <tt>update_values</tt> is set in <tt>flags</tt>, 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 <tt>flags</tt>.
-   *
-   * For the purpose of this function, refer to the documentation in
-   * FiniteElement.
-   *
-   * This class assumes that shape functions of this FiniteElement do
-   * <em>not</em> depend on the actual shape of the cells in real space.
-   *
-   * The effect in this element is as follows:
-   * <ul>
-   *
-   * <li> if <tt>update_gradients</tt> is set, the result will contain
-   * <tt>update_gradients</tt> and <tt>update_covariant_transformation</tt>.
-   * The latter is required to transform the gradient on the unit cell to the
-   * real cell. Remark, that the action required by
-   * <tt>update_covariant_transformation</tt> is actually performed by the
-   * Mapping object used in conjunction with this finite element.
-   *
-   * <li> if <tt>update_hessians</tt> is set, the result will contain
-   * <tt>update_hessians</tt> and <tt>update_covariant_transformation</tt>.
-   * 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.
-   *
-   * </ul>
-   */
-  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 0de38d29b30e092ee5938ff36b0bd3a87bb06fc6..82ef17fb8e958e200b0acc0da9b6400c7f1d2a05 100644 (file)
--- a/include/deal.II/fe/fe_poly.templates.h
+++ b/include/deal.II/fe/fe_poly.templates.h
@@ -184,32 +184,11 @@ FE_Poly<PolynomialType,dim,spacedim>::shape_4th_derivative_component
 template <class PolynomialType, int dim, int spacedim>
 UpdateFlags
 FE_Poly<PolynomialType,dim,spacedim>::requires_update_flags (const UpdateFlags flags) const
-{
-  return update_once(flags) | update_each(flags);
-}
-
-
-
-template <class PolynomialType, int dim, int spacedim>
-UpdateFlags
-FE_Poly<PolynomialType,dim,spacedim>::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 <class PolynomialType, int dim, int spacedim>
-UpdateFlags
-FE_Poly<PolynomialType,dim,spacedim>::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)