Deprecate unsupported/untested functionality

diff --git a/include/deal.II/matrix_free/matrix_free.h b/include/deal.II/matrix_free/matrix_free.h
index a925f95a44bd162a748760a8ba532cd206e770ae..f43b59cd9e59f81924289e649b4dc82d1068550b 100644 (file)
--- 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 <typename DoFHandlerType, typename QuadratureType>
   void reinit (const Mapping<dim>     &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 <typename DoFHandlerType, typename QuadratureType>
-  void reinit (const Mapping<dim>     &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 <typename DoFHandlerType, typename QuadratureType>
-  void reinit (const DoFHandlerType   &dof_handler,
+  void reinit (const Mapping<dim>     &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 <typename DoFHandlerType, typename QuadratureType>
   void reinit (const Mapping<dim>                          &mapping,
                const std::vector<const DoFHandlerType *>   &dof_handler,
                const std::vector<const ConstraintMatrix *> &constraint,
-               const std::vector<IndexSet>                 &locally_owned_set,
                const std::vector<QuadratureType>           &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 <typename DoFHandlerType, typename QuadratureType>
-  void reinit (const Mapping<dim>                          &mapping,
-               const std::vector<const DoFHandlerType *>   &dof_handler,
+  void reinit (const std::vector<const DoFHandlerType *>   &dof_handler,
                const std::vector<const ConstraintMatrix *> &constraint,
                const std::vector<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 <typename DoFHandlerType, typename QuadratureType>
-  void reinit (const std::vector<const DoFHandlerType *>   &dof_handler,
+  void reinit (const Mapping<dim>                          &mapping,
+               const std::vector<const DoFHandlerType *>   &dof_handler,
                const std::vector<const ConstraintMatrix *> &constraint,
+               const std::vector<IndexSet>                 &locally_owned_set,
                const std::vector<QuadratureType>           &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