Skip to content
Snippets Groups Projects
Commit c22f9958 authored by Christoph Lehmann's avatar Christoph Lehmann
Browse files

[PL/TRM] Use StrongType for liquid viscosity

parent 17c2eaec
No related branches found
No related tags found
No related merge requests found
...@@ -21,7 +21,7 @@ void DarcyLawModel<DisplacementDim>::eval( ...@@ -21,7 +21,7 @@ void DarcyLawModel<DisplacementDim>::eval(
ThermoOsmosisData<DisplacementDim> const& th_osmosis_data, ThermoOsmosisData<DisplacementDim> const& th_osmosis_data,
DarcyLawData<DisplacementDim>& out) const DarcyLawData<DisplacementDim>& out) const
{ {
*out = perm_data.Ki / mu_L_data.viscosity * *out = perm_data.Ki / mu_L_data() *
(perm_data.k_rel * (perm_data.k_rel *
(p_cap_data.grad_p_cap + rho_L_data.rho_LR * b_)) + (p_cap_data.grad_p_cap + rho_L_data.rho_LR * b_)) +
th_osmosis_data.seepage_velocity_contribution; th_osmosis_data.seepage_velocity_contribution;
......
...@@ -29,14 +29,14 @@ void EqPModel<DisplacementDim>::eval( ...@@ -29,14 +29,14 @@ void EqPModel<DisplacementDim>::eval(
{ {
out.M_pu_X_BTI2N = S_L_data.S_L * rho_L_data.rho_LR * biot_data(); out.M_pu_X_BTI2N = S_L_data.S_L * rho_L_data.rho_LR * biot_data();
out.K_pp_Laplace = perm_data.k_rel * rho_L_data.rho_LR * perm_data.Ki / out.K_pp_Laplace =
mu_L_data.viscosity; perm_data.k_rel * rho_L_data.rho_LR * perm_data.Ki / mu_L_data();
out.J_pp_X_BTI2NT_u_dot_N = out.J_pp_X_BTI2NT_u_dot_N =
-rho_L_data.rho_LR * dS_L_data.dS_L_dp_cap * biot_data(); -rho_L_data.rho_LR * dS_L_data.dS_L_dp_cap * biot_data();
out.J_pp_dNT_V_N = out.J_pp_dNT_V_N =
perm_data.Ki / mu_L_data.viscosity * perm_data.Ki / mu_L_data() *
(rho_L_data.rho_LR * perm_data.dk_rel_dS_L * dS_L_data.dS_L_dp_cap * (rho_L_data.rho_LR * perm_data.dk_rel_dS_L * dS_L_data.dS_L_dp_cap *
(p_cap_data.grad_p_cap + rho_L_data.rho_LR * b_)); (p_cap_data.grad_p_cap + rho_L_data.rho_LR * b_));
......
...@@ -24,9 +24,8 @@ void LiquidViscosityModel<DisplacementDim>::eval( ...@@ -24,9 +24,8 @@ void LiquidViscosityModel<DisplacementDim>::eval(
variables.temperature = T_data.T; variables.temperature = T_data.T;
variables.density = rho_L_data.rho_LR; variables.density = rho_L_data.rho_LR;
out.viscosity = *out = media_data.liquid.property(MPL::PropertyType::viscosity)
media_data.liquid.property(MPL::PropertyType::viscosity) .template value<double>(variables, x_t.x, x_t.t, x_t.dt);
.template value<double>(variables, x_t.x, x_t.t, x_t.dt);
} }
template struct LiquidViscosityModel<2>; template struct LiquidViscosityModel<2>;
......
...@@ -11,20 +11,18 @@ ...@@ -11,20 +11,18 @@
#pragma once #pragma once
#include "Base.h" #include "Base.h"
#include "BaseLib/StrongType.h"
#include "LiquidDensity.h" #include "LiquidDensity.h"
namespace ProcessLib::ThermoRichardsMechanics namespace ProcessLib::ThermoRichardsMechanics
{ {
struct LiquidViscosityData using LiquidViscosityData =
{ BaseLib::StrongType<double, struct LiquidViscosityDataTag>;
double viscosity;
static auto reflect() constexpr std::string_view ioName(struct LiquidViscosityDataTag*)
{ {
return ProcessLib::Reflection::reflectWithName( return "viscosity";
"viscosity", &LiquidViscosityData::viscosity); }
}
};
template <int DisplacementDim> template <int DisplacementDim>
struct LiquidViscosityModel struct LiquidViscosityModel
......
...@@ -69,8 +69,7 @@ void TRMHeatStorageAndFluxModel<DisplacementDim>::eval( ...@@ -69,8 +69,7 @@ void TRMHeatStorageAndFluxModel<DisplacementDim>::eval(
// temperature equation, pressure part // temperature equation, pressure part
// //
out.K_Tp_NT_V_dN = -volumetric_heat_capacity_liquid * perm.k_rel / out.K_Tp_NT_V_dN = -volumetric_heat_capacity_liquid * perm.k_rel /
mu_L_data.viscosity * mu_L_data() * (perm.Ki.transpose() * T_data.grad_T);
(perm.Ki.transpose() * T_data.grad_T);
out.K_Tp_X_NTN = -volumetric_heat_capacity_liquid * out.K_Tp_X_NTN = -volumetric_heat_capacity_liquid *
darcy_data().dot(T_data.grad_T) / perm.k_rel * darcy_data().dot(T_data.grad_T) / perm.k_rel *
perm.dk_rel_dS_L * dS_L_data.dS_L_dp_cap; perm.dk_rel_dS_L * dS_L_data.dS_L_dp_cap;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment