]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Switch order of template arguments
authorMartin Kronbichler <martin.kronbichler@uni-a.de>
Sun, 21 May 2023 18:05:02 +0000 (20:05 +0200)
committerMartin Kronbichler <martin.kronbichler@uni-a.de>
Wed, 31 May 2023 14:45:08 +0000 (16:45 +0200)
include/deal.II/matrix_free/evaluation_kernels.h
include/deal.II/matrix_free/tensor_product_kernels.h

index 4d6fa24347cb2e9150ed00830e60ee8561d59d4a..e193d75e289e583bb541e1224f5fd3dc6ff252da 100644 (file)
@@ -1048,8 +1048,8 @@ namespace internal
                                         dim,
                                         (fe_degree == -1) ? 1 : fe_degree + 1,
                                         n_q_points_1d,
-                                        Number,
                                         normal_dir,
+                                        Number,
                                         Number2>;
 
     using EvalTangent =
@@ -1057,8 +1057,8 @@ namespace internal
                                         dim,
                                         (fe_degree == -1) ? 1 : fe_degree,
                                         n_q_points_1d,
-                                        Number,
                                         normal_dir,
+                                        Number,
                                         Number2>;
     using Eval0 =
       typename std::conditional<normal_dir == 0, EvalNormal, EvalTangent>::type;
@@ -1244,8 +1244,8 @@ namespace internal
                                         dim,
                                         (fe_degree == -1) ? 1 : fe_degree + 1,
                                         n_q_points_1d,
-                                        Number,
                                         normal_dir,
+                                        Number,
                                         Number2>;
 
     using EvalTangent =
@@ -1253,8 +1253,8 @@ namespace internal
                                         dim,
                                         (fe_degree == -1) ? 1 : fe_degree,
                                         n_q_points_1d,
-                                        Number,
                                         normal_dir,
+                                        Number,
                                         Number2>;
     using Eval0 =
       typename std::conditional<normal_dir == 0, EvalNormal, EvalTangent>::type;
@@ -1437,6 +1437,14 @@ namespace internal
    *
    * This class allows for dimension-independent application of the operation,
    * implemented by template recursion. It has been tested up to 6d.
+   *
+   * The last two template arguments in this class are unused. They have a
+   * default type set to bool, but any type will compile. These arguments are
+   * present for backward compatibility of this (internal) interface with
+   * previous versions of deal.II, where the template arguments were used to
+   * indicate the number types These are now part of the do_forward() and
+   * do_backward() functions, and they will be removed from a future version
+   * of deal.II.
    */
   template <EvaluatorVariant  variant,
             EvaluatorQuantity quantity,
@@ -3053,16 +3061,16 @@ namespace internal
                                           dim - 1,
                                           (fe_degree == -1) ? 1 : fe_degree + 1,
                                           n_q_points_1d,
-                                          Number,
                                           normal_dir,
+                                          Number,
                                           Number2>;
       using EvalTangent =
         EvaluatorTensorProductAnisotropic<evaluate_raviart_thomas,
                                           dim - 1,
                                           (fe_degree == -1) ? 1 : fe_degree,
                                           n_q_points_1d,
-                                          Number,
                                           normal_dir,
+                                          Number,
                                           Number2>;
 
       using TempEval0 = typename std::
@@ -3258,16 +3266,16 @@ namespace internal
                                           dim - 1,
                                           (fe_degree == -1) ? 1 : fe_degree + 1,
                                           n_q_points_1d,
-                                          Number,
                                           normal_dir,
+                                          Number,
                                           Number2>;
       using EvalTangent =
         EvaluatorTensorProductAnisotropic<evaluate_raviart_thomas,
                                           dim - 1,
                                           (fe_degree == -1) ? 1 : fe_degree,
                                           n_q_points_1d,
-                                          Number,
                                           normal_dir,
+                                          Number,
                                           Number2>;
 
       using TempEval0 = typename std::
@@ -3713,15 +3721,15 @@ namespace internal
                                           dim,
                                           (fe_degree == -1) ? 1 : fe_degree + 1,
                                           0,
-                                          Number,
                                           0,
+                                          Number,
                                           Number2>,
         EvaluatorTensorProductAnisotropic<evaluate_raviart_thomas,
                                           dim,
                                           (fe_degree == -1) ? 1 : fe_degree,
                                           0,
-                                          Number,
                                           0,
+                                          Number,
                                           Number2>>::type;
       using Evalf1 = typename std::conditional<
         face_direction == 1,
@@ -3729,15 +3737,15 @@ namespace internal
                                           dim,
                                           (fe_degree == -1) ? 1 : fe_degree + 1,
                                           0,
-                                          Number,
                                           1,
+                                          Number,
                                           Number2>,
         EvaluatorTensorProductAnisotropic<evaluate_raviart_thomas,
                                           dim,
                                           (fe_degree == -1) ? 1 : fe_degree,
                                           0,
-                                          Number,
                                           1,
+                                          Number,
                                           Number2>>::type;
       using Evalf2 = typename std::conditional<
         face_direction == 2,
@@ -3745,15 +3753,15 @@ namespace internal
                                           dim,
                                           (fe_degree == -1) ? 1 : fe_degree + 1,
                                           0,
-                                          Number,
                                           2,
+                                          Number,
                                           Number2>,
         EvaluatorTensorProductAnisotropic<evaluate_raviart_thomas,
                                           dim,
                                           (fe_degree == -1) ? 1 : fe_degree,
                                           0,
-                                          Number,
                                           2,
+                                          Number,
                                           Number2>>::type;
 
       Evalf0 evalf0 =
index df3cb6cbd45c0f30c40441623690cecc4c9d858f..d6b7b0e4609e68ca9c58afb7fcba09b838853a9f 100644 (file)
@@ -149,8 +149,8 @@ namespace internal
             int              dim,
             int              n_rows,
             int              n_columns,
+            int              normal_dir,
             typename Number,
-            int normal_dir,
             typename Number2 = Number>
   struct EvaluatorTensorProductAnisotropic
   {};
@@ -2534,15 +2534,15 @@ namespace internal
   template <int dim,
             int n_rows,
             int n_columns,
-            typename Number,
             int normal_dir,
+            typename Number,
             typename Number2>
   struct EvaluatorTensorProductAnisotropic<evaluate_raviart_thomas,
                                            dim,
                                            n_rows,
                                            n_columns,
-                                           Number,
                                            normal_dir,
+                                           Number,
                                            Number2>
   {
     static constexpr unsigned int n_rows_of_product =
@@ -2666,8 +2666,8 @@ namespace internal
   template <int dim,
             int n_rows,
             int n_columns,
-            typename Number,
             int normal_dir,
+            typename Number,
             typename Number2>
   template <int direction, bool contract_over_rows, bool add, bool one_line>
   inline void
@@ -2676,8 +2676,8 @@ namespace internal
     dim,
     n_rows,
     n_columns,
-    Number,
     normal_dir,
+    Number,
     Number2>::apply(const Number2 *DEAL_II_RESTRICT shape_data,
                     const Number *                  in,
                     Number *                        out)
@@ -2759,8 +2759,8 @@ namespace internal
   template <int dim,
             int n_rows,
             int n_columns,
-            typename Number,
             int normal_dir,
+            typename Number,
             typename Number2>
   template <int  face_direction,
             bool contract_onto_face,
@@ -2772,8 +2772,8 @@ namespace internal
     dim,
     n_rows,
     n_columns,
-    Number,
     normal_dir,
+    Number,
     Number2>::apply_face(const Number *DEAL_II_RESTRICT in,
                          Number *DEAL_II_RESTRICT       out) const
   {

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.