From 1d5d4c6f9c047e2f33a4284d54a3196c0b982248 Mon Sep 17 00:00:00 2001 From: Wenqing Wang Date: Thu, 10 Oct 2024 13:40:38 +0200 Subject: [PATCH] [HM] Renamed HydroMechanicsProcessData::phase_pressure to HydroMechanicsProcessData::phase_variable --- ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp | 4 ++-- ProcessLib/HydroMechanics/HydroMechanicsFEM-impl.h | 4 ++-- ProcessLib/HydroMechanics/HydroMechanicsProcessData.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp b/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp index ffedef90dee..bf6823b7aca 100644 --- a/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp +++ b/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp @@ -221,7 +221,7 @@ std::unique_ptr createHydroMechanicsProcess( // The uniqueness of phase has already been checked in // `checkMPLPhasesForSinglePhaseFlow`. - MaterialPropertyLib::Variable const phase_pressure = + MaterialPropertyLib::Variable const phase_variable = (*ranges::begin(media_map.media()))->hasPhase("Gas") ? MaterialPropertyLib::Variable::gas_phase_pressure : MaterialPropertyLib::Variable::liquid_phase_pressure; @@ -252,7 +252,7 @@ std::unique_ptr createHydroMechanicsProcess( hydraulic_process_id, mechanics_related_process_id, use_taylor_hood_elements, - phase_pressure}; + phase_variable}; SecondaryVariableCollection secondary_variables; diff --git a/ProcessLib/HydroMechanics/HydroMechanicsFEM-impl.h b/ProcessLib/HydroMechanics/HydroMechanicsFEM-impl.h index 9a84413a00d..4bf6dacfc92 100644 --- a/ProcessLib/HydroMechanics/HydroMechanicsFEM-impl.h +++ b/ProcessLib/HydroMechanics/HydroMechanicsFEM-impl.h @@ -257,7 +257,7 @@ void HydroMechanicsLocalAssembler(vars, _process_data.phase_pressure, + .template dValue(vars, _process_data.phase_variable, x_position, t, dt) / rho_fr; @@ -616,7 +616,7 @@ void HydroMechanicsLocalAssembler(vars, x_position, t, dt); auto const beta_p = fluid.property(MPL::PropertyType::density) - .template dValue(vars, _process_data.phase_pressure, + .template dValue(vars, _process_data.phase_variable, x_position, t, dt) / rho_fr; diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcessData.h b/ProcessLib/HydroMechanics/HydroMechanicsProcessData.h index c710e200a7b..86a532c6267 100644 --- a/ProcessLib/HydroMechanics/HydroMechanicsProcessData.h +++ b/ProcessLib/HydroMechanics/HydroMechanicsProcessData.h @@ -90,7 +90,7 @@ struct HydroMechanicsProcessData const bool use_taylor_hood_elements; - MaterialPropertyLib::Variable const phase_pressure; + MaterialPropertyLib::Variable const phase_variable; MeshLib::PropertyVector* pressure_interpolated = nullptr; std::array*, 3> principal_stress_vector = {