From d4d93f7967e14c5d6bf5d2af7dfacfa31967e052 Mon Sep 17 00:00:00 2001
From: Dominik Kern <dominik.kern1@ifgt.tu-freiberg.de>
Date: Thu, 24 Sep 2020 15:28:03 +0200
Subject: [PATCH] [PL] Remove unused coupled_xs computeSecondaryVars
---
ProcessLib/HeatConduction/HeatConductionProcess.cpp | 2 +-
ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp | 2 +-
ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp | 3 +--
.../LIE/SmallDeformation/SmallDeformationProcess.cpp | 2 +-
ProcessLib/LiquidFlow/LiquidFlowProcess.cpp | 2 +-
ProcessLib/LocalAssemblerInterface.cpp | 9 +--------
ProcessLib/LocalAssemblerInterface.h | 3 +--
.../RichardsMechanics/RichardsMechanicsProcess.cpp | 3 +--
ProcessLib/SmallDeformation/SmallDeformationProcess.cpp | 3 +--
.../ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp | 2 +-
10 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/ProcessLib/HeatConduction/HeatConductionProcess.cpp b/ProcessLib/HeatConduction/HeatConductionProcess.cpp
index 7124426f857..7affa6cac58 100644
--- a/ProcessLib/HeatConduction/HeatConductionProcess.cpp
+++ b/ProcessLib/HeatConduction/HeatConductionProcess.cpp
@@ -132,7 +132,7 @@ void HeatConductionProcess::computeSecondaryVariableConcrete(
GlobalExecutor::executeSelectedMemberOnDereferenced(
&HeatConductionLocalAssemblerInterface::computeSecondaryVariable,
_local_assemblers, pv.getActiveElementIDs(), getDOFTable(process_id), t,
- dt, x, x_dot, _coupled_solutions);
+ dt, x, x_dot);
}
} // namespace HeatConduction
diff --git a/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp b/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp
index a7f40e2c8bc..96a943db910 100644
--- a/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp
+++ b/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp
@@ -196,7 +196,7 @@ void HeatTransportBHEProcess::computeSecondaryVariableConcrete(
GlobalExecutor::executeSelectedMemberOnDereferenced(
&HeatTransportBHELocalAssemblerInterface::computeSecondaryVariable,
_local_assemblers, pv.getActiveElementIDs(), getDOFTable(process_id), t,
- dt, x, x_dot, _coupled_solutions);
+ dt, x, x_dot);
}
#ifdef OGS_USE_PYTHON
diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp b/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
index b994ada35a7..304762ca13a 100644
--- a/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
+++ b/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
@@ -528,8 +528,7 @@ void HydroMechanicsProcess<DisplacementDim>::computeSecondaryVariableConcrete(
ProcessLib::ProcessVariable const& pv = getProcessVariables(process_id)[0];
GlobalExecutor::executeSelectedMemberOnDereferenced(
&LocalAssemblerIF::computeSecondaryVariable, _local_assemblers,
- pv.getActiveElementIDs(), getDOFTable(process_id), t, dt, x, x_dot,
- _coupled_solutions);
+ pv.getActiveElementIDs(), getDOFTable(process_id), t, dt, x, x_dot);
}
template <int DisplacementDim>
diff --git a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp
index 26deeeb3669..9d07f5adb9f 100644
--- a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp
+++ b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp
@@ -537,7 +537,7 @@ void SmallDeformationProcess<DisplacementDim>::computeSecondaryVariableConcrete(
GlobalExecutor::executeSelectedMemberOnDereferenced(
&SmallDeformationLocalAssemblerInterface::computeSecondaryVariable,
_local_assemblers, pv.getActiveElementIDs(), getDOFTable(process_id), t,
- dt, x, x_dot, _coupled_solutions);
+ dt, x, x_dot);
}
template <int DisplacementDim>
diff --git a/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp b/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp
index ae54d245ff1..51c7b989f77 100644
--- a/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp
+++ b/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp
@@ -120,7 +120,7 @@ void LiquidFlowProcess::computeSecondaryVariableConcrete(
GlobalExecutor::executeSelectedMemberOnDereferenced(
&LiquidFlowLocalAssemblerInterface::computeSecondaryVariable,
_local_assemblers, pv.getActiveElementIDs(), getDOFTable(process_id), t,
- dt, x, x_dot, _coupled_solutions);
+ dt, x, x_dot);
}
Eigen::Vector3d LiquidFlowProcess::getFlux(
diff --git a/ProcessLib/LocalAssemblerInterface.cpp b/ProcessLib/LocalAssemblerInterface.cpp
index 40d0880dc77..a1e30460f72 100644
--- a/ProcessLib/LocalAssemblerInterface.cpp
+++ b/ProcessLib/LocalAssemblerInterface.cpp
@@ -72,16 +72,9 @@ void LocalAssemblerInterface::assembleWithJacobianForStaggeredScheme(
void LocalAssemblerInterface::computeSecondaryVariable(
std::size_t const mesh_item_id,
NumLib::LocalToGlobalIndexMap const& dof_table, double const t,
- double const dt, GlobalVector const& x, GlobalVector const& x_dot,
- CoupledSolutionsForStaggeredScheme const* coupled_xs)
+ double const dt, GlobalVector const& x, GlobalVector const& x_dot)
{
auto const indices = NumLib::getIndices(mesh_item_id, dof_table);
-
- if (coupled_xs != nullptr)
- {
- return;
- }
-
auto const local_x = x.get(indices);
auto const local_x_dot = x_dot.get(indices);
computeSecondaryVariableConcrete(t, dt, local_x, local_x_dot);
diff --git a/ProcessLib/LocalAssemblerInterface.h b/ProcessLib/LocalAssemblerInterface.h
index ca90d44fbff..9a42e20b46d 100644
--- a/ProcessLib/LocalAssemblerInterface.h
+++ b/ProcessLib/LocalAssemblerInterface.h
@@ -81,8 +81,7 @@ public:
std::size_t const mesh_item_id,
NumLib::LocalToGlobalIndexMap const& dof_table, double const t,
double const dt, GlobalVector const& local_x,
- GlobalVector const& local_x_dot,
- CoupledSolutionsForStaggeredScheme const* coupled_xs);
+ GlobalVector const& local_x_dot);
virtual void preTimestep(std::size_t const mesh_item_id,
NumLib::LocalToGlobalIndexMap const& dof_table,
diff --git a/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp b/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp
index c7e64883de9..0f117c1f912 100644
--- a/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp
+++ b/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp
@@ -586,8 +586,7 @@ void RichardsMechanicsProcess<DisplacementDim>::
GlobalExecutor::executeSelectedMemberOnDereferenced(
&LocalAssemblerIF::computeSecondaryVariable, _local_assemblers,
- pv.getActiveElementIDs(), getDOFTable(process_id), t, dt, x, x_dot,
- _coupled_solutions);
+ pv.getActiveElementIDs(), getDOFTable(process_id), t, dt, x, x_dot);
}
template <int DisplacementDim>
diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp b/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp
index b2b04be822b..f66e58fbf67 100644
--- a/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp
+++ b/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp
@@ -270,8 +270,7 @@ void SmallDeformationProcess<DisplacementDim>::computeSecondaryVariableConcrete(
ProcessLib::ProcessVariable const& pv = getProcessVariables(process_id)[0];
GlobalExecutor::executeSelectedMemberOnDereferenced(
&LocalAssemblerInterface::computeSecondaryVariable, _local_assemblers,
- pv.getActiveElementIDs(), getDOFTable(process_id), t, dt, x, x_dot,
- _coupled_solutions);
+ pv.getActiveElementIDs(), getDOFTable(process_id), t, dt, x, x_dot);
}
template class SmallDeformationProcess<2>;
template class SmallDeformationProcess<3>;
diff --git a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp
index 33d4a079f9c..e99e71ba8d8 100644
--- a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp
+++ b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp
@@ -385,7 +385,7 @@ void ThermoHydroMechanicsProcess<DisplacementDim>::
DBUG("Compute the secondary variables for ThermoHydroMechanicsProcess.");
GlobalExecutor::executeMemberOnDereferenced(
&LocalAssemblerInterface::computeSecondaryVariable, _local_assemblers,
- getDOFTable(process_id), t, dt, x, x_dot, _coupled_solutions);
+ getDOFTable(process_id), t, dt, x, x_dot);
}
template <int DisplacementDim>
--
GitLab