Address MatrixFree interface change for faces

masterleinad · masterleinad · commit 031a74b07368 · 2018-07-04T18:21:13.000+02:00
diff --git a/applications/matrixfree/matrixfree_data.h b/applications/matrixfree/matrixfree_data.h
@@ -80,7 +80,6 @@ class MatrixFreeData
     addit_data.tasks_parallel_scheme = dealii::MatrixFree<dim, double>::AdditionalData::none;
     addit_data.tasks_block_size = 3;
     addit_data.level_mg_handler = dealii::numbers::invalid_unsigned_int;
-    addit_data.build_face_info = true;
 
     mf = std::make_shared<dealii::MatrixFree<dim, double>>();
     mf->reinit(
diff --git a/include/cfl/matrixfree/fe_data.h b/include/cfl/matrixfree/fe_data.h
@@ -863,7 +863,7 @@ class FEDatas<FEData, Types...> : public FEDatas<Types...>
 
   template <unsigned int fe_number_extern, bool interior>
   auto
-  get_normal_gradient(unsigned int q) const
+  get_normal_derivative(unsigned int q) const
   {
     if constexpr(sizeof...(Types) != 0)
       {
@@ -872,22 +872,22 @@ class FEDatas<FEData, Types...> : public FEDatas<Types...>
 #ifdef DEBUG_OUTPUT
             std::cout << "get normal gradient FEDatas " << fe_number << " " << q << std::endl;
 #endif
-            if constexpr(interior) return fe_data.fe_evaluation_interior->get_normal_gradient(q);
+            if constexpr(interior) return fe_data.fe_evaluation_interior->get_normal_derivative(q);
             else
-              return -(fe_data.fe_evaluation_exterior->get_normal_gradient(q));
+              return -(fe_data.fe_evaluation_exterior->get_normal_derivative(q));
           }
         else
-          return Base::template get_normal_gradient<fe_number_extern, interior>(q);
+          return Base::template get_normal_derivative<fe_number_extern, interior>(q);
       }
     else
     {
 #ifdef DEBUG_OUTPUT
       std::cout << "get normal gradient FEDatas " << fe_number << " " << q << std::endl;
 #endif
       static_assert(fe_number == fe_number_extern, "Component not found!");
-      if constexpr(interior) return fe_data.fe_evaluation_interior->get_normal_gradient(q);
+      if constexpr(interior) return fe_data.fe_evaluation_interior->get_normal_derivative(q);
       else
-        return -(fe_data.fe_evaluation_exterior->get_normal_gradient(q));
+        return -(fe_data.fe_evaluation_exterior->get_normal_derivative(q));
     }
   }
 
@@ -1294,7 +1294,7 @@ class FEDatas<FEData, Types...> : public FEDatas<Types...>
 
   template <unsigned int fe_number_extern, bool interior, typename ValueType>
   void
-  submit_normal_gradient(const ValueType& value, unsigned int q)
+  submit_normal_derivative(const ValueType& value, unsigned int q)
   {
     if constexpr(sizeof...(Types) != 0)
       {
@@ -1303,12 +1303,12 @@ class FEDatas<FEData, Types...> : public FEDatas<Types...>
 #ifdef DEBUG_OUTPUT
             std::cout << "submit normal gradient " << fe_number << " " << q << std::endl;
 #endif
-            if constexpr(interior) fe_data.fe_evaluation_interior->submit_normal_gradient(value, q);
+            if constexpr(interior) fe_data.fe_evaluation_interior->submit_normal_derivative(value, q);
             else
-              fe_data.fe_evaluation_exterior->submit_normal_gradient(-value, q);
+              fe_data.fe_evaluation_exterior->submit_normal_derivative(-value, q);
           }
         else
-          Base::template submit_normal_gradient<fe_number_extern, interior, ValueType>(value, q);
+          Base::template submit_normal_derivative<fe_number_extern, interior, ValueType>(value, q);
       }
     else
     {
@@ -1318,9 +1318,9 @@ class FEDatas<FEData, Types...> : public FEDatas<Types...>
       static_assert(CFL::Traits::is_fe_data_face<FEData>::value,
                     "This function can only be called for FEDataFace objects!");
       static_assert(fe_number == fe_number_extern, "Component not found!");
-      if constexpr(interior) fe_data.fe_evaluation_interior->submit_normal_gradient(value, q);
+      if constexpr(interior) fe_data.fe_evaluation_interior->submit_normal_derivative(value, q);
       else
-        fe_data.fe_evaluation_exterior->submit_normal_gradient(-value, q);
+        fe_data.fe_evaluation_exterior->submit_normal_derivative(-value, q);
     }
   }
 
