From a6979aaa1bdc61dcdbfc4e3a74571606eb21cb0c Mon Sep 17 00:00:00 2001 From: Dmitri Naumov <dmitri.naumov@ufz.de> Date: Tue, 13 Aug 2019 17:49:45 +0200 Subject: [PATCH] [PL] RM; split push back btw. init and postTS. --- .../RichardsMechanics/RichardsMechanicsFEM.h | 16 +++++++++++++--- .../RichardsMechanicsProcess.cpp | 8 ++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ProcessLib/RichardsMechanics/RichardsMechanicsFEM.h b/ProcessLib/RichardsMechanics/RichardsMechanicsFEM.h index a557225a83d..99e672d7f5f 100644 --- a/ProcessLib/RichardsMechanics/RichardsMechanicsFEM.h +++ b/ProcessLib/RichardsMechanics/RichardsMechanicsFEM.h @@ -88,9 +88,19 @@ public: std::vector<double>& local_b_data, std::vector<double>& local_Jac_data, LocalCoupledSolutions const& local_coupled_solutions) override; - void preTimestepConcrete(std::vector<double> const& /*local_x*/, - double const /*t*/, - double const /*delta_t*/) override + void initializeConcrete() override + { + unsigned const n_integration_points = + _integration_method.getNumberOfPoints(); + + for (unsigned ip = 0; ip < n_integration_points; ip++) + { + _ip_data[ip].pushBackState(); + } + } + + void postTimestepConcrete(std::vector<double> const& /*local_x*/ + ) override { unsigned const n_integration_points = _integration_method.getNumberOfPoints(); diff --git a/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp b/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp index e637303488b..5378d63831e 100644 --- a/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp +++ b/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp @@ -201,6 +201,14 @@ void RichardsMechanicsProcess<DisplacementDim>::initializeConcreteProcess( MeshLib::getOrCreateMeshProperty<double>( const_cast<MeshLib::Mesh&>(mesh), "pressure_interpolated", MeshLib::MeshItemType::Node, 1); + + // Initialize local assemblers after all variables have been set. + const int process_id = 0; + ProcessLib::ProcessVariable const& pv = getProcessVariables(process_id)[0]; + + GlobalExecutor::executeSelectedMemberOnDereferenced( + &LocalAssemblerInterface::initialize, _local_assemblers, + pv.getActiveElementIDs(), *_local_to_global_index_map); } template <int DisplacementDim> -- GitLab