From 81ad41e210dba87d2a5547d980001075063add9e Mon Sep 17 00:00:00 2001 From: Dmitri Naumov <github@naumov.de> Date: Sun, 1 Mar 2020 12:45:44 +0100 Subject: [PATCH] [PL/RM] Reorder; move permeability computation. --- .../RichardsMechanicsFEM-impl.h | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h b/ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h index c1368c241a0..15288e84d58 100644 --- a/ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h +++ b/ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h @@ -587,17 +587,6 @@ void RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement, double const chi_S_L = chi(S_L); double const chi_S_L_prev = chi(S_L_prev); - double const k_rel = - medium->property(MPL::PropertyType::relative_permeability) - .template value<double>(variables, x_position, t, dt); - auto const mu = liquid_phase.property(MPL::PropertyType::viscosity) - .template value<double>(variables, x_position, t, dt); - auto const K_intrinsic = MPL::formEigenTensor<DisplacementDim>( - solid_phase.property(MPL::PropertyType::permeability) - .value(variables, x_position, t, dt)); - - GlobalDimMatrixType const rho_Ki_over_mu = K_intrinsic * rho_LR / mu; - variables[static_cast<int>( MPL::Variable::effective_pore_pressure_rate)] = (chi_S_L * (-p_cap_ip) - @@ -626,6 +615,17 @@ void RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement, dt; } + double const k_rel = + medium->property(MPL::PropertyType::relative_permeability) + .template value<double>(variables, x_position, t, dt); + auto const mu = liquid_phase.property(MPL::PropertyType::viscosity) + .template value<double>(variables, x_position, t, dt); + auto const K_intrinsic = MPL::formEigenTensor<DisplacementDim>( + solid_phase.property(MPL::PropertyType::permeability) + .value(variables, x_position, t, dt)); + + GlobalDimMatrixType const rho_Ki_over_mu = K_intrinsic * rho_LR / mu; + // // displacement equation, displacement part // -- GitLab