From 7670a4859381b13448c5b370341bb4417d0a5edd Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Sat, 23 Jan 2016 18:54:29 -0600 Subject: [PATCH] Remove now no longer used FE_DGP_Nonparametric::update_once/each. --- include/deal.II/fe/fe_dgp_nonparametric.h | 26 +++------------------ source/fe/fe_dgp_nonparametric.cc | 28 ++++------------------- 2 files changed, 7 insertions(+), 47 deletions(-) diff --git a/include/deal.II/fe/fe_dgp_nonparametric.h b/include/deal.II/fe/fe_dgp_nonparametric.h index 1c075c5424..86a69faeaf 100644 --- a/include/deal.II/fe/fe_dgp_nonparametric.h +++ b/include/deal.II/fe/fe_dgp_nonparametric.h @@ -595,29 +595,9 @@ private: * within the constructor to be passed to the constructor of @p * FiniteElementData. */ - static std::vector get_dpo_vector (const unsigned int degree); - - /** - * Given a set of flags indicating what quantities are requested from a @p - * FEValues object, return which of these can be precomputed once and for - * all. Often, the values of shape function at quadrature points can be - * precomputed, for example, in which case the return value of this function - * would be the logical and of the input @p flags and @p update_values. - * - * For the present kind of finite element, this is exactly the case. - */ - UpdateFlags update_once (const UpdateFlags flags) const; - - /** - * This is the opposite to the above function: given a set of flags - * indicating what we want to know, return which of these need to be - * computed each time we visit a new cell. - * - * If for the computation of one quantity something else is also required - * (for example, we often need the covariant transformation when gradients - * need to be computed), include this in the result as well. - */ - UpdateFlags update_each (const UpdateFlags flags) const; + static + std::vector + get_dpo_vector (const unsigned int degree); /** * Degree of the polynomials. diff --git a/source/fe/fe_dgp_nonparametric.cc b/source/fe/fe_dgp_nonparametric.cc index 0d34f424c3..6b75823880 100644 --- a/source/fe/fe_dgp_nonparametric.cc +++ b/source/fe/fe_dgp_nonparametric.cc @@ -238,28 +238,6 @@ FE_DGPNonparametric::get_dpo_vector (const unsigned int deg) template UpdateFlags FE_DGPNonparametric::requires_update_flags (const UpdateFlags flags) const -{ - return update_once(flags) | update_each(flags); -} - - - -template -UpdateFlags -FE_DGPNonparametric::update_once (const UpdateFlags) 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; -} - - -template -UpdateFlags -FE_DGPNonparametric::update_each (const UpdateFlags flags) const { UpdateFlags out = flags; @@ -270,6 +248,7 @@ FE_DGPNonparametric::update_each (const UpdateFlags flags) const } + //--------------------------------------------------------------------------- // Data field initialization //--------------------------------------------------------------------------- @@ -283,8 +262,9 @@ get_data (const UpdateFlags u dealii::internal::FEValues::FiniteElementRelatedData &/*output_data*/) const { // generate a new data object - typename FiniteElement::InternalDataBase *data = new typename FiniteElement::InternalDataBase; - data->update_each = update_once(update_flags) | update_each(update_flags); // FIX: only update_each required + typename FiniteElement::InternalDataBase *data + = new typename FiniteElement::InternalDataBase; + data->update_each = requires_update_flags(update_flags); // other than that, there is nothing we can add here as discussed // in the general documentation of this class -- 2.39.5