From eb8e1d2559d204410306bc80adae2deb2e648795 Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Wed, 13 Dec 2017 10:36:42 +0100
Subject: [PATCH] [PCS] Condensed
HydroMechanicsProcess::assembleWithJacobianConcreteProcess
---
.../HydroMechanicsProcess-impl.h | 21 +++++++------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcess-impl.h b/ProcessLib/HydroMechanics/HydroMechanicsProcess-impl.h
index 29c79cd5125..d9804f7ce7e 100644
--- a/ProcessLib/HydroMechanics/HydroMechanicsProcess-impl.h
+++ b/ProcessLib/HydroMechanics/HydroMechanicsProcess-impl.h
@@ -298,31 +298,26 @@ void HydroMechanicsProcess<DisplacementDim>::
}
// For the staggered scheme
- // For the equations of displacement
- if (_coupled_solutions->process_id == 1)
+ if (_coupled_solutions->process_id == 0)
+ {
+ DBUG(
+ "Assemble the Jacobian equations of liquid fluid process in "
+ "HydroMechanics for the staggered scheme.");
+ }
+ else
{
DBUG(
"Assemble the Jacobian equations of mechanical process in "
"HydroMechanics for the staggered scheme.");
-
- GlobalExecutor::executeMemberDereferenced(
- _global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
- _local_assemblers, *_local_to_global_index_map, t, x, xdot,
- dxdot_dx, dx_dx, M, K, b, Jac, _coupled_solutions,
- _local_to_global_index_map_with_base_nodes.get());
- return;
}
- // For the equations of pressure
- DBUG(
- "Assemble the Jacobian equations of liquid fluid process in "
- "HydroMechanics for the staggered scheme.");
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
_local_assemblers, *_local_to_global_index_map, t, x,
xdot, dxdot_dx, dx_dx, M, K, b, Jac, _coupled_solutions,
_local_to_global_index_map_with_base_nodes.get());
}
+
template <int DisplacementDim>
void HydroMechanicsProcess<DisplacementDim>::preTimestepConcreteProcess(
GlobalVector const& x, double const t, double const dt,
--
GitLab