Skip to content
Snippets Groups Projects
Commit 770209ab authored by renchao.lu's avatar renchao.lu
Browse files

Merge branch 'clang_format' into 'master'

[THM] corrected clang-format in ThermoHydroMechanicsFEM-impl.h

See merge request ogs/ogs!3725
parents 17df6291 24fb68a5
No related branches found
No related tags found
No related merge requests found
...@@ -238,7 +238,8 @@ void ThermoHydroMechanicsLocalAssembler<ShapeFunctionDisplacement, ...@@ -238,7 +238,8 @@ void ThermoHydroMechanicsLocalAssembler<ShapeFunctionDisplacement,
vars[static_cast<int>(MaterialPropertyLib::Variable::phase_pressure)] = vars[static_cast<int>(MaterialPropertyLib::Variable::phase_pressure)] =
p_int_pt; p_int_pt;
vars[static_cast<int>(MaterialPropertyLib::Variable::liquid_saturation)] = 1.0; vars[static_cast<int>(
MaterialPropertyLib::Variable::liquid_saturation)] = 1.0;
auto const solid_density = auto const solid_density =
solid_phase.property(MaterialPropertyLib::PropertyType::density) solid_phase.property(MaterialPropertyLib::PropertyType::density)
...@@ -255,7 +256,8 @@ void ThermoHydroMechanicsLocalAssembler<ShapeFunctionDisplacement, ...@@ -255,7 +256,8 @@ void ThermoHydroMechanicsLocalAssembler<ShapeFunctionDisplacement,
->property(MaterialPropertyLib::PropertyType::biot_coefficient) ->property(MaterialPropertyLib::PropertyType::biot_coefficient)
.template value<double>(vars, x_position, t, dt); .template value<double>(vars, x_position, t, dt);
auto const solid_skeleton_compressibility = 1 / solid_material.getBulkModulus(t, x_position); auto const solid_skeleton_compressibility =
1 / solid_material.getBulkModulus(t, x_position);
auto const beta_SR = (1 - alpha) * solid_skeleton_compressibility; auto const beta_SR = (1 - alpha) * solid_skeleton_compressibility;
...@@ -288,9 +290,10 @@ void ThermoHydroMechanicsLocalAssembler<ShapeFunctionDisplacement, ...@@ -288,9 +290,10 @@ void ThermoHydroMechanicsLocalAssembler<ShapeFunctionDisplacement,
.template value<double>(vars, x_position, t, dt); .template value<double>(vars, x_position, t, dt);
auto const drho_dp = auto const drho_dp =
liquid_phase.property(MaterialPropertyLib::PropertyType::density) liquid_phase.property(MaterialPropertyLib::PropertyType::density)
.template dValue<double>( .template dValue<double>(
vars, MaterialPropertyLib::Variable::phase_pressure, x_position, t, dt); vars, MaterialPropertyLib::Variable::phase_pressure,
x_position, t, dt);
auto const fluid_compressibility = 1 / fluid_density * drho_dp; auto const fluid_compressibility = 1 / fluid_density * drho_dp;
...@@ -370,7 +373,10 @@ void ThermoHydroMechanicsLocalAssembler<ShapeFunctionDisplacement, ...@@ -370,7 +373,10 @@ void ThermoHydroMechanicsLocalAssembler<ShapeFunctionDisplacement,
// //
laplace_p.noalias() += dNdx_p.transpose() * K_over_mu * dNdx_p * w; laplace_p.noalias() += dNdx_p.transpose() * K_over_mu * dNdx_p * w;
storage_p.noalias() += N_p.transpose() * (porosity * fluid_compressibility + (alpha - porosity) * beta_SR) * N_p * w; storage_p.noalias() +=
N_p.transpose() *
(porosity * fluid_compressibility + (alpha - porosity) * beta_SR) *
N_p * w;
laplace_T.noalias() += laplace_T.noalias() +=
dNdx_p.transpose() * K_pT_thermal_osmosis * dNdx_T * w; dNdx_p.transpose() * K_pT_thermal_osmosis * dNdx_T * w;
...@@ -402,13 +408,16 @@ void ThermoHydroMechanicsLocalAssembler<ShapeFunctionDisplacement, ...@@ -402,13 +408,16 @@ void ThermoHydroMechanicsLocalAssembler<ShapeFunctionDisplacement,
MaterialPropertyLib::PropertyType::specific_heat_capacity) MaterialPropertyLib::PropertyType::specific_heat_capacity)
.template value<double>(vars, x_position, t, dt); .template value<double>(vars, x_position, t, dt);
auto const effective_thermal_conductivity = auto const effective_thermal_conductivity =
MaterialPropertyLib::formEigenTensor<DisplacementDim>(medium MaterialPropertyLib::formEigenTensor<DisplacementDim>(
->property(MaterialPropertyLib::PropertyType::thermal_conductivity) medium
->property(
MaterialPropertyLib::PropertyType::thermal_conductivity)
.value(vars, x_position, t, dt)); .value(vars, x_position, t, dt));
KTT.noalias() += KTT.noalias() +=
(dNdx_T.transpose() * effective_thermal_conductivity * dNdx_T + (dNdx_T.transpose() * effective_thermal_conductivity * dNdx_T +
N_T.transpose() * velocity.transpose() * dNdx_T * fluid_density * c_f) * N_T.transpose() * velocity.transpose() * dNdx_T * fluid_density *
c_f) *
w - w -
fluid_density * c_f * N_T.transpose() * (dNdx_T * T).transpose() * fluid_density * c_f * N_T.transpose() * (dNdx_T * T).transpose() *
K_pT_thermal_osmosis * dNdx_T * w; K_pT_thermal_osmosis * dNdx_T * w;
......
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