[NL] Add a create function for common FE type.

endJunction · May 27, 2019 · b63c384 · b63c384
1 parent e27b61e
commit b63c384
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 51 deletions.
diff --git a/NumLib/Fem/FiniteElement/TemplateIsoparametric.h b/NumLib/Fem/FiniteElement/TemplateIsoparametric.h
@@ -157,4 +157,16 @@ class TemplateIsoparametric
     const MeshElementType* _ele;
 };
 
+/// Creates a TemplateIsoparametric element for the given shape functions and
+/// the underlying mesh element.
+template <typename ShapeFunction, typename ShapeMatricesType>
+NumLib::TemplateIsoparametric<ShapeFunction, ShapeMatricesType>
+createIsoparametricFiniteElement(MeshLib::Element const& e)
+{
+    using FemType =
+        NumLib::TemplateIsoparametric<ShapeFunction, ShapeMatricesType>;
+
+    return FemType{
+        *static_cast<const typename ShapeFunction::MeshElement*>(&e)};
+}
 }  // namespace NumLib
diff --git a/NumLib/Function/Interpolation.h b/NumLib/Function/Interpolation.h
@@ -108,9 +108,10 @@ void interpolateToHigherOrderNodes(
     using SF = LowerOrderShapeFunction;
     using ShapeMatricesType = ShapeMatrixPolicyType<SF, GlobalDim>;
     using ShapeMatrices = typename ShapeMatricesType::ShapeMatrices;
-    using FemType = TemplateIsoparametric<SF, ShapeMatricesType>;
 
-    FemType fe(*static_cast<const typename SF::MeshElement*>(&element));
+    auto const fe =
+        NumLib::createIsoparametricFiniteElement<SF, ShapeMatricesType>(
+            element);
     int const number_base_nodes = element.getNumberOfBaseNodes();
     int const number_all_nodes = element.getNumberOfNodes();
 

diff --git a/ProcessLib/BoundaryCondition/ConstraintDirichletBoundaryConditionLocalAssembler.h b/ProcessLib/BoundaryCondition/ConstraintDirichletBoundaryConditionLocalAssembler.h
@@ -89,12 +89,8 @@ class ConstraintDirichletBoundaryConditionLocalAssembler final
     {
         (void)local_matrix_size; // unused, but needed for the interface
 
-
-        using FemType =
-            NumLib::TemplateIsoparametric<ShapeFunction, ShapeMatricesType>;
-
-        FemType fe(*static_cast<const typename ShapeFunction::MeshElement*>(
-            &_surface_element));
+        auto const fe = NumLib::createIsoparametricFiniteElement<
+            ShapeFunction, ShapeMatricesType>(_surface_element);
 
         auto const n_integration_points =
             _integration_method.getNumberOfPoints();

diff --git a/ProcessLib/BoundaryCondition/Python/PythonBoundaryConditionLocalAssembler.h b/ProcessLib/BoundaryCondition/Python/PythonBoundaryConditionLocalAssembler.h
@@ -52,10 +52,8 @@ class PythonBoundaryConditionLocalAssembler final
     {
         using ShapeMatricesType =
             ShapeMatrixPolicyType<ShapeFunction, GlobalDim>;
-        using FemType =
-            NumLib::TemplateIsoparametric<ShapeFunction, ShapeMatricesType>;
-        FemType fe(*static_cast<const typename ShapeFunction::MeshElement*>(
-            &this->_element));
+        auto const fe = NumLib::createIsoparametricFiniteElement<
+            ShapeFunction, ShapeMatricesType>(Base::_element);
 
         unsigned const num_integration_points =
             Base::_integration_method.getNumberOfPoints();

diff --git a/ProcessLib/ComponentTransport/ComponentTransportFEM.h b/ProcessLib/ComponentTransport/ComponentTransportFEM.h
@@ -809,11 +809,8 @@ class LocalAssemblerData : public ComponentTransportLocalAssemblerInterface
     {
         // eval shape matrices at given point
         auto const shape_matrices = [&]() {
-            using FemType =
-                NumLib::TemplateIsoparametric<ShapeFunction, ShapeMatricesType>;
-
-            FemType fe(*static_cast<const typename ShapeFunction::MeshElement*>(
-                &_element));
+            auto const fe = NumLib::createIsoparametricFiniteElement<
+                ShapeFunction, ShapeMatricesType>(_element);
 
             typename ShapeMatricesType::ShapeMatrices shape_matrices(
                 ShapeFunction::DIM, GlobalDim, ShapeFunction::NPOINTS);

diff --git a/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h b/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h
@@ -138,11 +138,8 @@ class LocalAssemblerData : public GroundwaterFlowLocalAssemblerInterface
                             std::vector<double> const& local_x) const override
     {
         // eval dNdx and invJ at p
-        using FemType =
-            NumLib::TemplateIsoparametric<ShapeFunction, ShapeMatricesType>;
-
-        FemType fe(*static_cast<const typename ShapeFunction::MeshElement*>(
-            &_element));
+        auto const fe = NumLib::createIsoparametricFiniteElement<
+            ShapeFunction, ShapeMatricesType>(_element);
 
         typename ShapeMatricesType::ShapeMatrices shape_matrices(
             ShapeFunction::DIM, GlobalDim, ShapeFunction::NPOINTS);

diff --git a/ProcessLib/HT/HTFEM.h b/ProcessLib/HT/HTFEM.h
@@ -132,11 +132,8 @@ class HTFEM : public HTLocalAssemblerInterface
                             std::vector<double> const& local_x) const override
     {
         // eval dNdx and invJ at given point
-        using FemType =
-            NumLib::TemplateIsoparametric<ShapeFunction, ShapeMatricesType>;
-
-        FemType fe(*static_cast<const typename ShapeFunction::MeshElement*>(
-            &this->_element));
+        auto const fe = NumLib::createIsoparametricFiniteElement<
+            ShapeFunction, ShapeMatricesType>(_element);
 
         typename ShapeMatricesType::ShapeMatrices shape_matrices(
             ShapeFunction::DIM, GlobalDim, ShapeFunction::NPOINTS);

diff --git a/ProcessLib/SourceTerms/Python/PythonSourceTermLocalAssembler.h b/ProcessLib/SourceTerms/Python/PythonSourceTermLocalAssembler.h
@@ -92,10 +92,8 @@ class PythonSourceTermLocalAssembler final
     {
         using ShapeMatricesType =
             ShapeMatrixPolicyType<ShapeFunction, GlobalDim>;
-        using FemType =
-            NumLib::TemplateIsoparametric<ShapeFunction, ShapeMatricesType>;
-        FemType fe(*static_cast<const typename ShapeFunction::MeshElement*>(
-            &_element));
+        auto const fe = NumLib::createIsoparametricFiniteElement<
+            ShapeFunction, ShapeMatricesType>(_element);
 
         unsigned const num_integration_points =
             _integration_method.getNumberOfPoints();

diff --git a/ProcessLib/SurfaceFlux/SurfaceFluxLocalAssembler.h b/ProcessLib/SurfaceFlux/SurfaceFluxLocalAssembler.h
@@ -71,11 +71,8 @@ class SurfaceFluxLocalAssembler final
           _bulk_element_id(bulk_element_ids[surface_element.getID()]),
           _bulk_face_id(bulk_face_ids[surface_element.getID()])
     {
-        using FemType =
-            NumLib::TemplateIsoparametric<ShapeFunction, ShapeMatricesType>;
-
-        FemType fe(*static_cast<const typename ShapeFunction::MeshElement*>(
-            &surface_element));
+        auto const fe = NumLib::createIsoparametricFiniteElement<
+            ShapeFunction, ShapeMatricesType>(_surface_element);
 
         std::size_t const n_integration_points =
             _integration_method.getNumberOfPoints();

diff --git a/ProcessLib/Utils/InitShapeMatrices.h b/ProcessLib/Utils/InitShapeMatrices.h
@@ -28,10 +28,9 @@ initShapeMatrices(MeshLib::Element const& e, bool is_axially_symmetric,
         Eigen::aligned_allocator<typename ShapeMatricesType::ShapeMatrices>>
         shape_matrices;
 
-    using FemType = NumLib::TemplateIsoparametric<
-        ShapeFunction, ShapeMatricesType>;
-
-    FemType fe(*static_cast<const typename ShapeFunction::MeshElement*>(&e));
+    auto const fe =
+        NumLib::createIsoparametricFiniteElement<ShapeFunction,
+                                                 ShapeMatricesType>(e);
 
     unsigned const n_integration_points = integration_method.getNumberOfPoints();
 
@@ -52,10 +51,9 @@ double interpolateXCoordinate(
     MeshLib::Element const& e,
     typename ShapeMatricesType::ShapeMatrices::ShapeType const& N)
 {
-    using FemType = NumLib::TemplateIsoparametric<
-        ShapeFunction, ShapeMatricesType>;
-
-    FemType fe(*static_cast<const typename ShapeFunction::MeshElement*>(&e));
+    auto const fe =
+        NumLib::createIsoparametricFiniteElement<ShapeFunction,
+                                                 ShapeMatricesType>(e);
 
     return fe.interpolateZerothCoordinate(N);
 }
@@ -65,10 +63,9 @@ std::array<double, 3> interpolateCoordinates(
     MeshLib::Element const& e,
     typename ShapeMatricesType::ShapeMatrices::ShapeType const& N)
 {
-    using FemType = NumLib::TemplateIsoparametric<
-        ShapeFunction, ShapeMatricesType>;
-
-    FemType fe(*static_cast<const typename ShapeFunction::MeshElement*>(&e));
+    auto const fe =
+        NumLib::createIsoparametricFiniteElement<ShapeFunction,
+                                                 ShapeMatricesType>(e);
 
     return fe.interpolateCoordinates(N);
 }

diff --git a/Tests/NumLib/TestFunctionInterpolation.cpp b/Tests/NumLib/TestFunctionInterpolation.cpp
@@ -47,8 +47,6 @@ TEST(NumLibFunctionInterpolationTest, Linear1DElement)
     using ShapeFunction = NumLib::ShapeLine2;
     using ShapeMatricesType = ShapeMatrixPolicyType<ShapeFunction, 1u>;
 
-    using FemType = NumLib::TemplateIsoparametric<ShapeFunction, ShapeMatricesType>;
-
     using IntegrationMethod = NumLib::GaussLegendreIntegrationPolicy<
         ShapeFunction::MeshElement>::IntegrationMethod;
 
@@ -60,7 +58,9 @@ TEST(NumLibFunctionInterpolationTest, Linear1DElement)
         MeshLib::Line(std::array<MeshLib::Node*, 2>{{&pt_a, &pt_b}});
 
     // set up shape function
-    FemType finite_element(*static_cast<const ShapeFunction::MeshElement*>(&element));
+    auto const finite_element =
+        NumLib::createIsoparametricFiniteElement<ShapeFunction,
+                                                 ShapeMatricesType>(element);
 
     const unsigned integration_order = 2;
     IntegrationMethod integration_method(integration_order);