diff --git a/ProcessLib/HT/HTFEM.h b/ProcessLib/HT/HTFEM.h index da14725acc227e43f14588f20cda86ea16f12ea9..3ed82f8411bce855d2be453f60bdf025a8f08156 100644 --- a/ProcessLib/HT/HTFEM.h +++ b/ProcessLib/HT/HTFEM.h @@ -50,10 +50,12 @@ public: NumLib::GenericIntegrationMethod const& integration_method, bool const is_axially_symmetric, HTProcessData const& process_data, + NumLib::ShapeMatrixCache const& shape_matrix_cache, const unsigned dof_per_node) : HTLocalAssemblerInterface(), _element(element), _process_data(process_data), + _shape_matrix_cache(shape_matrix_cache), _integration_method(integration_method) { // This assertion is valid only if all nodal d.o.f. use the same shape @@ -166,6 +168,7 @@ public: protected: MeshLib::Element const& _element; HTProcessData const& _process_data; + NumLib::ShapeMatrixCache const& _shape_matrix_cache; NumLib::GenericIntegrationMethod const& _integration_method; std::vector< diff --git a/ProcessLib/HT/HTProcess.cpp b/ProcessLib/HT/HTProcess.cpp index f1dd20f1f8b273520a164eb9de5860dbbef61038..50971ed954cbcc327b0ea09cb1ee558277e9f189 100644 --- a/ProcessLib/HT/HTProcess.cpp +++ b/ProcessLib/HT/HTProcess.cpp @@ -56,14 +56,14 @@ void HTProcess::initializeConcreteProcess( ProcessLib::createLocalAssemblers<MonolithicHTFEM>( mesh_space_dimension, mesh.getElements(), dof_table, _local_assemblers, NumLib::IntegrationOrder{integration_order}, - mesh.isAxiallySymmetric(), _process_data); + mesh.isAxiallySymmetric(), _process_data, _shape_matrix_cache); } else { ProcessLib::createLocalAssemblers<StaggeredHTFEM>( mesh_space_dimension, mesh.getElements(), dof_table, _local_assemblers, NumLib::IntegrationOrder{integration_order}, - mesh.isAxiallySymmetric(), _process_data); + mesh.isAxiallySymmetric(), _process_data, _shape_matrix_cache); } _secondary_variables.addSecondaryVariable( diff --git a/ProcessLib/HT/MonolithicHTFEM.h b/ProcessLib/HT/MonolithicHTFEM.h index 902036df8d9c41f16a2f95148a2e2880ab7fdf4b..73474c5908ea2c114ca99986a564bdc43556f79d 100644 --- a/ProcessLib/HT/MonolithicHTFEM.h +++ b/ProcessLib/HT/MonolithicHTFEM.h @@ -59,10 +59,12 @@ public: std::size_t const local_matrix_size, NumLib::GenericIntegrationMethod const& integration_method, bool is_axially_symmetric, - HTProcessData const& process_data) - : HTFEM<ShapeFunction, GlobalDim>( - element, local_matrix_size, integration_method, - is_axially_symmetric, process_data, NUM_NODAL_DOF) + HTProcessData const& process_data, + NumLib::ShapeMatrixCache const& shape_matrix_cache) + : HTFEM<ShapeFunction, GlobalDim>(element, local_matrix_size, + integration_method, + is_axially_symmetric, process_data, + shape_matrix_cache, NUM_NODAL_DOF) { } diff --git a/ProcessLib/HT/StaggeredHTFEM.h b/ProcessLib/HT/StaggeredHTFEM.h index db88872e2bacc819516a3f8a72291574a4be6105..3939dc522b4fd6a69825971bfbbb2f3194d64bd4 100644 --- a/ProcessLib/HT/StaggeredHTFEM.h +++ b/ProcessLib/HT/StaggeredHTFEM.h @@ -58,10 +58,11 @@ public: std::size_t const local_matrix_size, NumLib::GenericIntegrationMethod const& integration_method, bool is_axially_symmetric, - HTProcessData const& process_data) - : HTFEM<ShapeFunction, GlobalDim>(element, local_matrix_size, - integration_method, - is_axially_symmetric, process_data, 1) + HTProcessData const& process_data, + NumLib::ShapeMatrixCache const& shape_matrix_cache) + : HTFEM<ShapeFunction, GlobalDim>( + element, local_matrix_size, integration_method, + is_axially_symmetric, process_data, shape_matrix_cache, 1) { }