From 3f8f9adca3907ee38ac86fe1841d6f9b67ff73dd Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Thu, 23 Jul 2020 18:44:24 +0200
Subject: [PATCH] [PL] Deduplicate code. Use initShapeMatrices.
---
...DirichletBoundaryConditionLocalAssembler.h | 22 ++++++-------------
.../SurfaceFlux/SurfaceFluxLocalAssembler.h | 20 +++++------------
2 files changed, 12 insertions(+), 30 deletions(-)
diff --git a/ProcessLib/BoundaryCondition/ConstraintDirichletBoundaryConditionLocalAssembler.h b/ProcessLib/BoundaryCondition/ConstraintDirichletBoundaryConditionLocalAssembler.h
index fe2750f5108..b7845588f0e 100644
--- a/ProcessLib/BoundaryCondition/ConstraintDirichletBoundaryConditionLocalAssembler.h
+++ b/ProcessLib/BoundaryCondition/ConstraintDirichletBoundaryConditionLocalAssembler.h
@@ -86,27 +86,19 @@ public:
_surface_element_normal(MeshLib::calculateNormalizedSurfaceNormal(
_surface_element, *(bulk_mesh.getElements()[_bulk_element_id])))
{
- auto const fe = NumLib::createIsoparametricFiniteElement<
- ShapeFunction, ShapeMatricesType>(_surface_element);
+ auto const shape_matrices =
+ initShapeMatrices<ShapeFunction, ShapeMatricesType, GlobalDim,
+ NumLib::ShapeMatrixType::N_J>(
+ _surface_element, is_axially_symmetric, _integration_method);
+
+ auto const bulk_face_id = bulk_ids[_surface_element.getID()].second;
auto const n_integration_points =
_integration_method.getNumberOfPoints();
-
- auto const bulk_face_id = bulk_ids[_surface_element.getID()].second;
- std::vector<
- typename ShapeMatricesType::ShapeMatrices,
- Eigen::aligned_allocator<typename ShapeMatricesType::ShapeMatrices>>
- shape_matrices;
- shape_matrices.reserve(n_integration_points);
_ip_data.reserve(n_integration_points);
+
for (unsigned ip = 0; ip < n_integration_points; ++ip)
{
- shape_matrices.emplace_back(ShapeFunction::DIM, GlobalDim,
- ShapeFunction::NPOINTS);
- fe.template computeShapeFunctions<NumLib::ShapeMatrixType::N_J>(
- _integration_method.getWeightedPoint(ip).getCoords(),
- shape_matrices[ip], GlobalDim, is_axially_symmetric);
-
auto const& wp = _integration_method.getWeightedPoint(ip);
auto bulk_element_point = MeshLib::getBulkElementPoint(
bulk_mesh, _bulk_element_id, bulk_face_id, wp);
diff --git a/ProcessLib/SurfaceFlux/SurfaceFluxLocalAssembler.h b/ProcessLib/SurfaceFlux/SurfaceFluxLocalAssembler.h
index 01b81bc20ee..f21d1e56904 100644
--- a/ProcessLib/SurfaceFlux/SurfaceFluxLocalAssembler.h
+++ b/ProcessLib/SurfaceFlux/SurfaceFluxLocalAssembler.h
@@ -73,25 +73,15 @@ public:
_bulk_element_id(bulk_element_ids[surface_element.getID()]),
_bulk_face_id(bulk_face_ids[surface_element.getID()])
{
- auto const fe = NumLib::createIsoparametricFiniteElement<
- ShapeFunction, ShapeMatricesType>(_surface_element);
-
- std::size_t const n_integration_points =
+ auto const n_integration_points =
_integration_method.getNumberOfPoints();
- std::vector<
- typename ShapeMatricesType::ShapeMatrices,
- Eigen::aligned_allocator<typename ShapeMatricesType::ShapeMatrices>>
- shape_matrices;
- shape_matrices.reserve(n_integration_points);
- _detJ_times_integralMeasure.reserve(n_integration_points);
+ auto const shape_matrices =
+ NumLib::initShapeMatrices<ShapeFunction, ShapeMatricesType,
+ GlobalDim, NumLib::ShapeMatrixType::N_J>(
+ _surface_element, is_axially_symmetric, _integration_method);
for (std::size_t ip = 0; ip < n_integration_points; ++ip)
{
- shape_matrices.emplace_back(ShapeFunction::DIM, GlobalDim,
- ShapeFunction::NPOINTS);
- fe.template computeShapeFunctions<NumLib::ShapeMatrixType::N_J>(
- _integration_method.getWeightedPoint(ip).getCoords(),
- shape_matrices[ip], GlobalDim, is_axially_symmetric);
_detJ_times_integralMeasure.push_back(
shape_matrices[ip].detJ * shape_matrices[ip].integralMeasure);
}
--
GitLab