From a3a38f53f349f6b5762beeecc380589490d9c63e Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Tue, 27 Jun 2023 17:20:44 +0200
Subject: [PATCH] [HM] Replaced process id number with the corresponding
variable
---
ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp | 12 ++++++------
ProcessLib/HydroMechanics/HydroMechanicsProcess.h | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp b/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
index 7c3e597fed6..7e0082cd445 100644
--- a/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
+++ b/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
@@ -84,7 +84,7 @@ HydroMechanicsProcess<DisplacementDim>::getMatrixSpecifications(
{
// For the monolithic scheme or the M process (deformation) in the staggered
// scheme.
- if (_process_data.isMonolithicSchemeUsed() || process_id == 1)
+ if (process_id == _process_data.mechanics_related_process_id)
{
auto const& l = *_local_to_global_index_map;
return {l.dofSizeWithoutGhosts(), l.dofSizeWithoutGhosts(),
@@ -326,7 +326,7 @@ void HydroMechanicsProcess<DisplacementDim>::
else
{
// For the staggered scheme
- if (process_id == 0)
+ if (process_id == _process_data.hydraulic_process_id)
{
DBUG(
"Assemble the Jacobian equations of liquid fluid process in "
@@ -364,11 +364,11 @@ void HydroMechanicsProcess<DisplacementDim>::
std::negate<double>());
}
};
- if (use_monolithic_scheme || process_id == 0)
+ if (process_id == _process_data.hydraulic_process_id)
{
copyRhs(0, *_hydraulic_flow);
}
- if (use_monolithic_scheme || process_id == 1)
+ if (process_id == _process_data.mechanics_related_process_id)
{
copyRhs(1, *_nodal_forces);
}
@@ -398,7 +398,7 @@ void HydroMechanicsProcess<DisplacementDim>::postTimestepConcreteProcess(
std::vector<GlobalVector*> const& x_dot, double const t, double const dt,
const int process_id)
{
- if (process_id != 0)
+ if (process_id != _process_data.hydraulic_process_id)
{
return;
}
@@ -458,7 +458,7 @@ void HydroMechanicsProcess<DisplacementDim>::computeSecondaryVariableConcrete(
double const t, double const dt, std::vector<GlobalVector*> const& x,
GlobalVector const& x_dot, const int process_id)
{
- if (process_id != 0)
+ if (process_id != _process_data.hydraulic_process_id)
{
return;
}
diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcess.h b/ProcessLib/HydroMechanics/HydroMechanicsProcess.h
index fd814a4fbd6..9388da66cd2 100644
--- a/ProcessLib/HydroMechanics/HydroMechanicsProcess.h
+++ b/ProcessLib/HydroMechanics/HydroMechanicsProcess.h
@@ -146,7 +146,7 @@ private:
/// process has process_id == 1 in the staggered scheme.
bool hasMechanicalProcess(int const process_id) const
{
- return _process_data.isMonolithicSchemeUsed() || process_id == 1;
+ return process_id == _process_data.mechanics_related_process_id;
}
MeshLib::PropertyVector<double>* _nodal_forces = nullptr;
--
GitLab