From 72382caa86249475a09858bcc0170a314e808368 Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Mon, 1 Jul 2019 14:37:49 +0200
Subject: [PATCH] [StaggeredTM] Added two members of process IDs to
ThermoMechanicsProcess
---
.../CreateThermoMechanicsProcess.cpp | 14 +++++++---
.../ThermoMechanicsProcess.cpp | 26 +++++++++----------
.../ThermoMechanics/ThermoMechanicsProcess.h | 23 ++++++++++------
3 files changed, 38 insertions(+), 25 deletions(-)
diff --git a/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp b/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp
index 6c59aab55f5..ad33b3cca02 100644
--- a/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp
+++ b/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp
@@ -40,7 +40,7 @@ std::unique_ptr<Process> createThermoMechanicsProcess(
config.checkConfigParameter("type", "THERMO_MECHANICS");
DBUG("Create ThermoMechanicsProcess.");
- auto const staggered_scheme =
+ auto const staggered_scheme =
//! \ogs_file_param{prj__processes__process__THERMO_MECHANICS__coupling_scheme}
config.getConfigParameterOptional<std::string>("coupling_scheme");
const bool use_monolithic_scheme =
@@ -59,9 +59,9 @@ std::unique_ptr<Process> createThermoMechanicsProcess(
{
auto per_process_variables = findProcessVariables(
variables, pv_config,
- {//! \ogs_file_param_special{prj__processes__process__THERMO_MECHANICS__process_variables__temperature}
+ {//! \ogs_file_param_special{prj__processes__process__THERMO_MECHANICS__process_variables__temperature}
"temperature",
- //! \ogs_file_param_special{prj__processes__process__THERMO_MECHANICS__process_variables__displacement}
+ //! \ogs_file_param_special{prj__processes__process__THERMO_MECHANICS__process_variables__displacement}
"displacement"});
variable_T = &per_process_variables[0].get();
variable_u = &per_process_variables[1].get();
@@ -80,6 +80,11 @@ std::unique_ptr<Process> createThermoMechanicsProcess(
variable_u = &process_variables[1][0].get();
}
+ // Process IDs, which are set according to the appearance order of the
+ // process variables. Up to now, the ordering is fixed as:
+ int heat_conduction_process_id = 0;
+ int mechanics_process_id = 1;
+
DBUG("Associate displacement with process variable '%s'.",
variable_u->getName().c_str());
@@ -192,7 +197,8 @@ std::unique_ptr<Process> createThermoMechanicsProcess(
std::move(name), mesh, std::move(jacobian_assembler), parameters,
integration_order, std::move(process_variables),
std::move(process_data), std::move(secondary_variables),
- std::move(named_function_caller), use_monolithic_scheme);
+ std::move(named_function_caller), use_monolithic_scheme,
+ mechanics_process_id, heat_conduction_process_id);
}
template std::unique_ptr<Process> createThermoMechanicsProcess<2>(
diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp
index 5df40fcff52..83b371381ee 100644
--- a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp
+++ b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp
@@ -23,8 +23,7 @@ namespace ThermoMechanics
{
template <int DisplacementDim>
ThermoMechanicsProcess<DisplacementDim>::ThermoMechanicsProcess(
- std::string name,
- MeshLib::Mesh& mesh,
+ std::string name, MeshLib::Mesh& mesh,
std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler,
std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
unsigned const integration_order,
@@ -33,12 +32,15 @@ ThermoMechanicsProcess<DisplacementDim>::ThermoMechanicsProcess(
ThermoMechanicsProcessData<DisplacementDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller,
- bool const use_monolithic_scheme)
+ bool const use_monolithic_scheme, int const mechanics_process_id,
+ int const heat_conduction_process_id)
: Process(std::move(name), mesh, std::move(jacobian_assembler), parameters,
integration_order, std::move(process_variables),
std::move(secondary_variables), std::move(named_function_caller),
use_monolithic_scheme),
- _process_data(std::move(process_data))
+ _process_data(std::move(process_data)),
+ _mechanics_process_id(mechanics_process_id),
+ _heat_conduction_process_id(heat_conduction_process_id)
{
_nodal_forces = MeshLib::getOrCreateMeshProperty<double>(
mesh, "NodalForces", MeshLib::MeshItemType::Node, DisplacementDim);
@@ -209,7 +211,7 @@ void ThermoMechanicsProcess<DisplacementDim>::assembleConcreteProcess(
DBUG("Assemble ThermoMechanicsProcess.");
std::vector<std::reference_wrapper<NumLib::LocalToGlobalIndexMap>>
- dof_table = {std::ref(*_local_to_global_index_map)};
+ dof_table = {std::ref(*_local_to_global_index_map)};
const int process_id =
_use_monolithic_scheme ? 0 : _coupled_solutions->process_id;
ProcessLib::ProcessVariable const& pv = getProcessVariables(process_id)[0];
@@ -217,8 +219,7 @@ void ThermoMechanicsProcess<DisplacementDim>::assembleConcreteProcess(
// Call global assembler for each local assembly item.
GlobalExecutor::executeSelectedMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assemble, _local_assemblers,
- pv.getActiveElementIDs(), dof_table, t, x, M, K, b,
- _coupled_solutions);
+ pv.getActiveElementIDs(), dof_table, t, x, M, K, b, _coupled_solutions);
}
template <int DisplacementDim>
@@ -233,16 +234,16 @@ void ThermoMechanicsProcess<DisplacementDim>::
DBUG("AssembleJacobian ThermoMechanicsProcess.");
std::vector<std::reference_wrapper<NumLib::LocalToGlobalIndexMap>>
- dof_table = {std::ref(*_local_to_global_index_map)};
- const int process_id =
+ dof_table = {std::ref(*_local_to_global_index_map)};
+ const int process_id =
_use_monolithic_scheme ? 0 : _coupled_solutions->process_id;
ProcessLib::ProcessVariable const& pv = getProcessVariables(process_id)[0];
// Call global assembler for each local assembly item.
GlobalExecutor::executeSelectedMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
- _local_assemblers, pv.getActiveElementIDs(), dof_table, t, x,
- xdot, dxdot_dx, dx_dx, M, K, b, Jac, _coupled_solutions);
+ _local_assemblers, pv.getActiveElementIDs(), dof_table, t, x, xdot,
+ dxdot_dx, dx_dx, M, K, b, Jac, _coupled_solutions);
// TODO (naumov): Refactor the copy rhs part. This is copy from HM.
auto copyRhs = [&](int const variable_id, auto& output_vector) {
@@ -283,8 +284,7 @@ void ThermoMechanicsProcess<DisplacementDim>::preTimestepConcreteProcess(
GlobalExecutor::executeSelectedMemberOnDereferenced(
&ThermoMechanicsLocalAssemblerInterface::preTimestep, _local_assemblers,
- pv.getActiveElementIDs(), *_local_to_global_index_map, x, t,
- dt);
+ pv.getActiveElementIDs(), *_local_to_global_index_map, x, t, dt);
}
template <int DisplacementDim>
diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h
index 2b14f356de7..19247f6f6a4 100644
--- a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h
+++ b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h
@@ -37,7 +37,6 @@ struct KelvinVectorIntegrationPointWriter final : public IntegrationPointWriter
int numberOfComponents() const override { return _n_components; }
int integrationOrder() const override { return _integration_order; }
-
std::string name() const override
{
// TODO (naumov) remove ip suffix. Probably needs modification of the
@@ -75,7 +74,9 @@ public:
ThermoMechanicsProcessData<DisplacementDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller,
- bool const use_monolithic_scheme);
+ bool const use_monolithic_scheme,
+ int const mechanics_process_id,
+ int const heat_conduction_process_id);
//! \name ODESystem interface
//! @{
@@ -88,18 +89,18 @@ private:
MeshLib::Mesh const& mesh,
unsigned const integration_order) override;
- void assembleConcreteProcess(
- const double t, GlobalVector const& x, GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ void assembleConcreteProcess(const double t, GlobalVector const& x,
+ GlobalMatrix& M, GlobalMatrix& K,
+ GlobalVector& b) override;
void assembleWithJacobianConcreteProcess(
const double t, GlobalVector const& x, GlobalVector const& xdot,
const double dxdot_dx, const double dx_dx, GlobalMatrix& M,
GlobalMatrix& K, GlobalVector& b, GlobalMatrix& Jac) override;
- void preTimestepConcreteProcess(
- GlobalVector const& x, double const t, double const dt,
- const int process_id) override;
+ void preTimestepConcreteProcess(GlobalVector const& x, double const t,
+ double const dt,
+ const int process_id) override;
void postTimestepConcreteProcess(GlobalVector const& x, const double t,
const double delta_t,
@@ -116,6 +117,12 @@ private:
MeshLib::PropertyVector<double>* _nodal_forces = nullptr;
MeshLib::PropertyVector<double>* _heat_flux = nullptr;
+
+ /// ID of the mechanical process.
+ int const _mechanics_process_id;
+
+ /// ID of heat conduction process.
+ int const _heat_conduction_process_id;
};
extern template class ThermoMechanicsProcess<2>;
--
GitLab