MF: make things more consistent

diff --git a/include/deal.II/matrix_free/evaluation_kernels.h b/include/deal.II/matrix_free/evaluation_kernels.h
index ff05bbc5a0b6e3122738029c404ceede7e3f97a3..c43ba6bb148b050be8b18e6111c6e8f5569a52b2 100644 (file)
--- a/include/deal.II/matrix_free/evaluation_kernels.h
+++ b/include/deal.II/matrix_free/evaluation_kernels.h
@@ -3672,7 +3672,6 @@ namespace internal
         }
     }
 
-  private:
     template <typename EvalType>
     static EvalType
     create_evaluator_tensor_product(

diff --git a/include/deal.II/matrix_free/shape_info.templates.h b/include/deal.II/matrix_free/shape_info.templates.h
index 2dc95d4e4cfb3559d87eeecc05a4076c33c50d4e..b4710457875ece6770d74d7da21e2f747f1525a5 100644 (file)
--- a/include/deal.II/matrix_free/shape_info.templates.h
+++ b/include/deal.II/matrix_free/shape_info.templates.h
@@ -944,7 +944,7 @@ namespace internal
         {
           face_to_cell_index_nodal.reinit(GeometryInfo<dim>::faces_per_cell,
                                           dofs_per_component_on_face);
-          for (auto f : GeometryInfo<dim>::face_indices())
+          for (const auto f : GeometryInfo<dim>::face_indices())
             {
               const unsigned int direction = f / 2;
               const unsigned int stride =
@@ -990,7 +990,7 @@ namespace internal
         {
           face_to_cell_index_hermite.reinit(GeometryInfo<dim>::faces_per_cell,
                                             2 * dofs_per_component_on_face);
-          for (auto f : GeometryInfo<dim>::face_indices())
+          for (const auto f : GeometryInfo<dim>::face_indices())
             {
               const unsigned int direction = f / 2;
               const unsigned int stride =

diff --git a/include/deal.II/matrix_free/tensor_product_kernels.h b/include/deal.II/matrix_free/tensor_product_kernels.h
index 50f31668005e027de460f673158f2e3845ac1132..8e7b206113a9cbad45d304b8f11a47f3a26d68fd 100644 (file)
--- a/include/deal.II/matrix_free/tensor_product_kernels.h
+++ b/include/deal.II/matrix_free/tensor_product_kernels.h
@@ -476,7 +476,7 @@ namespace internal
                   (dim > 2 ? n_rows : 1);
 
     AssertIndexRange(face_direction, dim);
-    constexpr int stride     = Utilities::pow(n_rows, face_direction);
+    constexpr int in_stride  = Utilities::pow(n_rows, face_direction);
     constexpr int out_stride = Utilities::pow(n_rows, dim - 1);
     const Number *DEAL_II_RESTRICT shape_values = this->shape_values;
 
@@ -494,11 +494,12 @@ namespace internal
                   res2 = shape_values[2 * n_rows] * in[0];
                 for (int ind = 1; ind < n_rows; ++ind)
                   {
-                    res0 += shape_values[ind] * in[stride * ind];
+                    res0 += shape_values[ind] * in[in_stride * ind];
                     if (max_derivative > 0)
-                      res1 += shape_values[ind + n_rows] * in[stride * ind];
+                      res1 += shape_values[ind + n_rows] * in[in_stride * ind];
                     if (max_derivative > 1)
-                      res2 += shape_values[ind + 2 * n_rows] * in[stride * ind];
+                      res2 +=
+                        shape_values[ind + 2 * n_rows] * in[in_stride * ind];
                   }
                 if (add)
                   {
@@ -522,14 +523,14 @@ namespace internal
                 for (int col = 0; col < n_rows; ++col)
                   {
                     if (add)
-                      out[col * stride] += shape_values[col] * in[0];
+                      out[col * in_stride] += shape_values[col] * in[0];
                     else
-                      out[col * stride] = shape_values[col] * in[0];
+                      out[col * in_stride] = shape_values[col] * in[0];
                     if (max_derivative > 0)
-                      out[col * stride] +=
+                      out[col * in_stride] +=
                         shape_values[col + n_rows] * in[out_stride];
                     if (max_derivative > 1)
-                      out[col * stride] +=
+                      out[col * in_stride] +=
                         shape_values[col + 2 * n_rows] * in[2 * out_stride];
                   }
               }
@@ -916,7 +917,7 @@ namespace internal
     const int n_blocks2 = dim > 2 ? n_rows : 1;
 
     AssertIndexRange(face_direction, dim);
-    const int stride =
+    const int in_stride =
       face_direction > 0 ? Utilities::fixed_power<face_direction>(n_rows) : 1;
     const int out_stride =
       dim > 1 ? Utilities::fixed_power<dim - 1>(n_rows) : 1;
@@ -935,11 +936,12 @@ namespace internal
                   res2 = shape_values[2 * n_rows] * in[0];
                 for (unsigned int ind = 1; ind < n_rows; ++ind)
                   {
-                    res0 += shape_values[ind] * in[stride * ind];
+                    res0 += shape_values[ind] * in[in_stride * ind];
                     if (max_derivative > 0)
-                      res1 += shape_values[ind + n_rows] * in[stride * ind];
+                      res1 += shape_values[ind + n_rows] * in[in_stride * ind];
                     if (max_derivative > 1)
-                      res2 += shape_values[ind + 2 * n_rows] * in[stride * ind];
+                      res2 +=
+                        shape_values[ind + 2 * n_rows] * in[in_stride * ind];
                   }
                 if (add)
                   {
@@ -963,14 +965,14 @@ namespace internal
                 for (unsigned int col = 0; col < n_rows; ++col)
                   {
                     if (add)
-                      out[col * stride] += shape_values[col] * in[0];
+                      out[col * in_stride] += shape_values[col] * in[0];
                     else
-                      out[col * stride] = shape_values[col] * in[0];
+                      out[col * in_stride] = shape_values[col] * in[0];
                     if (max_derivative > 0)
-                      out[col * stride] +=
+                      out[col * in_stride] +=
                         shape_values[col + n_rows] * in[out_stride];
                     if (max_derivative > 1)
-                      out[col * stride] +=
+                      out[col * in_stride] +=
                         shape_values[col + 2 * n_rows] * in[2 * out_stride];
                   }
               }
@@ -2661,7 +2663,7 @@ namespace internal
 
     AssertIndexRange(face_direction, dim);
 
-    constexpr int stride =
+    constexpr int in_stride =
       (face_direction == normal_dir) ?
         Utilities::pow(n_rows - 1, face_direction) :
         ((face_direction == 0) ?
@@ -2691,12 +2693,13 @@ namespace internal
 
                 for (int ind = 1; ind < n_rows; ++ind)
                   {
-                    res0 += shape_values[ind] * in[stride * ind];
+                    res0 += shape_values[ind] * in[in_stride * ind];
                     if (max_derivative > 0)
-                      res1 += shape_values[ind + n_rows] * in[stride * ind];
+                      res1 += shape_values[ind + n_rows] * in[in_stride * ind];
 
                     if (max_derivative > 1)
-                      res2 += shape_values[ind + 2 * n_rows] * in[stride * ind];
+                      res2 +=
+                        shape_values[ind + 2 * n_rows] * in[in_stride * ind];
                   }
                 if (add)
                   {
@@ -2724,16 +2727,16 @@ namespace internal
                 for (int col = 0; col < n_rows; ++col)
                   {
                     if (add)
-                      out[col * stride] += shape_values[col] * in[0];
+                      out[col * in_stride] += shape_values[col] * in[0];
                     else
-                      out[col * stride] = shape_values[col] * in[0];
+                      out[col * in_stride] = shape_values[col] * in[0];
 
                     if (max_derivative > 0)
-                      out[col * stride] +=
+                      out[col * in_stride] +=
                         shape_values[col + n_rows] * in[out_stride];
 
                     if (max_derivative > 1)
-                      out[col * stride] +=
+                      out[col * in_stride] +=
                         shape_values[col + 2 * n_rows] * in[2 * out_stride];
                   }
               }