Commit cf9cd628 authored by Dmitry Yu. Naumov's avatar Dmitry Yu. Naumov

Merge branch 'HM_staggered_bugfix_pressure_interpolated_not_written' into 'master'

Drop coupled_xs from computeSecondaryVars. Fix pressure_interpolated in HM staggered.

See merge request ogs/ogs!3126
parents b87dcad4 4bf09b64
Pipeline #1496 passed with stages
in 122 minutes and 40 seconds
......@@ -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
......
......@@ -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
......
......@@ -524,12 +524,16 @@ void HydroMechanicsProcess<DisplacementDim>::computeSecondaryVariableConcrete(
double const t, double const dt, GlobalVector const& x,
GlobalVector const& x_dot, const int process_id)
{
if (process_id != 0)
{
return;
}
DBUG("Compute the secondary variables for HydroMechanicsProcess.");
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>
......
......@@ -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>
......
......@@ -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(
......
......@@ -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);
......
......@@ -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,
......
......@@ -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>
......
......@@ -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>;
......
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment