From fa22dcfa99124d80244a8fde910575c13f25db21 Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Sat, 29 Oct 2016 16:06:53 +0200 Subject: [PATCH] Deprecate unsupported/untested functionality --- include/deal.II/matrix_free/matrix_free.h | 55 ++++++++++------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/include/deal.II/matrix_free/matrix_free.h b/include/deal.II/matrix_free/matrix_free.h index a925f95a44..f43b59cd9e 100644 --- a/include/deal.II/matrix_free/matrix_free.h +++ b/include/deal.II/matrix_free/matrix_free.h @@ -287,41 +287,38 @@ public: * or contain several copies of the same element. Mixing several different * elements into one FESystem is not allowed. In that case, use the * initialization function with several DoFHandler arguments. - * - * The @p IndexSet @p locally_owned_dofs is used to specify the parallel - * partitioning with MPI. Usually, this needs not be specified, and the - * other initialization function without and @p IndexSet description can be - * used, which gets the partitioning information builtin into the - * DoFHandler. */ template void reinit (const Mapping &mapping, const DoFHandlerType &dof_handler, const ConstraintMatrix &constraint, - const IndexSet &locally_owned_dofs, const QuadratureType &quad, const AdditionalData additional_data = AdditionalData()); /** - * Initializes the data structures. Same as above, but with index set stored - * in the DoFHandler for describing the locally owned degrees of freedom. + * Initializes the data structures. Same as above, but using a $Q_1$ + * mapping. */ template - void reinit (const Mapping &mapping, - const DoFHandlerType &dof_handler, + void reinit (const DoFHandlerType &dof_handler, const ConstraintMatrix &constraint, const QuadratureType &quad, const AdditionalData additional_data = AdditionalData()); /** - * Initializes the data structures. Same as above, but using a $Q_1$ - * mapping. + * 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 - void reinit (const DoFHandlerType &dof_handler, + void reinit (const Mapping &mapping, + const DoFHandlerType &dof_handler, const ConstraintMatrix &constraint, + const IndexSet &locally_owned_dofs, const QuadratureType &quad, - const AdditionalData additional_data = AdditionalData()); + const AdditionalData additional_data = AdditionalData()) DEAL_II_DEPRECATED; /** * Extracts the information needed to perform loops over cells. The @@ -342,42 +339,38 @@ public: * different degrees. However, the number of different quadrature formulas * can be sets independently from the number of DoFHandlers, when several * elements are always integrated with the same quadrature formula. - * - * The @p IndexSet @p locally_owned_dofs is used to specify the parallel - * partitioning with MPI. Usually, this needs not be specified, and the - * other initialization function without and @p IndexSet description can be - * used, which gets the partitioning information from the DoFHandler. This - * is the most general initialization function. */ template 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 before, but now the index set - * description of the locally owned range of degrees of freedom is taken - * from the DoFHandler. + * Initializes the data structures. Same as above, but using a $Q_1$ + * mapping. */ template - void reinit (const Mapping &mapping, - const std::vector &dof_handler, + void reinit (const std::vector &dof_handler, const std::vector &constraint, const std::vector &quad, const AdditionalData additional_data = AdditionalData()); /** - * Initializes the data structures. Same as above, but using a $Q_1$ - * mapping. + * 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 - void reinit (const std::vector &dof_handler, + 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()); + const AdditionalData additional_data = AdditionalData()) DEAL_II_DEPRECATED; /** * Initializes the data structures. Same as before, but now the index set -- 2.39.5