From 712da1eeeb3e3fa7b6d5bc7cf0df308e7c46bb37 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Sun, 22 Mar 2020 20:36:48 -0600 Subject: [PATCH] Remove update_once/each() functions from FE_NedelecSZ. These functions *used* to be part of the public interfaces of FE classes, but haven't in a long time. They also aren't 'virtual' any more for this class. Furthermore, all uses of these functions are of the form 'update_once() | update_each()', so we may as well just call the 'requires_update_flags()' function that is the current interface. --- include/deal.II/fe/fe_nedelec_sz.h | 16 ---------------- source/fe/fe_nedelec_sz.cc | 26 +------------------------- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/include/deal.II/fe/fe_nedelec_sz.h b/include/deal.II/fe/fe_nedelec_sz.h index 1acd11c747..93a279e0b3 100644 --- a/include/deal.II/fe/fe_nedelec_sz.h +++ b/include/deal.II/fe/fe_nedelec_sz.h @@ -147,22 +147,6 @@ public: const Point & p, const unsigned int component) const override; - /** - * Given flags, determines the values which must be computed only - * for the reference cell. Make sure, that #mapping_kind is set by the - * derived class, such that this function can operate correctly. - */ - UpdateFlags - update_once(const UpdateFlags flags) const; - - /** - * Given flags, determines the values which must be computed in - * each cell cell. Make sure, that #mapping_kind is set by the derived - * class, such that this function can operate correctly. - */ - UpdateFlags - update_each(const UpdateFlags flags) const; - protected: /** * The mapping kind to be used to map shape functions from the reference diff --git a/source/fe/fe_nedelec_sz.cc b/source/fe/fe_nedelec_sz.cc index 0a01bc02f8..b678253183 100644 --- a/source/fe/fe_nedelec_sz.cc +++ b/source/fe/fe_nedelec_sz.cc @@ -136,7 +136,7 @@ FE_NedelecSZ::get_data( typename dealii::FiniteElement::InternalDataBase> data_ptr = std_cxx14::make_unique(); auto &data = dynamic_cast(*data_ptr); - data.update_each = update_each(update_flags) | update_once(update_flags); + data.update_each = requires_update_flags(update_flags); // Useful quantities: const unsigned int degree(this->degree - 1); // Note: FE holds input degree+1 @@ -2175,30 +2175,6 @@ template UpdateFlags FE_NedelecSZ::requires_update_flags( const UpdateFlags flags) const -{ - return update_once(flags) | update_each(flags); -} - - - -template -UpdateFlags -FE_NedelecSZ::update_once(const UpdateFlags flags) const -{ - const bool values_once = (mapping_kind == mapping_none); - - UpdateFlags out = update_default; - if (values_once && (flags & update_values)) - out |= update_values; - - return out; -} - - - -template -UpdateFlags -FE_NedelecSZ::update_each(const UpdateFlags flags) const { UpdateFlags out = update_default; -- 2.39.5