From 2206fcce0747fffed0bbceed3365b314a6fb298b Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Thu, 25 Jun 2020 08:02:24 -0400 Subject: [PATCH] Remove deprecated MatrixFree functions --- include/deal.II/matrix_free/fe_evaluation.h | 32 ------- include/deal.II/matrix_free/matrix_free.h | 98 --------------------- include/deal.II/matrix_free/task_info.h | 5 -- 3 files changed, 135 deletions(-) diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h index cbde241e1f..2763224b09 100644 --- a/include/deal.II/matrix_free/fe_evaluation.h +++ b/include/deal.II/matrix_free/fe_evaluation.h @@ -685,14 +685,6 @@ public: VectorizedArrayType JxW(const unsigned int q_index) const; - /** - * Fills the JxW values currently used into the given array. - * - * @deprecated Use JxW() instead. - */ - DEAL_II_DEPRECATED void - fill_JxW_values(AlignedVector &JxW_values) const; - /** * Return the inverse and transposed version of Jacobian of the mapping * between the unit to the real cell (representing the covariant @@ -3660,30 +3652,6 @@ FEEvaluationBase:: -template -inline void -FEEvaluationBase:: - fill_JxW_values(AlignedVector &JxW_values) const -{ - AssertDimension(JxW_values.size(), n_quadrature_points); - Assert(J_value != nullptr, ExcNotInitialized()); - if (this->cell_type <= internal::MatrixFreeFunctions::affine) - { - VectorizedArrayType J = J_value[0]; - for (unsigned int q = 0; q < this->n_quadrature_points; ++q) - JxW_values[q] = J * this->quadrature_weights[q]; - } - else - for (unsigned int q = 0; q < n_quadrature_points; ++q) - JxW_values[q] = J_value[q]; -} - - - template - DEAL_II_DEPRECATED void - reinit(const Mapping & mapping, - const DoFHandler & dof_handler, - const AffineConstraints &constraint, - const IndexSet & locally_owned_dofs, - const QuadratureType & quad, - const AdditionalData & additional_data = AdditionalData()); - /** * Extracts the information needed to perform loops over cells. The * DoFHandler and AffineConstraints objects describe the layout of degrees of @@ -662,36 +646,6 @@ public: const std::vector & quad, const AdditionalData &additional_data = AdditionalData()); - /** - * Same as above. - * - * @deprecated Setting the index set specifically is not supported any - * more. Use the reinit function without index set argument to choose the - * one provided by DoFHandler::locally_owned_dofs(). - */ - template - DEAL_II_DEPRECATED void - reinit(const Mapping & mapping, - const std::vector *> & dof_handler, - const std::vector *> &constraint, - const std::vector & locally_owned_set, - const std::vector &quad, - const AdditionalData & additional_data = AdditionalData()); - - /** - * Initializes the data structures. Same as above, but using hp::DoFHandlers. - * - * @deprecated Use the overload taking a DoFHandler object instead. - */ - template - DEAL_II_DEPRECATED void - reinit(const Mapping & mapping, - const std::vector *> & dof_handler_hp, - const std::vector *> &constraint, - const std::vector & locally_owned_set, - const std::vector &quad, - const AdditionalData & additional_data = AdditionalData()); - /** * Initializes the data structures. Same as before, but now the index set * description of the locally owned range of degrees of freedom is taken @@ -3034,32 +2988,6 @@ MatrixFree::reinit( -template -template -void -MatrixFree::reinit( - const Mapping & mapping, - const std::vector *> & dof_handler_hp, - const std::vector *> &constraint, - const std::vector & locally_owned_set, - const std::vector & quad, - const AdditionalData & additional_data) -{ - std::vector *> dof_handlers; - - for (const auto dof_handler : dof_handler_hp) - dof_handlers.push_back(dof_handler); - - this->reinit(mapping, - dof_handlers, - constraint, - locally_owned_set, - quad, - additional_data); -} - - - template template void @@ -3107,32 +3035,6 @@ MatrixFree::reinit( -template -template -void -MatrixFree::reinit( - const Mapping & mapping, - const std::vector *> & dof_handler, - const std::vector *> &constraint, - const std::vector & locally_owned_set, - const std::vector & quad, - const typename MatrixFree::AdditionalData - &additional_data) -{ - // find out whether we use a hp Quadrature or a standard quadrature - std::vector> quad_hp; - for (unsigned int q = 0; q < quad.size(); ++q) - quad_hp.emplace_back(quad[q]); - internal_reinit(mapping, - dof_handler, - constraint, - locally_owned_set, - quad_hp, - additional_data); -} - - - template template void diff --git a/include/deal.II/matrix_free/task_info.h b/include/deal.II/matrix_free/task_info.h index 95f842c67f..e7fe06ab1e 100644 --- a/include/deal.II/matrix_free/task_info.h +++ b/include/deal.II/matrix_free/task_info.h @@ -576,11 +576,6 @@ namespace internal unsigned int n_procs; }; - /** - * Typedef to deprecated name. - */ - using SizeInfo DEAL_II_DEPRECATED = TaskInfo; - } // end of namespace MatrixFreeFunctions } // end of namespace internal -- 2.39.5