diff --git a/ProcessLib/HT/CreateHTProcess.cpp b/ProcessLib/HT/CreateHTProcess.cpp
index 8c421c21434e24eac6ca26b5785f2dc6f10b1f80..ca665c136bea98c4cd6982489c60c1d229f6c7f4 100644
--- a/ProcessLib/HT/CreateHTProcess.cpp
+++ b/ProcessLib/HT/CreateHTProcess.cpp
@@ -75,6 +75,10 @@ std::unique_ptr<Process> createHTProcess(
process_variables.push_back(std::move(per_process_variables));
}
}
+ // Process IDs, which are set according to the appearance order of the
+ // process variables.
+ const int _heat_transport_process_id = 0;
+ const int _hydraulic_process_id = 1;
MaterialLib::PorousMedium::PorousMediaProperties porous_media_properties{
MaterialLib::PorousMedium::createPorousMediaProperties(mesh, config,
@@ -239,7 +243,8 @@ std::unique_ptr<Process> createHTProcess(
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),
- use_monolithic_scheme, std::move(surfaceflux));
+ use_monolithic_scheme, std::move(surfaceflux),
+ _heat_transport_process_id, _hydraulic_process_id);
}
} // namespace HT
diff --git a/ProcessLib/HT/HTProcess.cpp b/ProcessLib/HT/HTProcess.cpp
index 2e22402088e6402a0663b8d8239844d74950dc76..d19f57f597b89dcecb5c982326f7f2fc589d7293 100644
--- a/ProcessLib/HT/HTProcess.cpp
+++ b/ProcessLib/HT/HTProcess.cpp
@@ -35,13 +35,17 @@ HTProcess::HTProcess(
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller,
bool const use_monolithic_scheme,
- std::unique_ptr<ProcessLib::SurfaceFluxData>&& surfaceflux)
+ std::unique_ptr<ProcessLib::SurfaceFluxData>&& surfaceflux,
+ const int heat_transport_process_id,
+ const int hydraulic_process_id)
: Process(mesh, std::move(jacobian_assembler), parameters,
integration_order, std::move(process_variables),
std::move(secondary_variables), std::move(named_function_caller),
use_monolithic_scheme),
_material_properties(std::move(material_properties)),
- _surfaceflux(std::move(surfaceflux))
+ _surfaceflux(std::move(surfaceflux)),
+ _heat_transport_process_id(heat_transport_process_id),
+ _hydraulic_process_id(hydraulic_process_id)
{
}
@@ -67,14 +71,11 @@ void HTProcess::initializeConcreteProcess(
}
else
{
- const int heat_transport_process_id = 0;
- const int hydraulic_process_id = 1;
-
ProcessLib::createLocalAssemblers<StaggeredHTFEM>(
mesh.getDimension(), mesh.getElements(), dof_table,
pv.getShapeFunctionOrder(), _local_assemblers,
mesh.isAxiallySymmetric(), integration_order, *_material_properties,
- heat_transport_process_id, hydraulic_process_id);
+ _heat_transport_process_id, _hydraulic_process_id);
}
_secondary_variables.addSecondaryVariable(
@@ -99,7 +100,7 @@ void HTProcess::assembleConcreteProcess(const double t,
}
else
{
- if (_coupled_solutions->process_id == 0)
+ if (_coupled_solutions->process_id == _heat_transport_process_id)
{
DBUG(
"Assemble the equations of heat transport process within "
@@ -152,8 +153,8 @@ void HTProcess::assembleWithJacobianConcreteProcess(
ProcessLib::ProcessVariable const& pv = getProcessVariables(process_id)[0];
GlobalExecutor::executeSelectedMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
- _local_assemblers, pv.getActiveElementIDs(), dof_tables, t, x,
- xdot, dxdot_dx, dx_dx, M, K, b, Jac, _coupled_solutions);
+ _local_assemblers, pv.getActiveElementIDs(), dof_tables, t, x, xdot,
+ dxdot_dx, dx_dx, M, K, b, Jac, _coupled_solutions);
}
void HTProcess::preTimestepConcreteProcess(GlobalVector const& x,
@@ -192,8 +193,7 @@ void HTProcess::setCoupledTermForTheStaggeredSchemeToLocalAssemblers()
ProcessLib::ProcessVariable const& pv = getProcessVariables(process_id)[0];
GlobalExecutor::executeSelectedMemberOnDereferenced(
&HTLocalAssemblerInterface::setStaggeredCoupledSolutions,
- _local_assemblers, pv.getActiveElementIDs(),
- _coupled_solutions);
+ _local_assemblers, pv.getActiveElementIDs(), _coupled_solutions);
}
std::tuple<NumLib::LocalToGlobalIndexMap*, bool>
@@ -220,29 +220,27 @@ HTProcess::getDOFTableForExtrapolatorData() const
manage_storage);
}
-void HTProcess::setCoupledSolutionsOfPreviousTimeStep()
+void HTProcess::setCoupledSolutionsOfPreviousTimeStepPerProcess(
+ const int process_id)
{
- const auto number_of_coupled_solutions =
- _coupled_solutions->coupled_xs.size();
- _coupled_solutions->coupled_xs_t0.clear();
- _coupled_solutions->coupled_xs_t0.reserve(number_of_coupled_solutions);
- const int process_id = _coupled_solutions->process_id;
- for (std::size_t i = 0; i < number_of_coupled_solutions; i++)
+ const auto& x_t0 = _xs_previous_timestep[process_id];
+ if (x_t0 == nullptr)
{
- const auto& x_t0 = _xs_previous_timestep[process_id];
- if (x_t0 == nullptr)
- {
- OGS_FATAL(
- "Memory is not allocated for the global vector "
- "of the solution of the previous time step for the ."
- "staggered scheme.\n It can be done by overriding "
- "Process::preTimestepConcreteProcess"
- "(ref. HTProcess::preTimestepConcreteProcess) ");
- }
-
- MathLib::LinAlg::setLocalAccessibleVector(*x_t0);
- _coupled_solutions->coupled_xs_t0.emplace_back(x_t0.get());
+ OGS_FATAL(
+ "Memory is not allocated for the global vector of the solution of "
+ "the previous time step for the staggered scheme.\n It can be done "
+ "by overriding Process::preTimestepConcreteProcess (ref. "
+ "HTProcess::preTimestepConcreteProcess) ");
}
+
+ _coupled_solutions->coupled_xs_t0[process_id] = x_t0.get();
+}
+
+void HTProcess::setCoupledSolutionsOfPreviousTimeStep()
+{
+ _coupled_solutions->coupled_xs_t0.resize(2);
+ setCoupledSolutionsOfPreviousTimeStepPerProcess(_heat_transport_process_id);
+ setCoupledSolutionsOfPreviousTimeStepPerProcess(_hydraulic_process_id);
}
Eigen::Vector3d HTProcess::getFlux(std::size_t element_id,
@@ -259,7 +257,7 @@ Eigen::Vector3d HTProcess::getFlux(std::size_t element_id,
return _local_assemblers[element_id]->getFlux(p, t, local_x);
}
-// this is almost a copy of the implemention in the GroundwaterFlow
+// this is almost a copy of the implementation in the GroundwaterFlow
void HTProcess::postTimestepConcreteProcess(GlobalVector const& x,
const double t,
const double /*delta_t*/,
@@ -272,7 +270,7 @@ void HTProcess::postTimestepConcreteProcess(GlobalVector const& x,
"The condition of process_id = 0 must be satisfied for "
"monolithic HTProcess, which is a single process.");
}
- if (!_use_monolithic_scheme && process_id != 1)
+ if (!_use_monolithic_scheme && process_id != _hydraulic_process_id)
{
DBUG("This is the thermal part of the staggered HTProcess.");
return;
diff --git a/ProcessLib/HT/HTProcess.h b/ProcessLib/HT/HTProcess.h
index 7b5a93a70578a220e50b585a5230b4aaf7aba24b..a955d35d4ae8402d0a6075ac83cbd94249e6edbb 100644
--- a/ProcessLib/HT/HTProcess.h
+++ b/ProcessLib/HT/HTProcess.h
@@ -61,8 +61,9 @@ public:
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller,
bool const use_monolithic_scheme,
- std::unique_ptr<ProcessLib::SurfaceFluxData>&& surfaceflux);
-
+ std::unique_ptr<ProcessLib::SurfaceFluxData>&& surfaceflux,
+ const int heat_transport_process_id,
+ const int hydraulic_process_id);
//! \name ODESystem interface
//! @{
@@ -100,8 +101,11 @@ private:
double const dt,
const int process_id) override;
+ void setCoupledSolutionsOfPreviousTimeStepPerProcess(const int process_id);
+
/// Set the solutions of the previous time step to the coupled term.
- /// It only performs for the staggered scheme.
+ /// It is only for the staggered scheme, and it must be called within
+ /// the coupling loop because that the coupling term is only created there.
void setCoupledSolutionsOfPreviousTimeStep();
/**
@@ -118,6 +122,9 @@ private:
std::array<std::unique_ptr<GlobalVector>, 2> _xs_previous_timestep;
std::unique_ptr<ProcessLib::SurfaceFluxData> _surfaceflux;
+
+ const int _heat_transport_process_id;
+ const int _hydraulic_process_id;
};
} // namespace HT