diff --git a/include/cfl/matrixfree/fefunctions.h b/include/cfl/matrixfree/fefunctions.h
@@ -379,7 +379,7 @@ namespace dealii
       static constexpr IntegrationFlags integration_flags{ false, false, true, false };
 
       /**
-       * Wrapper around submit_normal_gradient function of FEEvaluation
+       * Wrapper around submit_normal_derivative function of FEEvaluation
        *
        */
       template <class FEEvaluation, typename ValueType>
@@ -396,7 +396,7 @@ namespace dealii
         std::cout << "submit TestNormalGradientInteriorFace " << Base::index << " " << q
                   << std::endl;
 #endif
-        phi.template submit_normal_gradient<Base::index, true>(value, q);
+        phi.template submit_normal_derivative<Base::index, true>(value, q);
       }
     };
 
@@ -414,7 +414,7 @@ namespace dealii
       static constexpr IntegrationFlags integration_flags{ false, false, false, true };
 
       /**
-       * Wrapper around submit_normal_gradient function of FEEvaluation
+       * Wrapper around submit_normal_derivative function of FEEvaluation
        *
        */
       template <class FEEvaluation, typename ValueType>
@@ -431,7 +431,7 @@ namespace dealii
         std::cout << "submit TestNormalGradientExteriorFace " << Base::index << " " << q
                   << std::endl;
 #endif
-        phi.template submit_normal_gradient<Base::index, false>(value, q);
+        phi.template submit_normal_derivative<Base::index, false>(value, q);
       }
     };
 
@@ -893,7 +893,7 @@ namespace dealii
       value(const FEDatas& phi, unsigned int q) const
       {
         const auto value =
-          Base::scalar_factor * phi.template get_normal_gradient<Base::index, true>(q);
+          Base::scalar_factor * phi.template get_normal_derivative<Base::index, true>(q);
         std::cout << "scalar factor: " << Base::scalar_factor << std::endl;
         return value;
       }
@@ -935,7 +935,7 @@ namespace dealii
       value(const FEDatas& phi, unsigned int q) const
       {
         const auto value =
-          Base::scalar_factor * phi.template get_normal_gradient<Base::index, false>(q);
+          Base::scalar_factor * phi.template get_normal_derivative<Base::index, false>(q);
         std::cout << "scalar factor: " << Base::scalar_factor << std::endl;
         return value;
       }
diff --git a/tests/matrixfree/matrixfree_data.h b/tests/matrixfree/matrixfree_data.h
@@ -80,7 +80,6 @@ class MatrixFreeData
     addit_data.tasks_parallel_scheme = dealii::MatrixFree<dim, double>::AdditionalData::none;
     addit_data.tasks_block_size = 3;
     addit_data.level_mg_handler = dealii::numbers::invalid_unsigned_int;
