Deprecate some functions in FETools.

diff --git a/include/deal.II/fe/fe_tools.h b/include/deal.II/fe/fe_tools.h
index fd43859389ff8d0a8d665c0e2085aae8a43d6fa8..bdddae6fe71f304a2753da7d00628305bd4fc450 100644 (file)
--- a/include/deal.II/fe/fe_tools.h
+++ b/include/deal.II/fe/fe_tools.h
@@ -1012,9 +1012,12 @@ namespace FETools
 
     /**
      * Same as above but for a specific number of sub-elements.
+     *
+     * @deprecated Use the versions of this function that take a
+     *   vector of elements or an initializer list as arguments.
      */
     template <int dim, int spacedim>
-    FiniteElementData<dim>
+    DEAL_II_DEPRECATED_EARLY FiniteElementData<dim>
     multiply_dof_numbers(const FiniteElement<dim, spacedim> *fe1,
                          const unsigned int                  N1,
                          const FiniteElement<dim, spacedim> *fe2 = nullptr,
@@ -1069,20 +1072,23 @@ namespace FETools
      * strategy outlined in the documentation of the
      * FETools::Composition namespace. Consequently, this function
      * does not have a @p do_tensor_product argument.
+     *
+     * @deprecated Use the versions of this function that take a
+     *   vector of elements or an initializer list as arguments.
      */
     template <int dim, int spacedim>
-    std::vector<bool>
-    compute_restriction_is_additive_flags(
-      const FiniteElement<dim, spacedim> *fe1,
-      const unsigned int                  N1,
-      const FiniteElement<dim, spacedim> *fe2 = nullptr,
-      const unsigned int                  N2  = 0,
-      const FiniteElement<dim, spacedim> *fe3 = nullptr,
-      const unsigned int                  N3  = 0,
-      const FiniteElement<dim, spacedim> *fe4 = nullptr,
-      const unsigned int                  N4  = 0,
-      const FiniteElement<dim, spacedim> *fe5 = nullptr,
-      const unsigned int                  N5  = 0);
+    DEAL_II_DEPRECATED_EARLY std::vector<bool>
+                             compute_restriction_is_additive_flags(
+                               const FiniteElement<dim, spacedim> *fe1,
+                               const unsigned int                  N1,
+                               const FiniteElement<dim, spacedim> *fe2 = nullptr,
+                               const unsigned int                  N2 = 0,
+                               const FiniteElement<dim, spacedim> *fe3 = nullptr,
+                               const unsigned int                  N3 = 0,
+                               const FiniteElement<dim, spacedim> *fe4 = nullptr,
+                               const unsigned int                  N4 = 0,
+                               const FiniteElement<dim, spacedim> *fe5 = nullptr,
+                               const unsigned int                  N5 = 0);
 
 
     /**
@@ -1137,21 +1143,24 @@ namespace FETools
      *
      * See the documentation of namespace FETools::Compositing for more
      * information about the @p do_tensor_product argument.
+     *
+     * @deprecated Use the versions of this function that take a
+     *   vector of elements or an initializer list as arguments.
      */
     template <int dim, int spacedim>
-    std::vector<ComponentMask>
-    compute_nonzero_components(
-      const FiniteElement<dim, spacedim> *fe1,
-      const unsigned int                  N1,
-      const FiniteElement<dim, spacedim> *fe2               = nullptr,
-      const unsigned int                  N2                = 0,
-      const FiniteElement<dim, spacedim> *fe3               = nullptr,
-      const unsigned int                  N3                = 0,
-      const FiniteElement<dim, spacedim> *fe4               = nullptr,
-      const unsigned int                  N4                = 0,
-      const FiniteElement<dim, spacedim> *fe5               = nullptr,
-      const unsigned int                  N5                = 0,
-      const bool                          do_tensor_product = true);
+    DEAL_II_DEPRECATED_EARLY std::vector<ComponentMask>
+                             compute_nonzero_components(
+                               const FiniteElement<dim, spacedim> *fe1,
+                               const unsigned int                  N1,
+                               const FiniteElement<dim, spacedim> *fe2 = nullptr,
+                               const unsigned int                  N2 = 0,
+                               const FiniteElement<dim, spacedim> *fe3 = nullptr,
+                               const unsigned int                  N3 = 0,
+                               const FiniteElement<dim, spacedim> *fe4 = nullptr,
+                               const unsigned int                  N4 = 0,
+                               const FiniteElement<dim, spacedim> *fe5 = nullptr,
+                               const unsigned int                  N5 = 0,
+                               const bool                          do_tensor_product = true);
 
     /**
      * For a given (composite) @p finite_element build @p