Commit 2f7741ce authored by wenqing's avatar wenqing
Browse files

[TRM] Update for the changes in RM for using drho_l/dp

parent ad484fd5
......@@ -36,8 +36,7 @@ void checkMPLProperties(
MaterialPropertyLib::relative_permeability,
MaterialPropertyLib::saturation};
std::array const required_liquid_properties = {
MaterialPropertyLib::viscosity, MaterialPropertyLib::density,
MaterialPropertyLib::bulk_modulus};
MaterialPropertyLib::viscosity, MaterialPropertyLib::density};
std::array const required_solid_properties = {MaterialPropertyLib::density};
// Thermal properties are not checked because they can be phase property or
......
......@@ -393,10 +393,6 @@ void ThermoRichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
variables[static_cast<int>(MPL::Variable::grain_compressibility)] =
beta_SR;
auto const K_LR =
liquid_phase.property(MPL::PropertyType::bulk_modulus)
.template value<double>(variables, x_position, t, dt);
auto const rho_LR =
liquid_phase.property(MPL::PropertyType::density)
.template value<double>(variables, x_position, t, dt);
......@@ -625,13 +621,19 @@ void ThermoRichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
laplace_p.noalias() +=
dNdx_p.transpose() * k_rel * rho_Ki_over_mu * dNdx_p * w;
const double alphaB_minu_phi = alpha - phi;
double const a0 = alphaB_minu_phi * beta_SR;
double const specific_storage_a_p = S_L * (phi / K_LR + S_L * a0);
auto const beta_LR = 1 / rho_LR *
liquid_phase.property(MPL::PropertyType::density)
.template dValue<double>(
variables, MPL::Variable::phase_pressure,
x_position, t, dt);
const double alphaB_minus_phi = alpha - phi;
double const a0 = alphaB_minus_phi * beta_SR;
double const specific_storage_a_p = S_L * (phi * beta_LR + S_L * a0);
double const specific_storage_a_S = phi - p_cap_ip * S_L * a0;
double const dspecific_storage_a_p_dp_cap =
dS_L_dp_cap * (phi / K_LR + 2 * S_L * a0);
dS_L_dp_cap * (phi * beta_LR + 2 * S_L * a0);
double const dspecific_storage_a_S_dp_cap =
-a0 * (S_L + p_cap_ip * dS_L_dp_cap);
......@@ -695,7 +697,7 @@ void ThermoRichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
MPL::getLiquidThermalExpansivity(liquid_phase, variables,
rho_LR, x_position, t, dt);
const double eff_thermal_expansion =
alphaB_minu_phi *
alphaB_minus_phi *
solid_linear_thermal_expansion_coefficient.trace() +
phi * fluid_volumetric_thermal_expansion_coefficient;
......
......@@ -32,11 +32,6 @@
<phase>
<type>AqueousLiquid</type>
<properties>
<property>
<name>bulk_modulus</name>
<type>Constant</type>
<value>1e100</value>
</property>
<property>
<name>viscosity</name>
<type>Constant</type>
......
......@@ -37,11 +37,6 @@
<phase>
<type>AqueousLiquid</type>
<properties>
<property>
<name>bulk_modulus</name>
<type>Constant</type>
<value>100e100</value>
</property>
<property>
<name>specific_heat_capacity</name>
<type>Constant</type>
......
......@@ -39,11 +39,6 @@
<phase>
<type>AqueousLiquid</type>
<properties>
<property>
<name>bulk_modulus</name>
<type>Constant</type>
<value>2e9</value>
</property>
<property>
<name>viscosity</name>
<type>Constant</type>
......@@ -51,8 +46,13 @@
</property>
<property>
<name>density</name>
<type>Constant</type>
<value>1e3</value>
<type>Linear</type>
<reference_value>1e3</reference_value>
<independent_variable>
<variable_name>phase_pressure</variable_name>
<reference_condition>0</reference_condition>
<slope>5e-10</slope>
</independent_variable>
</property>
<property>
<name>specific_heat_capacity</name>
......
......@@ -45,11 +45,6 @@
<phase>
<type>AqueousLiquid</type>
<properties>
<property>
<name>bulk_modulus</name>
<type>Constant</type>
<value>1e100</value>
</property>
<property>
<name>viscosity</name>
<type>Constant</type>
......
......@@ -32,11 +32,6 @@
<phase>
<type>AqueousLiquid</type>
<properties>
<property>
<name>bulk_modulus</name>
<type>Constant</type>
<value>2.2e300</value>
</property>
<property>
<name>viscosity</name>
<type>Constant</type>
......
......@@ -32,11 +32,6 @@
<phase>
<type>AqueousLiquid</type>
<properties>
<property>
<name>bulk_modulus</name>
<type>Constant</type>
<value>1e100</value>
</property>
<property>
<name>viscosity</name>
<type>Constant</type>
......
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