Remove more

dealii · Dec 15, 2021 · b69b462 · b69b462
1 parent 07535e5
commit b69b462
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 34 deletions.
diff --git a/include/deal.II/matrix_free/evaluation_kernels.h b/include/deal.II/matrix_free/evaluation_kernels.h
@@ -3681,12 +3681,11 @@ namespace internal
 
 
 
-  template <int dim,
-            typename Number,
-            typename VectorizedArrayType,
-            typename Number2 = Number>
+  template <int dim, typename Number2, typename VectorizedArrayType>
   struct FEFaceEvaluationImplGatherEvaluateSelector
   {
+    using Number = typename VectorizedArrayType::value_type;
+
     template <int fe_degree, int n_q_points_1d>
     static bool
     run(const unsigned int                                n_components,
@@ -3903,12 +3902,11 @@ namespace internal
 
 
 
-  template <int dim,
-            typename Number,
-            typename VectorizedArrayType,
-            typename Number2 = Number>
+  template <int dim, typename Number2, typename VectorizedArrayType>
   struct FEFaceEvaluationImplIntegrateScatterSelector
   {
+    using Number = typename VectorizedArrayType::value_type;
+
     template <int fe_degree, int n_q_points_1d>
     static bool
     run(const unsigned int                                n_components,

diff --git a/include/deal.II/matrix_free/evaluation_template_factory.templates.h b/include/deal.II/matrix_free/evaluation_template_factory.templates.h
@@ -143,12 +143,11 @@ namespace internal
     const std::vector<ArrayView<const Number>> *      sm_ptr,
     FEEvaluationData<dim, VectorizedArrayType, true> &fe_eval)
   {
-    instantiation_helper_run<1,
-                             FEFaceEvaluationImplGatherEvaluateSelector<
-                               dim,
-                               typename VectorizedArrayType::value_type,
-                               VectorizedArrayType,
-                               Number>>(
+    instantiation_helper_run<
+      1,
+      FEFaceEvaluationImplGatherEvaluateSelector<dim,
+                                                 Number,
+                                                 VectorizedArrayType>>(
       fe_eval.get_shape_info().data[0].fe_degree,
       fe_eval.get_shape_info().data[0].n_q_points_1d,
       n_components,
@@ -169,12 +168,11 @@ namespace internal
     const std::vector<ArrayView<const Number>> *      sm_ptr,
     FEEvaluationData<dim, VectorizedArrayType, true> &fe_eval)
   {
-    instantiation_helper_run<1,
-                             FEFaceEvaluationImplIntegrateScatterSelector<
-                               dim,
-                               typename VectorizedArrayType::value_type,
-                               VectorizedArrayType,
-                               Number>>(
+    instantiation_helper_run<
+      1,
+      FEFaceEvaluationImplIntegrateScatterSelector<dim,
+                                                   Number,
+                                                   VectorizedArrayType>>(
       fe_eval.get_shape_info().data[0].fe_degree,
       fe_eval.get_shape_info().data[0].n_q_points_1d,
       n_components,

diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h
@@ -8059,9 +8059,8 @@ FEFaceEvaluation<dim,
                                 this->data->data.front().n_q_points_1d) &&
       internal::FEFaceEvaluationImplGatherEvaluateSelector<
         dim,
-        Number,
-        VectorizedArrayType,
-        typename VectorType::value_type>::
+        typename VectorType::value_type,
+        VectorizedArrayType>::
         supports(evaluation_flag,
                  *this->data,
                  internal::get_beginning<typename VectorType::value_type>(
@@ -8073,10 +8072,9 @@ FEFaceEvaluation<dim,
         {
           internal::FEFaceEvaluationImplGatherEvaluateSelector<
             dim,
-            Number,
-            VectorizedArrayType,
-            typename VectorType::value_type>::template run<fe_degree,
-                                                           n_q_points_1d>(
+            typename VectorType::value_type,
+            VectorizedArrayType>::template run<fe_degree,
+                                               n_q_points_1d>(
             n_components,
             evaluation_flag,
             internal::get_beginning<typename VectorType::value_type>(
@@ -8178,9 +8176,8 @@ FEFaceEvaluation<dim,
                                 this->data->data.front().n_q_points_1d) &&
       internal::FEFaceEvaluationImplGatherEvaluateSelector<
         dim,
-        Number,
-        VectorizedArrayType,
-        typename VectorType::value_type>::
+        typename VectorType::value_type,
+        VectorizedArrayType>::
         supports(integration_flag,
                  *this->data,
                  internal::get_beginning<typename VectorType::value_type>(
@@ -8192,10 +8189,9 @@ FEFaceEvaluation<dim,
         {
           internal::FEFaceEvaluationImplIntegrateScatterSelector<
             dim,
-            Number,
-            VectorizedArrayType,
-            typename VectorType::value_type>::template run<fe_degree,
-                                                           n_q_points_1d>(
+            typename VectorType::value_type,
+            VectorizedArrayType>::template run<fe_degree,
+                                               n_q_points_1d>(
             n_components,
             integration_flag,
             internal::get_beginning<typename VectorType::value_type>(