-    addit_data.build_face_info = true;
 
     mf = std::make_shared<dealii::MatrixFree<dim, double>>();
     mf->reinit(

Original file line number	Diff line number	Diff line change
`@@ -863,7 +863,7 @@ class FEDatas<FEData, Types...> : public FEDatas<Types...>`
`863`	`863`
`864`	`864`	`template <unsigned int fe_number_extern, bool interior>`
`865`	`865`	`auto`
`866`		`- get_normal_gradient(unsigned int q) const`
	`866`	`+ get_normal_derivative(unsigned int q) const`
`867`	`867`	`{`
`868`	`868`	`if constexpr(sizeof...(Types) != 0)`
`869`	`869`	`{`
`@@ -872,22 +872,22 @@ class FEDatas<FEData, Types...> : public FEDatas<Types...>`
`872`	`872`	`#ifdef DEBUG_OUTPUT`
`873`	`873`	`std::cout << "get normal gradient FEDatas " << fe_number << " " << q << std::endl;`
`874`	`874`	`#endif`
`875`		`- if constexpr(interior) return fe_data.fe_evaluation_interior->get_normal_gradient(q);`
	`875`	`+ if constexpr(interior) return fe_data.fe_evaluation_interior->get_normal_derivative(q);`
`876`	`876`	`else`
`877`		`- return -(fe_data.fe_evaluation_exterior->get_normal_gradient(q));`
	`877`	`+ return -(fe_data.fe_evaluation_exterior->get_normal_derivative(q));`
`878`	`878`	`}`
`879`	`879`	`else`
`880`		`- return Base::template get_normal_gradient<fe_number_extern, interior>(q);`
	`880`	`+ return Base::template get_normal_derivative<fe_number_extern, interior>(q);`
`881`	`881`	`}`
`882`	`882`	`else`
`883`	`883`	`{`
`884`	`884`	`#ifdef DEBUG_OUTPUT`
`885`	`885`	`std::cout << "get normal gradient FEDatas " << fe_number << " " << q << std::endl;`
`886`	`886`	`#endif`
`887`	`887`	`static_assert(fe_number == fe_number_extern, "Component not found!");`
`888`		`- if constexpr(interior) return fe_data.fe_evaluation_interior->get_normal_gradient(q);`
	`888`	`+ if constexpr(interior) return fe_data.fe_evaluation_interior->get_normal_derivative(q);`
`889`	`889`	`else`
`890`		`- return -(fe_data.fe_evaluation_exterior->get_normal_gradient(q));`
	`890`	`+ return -(fe_data.fe_evaluation_exterior->get_normal_derivative(q));`
`891`	`891`	`}`
`892`	`892`	`}`
`893`	`893`
`@@ -1294,7 +1294,7 @@ class FEDatas<FEData, Types...> : public FEDatas<Types...>`
`1294`	`1294`
`1295`	`1295`	`template <unsigned int fe_number_extern, bool interior, typename ValueType>`
`1296`	`1296`	`void`
`1297`		`- submit_normal_gradient(const ValueType& value, unsigned int q)`
	`1297`	`+ submit_normal_derivative(const ValueType& value, unsigned int q)`
`1298`	`1298`	`{`
`1299`	`1299`	`if constexpr(sizeof...(Types) != 0)`
`1300`	`1300`	`{`
`@@ -1303,12 +1303,12 @@ class FEDatas<FEData, Types...> : public FEDatas<Types...>`
`1303`	`1303`	`#ifdef DEBUG_OUTPUT`
`1304`	`1304`	`std::cout << "submit normal gradient " << fe_number << " " << q << std::endl;`
`1305`	`1305`	`#endif`
`1306`		`- if constexpr(interior) fe_data.fe_evaluation_interior->submit_normal_gradient(value, q);`
	`1306`	`+ if constexpr(interior) fe_data.fe_evaluation_interior->submit_normal_derivative(value, q);`
`1307`	`1307`	`else`
`1308`		`- fe_data.fe_evaluation_exterior->submit_normal_gradient(-value, q);`
	`1308`	`+ fe_data.fe_evaluation_exterior->submit_normal_derivative(-value, q);`
`1309`	`1309`	`}`
`1310`	`1310`	`else`
`1311`		`- Base::template submit_normal_gradient<fe_number_extern, interior, ValueType>(value, q);`
	`1311`	`+ Base::template submit_normal_derivative<fe_number_extern, interior, ValueType>(value, q);`
`1312`	`1312`	`}`
`1313`	`1313`	`else`
`1314`	`1314`	`{`
`@@ -1318,9 +1318,9 @@ class FEDatas<FEData, Types...> : public FEDatas<Types...>`
`1318`	`1318`	`static_assert(CFL::Traits::is_fe_data_face<FEData>::value,`
`1319`	`1319`	`"This function can only be called for FEDataFace objects!");`
`1320`	`1320`	`static_assert(fe_number == fe_number_extern, "Component not found!");`
`1321`		`- if constexpr(interior) fe_data.fe_evaluation_interior->submit_normal_gradient(value, q);`
	`1321`	`+ if constexpr(interior) fe_data.fe_evaluation_interior->submit_normal_derivative(value, q);`
`1322`	`1322`	`else`
`1323`		`- fe_data.fe_evaluation_exterior->submit_normal_gradient(-value, q);`
	`1323`	`+ fe_data.fe_evaluation_exterior->submit_normal_derivative(-value, q);`
`1324`	`1324`	`}`
`1325`	`1325`	`}`
`1326`	`1326`