Commit d02928d7 authored by wenqing's avatar wenqing
Browse files

Merge branch 'THM_update' into 'master'

Replaced the hard coded solid density model in THM with the MPL property

See merge request !3714
parents 6e434208 344e411e
Pipeline #5640 failed with stages
in 53 minutes
Reference temperature for the thermal part of thermo-hydro-mechanical process.
......@@ -126,14 +126,6 @@ std::unique_ptr<Process> createThermoHydroMechanicsProcess(
MaterialLib::Solids::createConstitutiveRelations<DisplacementDim>(
parameters, local_coordinate_system, config);
// reference temperature
auto const& reference_temperature = ParameterLib::findParameter<double>(
config,
//! \ogs_file_param_special{prj__processes__process__THERMO_HYDRO_MECHANICS__reference_temperature}
"reference_temperature", parameters, 1, &mesh);
DBUG("Use '{:s}' as reference temperature parameter.",
reference_temperature.name);
// Specific body force
Eigen::Matrix<double, DisplacementDim, 1> specific_body_force;
{
......@@ -169,7 +161,6 @@ std::unique_ptr<Process> createThermoHydroMechanicsProcess(
std::move(media_map),
std::move(solid_constitutive_relations),
initial_stress,
reference_temperature,
specific_body_force};
SecondaryVariableCollection secondary_variables;
......
......@@ -319,15 +319,6 @@ void ThermoHydroMechanicsLocalAssembler<ShapeFunctionDisplacement,
dthermal_strain =
solid_linear_thermal_expansion_coefficient * dT_int_pt;
double const T_ref =
_process_data.reference_temperature(t, x_position)[0];
double const rho_s =
solid_density *
(1 -
Invariants::trace(solid_linear_thermal_expansion_coefficient) *
T_int_pt -
T_ref);
auto const K_pT_thermal_osmosis =
(solid_phase.hasProperty(
MaterialPropertyLib::PropertyType::thermal_osmosis_coefficient)
......@@ -362,7 +353,8 @@ void ThermoHydroMechanicsLocalAssembler<ShapeFunctionDisplacement,
displacement_index, displacement_index)
.noalias() += B.transpose() * C * B * w;
auto const rho = rho_s * (1 - porosity) + porosity * fluid_density;
auto const rho =
solid_density * (1 - porosity) + porosity * fluid_density;
local_rhs.template segment<displacement_size>(displacement_index)
.noalias() -=
(B.transpose() * sigma_eff - N_u_op.transpose() * rho * b) * w;
......
......@@ -50,7 +50,6 @@ struct ThermoHydroMechanicsProcessData
/// representation of length 4 or 6, ParameterLib::Parameter<double>.
ParameterLib::Parameter<double> const* const initial_stress;
ParameterLib::Parameter<double> const& reference_temperature;
/// Specific body forces applied to solid and fluid.
/// It is usually used to apply gravitational forces.
/// A vector of displacement dimension's length.
......
......@@ -37,7 +37,6 @@
<secondary_variable internal_name="velocity" output_name="velocity"/>
</secondary_variables>
<initial_stress>sigma0</initial_stress>
<reference_temperature>temperature_outside</reference_temperature>
</process>
</processes>
<media>
......
......@@ -13,7 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
<reference_temperature>T0</reference_temperature>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
......@@ -350,11 +349,6 @@
<type>Constant</type>
<value>0.3</value>
</parameter>
<parameter>
<name>T0</name>
<type>Constant</type>
<value>283.15</value>
</parameter>
<parameter>
<name>displacement0</name>
<type>Constant</type>
......
......@@ -13,7 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
<reference_temperature>T0</reference_temperature>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
......@@ -355,11 +354,6 @@
<type>Constant</type>
<value>0.3</value>
</parameter>
<parameter>
<name>T0</name>
<type>Constant</type>
<value>283.15</value>
</parameter>
<parameter>
<name>displacement0</name>
<type>Constant</type>
......
......@@ -13,7 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
<reference_temperature>T0</reference_temperature>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
......@@ -79,9 +78,19 @@
<value>2.7e-10 0 0 2.7e-10</value>
</property>
<property>
<!-- rho_s= rho_0 exp(-alpha_T (T-T0))-->
<name>density</name>
<type>Constant</type>
<value>2610</value>
<type>Exponential</type>
<!-- Reference density rho_0 -->
<reference_value>2610</reference_value>
<exponent>
<variable_name>temperature</variable_name>
<!-- Reference temeperature T0 -->
<reference_condition>283.15</reference_condition>
<!-- Volumetric thermal expansivity with sign-->
<factor>-3.0e-6</factor>
</exponent>
<offset>0.0</offset>
</property>
<property>
<name>thermal_conductivity</name>
......
......@@ -18,7 +18,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
<reference_temperature>T0</reference_temperature>
<process_variables>
<temperature>temperature</temperature>
<pressure>pressure</pressure>
......
......@@ -13,7 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
<reference_temperature>T0</reference_temperature>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
......@@ -168,11 +167,6 @@
<type>Constant</type>
<value>0.3</value>
</parameter>
<parameter>
<name>T0</name>
<type>Constant</type>
<value>273.15</value>
</parameter>
<parameter>
<name>displacement0</name>
<type>Constant</type>
......
......@@ -13,7 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
<reference_temperature>T0</reference_temperature>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
......@@ -168,11 +167,6 @@
<type>Constant</type>
<value>0.3</value>
</parameter>
<parameter>
<name>T0</name>
<type>Constant</type>
<value>273.15</value>
</parameter>
<parameter>
<name>displacement0</name>
<type>Constant</type>
......
......@@ -13,7 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
<reference_temperature>T0</reference_temperature>
<process_variables>
<temperature>temperature</temperature>
<pressure>pressure</pressure>
......@@ -168,11 +167,6 @@
<type>Constant</type>
<value>0.3</value>
</parameter>
<parameter>
<name>T0</name>
<type>Constant</type>
<value>273.15</value>
</parameter>
<parameter>
<name>displacement0</name>
<type>Constant</type>
......
......@@ -20,7 +20,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
<reference_temperature>temperature0</reference_temperature>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
......
......@@ -20,7 +20,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
<reference_temperature>temperature0</reference_temperature>
<process_variables>
<displacement>displacement</displacement>
<!-- beta*DeltaT/((alpha-phi)*(1-alpha)/K) //-->
......
......@@ -20,7 +20,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
<reference_temperature>temperature0</reference_temperature>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
......
......@@ -20,7 +20,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
<reference_temperature>temperature0</reference_temperature>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
......
......@@ -13,7 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
<reference_temperature>temperature0</reference_temperature>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
......
......@@ -13,7 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
<reference_temperature>temperature0</reference_temperature>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
......
......@@ -13,7 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
<reference_temperature>temperature_ic</reference_temperature>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
......
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