From 6e00c5fc97c70021830dbce60b649dfec1e8837b Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Mon, 13 Nov 2017 17:40:57 +0100
Subject: [PATCH] [PCS] Add an option to separate the process variables by
process in creating of the instances of classes of coupled processes.
---
.../processes/process/HT/t_coupling_scheme.md | 2 +
.../HYDRO_MECHANICS/t_coupling_scheme.md | 2 +
.../t_coupling_scheme.md | 2 +
.../process/PHASE_FIELD/t_coupling_scheme.md | 2 +
.../t_coupling_scheme.md | 3 +
.../THERMO_MECHANICS/t_coupling_scheme.md | 2 +
.../ComponentTransportProcess.cpp | 10 +--
.../ComponentTransportProcess.h | 3 +-
.../CreateComponentTransportProcess.cpp | 39 +++++++++--
ProcessLib/HT/CreateHTProcess.cpp | 40 ++++++++++--
ProcessLib/HT/HTProcess.cpp | 14 ++--
ProcessLib/HT/HTProcess.h | 3 +-
.../CreateHydroMechanicsProcess.cpp | 62 +++++++++++++-----
.../HydroMechanicsProcess-impl.h | 6 +-
.../HydroMechanics/HydroMechanicsProcess.h | 3 +-
.../CreateHydroMechanicsProcess.cpp | 42 ++++++++++--
.../HydroMechanics/HydroMechanicsProcess.cpp | 6 +-
.../HydroMechanics/HydroMechanicsProcess.h | 3 +-
.../PhaseField/CreatePhaseFieldProcess.cpp | 65 ++++++++++++++-----
.../PhaseField/PhaseFieldProcess-impl.h | 6 +-
ProcessLib/PhaseField/PhaseFieldProcess.h | 3 +-
ProcessLib/Process.cpp | 30 +++++----
...reateRichardsComponentTransportProcess.cpp | 40 ++++++++++--
.../RichardsComponentTransportProcess.cpp | 6 +-
.../RichardsComponentTransportProcess.h | 3 +-
.../CreateThermoMechanicsProcess.cpp | 65 ++++++++++++++-----
.../ThermoMechanicsProcess-impl.h | 6 +-
.../ThermoMechanics/ThermoMechanicsProcess.h | 3 +-
28 files changed, 356 insertions(+), 115 deletions(-)
create mode 100644 Documentation/ProjectFile/prj/processes/process/HT/t_coupling_scheme.md
create mode 100644 Documentation/ProjectFile/prj/processes/process/HYDRO_MECHANICS/t_coupling_scheme.md
create mode 100644 Documentation/ProjectFile/prj/processes/process/HYDRO_MECHANICS_WITH_LIE/t_coupling_scheme.md
create mode 100644 Documentation/ProjectFile/prj/processes/process/PHASE_FIELD/t_coupling_scheme.md
create mode 100644 Documentation/ProjectFile/prj/processes/process/RichardsComponentTransport/t_coupling_scheme.md
create mode 100644 Documentation/ProjectFile/prj/processes/process/THERMO_MECHANICS/t_coupling_scheme.md
diff --git a/Documentation/ProjectFile/prj/processes/process/HT/t_coupling_scheme.md b/Documentation/ProjectFile/prj/processes/process/HT/t_coupling_scheme.md
new file mode 100644
index 00000000000..b58ddae1e22
--- /dev/null
+++ b/Documentation/ProjectFile/prj/processes/process/HT/t_coupling_scheme.md
@@ -0,0 +1,2 @@
+An optional input to select the coupling scheme. The variable is 'staggered'.
+If this input is omitted, the coupling scheme is the monolithic scheme by default.
diff --git a/Documentation/ProjectFile/prj/processes/process/HYDRO_MECHANICS/t_coupling_scheme.md b/Documentation/ProjectFile/prj/processes/process/HYDRO_MECHANICS/t_coupling_scheme.md
new file mode 100644
index 00000000000..c4be227511f
--- /dev/null
+++ b/Documentation/ProjectFile/prj/processes/process/HYDRO_MECHANICS/t_coupling_scheme.md
@@ -0,0 +1,2 @@
+An optional input to select the coupling scheme. So far, only the monolithic
+scheme is available for HYDRO_MECHANICS, and this input can be omitted.
diff --git a/Documentation/ProjectFile/prj/processes/process/HYDRO_MECHANICS_WITH_LIE/t_coupling_scheme.md b/Documentation/ProjectFile/prj/processes/process/HYDRO_MECHANICS_WITH_LIE/t_coupling_scheme.md
new file mode 100644
index 00000000000..3beece0c76a
--- /dev/null
+++ b/Documentation/ProjectFile/prj/processes/process/HYDRO_MECHANICS_WITH_LIE/t_coupling_scheme.md
@@ -0,0 +1,2 @@
+An optional input to select the coupling scheme. So far, only the monolithic
+scheme is available for HYDRO_MECHANICS_WITH_LIE, and this input can be omitted.
diff --git a/Documentation/ProjectFile/prj/processes/process/PHASE_FIELD/t_coupling_scheme.md b/Documentation/ProjectFile/prj/processes/process/PHASE_FIELD/t_coupling_scheme.md
new file mode 100644
index 00000000000..70f06ad8430
--- /dev/null
+++ b/Documentation/ProjectFile/prj/processes/process/PHASE_FIELD/t_coupling_scheme.md
@@ -0,0 +1,2 @@
+An optional input to select the coupling scheme. So far, only the monolithic
+scheme is available for PHASE_FIELD, and this input can be omitted.
diff --git a/Documentation/ProjectFile/prj/processes/process/RichardsComponentTransport/t_coupling_scheme.md b/Documentation/ProjectFile/prj/processes/process/RichardsComponentTransport/t_coupling_scheme.md
new file mode 100644
index 00000000000..4ad60d8ae0d
--- /dev/null
+++ b/Documentation/ProjectFile/prj/processes/process/RichardsComponentTransport/t_coupling_scheme.md
@@ -0,0 +1,3 @@
+An optional input to select the coupling scheme. So far, only the monolithic
+scheme is available for RichardsComponentTransport, and this input can be
+omitted.
diff --git a/Documentation/ProjectFile/prj/processes/process/THERMO_MECHANICS/t_coupling_scheme.md b/Documentation/ProjectFile/prj/processes/process/THERMO_MECHANICS/t_coupling_scheme.md
new file mode 100644
index 00000000000..fb1c11d02f5
--- /dev/null
+++ b/Documentation/ProjectFile/prj/processes/process/THERMO_MECHANICS/t_coupling_scheme.md
@@ -0,0 +1,2 @@
+An optional input to select the coupling scheme. So far, only the monolithic
+scheme is available for THERMO_MECHANICS, and this input can be omitted.
diff --git a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
index 342f6e3409d..eb63cd1d42a 100644
--- a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
+++ b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
@@ -26,10 +26,12 @@ ComponentTransportProcess::ComponentTransportProcess(
process_variables,
ComponentTransportProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
- NumLib::NamedFunctionCaller&& named_function_caller)
+ NumLib::NamedFunctionCaller&& named_function_caller,
+ bool const use_monolithic_scheme)
: Process(mesh, std::move(jacobian_assembler), parameters,
integration_order, std::move(process_variables),
- std::move(secondary_variables), std::move(named_function_caller)),
+ std::move(secondary_variables), std::move(named_function_caller),
+ use_monolithic_scheme),
_process_data(std::move(process_data))
{
}
@@ -60,7 +62,7 @@ void ComponentTransportProcess::assembleConcreteProcess(
GlobalVector& b)
{
DBUG("Assemble ComponentTransportProcess.");
- if (!_is_monolithic_scheme)
+ if (!_use_monolithic_scheme)
setCoupledSolutionsOfPreviousTimeStep();
// Call global assembler for each local assembly item.
@@ -76,7 +78,7 @@ void ComponentTransportProcess::assembleWithJacobianConcreteProcess(
{
DBUG("AssembleWithJacobian ComponentTransportProcess.");
- if (!_is_monolithic_scheme)
+ if (!_use_monolithic_scheme)
setCoupledSolutionsOfPreviousTimeStep();
// Call global assembler for each local assembly item.
diff --git a/ProcessLib/ComponentTransport/ComponentTransportProcess.h b/ProcessLib/ComponentTransport/ComponentTransportProcess.h
index 95cf302a4a5..621fbfc9789 100644
--- a/ProcessLib/ComponentTransport/ComponentTransportProcess.h
+++ b/ProcessLib/ComponentTransport/ComponentTransportProcess.h
@@ -87,7 +87,8 @@ public:
process_variables,
ComponentTransportProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
- NumLib::NamedFunctionCaller&& named_function_caller);
+ NumLib::NamedFunctionCaller&& named_function_caller,
+ bool const use_monolithic_scheme);
//! \name ODESystem interface
//! @{
diff --git a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp
index dbcdbd75a93..9b3eeeafabe 100644
--- a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp
+++ b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp
@@ -35,19 +35,43 @@ std::unique_ptr<Process> createComponentTransportProcess(
config.checkConfigParameter("type", "ComponentTransport");
DBUG("Create ComponentTransportProcess.");
+ auto const staggered_scheme =
+ //! \ogs_file_param{prj__processes__process__coupling_scheme}
+ config.getConfigParameterOptional<std::string>("coupling_scheme");
+ const bool use_monolithic_scheme =
+ (staggered_scheme && (*staggered_scheme == "staggered")) ? false : true;
// Process variable.
//! \ogs_file_param{prj__processes__process__ComponentTransport__process_variables}
auto const pv_config = config.getConfigSubtree("process_variables");
- auto process_variables = findProcessVariables(
- variables, pv_config,
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>
+ process_variables;
+ if (use_monolithic_scheme) // monolithic scheme.
+ {
+ auto per_process_variables = findProcessVariables(
+ variables, pv_config,
+ {
+ //! \ogs_file_param_special{prj__processes__process__ComponentTransport__process_variables__concentration}
+ "concentration",
+ //! \ogs_file_param_special{prj__processes__process__ComponentTransport__process_variables__pressure}
+ "pressure"});
+ process_variables.push_back(std::move(per_process_variables));
+ }
+ else // staggered scheme.
+ {
+ std::array<std::string, 2> variable_names = {
+ {"concentration",
+ "pressure"}}; // double-braces required in C++11 (not in C++14)
+
+ for (int i = 0; i < 2; i++)
{
- //! \ogs_file_param_special{prj__processes__process__ComponentTransport__process_variables__concentration}
- "concentration",
- //! \ogs_file_param_special{prj__processes__process__ComponentTransport__process_variables__pressure}
- "pressure"});
+ auto per_process_variables =
+ findProcessVariables(variables, pv_config, {variable_names[i]});
+ process_variables.push_back(std::move(per_process_variables));
+ }
+ }
MaterialLib::PorousMedium::PorousMediaProperties porous_media_properties{
MaterialLib::PorousMedium::createPorousMediaProperties(
@@ -144,7 +168,8 @@ std::unique_ptr<Process> createComponentTransportProcess(
return std::make_unique<ComponentTransportProcess>(
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));
+ std::move(secondary_variables), std::move(named_function_caller),
+ use_monolithic_scheme);
}
} // namespace ComponentTransport
diff --git a/ProcessLib/HT/CreateHTProcess.cpp b/ProcessLib/HT/CreateHTProcess.cpp
index f8584ed408e..e52d9c2a3a4 100644
--- a/ProcessLib/HT/CreateHTProcess.cpp
+++ b/ProcessLib/HT/CreateHTProcess.cpp
@@ -37,17 +37,42 @@ std::unique_ptr<Process> createHTProcess(
DBUG("Create HTProcess.");
+ auto const staggered_scheme =
+ //! \ogs_file_param{prj__processes__process__HT__coupling_scheme}
+ config.getConfigParameterOptional<std::string>("coupling_scheme");
+ const bool use_monolithic_scheme =
+ (staggered_scheme && (*staggered_scheme == "staggered")) ? false : true;
+
// Process variable.
//! \ogs_file_param{prj__processes__process__HT__process_variables}
auto const pv_config = config.getConfigSubtree("process_variables");
- auto process_variables = findProcessVariables(
- variables, pv_config,
- {//! \ogs_file_param_special{prj__processes__process__HT__process_variables__temperature}
- "temperature",
- //! \ogs_file_param_special{prj__processes__process__HT__process_variables__pressure}
- "pressure"});
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>
+ process_variables;
+ if (use_monolithic_scheme) // monolithic scheme.
+ {
+ auto per_process_variables = findProcessVariables(
+ variables, pv_config,
+ {//! \ogs_file_param_special{prj__processes__process__HT__process_variables__temperature}
+ "temperature",
+ //! \ogs_file_param_special{prj__processes__process__HT__process_variables__pressure}
+ "pressure"});
+ process_variables.push_back(std::move(per_process_variables));
+ }
+ else // staggered scheme.
+ {
+ std::array<std::string, 2> variable_names = {
+ {"temperature",
+ "pressure"}}; // double-braces required in C++11 (not in C++14)
+
+ for (int i = 0; i < 2; i++)
+ {
+ auto per_process_variables =
+ findProcessVariables(variables, pv_config, {variable_names[i]});
+ process_variables.push_back(std::move(per_process_variables));
+ }
+ }
MaterialLib::PorousMedium::PorousMediaProperties porous_media_properties{
MaterialLib::PorousMedium::createPorousMediaProperties(mesh, config,
@@ -198,7 +223,8 @@ std::unique_ptr<Process> createHTProcess(
return std::make_unique<HTProcess>(
mesh, std::move(jacobian_assembler), parameters, integration_order,
std::move(process_variables), std::move(material_properties),
- std::move(secondary_variables), std::move(named_function_caller));
+ std::move(secondary_variables), std::move(named_function_caller),
+ use_monolithic_scheme);
}
} // namespace HT
diff --git a/ProcessLib/HT/HTProcess.cpp b/ProcessLib/HT/HTProcess.cpp
index 21ff4a0dfc9..d9b30be221e 100644
--- a/ProcessLib/HT/HTProcess.cpp
+++ b/ProcessLib/HT/HTProcess.cpp
@@ -31,10 +31,12 @@ HTProcess::HTProcess(
process_variables,
std::unique_ptr<HTMaterialProperties>&& material_properties,
SecondaryVariableCollection&& secondary_variables,
- NumLib::NamedFunctionCaller&& named_function_caller)
+ NumLib::NamedFunctionCaller&& named_function_caller,
+ bool const use_monolithic_scheme)
: Process(mesh, std::move(jacobian_assembler), parameters,
integration_order, std::move(process_variables),
- std::move(secondary_variables), std::move(named_function_caller)),
+ std::move(secondary_variables), std::move(named_function_caller),
+ use_monolithic_scheme),
_material_properties(std::move(material_properties))
{
}
@@ -46,7 +48,7 @@ void HTProcess::initializeConcreteProcess(
{
ProcessLib::ProcessVariable const& pv = getProcessVariables()[0];
- if (_is_monolithic_scheme)
+ if (_use_monolithic_scheme)
{
ProcessLib::createLocalAssemblers<MonolithicHTFEM>(
mesh.getDimension(), mesh.getElements(), dof_table,
@@ -76,7 +78,7 @@ void HTProcess::assembleConcreteProcess(const double t,
GlobalMatrix& K,
GlobalVector& b)
{
- if (_is_monolithic_scheme)
+ if (_use_monolithic_scheme)
{
DBUG("Assemble HTProcess.");
}
@@ -110,7 +112,7 @@ void HTProcess::assembleWithJacobianConcreteProcess(
{
DBUG("AssembleWithJacobian HTProcess.");
- if (!_is_monolithic_scheme)
+ if (!_use_monolithic_scheme)
setCoupledSolutionsOfPreviousTimeStep();
// Call global assembler for each local assembly item.
@@ -127,7 +129,7 @@ void HTProcess::preTimestepConcreteProcess(GlobalVector const& x,
{
assert(process_id < 2);
- if (_is_monolithic_scheme)
+ if (_use_monolithic_scheme)
return;
if (!_xs_previous_timestep[process_id])
diff --git a/ProcessLib/HT/HTProcess.h b/ProcessLib/HT/HTProcess.h
index 661782095f4..0c1c9459654 100644
--- a/ProcessLib/HT/HTProcess.h
+++ b/ProcessLib/HT/HTProcess.h
@@ -53,7 +53,8 @@ public:
process_variables,
std::unique_ptr<HTMaterialProperties>&& material_properties,
SecondaryVariableCollection&& secondary_variables,
- NumLib::NamedFunctionCaller&& named_function_caller);
+ NumLib::NamedFunctionCaller&& named_function_caller,
+ bool const use_monolithic_scheme);
//! \name ODESystem interface
//! @{
diff --git a/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp b/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp
index 31774e41bdb..a9beea3609a 100644
--- a/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp
+++ b/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp
@@ -35,40 +35,71 @@ std::unique_ptr<Process> createHydroMechanicsProcess(
config.checkConfigParameter("type", "HYDRO_MECHANICS");
DBUG("Create HydroMechanicsProcess.");
+ auto const staggered_scheme =
+ //! \ogs_file_param{prj__processes__process__HYDRO_MECHANICS__coupling_scheme}
+ config.getConfigParameterOptional<std::string>("coupling_scheme");
+ const bool use_monolithic_scheme =
+ (staggered_scheme && (*staggered_scheme == "staggered")) ? false : true;
+
// Process variable.
//! \ogs_file_param{prj__processes__process__HYDRO_MECHANICS__process_variables}
auto const pv_config = config.getConfigSubtree("process_variables");
- auto process_variables = findProcessVariables(
- variables, pv_config,
- {//! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS__process_variables__pressure}
- "pressure",
- //! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS__process_variables__displacement}
- "displacement"});
+ ProcessVariable* variable_p;
+ ProcessVariable* variable_u;
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>
+ process_variables;
+ if (use_monolithic_scheme) // monolithic scheme.
+ {
+ auto per_process_variables = findProcessVariables(
+ variables, pv_config,
+ {//! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS__process_variables__pressure}
+ "pressure",
+ //! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS__process_variables__displacement}
+ "displacement"});
+ variable_p = &per_process_variables[0].get();
+ variable_u = &per_process_variables[1].get();
+ process_variables.push_back(std::move(per_process_variables));
+ }
+ else // staggered scheme.
+ {
+ std::array<std::string, 2> variable_names = {
+ {"pressure",
+ "displacement"}}; // double-braces required in C++11 (not in C++14)
+
+ for (int i = 0; i < 2; i++)
+ {
+ auto per_process_variables =
+ findProcessVariables(variables, pv_config, {variable_names[i]});
+ process_variables.push_back(std::move(per_process_variables));
+ }
+ variable_p = &process_variables[0][0].get();
+ variable_u = &process_variables[1][0].get();
+ }
DBUG("Associate displacement with process variable \'%s\'.",
- process_variables[1].get().getName().c_str());
+ variable_u->getName().c_str());
- if (process_variables[1].get().getNumberOfComponents() != DisplacementDim)
+ if (variable_u->getNumberOfComponents() != DisplacementDim)
{
OGS_FATAL(
"Number of components of the process variable '%s' is different "
"from the displacement dimension: got %d, expected %d",
- process_variables[1].get().getName().c_str(),
- process_variables[1].get().getNumberOfComponents(),
+ variable_u->getName().c_str(),
+ variable_u->getNumberOfComponents(),
DisplacementDim);
}
DBUG("Associate pressure with process variable \'%s\'.",
- process_variables[0].get().getName().c_str());
- if (process_variables[0].get().getNumberOfComponents() != 1)
+ variable_p->getName().c_str());
+ if (variable_p->getNumberOfComponents() != 1)
{
OGS_FATAL(
"Pressure process variable '%s' is not a scalar variable but has "
"%d components.",
- process_variables[0].get().getName().c_str(),
- process_variables[0].get().getNumberOfComponents());
+ variable_p->getName().c_str(),
+ variable_p->getNumberOfComponents());
}
// Constitutive relation.
@@ -190,7 +221,8 @@ std::unique_ptr<Process> createHydroMechanicsProcess(
return std::make_unique<HydroMechanicsProcess<DisplacementDim>>(
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));
+ std::move(secondary_variables), std::move(named_function_caller),
+ use_monolithic_scheme);
}
template std::unique_ptr<Process> createHydroMechanicsProcess<2>(
diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcess-impl.h b/ProcessLib/HydroMechanics/HydroMechanicsProcess-impl.h
index 1532deaa1f2..e2be230ccad 100644
--- a/ProcessLib/HydroMechanics/HydroMechanicsProcess-impl.h
+++ b/ProcessLib/HydroMechanics/HydroMechanicsProcess-impl.h
@@ -32,10 +32,12 @@ HydroMechanicsProcess<DisplacementDim>::HydroMechanicsProcess(
process_variables,
HydroMechanicsProcessData<DisplacementDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
- NumLib::NamedFunctionCaller&& named_function_caller)
+ NumLib::NamedFunctionCaller&& named_function_caller,
+ bool const use_monolithic_scheme)
: Process(mesh, std::move(jacobian_assembler), parameters,
integration_order, std::move(process_variables),
- std::move(secondary_variables), std::move(named_function_caller)),
+ std::move(secondary_variables), std::move(named_function_caller),
+ use_monolithic_scheme),
_process_data(std::move(process_data))
{
}
diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcess.h b/ProcessLib/HydroMechanics/HydroMechanicsProcess.h
index 3fe00f95669..bae5bb8a29d 100644
--- a/ProcessLib/HydroMechanics/HydroMechanicsProcess.h
+++ b/ProcessLib/HydroMechanics/HydroMechanicsProcess.h
@@ -39,7 +39,8 @@ public:
process_variables,
HydroMechanicsProcessData<DisplacementDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
- NumLib::NamedFunctionCaller&& named_function_caller);
+ NumLib::NamedFunctionCaller&& named_function_caller,
+ bool const use_monolithic_scheme);
//! \name ODESystem interface
//! @{
diff --git a/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp b/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp
index 2379a87c656..eb08b52f095 100644
--- a/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp
+++ b/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp
@@ -39,6 +39,11 @@ std::unique_ptr<Process> createHydroMechanicsProcess(
//! \ogs_file_param{prj__processes__process__type}
config.checkConfigParameter("type", "HYDRO_MECHANICS_WITH_LIE");
DBUG("Create HydroMechanicsProcess with LIE.");
+ auto const staggered_scheme =
+ //! \ogs_file_param{prj__processes__process__HYDRO_MECHANICS_WITH_LIE__coupling_scheme}
+ config.getConfigParameterOptional<std::string>("coupling_scheme");
+ const bool use_monolithic_scheme =
+ (staggered_scheme && (*staggered_scheme == "staggered")) ? false : true;
// Process variables
//! \ogs_file_param{prj__processes__process__HYDRO_MECHANICS_WITH_LIE__process_variables}
@@ -46,7 +51,11 @@ std::unique_ptr<Process> createHydroMechanicsProcess(
auto range =
//! \ogs_file_param{prj__processes__process__HYDRO_MECHANICS_WITH_LIE__process_variables__process_variable}
pv_conf.getConfigParameterList<std::string>("process_variable");
- std::vector<std::reference_wrapper<ProcessVariable>> process_variables;
+ std::vector<std::reference_wrapper<ProcessVariable>> p_u_process_variables;
+ std::vector<std::reference_wrapper<ProcessVariable>> p_process_variables;
+ std::vector<std::reference_wrapper<ProcessVariable>> u_process_variables;
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>
+ process_variables;
for (std::string const& pv_name : range)
{
if (pv_name != "pressure" && pv_name != "displacement" &&
@@ -84,12 +93,36 @@ std::unique_ptr<Process> createHydroMechanicsProcess(
GlobalDim);
}
- process_variables.emplace_back(const_cast<ProcessVariable&>(*variable));
+ if (!use_monolithic_scheme)
+ {
+ if (pv_name == "pressure")
+ p_process_variables.emplace_back(
+ const_cast<ProcessVariable&>(*variable));
+ else
+ {
+ u_process_variables.emplace_back(
+ const_cast<ProcessVariable&>(*variable));
+ }
+ }
+ else
+ {
+ p_u_process_variables.emplace_back(
+ const_cast<ProcessVariable&>(*variable));
+ }
}
- if (process_variables.size() > 3)
+ if (p_u_process_variables.size() > 3 || u_process_variables.size() > 2)
OGS_FATAL("Currently only one displacement jump is supported");
+ if (!use_monolithic_scheme)
+ {
+ process_variables.push_back(std::move(p_process_variables));
+ process_variables.push_back(std::move(u_process_variables));
+ }
+ else
+ process_variables.push_back(std::move(p_u_process_variables));
+
+
// Constitutive relation.
// read type;
auto const constitutive_relation_config =
@@ -301,7 +334,8 @@ std::unique_ptr<Process> createHydroMechanicsProcess(
return std::make_unique<HydroMechanicsProcess<GlobalDim>>(
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));
+ std::move(secondary_variables), std::move(named_function_caller),
+ use_monolithic_scheme);
}
template std::unique_ptr<Process> createHydroMechanicsProcess<2>(
diff --git a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp
index e882f593418..5d3ff9fd3d0 100644
--- a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp
+++ b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp
@@ -41,10 +41,12 @@ HydroMechanicsProcess<GlobalDim>::HydroMechanicsProcess(
std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&& process_variables,
HydroMechanicsProcessData<GlobalDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
- NumLib::NamedFunctionCaller&& named_function_caller)
+ NumLib::NamedFunctionCaller&& named_function_caller,
+ bool const use_monolithic_scheme)
: Process(mesh, std::move(jacobian_assembler), parameters,
integration_order, std::move(process_variables),
- std::move(secondary_variables), std::move(named_function_caller)),
+ std::move(secondary_variables), std::move(named_function_caller),
+ use_monolithic_scheme),
_process_data(std::move(process_data))
{
INFO("[LIE/HM] looking for fracture elements in the given mesh");
diff --git a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h
index 6497ea7cf04..5c5f47330f8 100644
--- a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h
+++ b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h
@@ -42,7 +42,8 @@ public:
process_variables,
HydroMechanicsProcessData<GlobalDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
- NumLib::NamedFunctionCaller&& named_function_caller);
+ NumLib::NamedFunctionCaller&& named_function_caller,
+ bool const use_monolithic_scheme);
//! \name ODESystem interface
//! @{
diff --git a/ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp b/ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp
index 38546b7b51e..487b9a1bfd5 100644
--- a/ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp
+++ b/ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp
@@ -36,41 +36,71 @@ std::unique_ptr<Process> createPhaseFieldProcess(
config.checkConfigParameter("type", "PHASE_FIELD");
DBUG("Create PhaseFieldProcess.");
+ auto const staggered_scheme =
+ //! \ogs_file_param{prj__processes__process__PHASE_FIELD__coupling_scheme}
+ config.getConfigParameterOptional<std::string>("coupling_scheme");
+ const bool use_monolithic_scheme =
+ (staggered_scheme && (*staggered_scheme == "staggered")) ? false : true;
+
// Process variable.
//! \ogs_file_param{prj__processes__process__PHASE_FIELD__process_variables}
auto const pv_config = config.getConfigSubtree("process_variables");
- auto process_variables = findProcessVariables(
- variables, pv_config,
- {//! \ogs_file_param_special{prj__processes__process__PHASE_FIELD__process_variables__phasefield}
- "phasefield",
- //! \ogs_file_param_special{prj__processes__process__PHASE_FIELD__process_variables__displacement}
- "displacement"});
+ ProcessVariable* variable_ph;
+ ProcessVariable* variable_u;
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>
+ process_variables;
+ if (use_monolithic_scheme) // monolithic scheme.
+ {
+ auto per_process_variables = findProcessVariables(
+ variables, pv_config,
+ {//! \ogs_file_param_special{prj__processes__process__PHASE_FIELD__process_variables__phasefield}
+ "phasefield",
+ //! \ogs_file_param_special{prj__processes__process__PHASE_FIELD__process_variables__displacement}
+ "displacement"});
+ variable_ph = &per_process_variables[0].get();
+ variable_u = &per_process_variables[1].get();
+ process_variables.push_back(std::move(per_process_variables));
+ }
+ else // staggered scheme.
+ {
+ std::array<std::string, 2> variable_names = {
+ {"phasefield",
+ "displacement"}}; // double-braces required in C++11 (not in C++14)
+
+ for (int i = 0; i < 2; i++)
+ {
+ auto per_process_variables =
+ findProcessVariables(variables, pv_config, {variable_names[i]});
+ process_variables.push_back(std::move(per_process_variables));
+ }
+ variable_ph = &process_variables[0][0].get();
+ variable_u = &process_variables[1][0].get();
+ }
DBUG("Associate displacement with process variable \'%s\'.",
- process_variables[1].get().getName().c_str());
+ variable_u->getName().c_str());
- if (process_variables[1].get().getNumberOfComponents() != DisplacementDim)
+ if (variable_u->getNumberOfComponents() != DisplacementDim)
{
OGS_FATAL(
"Number of components of the process variable '%s' is different "
"from the displacement dimension: got %d, expected %d",
- process_variables[1].get().getName().c_str(),
- process_variables[1].get().getNumberOfComponents(),
+ variable_u->getName().c_str(),
+ variable_u->getNumberOfComponents(),
DisplacementDim);
}
DBUG("Associate phase field with process variable \'%s\'.",
- process_variables[0].get().getName().c_str());
- if (process_variables[0].get().getNumberOfComponents() != 1)
+ variable_ph->getName().c_str());
+ if (variable_ph->getNumberOfComponents() != 1)
{
OGS_FATAL(
- "Phase field process variable '%s' is not a scalar variable but has "
+ "Pressure process variable '%s' is not a scalar variable but has "
"%d components.",
- process_variables[0].get().getName().c_str(),
- process_variables[0].get().getNumberOfComponents(),
- DisplacementDim);
+ variable_ph->getName().c_str(),
+ variable_ph->getNumberOfComponents());
}
// Constitutive relation.
@@ -180,7 +210,8 @@ std::unique_ptr<Process> createPhaseFieldProcess(
return std::make_unique<PhaseFieldProcess<DisplacementDim>>(
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));
+ std::move(secondary_variables), std::move(named_function_caller),
+ use_monolithic_scheme);
}
template std::unique_ptr<Process> createPhaseFieldProcess<2>(
diff --git a/ProcessLib/PhaseField/PhaseFieldProcess-impl.h b/ProcessLib/PhaseField/PhaseFieldProcess-impl.h
index 313a081466b..6abc841697f 100644
--- a/ProcessLib/PhaseField/PhaseFieldProcess-impl.h
+++ b/ProcessLib/PhaseField/PhaseFieldProcess-impl.h
@@ -30,10 +30,12 @@ PhaseFieldProcess<DisplacementDim>::PhaseFieldProcess(
process_variables,
PhaseFieldProcessData<DisplacementDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
- NumLib::NamedFunctionCaller&& named_function_caller)
+ NumLib::NamedFunctionCaller&& named_function_caller,
+ bool const use_monolithic_scheme)
: Process(mesh, std::move(jacobian_assembler), parameters,
integration_order, std::move(process_variables),
- std::move(secondary_variables), std::move(named_function_caller)),
+ std::move(secondary_variables), std::move(named_function_caller),
+ use_monolithic_scheme),
_process_data(std::move(process_data))
{
}
diff --git a/ProcessLib/PhaseField/PhaseFieldProcess.h b/ProcessLib/PhaseField/PhaseFieldProcess.h
index 9e4e9406d5a..f9c4708afa8 100644
--- a/ProcessLib/PhaseField/PhaseFieldProcess.h
+++ b/ProcessLib/PhaseField/PhaseFieldProcess.h
@@ -61,7 +61,8 @@ public:
process_variables,
PhaseFieldProcessData<DisplacementDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
- NumLib::NamedFunctionCaller&& named_function_caller);
+ NumLib::NamedFunctionCaller&& named_function_caller,
+ bool const use_monolithic_scheme);
//! \name ODESystem interface
//! @{
diff --git a/ProcessLib/Process.cpp b/ProcessLib/Process.cpp
index 5eabe1688e9..95b504e763e 100644
--- a/ProcessLib/Process.cpp
+++ b/ProcessLib/Process.cpp
@@ -37,15 +37,16 @@ Process::Process(
_coupled_solutions(nullptr),
_integration_order(integration_order),
_process_variables(std::move(process_variables)),
- _boundary_conditions([&]() -> std::vector<BoundaryConditionCollection> {
+ _boundary_conditions([&](const size_t number_of_processes)
+ -> std::vector<BoundaryConditionCollection> {
std::vector<BoundaryConditionCollection> pcs_BCs;
- pcs_BCs.reserve(process_variables.size());
- for (std::size_t i = 0; i < process_variables.size(); i++)
+ pcs_BCs.reserve(number_of_processes);
+ for (std::size_t i = 0; i < number_of_processes; i++)
{
pcs_BCs.emplace_back(BoundaryConditionCollection(parameters));
}
return pcs_BCs;
- }())
+ }(_process_variables.size()))
{
}
@@ -72,15 +73,16 @@ void Process::initialize()
{
auto const& per_process_variables = _process_variables[pcs_id];
auto& per_process_BCs = _boundary_conditions[pcs_id];
+
+ per_process_BCs.addBCsForProcessVariables(per_process_variables,
+ *_local_to_global_index_map,
+ _integration_order);
+
std::vector<std::unique_ptr<NodalSourceTerm>> per_process_source_terms;
for (std::size_t variable_id = 0;
variable_id < per_process_variables.size();
variable_id++)
{
- per_process_BCs.addBCsForProcessVariables(
- per_process_variables, *_local_to_global_index_map,
- _integration_order);
-
ProcessVariable& pv = per_process_variables[variable_id];
auto sts = pv.createSourceTerms(*_local_to_global_index_map, 0,
_integration_order);
@@ -173,8 +175,8 @@ void Process::assemble(const double t, GlobalVector const& x, GlobalMatrix& M,
(_coupled_solutions) ? _coupled_solutions->process_id : 0;
_boundary_conditions[pcs_id].applyNaturalBC(t, x, K, b);
- const auto _source_terms_per_pcs = _source_terms[pcs_id];
- for (auto const& st : _source_terms_per_pcs)
+ auto& source_terms_per_pcs = _source_terms[pcs_id];
+ for (auto& st : source_terms_per_pcs)
{
st->integrateNodalSourceTerm(t, b);
}
@@ -212,7 +214,7 @@ void Process::constructDofTable()
if (_use_monolithic_scheme)
{
// Collect the mesh subsets in a vector.
- for (ProcessVariable const& pv : _process_variables)
+ for (ProcessVariable const& pv : _process_variables[0])
{
std::generate_n(
std::back_inserter(all_mesh_subsets),
@@ -223,7 +225,7 @@ void Process::constructDofTable()
}
// Create a vector of the number of variable components
- for (ProcessVariable const& pv : _process_variables)
+ for (ProcessVariable const& pv : _process_variables[0])
vec_var_n_components.push_back(pv.getNumberOfComponents());
}
else // for staggered scheme
@@ -235,14 +237,14 @@ void Process::constructDofTable()
// Collect the mesh subsets in a vector.
std::generate_n(
std::back_inserter(all_mesh_subsets),
- _process_variables[0].get().getNumberOfComponents(),
+ _process_variables[0][0].get().getNumberOfComponents(),
[&]() {
return MeshLib::MeshSubsets{_mesh_subset_all_nodes.get()};
});
// Create a vector of the number of variable components.
vec_var_n_components.push_back(
- _process_variables[0].get().getNumberOfComponents());
+ _process_variables[0][0].get().getNumberOfComponents());
}
_local_to_global_index_map =
std::make_unique<NumLib::LocalToGlobalIndexMap>(
diff --git a/ProcessLib/RichardsComponentTransport/CreateRichardsComponentTransportProcess.cpp b/ProcessLib/RichardsComponentTransport/CreateRichardsComponentTransportProcess.cpp
index 05d54724a2c..377fa17e6fd 100644
--- a/ProcessLib/RichardsComponentTransport/CreateRichardsComponentTransportProcess.cpp
+++ b/ProcessLib/RichardsComponentTransport/CreateRichardsComponentTransportProcess.cpp
@@ -36,18 +36,43 @@ std::unique_ptr<Process> createRichardsComponentTransportProcess(
DBUG("Create RichardsComponentTransportProcess.");
+ auto const staggered_scheme =
+ //! \ogs_file_param{prj__processes__process__RichardsComponentTransport__coupling_scheme}
+ config.getConfigParameterOptional<std::string>("coupling_scheme");
+ const bool use_monolithic_scheme =
+ (staggered_scheme && (*staggered_scheme == "staggered")) ? false : true;
+
// Process variable.
//! \ogs_file_param{prj__processes__process__RichardsComponentTransport__process_variables}
auto const pv_config = config.getConfigSubtree("process_variables");
- auto process_variables = findProcessVariables(
- variables, pv_config,
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>
+ process_variables;
+ if (use_monolithic_scheme) // monolithic scheme.
+ {
+ auto per_process_variables = findProcessVariables(
+ variables, pv_config,
+ {
+ //! \ogs_file_param_special{prj__processes__process__RichardsComponentTransport__process_variables__concentration}
+ "concentration",
+ //! \ogs_file_param_special{prj__processes__process__RichardsComponentTransport__process_variables__pressure}
+ "pressure"});
+ process_variables.push_back(std::move(per_process_variables));
+ }
+ else // staggered scheme.
+ {
+ std::array<std::string, 2> variable_names = {
+ {"concentration",
+ "pressure"}}; // double-braces required in C++11 (not in C++14)
+
+ for (int i = 0; i < 2; i++)
{
- //! \ogs_file_param_special{prj__processes__process__RichardsComponentTransport__process_variables__concentration}
- "concentration",
- //! \ogs_file_param_special{prj__processes__process__RichardsComponentTransport__process_variables__pressure}
- "pressure"});
+ auto per_process_variables =
+ findProcessVariables(variables, pv_config, {variable_names[i]});
+ process_variables.push_back(std::move(per_process_variables));
+ }
+ }
auto const& porous_medium_configs =
//! \ogs_file_param{prj__processes__process__RichardsComponentTransport__porous_medium}
@@ -146,7 +171,8 @@ std::unique_ptr<Process> createRichardsComponentTransportProcess(
return std::make_unique<RichardsComponentTransportProcess>(
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));
+ std::move(secondary_variables), std::move(named_function_caller),
+ use_monolithic_scheme);
}
} // namespace RichardsComponentTransport
diff --git a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.cpp b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.cpp
index fe2b08124d9..4071442b6d0 100644
--- a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.cpp
+++ b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.cpp
@@ -26,10 +26,12 @@ RichardsComponentTransportProcess::RichardsComponentTransportProcess(
process_variables,
RichardsComponentTransportProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
- NumLib::NamedFunctionCaller&& named_function_caller)
+ NumLib::NamedFunctionCaller&& named_function_caller,
+ bool const use_monolithic_scheme)
: Process(mesh, std::move(jacobian_assembler), parameters,
integration_order, std::move(process_variables),
- std::move(secondary_variables), std::move(named_function_caller)),
+ std::move(secondary_variables), std::move(named_function_caller),
+ use_monolithic_scheme),
_process_data(std::move(process_data))
{
}
diff --git a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.h b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.h
index 02f2b662844..357982028cd 100644
--- a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.h
+++ b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.h
@@ -111,7 +111,8 @@ public:
process_variables,
RichardsComponentTransportProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
- NumLib::NamedFunctionCaller&& named_function_caller);
+ NumLib::NamedFunctionCaller&& named_function_caller,
+ bool const use_monolithic_scheme);
//! \name ODESystem interface
//! @{
diff --git a/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp b/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp
index e785b49dc3d..470d7681702 100644
--- a/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp
+++ b/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp
@@ -36,41 +36,71 @@ std::unique_ptr<Process> createThermoMechanicsProcess(
config.checkConfigParameter("type", "THERMO_MECHANICS");
DBUG("Create ThermoMechanicsProcess.");
+ 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 =
+ (staggered_scheme && (*staggered_scheme == "staggered")) ? false : true;
+
// Process variable.
//! \ogs_file_param{prj__processes__process__THERMO_MECHANICS__process_variables}
auto const pv_config = config.getConfigSubtree("process_variables");
- auto process_variables = findProcessVariables(
- variables, pv_config,
- {//! \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}
- "displacement"});
+ ProcessVariable* variable_T;
+ ProcessVariable* variable_u;
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>
+ process_variables;
+ if (use_monolithic_scheme) // monolithic scheme.
+ {
+ auto per_process_variables = findProcessVariables(
+ variables, pv_config,
+ {//! \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}
+ "displacement"});
+ variable_T = &per_process_variables[0].get();
+ variable_u = &per_process_variables[1].get();
+ process_variables.push_back(std::move(per_process_variables));
+ }
+ else // staggered scheme.
+ {
+ std::array<std::string, 2> variable_names = {
+ {"temperature",
+ "displacement"}}; // double-braces required in C++11 (not in C++14)
+
+ for (int i = 0; i < 2; i++)
+ {
+ auto per_process_variables =
+ findProcessVariables(variables, pv_config, {variable_names[i]});
+ process_variables.push_back(std::move(per_process_variables));
+ }
+ variable_T = &process_variables[0][0].get();
+ variable_u = &process_variables[1][0].get();
+ }
DBUG("Associate displacement with process variable \'%s\'.",
- process_variables[1].get().getName().c_str());
+ variable_u->getName().c_str());
- if (process_variables[1].get().getNumberOfComponents() != DisplacementDim)
+ if (variable_u->getNumberOfComponents() != DisplacementDim)
{
OGS_FATAL(
"Number of components of the process variable '%s' is different "
"from the displacement dimension: got %d, expected %d",
- process_variables[1].get().getName().c_str(),
- process_variables[1].get().getNumberOfComponents(),
+ variable_u->getName().c_str(),
+ variable_u->getNumberOfComponents(),
DisplacementDim);
}
DBUG("Associate temperature with process variable \'%s\'.",
- process_variables[0].get().getName().c_str());
- if (process_variables[0].get().getNumberOfComponents() != 1)
+ variable_T->getName().c_str());
+ if (variable_T->getNumberOfComponents() != 1)
{
OGS_FATAL(
- "Temperature process variable '%s' is not a scalar variable but has "
+ "Pressure process variable '%s' is not a scalar variable but has "
"%d components.",
- process_variables[0].get().getName().c_str(),
- process_variables[0].get().getNumberOfComponents(),
- DisplacementDim);
+ variable_T->getName().c_str(),
+ variable_T->getNumberOfComponents());
}
// Constitutive relation.
@@ -179,7 +209,8 @@ std::unique_ptr<Process> createThermoMechanicsProcess(
return std::make_unique<ThermoMechanicsProcess<DisplacementDim>>(
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));
+ std::move(secondary_variables), std::move(named_function_caller),
+ use_monolithic_scheme);
}
template std::unique_ptr<Process> createThermoMechanicsProcess<2>(
diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess-impl.h b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess-impl.h
index e5e847e14a9..5429bda2beb 100644
--- a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess-impl.h
+++ b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess-impl.h
@@ -32,10 +32,12 @@ ThermoMechanicsProcess<DisplacementDim>::ThermoMechanicsProcess(
process_variables,
ThermoMechanicsProcessData<DisplacementDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
- NumLib::NamedFunctionCaller&& named_function_caller)
+ NumLib::NamedFunctionCaller&& named_function_caller,
+ bool const use_monolithic_scheme)
: Process(mesh, std::move(jacobian_assembler), parameters,
integration_order, std::move(process_variables),
- std::move(secondary_variables), std::move(named_function_caller)),
+ std::move(secondary_variables), std::move(named_function_caller),
+ use_monolithic_scheme),
_process_data(std::move(process_data))
{
}
diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h
index 09822f2f9f9..f874a55752a 100644
--- a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h
+++ b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h
@@ -36,7 +36,8 @@ public:
process_variables,
ThermoMechanicsProcessData<DisplacementDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
- NumLib::NamedFunctionCaller&& named_function_caller);
+ NumLib::NamedFunctionCaller&& named_function_caller,
+ bool const use_monolithic_scheme);
//! \name ODESystem interface
//! @{
--
GitLab