From 9ba75ced097b01eb9e3a18a56b10b981ff3ecc6a Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <christoph.lehmann@ufz.de>
Date: Tue, 15 Aug 2017 09:15:36 +0200
Subject: [PATCH] [PL] optimization: less storage, less products
---
...rmNaturalBoundaryConditionLocalAssembler.h | 50 +++++++++++++++----
...rmNeumannBoundaryConditionLocalAssembler.h | 12 ++---
2 files changed, 45 insertions(+), 17 deletions(-)
diff --git a/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryConditionLocalAssembler.h b/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryConditionLocalAssembler.h
index 73eb6f9c14c..873d05f838c 100644
--- a/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryConditionLocalAssembler.h
+++ b/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryConditionLocalAssembler.h
@@ -36,23 +36,55 @@ protected:
using NodalMatrixType = typename ShapeMatricesType::NodalMatrixType;
using NodalVectorType = typename ShapeMatricesType::NodalVectorType;
+ struct NAndWeight
+ {
+ NAndWeight(typename ShapeMatricesType::ShapeMatrices::ShapeType&& N_,
+ double const weight_)
+ : N(std::move(N_)), weight(weight_)
+ {
+ }
+ typename ShapeMatricesType::ShapeMatrices::ShapeType const N;
+ double const weight;
+ };
+
+private:
+ static std::vector<NAndWeight, Eigen::aligned_allocator<NAndWeight>>
+ initNsAndWeights(MeshLib::Element const& e, bool is_axially_symmetric,
+ unsigned const integration_order)
+ {
+ IntegrationMethod const integration_method(integration_order);
+ std::vector<NAndWeight, Eigen::aligned_allocator<NAndWeight>>
+ ns_and_weights;
+ ns_and_weights.reserve(integration_method.getNumberOfPoints());
+
+ auto sms = initShapeMatrices<ShapeFunction, ShapeMatricesType,
+ IntegrationMethod, GlobalDim>(
+ e, is_axially_symmetric, integration_method);
+ for (unsigned ip = 0; ip < sms.size(); ++ip)
+ {
+ auto& sm = sms[ip];
+ double const w =
+ sm.detJ * sm.integralMeasure *
+ integration_method.getWeightedPoint(ip).getWeight();
+
+ ns_and_weights.emplace_back(std::move(sm.N), w);
+ }
+
+ return ns_and_weights;
+ }
+
public:
GenericNonuniformNaturalBoundaryConditionLocalAssembler(
MeshLib::Element const& e, bool is_axially_symmetric,
unsigned const integration_order)
- : _integration_method(integration_order),
- _shape_matrices(initShapeMatrices<ShapeFunction, ShapeMatricesType,
- IntegrationMethod, GlobalDim>(
- e, is_axially_symmetric, _integration_method))
+ : _ns_and_weights(
+ initNsAndWeights(e, is_axially_symmetric, integration_order))
{
}
protected:
- IntegrationMethod const _integration_method;
- std::vector<typename ShapeMatricesType::ShapeMatrices,
- Eigen::aligned_allocator<
- typename ShapeMatricesType::ShapeMatrices>> const
- _shape_matrices;
+ std::vector<NAndWeight, Eigen::aligned_allocator<NAndWeight>> const
+ _ns_and_weights;
};
} // ProcessLib
diff --git a/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryConditionLocalAssembler.h b/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryConditionLocalAssembler.h
index 8c34c7580a0..12a2b88a89d 100644
--- a/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryConditionLocalAssembler.h
+++ b/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryConditionLocalAssembler.h
@@ -61,9 +61,6 @@ public:
{
_local_rhs.setZero();
- unsigned const n_integration_points =
- Base::_integration_method.getNumberOfPoints();
-
auto indices = NumLib::getIndices(id, dof_table_boundary);
// TODO lots of heap allocations.
@@ -75,16 +72,15 @@ public:
_data.values.getComponent(i, 0));
}
+ auto const n_integration_points = Base::_ns_and_weights.size();
for (unsigned ip = 0; ip < n_integration_points; ip++)
{
- auto const& sm = Base::_shape_matrices[ip];
+ auto const& n_and_weight = Base::_ns_and_weights[ip];
double flux;
NumLib::shapeFunctionInterpolate(neumann_param_nodal_values_local,
- sm.N, flux);
-
- auto const& wp = Base::_integration_method.getWeightedPoint(ip);
+ n_and_weight.N, flux);
_local_rhs.noalias() +=
- sm.N * flux * sm.detJ * wp.getWeight() * sm.integralMeasure;
+ n_and_weight.N * (n_and_weight.weight * flux);
}
// map boundary dof indices to bulk dof indices
--
GitLab