Commit 5f9cdb0b authored by Tom Fischer's avatar Tom Fischer
Browse files

Merge branch 'trm-re-enable-pressure-dependent-density' into 'master'

TRM: Re-enable pressure dependent density.

See merge request ogs/ogs!4236
parents 094a91d1 cfae9fed
......@@ -10,7 +10,6 @@
#include "FluidThermalExpansion.h"
#include "MaterialLib/MPL/Utils/FormKelvinVectorFromThermalExpansivity.h"
#include "MaterialLib/MPL/Utils/GetLiquidThermalExpansivity.h"
namespace ProcessLib::ThermoRichardsMechanics
......@@ -18,6 +17,8 @@ namespace ProcessLib::ThermoRichardsMechanics
template <int DisplacementDim>
void FluidThermalExpansionModel<DisplacementDim>::eval(
SpaceTimeData const& x_t, MediaData const& media_data,
CapillaryPressureData<DisplacementDim> const& p_cap_data,
TemperatureData<DisplacementDim> const& T_data,
SolidThermalExpansionData<DisplacementDim> const& s_therm_exp_data,
PorosityData const& poro_data, LiquidDensityData const& rho_L_data,
BiotData const& biot_data, FluidThermalExpansionData& out) const
......@@ -28,6 +29,9 @@ void FluidThermalExpansionModel<DisplacementDim>::eval(
namespace MPL = MaterialPropertyLib;
MPL::VariableArray variables;
variables[static_cast<int>(MPL::Variable::phase_pressure)] =
-p_cap_data.p_cap;
variables[static_cast<int>(MPL::Variable::temperature)] = -T_data.T;
double const phi = poro_data.phi;
double const alpha = biot_data.alpha;
......
......@@ -11,7 +11,6 @@
#pragma once
#include "LiquidDensity.h"
#include "MathLib/KelvinVector.h"
#include "Porosity.h"
#include "SolidThermalExpansion.h"
......@@ -27,6 +26,8 @@ struct FluidThermalExpansionModel
{
void eval(
SpaceTimeData const& x_t, MediaData const& media_data,
CapillaryPressureData<DisplacementDim> const& p_cap_data,
TemperatureData<DisplacementDim> const& T_data,
SolidThermalExpansionData<DisplacementDim> const& s_therm_exp_data,
PorosityData const& poro_data, LiquidDensityData const& rho_L_data,
BiotData const& biot_data, FluidThermalExpansionData& out) const;
......
......@@ -144,8 +144,9 @@ void ConstitutiveSetting<DisplacementDim>::eval(
dS_L_data, poro_data, p_cap_data, T_data,
vap_data);
models.f_therm_exp_model.eval(x_t, media_data, s_therm_exp_data, poro_data,
rho_L_data, biot_data, f_therm_exp_data);
models.f_therm_exp_model.eval(x_t, media_data, p_cap_data, T_data,
s_therm_exp_data, poro_data, rho_L_data,
biot_data, f_therm_exp_data);
models.storage_model.eval(x_t, biot_data, poro_data, rho_L_data, S_L_data,
dS_L_data, prev_state.S_L_data, p_cap_data,
......
......@@ -46,13 +46,18 @@
</property>
<property>
<name>density</name>
<type>Linear</type>
<reference_value>1e3</reference_value>
<independent_variable>
<type>Function</type>
<value>
<expression>1e3 * (1 + 5e-10 * (phase_pressure - 0)) + temperature - temperature</expression>
</value>
<dvalue>
<variable_name>phase_pressure</variable_name>
<reference_condition>0</reference_condition>
<slope>5e-10</slope>
</independent_variable>
<expression>1e3 * 5e-10</expression>
</dvalue>
<dvalue>
<variable_name>temperature</variable_name>
<expression>0</expression>
</dvalue>
</property>
<property>
<name>specific_heat_capacity</name>
......
Supports Markdown
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