diff --git a/ProcessLib/HydroMechanics/HydroMechanicsFEM.h b/ProcessLib/HydroMechanics/HydroMechanicsFEM.h
index 3431216d2447dc4eeed67c664ae7c25e7c9c535f..5ac173925f9bc31aea995e55cefcb07116934753 100644
--- a/ProcessLib/HydroMechanics/HydroMechanicsFEM.h
+++ b/ProcessLib/HydroMechanics/HydroMechanicsFEM.h
@@ -155,9 +155,18 @@ 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/HydroMechanics/HydroMechanicsProcess.cpp b/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
index 0ceeb1c0237fc9da145b5a06f1efc6dd5b435fc5..d4c754e77163e3012a26a86db1704b0a00b13914 100644
--- a/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
+++ b/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
@@ -245,6 +245,11 @@ void HydroMechanicsProcess<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.
+ GlobalExecutor::executeMemberOnDereferenced(
+ &LocalAssemblerInterface::initialize, _local_assemblers,
+ *_local_to_global_index_map);
}
template <int DisplacementDim>
diff --git a/ProcessLib/LocalAssemblerInterface.cpp b/ProcessLib/LocalAssemblerInterface.cpp
index adc706ab2138a5d64f3995fb23931147c7b3a8d6..63836d0bb49291b4e3b648ab619aa56b0d753748 100644
--- a/ProcessLib/LocalAssemblerInterface.cpp
+++ b/ProcessLib/LocalAssemblerInterface.cpp
@@ -91,6 +91,13 @@ void LocalAssemblerInterface::setInitialConditions(
setInitialConditionsConcrete(local_x, t);
}
+void LocalAssemblerInterface::initialize(
+ std::size_t const /*mesh_item_id*/,
+ NumLib::LocalToGlobalIndexMap const& /*dof_table*/)
+{
+ initializeConcrete();
+}
+
void LocalAssemblerInterface::preTimestep(
std::size_t const mesh_item_id,
NumLib::LocalToGlobalIndexMap const& dof_table, GlobalVector const& x,
diff --git a/ProcessLib/LocalAssemblerInterface.h b/ProcessLib/LocalAssemblerInterface.h
index 28352e86d441c9a66c621d223bed79e21673b189..ecd1878c598f490dcc6a9ec6bdcfa232f5cae70f 100644
--- a/ProcessLib/LocalAssemblerInterface.h
+++ b/ProcessLib/LocalAssemblerInterface.h
@@ -39,6 +39,9 @@ public:
NumLib::LocalToGlobalIndexMap const& dof_table, GlobalVector const& x,
double const t);
+ virtual void initialize(std::size_t const mesh_item_id,
+ NumLib::LocalToGlobalIndexMap const& dof_table);
+
virtual void preAssemble(double const /*t*/,
std::vector<double> const& /*local_x*/){};
@@ -116,6 +119,8 @@ private:
{
}
+ virtual void initializeConcrete() {}
+
virtual void preTimestepConcrete(std::vector<double> const& /*local_x*/,
double const /*t*/, double const /*dt*/)
{
diff --git a/ProcessLib/PhaseField/PhaseFieldFEM.h b/ProcessLib/PhaseField/PhaseFieldFEM.h
index 458cde06b9132acdb07f41df2dab3def80b82b44..10b035a2b91384d93998d156ba33dcc13d4dba31 100644
--- a/ProcessLib/PhaseField/PhaseFieldFEM.h
+++ b/ProcessLib/PhaseField/PhaseFieldFEM.h
@@ -207,9 +207,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/PhaseField/PhaseFieldProcess.cpp b/ProcessLib/PhaseField/PhaseFieldProcess.cpp
index 2c9108f151e8520859e287c43e71c7115ccc18a7..cd92d295f40c0e321df91725a61828e6b1fea7d1 100644
--- a/ProcessLib/PhaseField/PhaseFieldProcess.cpp
+++ b/ProcessLib/PhaseField/PhaseFieldProcess.cpp
@@ -140,6 +140,11 @@ void PhaseFieldProcess<DisplacementDim>::initializeConcreteProcess(
DisplacementDim>::RowsAtCompileTime,
getExtrapolator(), _local_assemblers,
&LocalAssemblerInterface::getIntPtEpsilon));
+
+ // Initialize local assemblers after all variables have been set.
+ GlobalExecutor::executeMemberOnDereferenced(
+ &LocalAssemblerInterface::initialize, _local_assemblers,
+ *_local_to_global_index_map);
}
template <int DisplacementDim>
diff --git a/ProcessLib/RichardsMechanics/RichardsMechanicsFEM.h b/ProcessLib/RichardsMechanics/RichardsMechanicsFEM.h
index a557225a83d2b972a4279120cc7801a8d4c14664..99e672d7f5f6bda0033b069d8e1a5b4c8459f93b 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 e637303488ba3a7f471476b5d4357dd2ef83f26b..1de8b423d0ced9c624b739f64eac67e670c867ef 100644
--- a/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp
+++ b/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp
@@ -201,6 +201,11 @@ 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.
+ GlobalExecutor::executeMemberOnDereferenced(
+ &LocalAssemblerInterface::initialize, _local_assemblers,
+ *_local_to_global_index_map);
}
template <int DisplacementDim>
diff --git a/ProcessLib/SmallDeformation/SmallDeformationFEM.h b/ProcessLib/SmallDeformation/SmallDeformationFEM.h
index 4c3665fb6d3d2107fb27c31feaf7c7e77cf830c2..b17c6225c9af2363a642c11364ea37f7231186bd 100644
--- a/ProcessLib/SmallDeformation/SmallDeformationFEM.h
+++ b/ProcessLib/SmallDeformation/SmallDeformationFEM.h
@@ -213,6 +213,17 @@ public:
return 0;
}
+ 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 assemble(double const /*t*/, std::vector<double> const& /*local_x*/,
std::vector<double>& /*local_M_data*/,
std::vector<double>& /*local_K_data*/,
@@ -309,9 +320,7 @@ public:
}
}
- void preTimestepConcrete(std::vector<double> const& /*local_x*/,
- double const /*t*/,
- double const /*delta_t*/) override
+ void postTimestepConcrete(std::vector<double> const& /*local_x*/) override
{
unsigned const n_integration_points =
_integration_method.getNumberOfPoints();
@@ -320,12 +329,6 @@ public:
{
_ip_data[ip].pushBackState();
}
- }
-
- void postTimestepConcrete(std::vector<double> const& /*local_x*/) override
- {
- unsigned const n_integration_points =
- _integration_method.getNumberOfPoints();
ParameterLib::SpatialPosition x_position;
x_position.setElementID(_element.getID());
diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp b/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp
index 491ef381ce6dde6fdfa7e8e174134e0461350211..095302459ac8336d3e7d075c06f7ee1cb95d0848 100644
--- a/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp
+++ b/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp
@@ -231,6 +231,11 @@ void SmallDeformationProcess<DisplacementDim>::initializeConcreteProcess(
position += integration_points_read * ip_meta_data.n_components;
}
}
+
+ // Initialize local assemblers after all variables have been set.
+ GlobalExecutor::executeMemberOnDereferenced(
+ &LocalAssemblerInterface::initialize, _local_assemblers,
+ *_local_to_global_index_map);
}
template <int DisplacementDim>
@@ -280,20 +285,13 @@ void SmallDeformationProcess<DisplacementDim>::
template <int DisplacementDim>
void SmallDeformationProcess<DisplacementDim>::preTimestepConcreteProcess(
- GlobalVector const& x, double const t, double const dt,
- const int process_id)
+ GlobalVector const& /*x*/, double const t, double const dt,
+ const int /*process_id*/)
{
DBUG("PreTimestep SmallDeformationProcess.");
_process_data.dt = dt;
_process_data.t = t;
-
- ProcessLib::ProcessVariable const& pv = getProcessVariables(process_id)[0];
-
- GlobalExecutor::executeSelectedMemberOnDereferenced(
- &LocalAssemblerInterface::preTimestep, _local_assemblers,
- pv.getActiveElementIDs(), *_local_to_global_index_map,
- x, t, dt);
}
template <int DisplacementDim>
diff --git a/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalFEM.h b/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalFEM.h
index 5c0a79ef83df2b567cf59b5f4498828024b3b0ec..0f8698eab88a5233c91d4ccbcc2cf61071bc9b60 100644
--- a/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalFEM.h
+++ b/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalFEM.h
@@ -514,9 +514,18 @@ public:
}
}
- 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/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.cpp b/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.cpp
index 389662cde2d65d41b8099b3a62e86712e5a84bf6..6f17af718df6bbb56954e4829a2b51216ee30eaa 100644
--- a/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.cpp
+++ b/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.cpp
@@ -223,6 +223,11 @@ void SmallDeformationNonlocalProcess<DisplacementDim>::
}
}
}
+
+ // Initialize local assemblers after all variables have been set.
+ GlobalExecutor::executeMemberOnDereferenced(
+ &LocalAssemblerInterface::initialize, _local_assemblers,
+ *_local_to_global_index_map);
}
template <int DisplacementDim>
@@ -291,7 +296,7 @@ void SmallDeformationNonlocalProcess<DisplacementDim>::
template <int DisplacementDim>
void SmallDeformationNonlocalProcess<
- DisplacementDim>::preTimestepConcreteProcess(GlobalVector const& x,
+ DisplacementDim>::preTimestepConcreteProcess(GlobalVector const& /*x*/,
double const t,
double const dt,
int const /*process_id*/)
@@ -300,13 +305,22 @@ void SmallDeformationNonlocalProcess<
_process_data.dt = dt;
_process_data.t = t;
+}
+
+template <int DisplacementDim>
+void SmallDeformationNonlocalProcess<
+ DisplacementDim>::postTimestepConcreteProcess(GlobalVector const& x,
+ double const /*t*/,
+ double const /*dt*/,
+ int const process_id)
+{
+ DBUG("PostTimestep SmallDeformationNonlocalProcess.");
- const int process_id = 0;
ProcessLib::ProcessVariable const& pv = getProcessVariables(process_id)[0];
GlobalExecutor::executeSelectedMemberOnDereferenced(
- &LocalAssemblerInterface::preTimestep, _local_assemblers,
- pv.getActiveElementIDs(), *_local_to_global_index_map, x, t, dt);
+ &LocalAssemblerInterface::postTimestep, _local_assemblers,
+ pv.getActiveElementIDs(), *_local_to_global_index_map, x);
}
template <int DisplacementDim>
diff --git a/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.h b/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.h
index 1c5cd4fe80635d1560d467c79e07af6eea102252..7769e2ea000412a1d242c1a36ce0db15bbfc6cfd 100644
--- a/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.h
+++ b/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.h
@@ -70,6 +70,10 @@ private:
double const dt,
int const /*process_id*/) override;
+ void postTimestepConcreteProcess(GlobalVector const& x, double const t,
+ double const dt,
+ int const process_id) override;
+
NumLib::IterationResult postIterationConcreteProcess(
GlobalVector const& x) override;
diff --git a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM.h b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM.h
index b7df421dbce0e8f125a7a72543ed0f7b29421793..18fb21dcb0416e9fedd78aa2fc48ba42246a3e36 100644
--- a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM.h
+++ b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM.h
@@ -88,9 +88,19 @@ public:
std::vector<double>& local_rhs_data,
std::vector<double>& local_Jac_data) 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/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp
index 5e6fb80989a049531dec93408eb4828d4243b68a..823ab71831a21aa260b3adb4bc266c2395080b3c 100644
--- a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp
+++ b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp
@@ -202,6 +202,11 @@ void ThermoHydroMechanicsProcess<DisplacementDim>::initializeConcreteProcess(
MeshLib::getOrCreateMeshProperty<double>(
const_cast<MeshLib::Mesh&>(mesh), "temperature_interpolated",
MeshLib::MeshItemType::Node, 1);
+
+ // Initialize local assemblers after all variables have been set.
+ GlobalExecutor::executeMemberOnDereferenced(
+ &LocalAssemblerInterface::initialize, _local_assemblers,
+ *_local_to_global_index_map);
}
template <int DisplacementDim>
diff --git a/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldFEM.h b/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldFEM.h
index 7d6f68728dfceb250ee0f81d55160def8e8fdef3..a0d421313203f8d0c0956870b9b80f397f8460fb 100644
--- a/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldFEM.h
+++ b/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldFEM.h
@@ -220,9 +220,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/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.cpp b/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.cpp
index 69be04191079022ccfab7e0964ad25b637764ce2..2a1ec6a1c7c3a22e2018d183025b3c06ffb01ebe 100644
--- a/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.cpp
+++ b/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.cpp
@@ -161,6 +161,11 @@ void ThermoMechanicalPhaseFieldProcess<DisplacementDim>::
_local_assemblers,
&ThermoMechanicalPhaseFieldLocalAssemblerInterface::
getIntPtHeatFlux));
+
+ // Initialize local assemblers after all variables have been set.
+ GlobalExecutor::executeMemberOnDereferenced(
+ &LocalAssemblerInterface::initialize, _local_assemblers,
+ *_local_to_global_index_map);
}
template <int DisplacementDim>
diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h b/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h
index b14b1a06cbdd7146021486bec6aaeb1dc4f98c5b..4c45008c62f9970610ec39871a7b57ddff054cf1 100644
--- a/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h
+++ b/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h
@@ -153,9 +153,18 @@ public:
std::vector<double>& local_rhs_data,
std::vector<double>& local_Jac_data) 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/ThermoMechanics/ThermoMechanicsProcess.cpp b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp
index 09a21c48d2dc0b1564504d0fac79078729ca99a0..444684c24585ad9d60c6df9d68e2786774ee3617 100644
--- a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp
+++ b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp
@@ -248,6 +248,11 @@ void ThermoMechanicsProcess<DisplacementDim>::initializeConcreteProcess(
position += integration_points_read * ip_meta_data.n_components;
}
}
+
+ // Initialize local assemblers after all variables have been set.
+ GlobalExecutor::executeMemberOnDereferenced(
+ &LocalAssemblerInterface::initialize, _local_assemblers,
+ *_local_to_global_index_map);
}
template <int DisplacementDim>