From 60beed184413ec88b37d8599435bd62f3f954d8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Buchwald?= Date: Thu, 16 Nov 2023 22:40:38 +0100 Subject: [PATCH 1/3] [PL,MPL] Use liquid or gas phase pressure This eliminates the ambiguity of the phase_pressure variable, which is replaced with the gas_phase_pressure. --- .../MPL/Properties/AverageMolarMass.cpp | 2 +- .../MPL/Properties/ClausiusClapeyron.cpp | 2 +- .../Density/WaterDensityIAPWSIF97Region1.cpp | 8 ++--- .../WaterLiquidDensityIAPWSIF97Region4.cpp | 2 +- .../Properties/Density/WaterVapourDensity.cpp | 8 ++--- .../WaterVapourDensityIAPWSIF97Region4.cpp | 2 +- .../MPL/Properties/DupuitPermeability.cpp | 2 +- .../WaterEnthalpyIAPWSIF97Region1.cpp | 4 +-- .../WaterLiquidEnthalpyIAPWSIF97Region4.cpp | 2 +- .../WaterVapourEnthalpyIAPWSIF97Region4.cpp | 2 +- .../GasPressureDependentPermeability.cpp | 2 +- MaterialLib/MPL/Properties/IdealGasLaw.cpp | 16 +++++----- .../Properties/IdealGasLawBinaryMixture.cpp | 6 ++-- ...rSaturationTemperatureIAPWSIF97Region4.cpp | 2 +- .../WaterTemperatureIAPWSIF97Region1.cpp | 2 +- MaterialLib/MPL/VariableType.h | 10 +++--- .../ComponentTransportFEM.h | 32 +++++++++++-------- ProcessLib/HT/HTFEM.h | 4 +-- ProcessLib/HT/MonolithicHTFEM.h | 2 +- ProcessLib/HT/StaggeredHTFEM-impl.h | 8 ++--- .../LiquidFlowLocalAssembler-impl.h | 14 ++++---- .../RichardsComponentTransportFEM-impl.h | 4 +-- ProcessLib/RichardsFlow/RichardsFlowFEM.h | 7 ++-- .../RichardsMechanicsFEM-impl.h | 30 +++++++++-------- .../SteadyStateDiffusionFEM.h | 6 ++-- ProcessLib/StokesFlow/StokesFlowFEM.h | 2 +- .../NoPhaseTransition.cpp | 6 ++-- .../PhaseTransitionModels/PhaseTransition.cpp | 10 +++--- ProcessLib/TH2M/TH2MFEM-impl.h | 2 +- ...malTwoPhaseFlowWithPPLocalAssembler-impl.h | 2 +- .../ThermoHydroMechanicsFEM-impl.h | 6 ++-- .../ThermoRichardsFlowFEM-impl.h | 26 ++++++++------- .../FluidThermalExpansion.cpp | 2 +- .../ConstitutiveCommon/LiquidDensity.cpp | 10 +++--- .../ConstitutiveCommon/TRMVaporDiffusion.cpp | 6 ++-- .../ThermoRichardsMechanicsFEM-impl.h | 2 +- .../TwoPhaseFlowWithPPLocalAssembler-impl.h | 4 +-- Tests/Data/HydroMechanics/A2/A2.prj | 2 +- .../InjectionProduction1D.prj | 2 +- .../InjectionProduction1DMono.prj | 2 +- .../InjectionProduction1DMono_python.prj | 2 +- ...jectionProduction1DMono_python_Neumann.prj | 2 +- .../InjectionProduction1D_MFront.prj | 2 +- .../InjectionProduction1D_python.prj | 2 +- .../ConcentrationDiffusionAndStorage.prj | 2 +- .../DiffusionAndStorageAndAdvection.prj | 6 ++-- ...iffusionAndStorageAndAdvectionAndDecay.prj | 2 +- ...ionAndStorageAndAdvectionAndDispersion.prj | 2 +- ...ndStorageAndAdvectionAndDispersionHalf.prj | 2 +- ...nAndStorageAndGravityAndDispersionHalf.prj | 2 +- .../ConcentrationDiffusionAndStorage.prj | 2 +- .../DiffusionAndStorageAndAdvection.prj | 2 +- ...iffusionAndStorageAndAdvectionAndDecay.prj | 2 +- ...ionAndStorageAndAdvectionAndDispersion.prj | 2 +- ...ndStorageAndAdvectionAndDispersionHalf.prj | 2 +- ...eAndAdvectionAndDispersion_3Components.prj | 2 +- ...nAndStorageAndGravityAndDispersionHalf.prj | 2 +- .../ComponentTransport/Theis/theis.prj | 2 +- .../1Din3D/line_fractures_in_3D.prj | 2 +- .../FractureIn3D/fractures_in_3D.prj | 6 ++-- .../transient_flow_in_inclined_2D_plane.prj | 2 +- Tests/Data/RichardsMechanics/A2.prj | 2 +- .../LiakopoulosHM/liakopoulos.prj | 2 +- .../LiakopoulosHM/liakopoulos_QN.prj | 2 +- .../RichardsFlow_2d_quasinewton.prj | 2 +- .../RichardsFlow_2d_richardsflow.prj | 2 +- .../RichardsFlow_2d_small.prj | 2 +- .../RichardsFlow_2d_small_masslumping.prj | 2 +- ...lternative_mass_balance_anzInterval_10.prj | 2 +- .../bishops_effective_stress_power_law.prj | 2 +- ...ops_effective_stress_saturation_cutoff.prj | 2 +- .../confined_compression_fully_saturated.prj | 2 +- ...ed_compression_fully_saturated_restart.prj | 2 +- .../deformation_dependent_porosity.prj | 2 +- ...eformation_dependent_porosity_swelling.prj | 2 +- .../flow_fully_saturated.prj | 2 +- .../flow_fully_saturated_anisotropic.prj | 2 +- ...flow_fully_saturated_coordinate_system.prj | 2 +- .../flow_fully_saturated_linear.prj | 2 +- Tests/Data/RichardsMechanics/gravity.prj | 2 +- .../RichardsMechanics/mechanics_linear.prj | 2 +- ...orthotropic_power_law_permeability_xyz.prj | 2 +- .../orthotropic_swelling_xy.prj | 2 +- .../orthotropic_swelling_xyz.prj | 2 +- .../rotated_consolidation.prj | 2 +- .../TH2M/H2M/OrthotropicSwelling/square.prj | 2 +- Tests/Data/TH2M/HM/flow_fully_saturated.prj | 2 +- .../Data/TH2M/HM/flow_fully_saturated_gas.prj | 2 +- .../Data/TH2M/M/M_2d_neumann/M_2d_neumann.prj | 4 +-- .../TH2M/TH/idealGasLaw/compression_gas.prj | 2 +- .../TH2M/TH2M/Ansicht_Simple_1e2/A2_THM.prj | 2 +- .../TH2M/TH2M/Ansicht_Simple_1e2/A2_TRM.prj | 2 +- Tests/Data/ThermoHydroMechanics/A2/A2.prj | 2 +- .../ThermoHydroMechanics/A2/A2_heating.prj | 2 +- .../arehs-salt-THM01_0.prj | 8 ++--- .../HeatingHomogeneousDomain/hex_THM.prj | 10 +++--- .../Storage/cube_incompressible_fluid.prj | 2 +- .../Linear/Storage/cube_isochoric_heat-up.prj | 2 +- .../Linear/ThermoOsmosis/Column.prj | 2 +- .../cube_ortho_phi0.0.prj | 2 +- .../cube_ortho_phi0.183.prj | 2 +- .../cube_ortho_phi0.183_petsc.prj | 2 +- .../square_ortho_phi0.0.prj | 2 +- .../square_ortho_phi0.183.prj | 2 +- .../TRcustom_unsaturated.prj | 2 +- .../SimplifiedMechanics/TRhyd_saturated.prj | 2 +- .../SimplifiedMechanics/TRhyd_unsaturated.prj | 2 +- .../TRhyd_unsaturated_bishopstest.prj | 2 +- .../SimplifiedMechanics/TRuni_saturated.prj | 2 +- .../SimplifiedMechanics/TRuni_unsaturated.prj | 2 +- .../TRuni_unsaturated_bishopstest.prj | 2 +- .../TaskCDECOVALEX2023/Decovalex-0-TRF.prj | 6 ++-- .../Decovalex-0-TRF.prj | 6 ++-- .../ThermoOsmosis/Column.prj | 2 +- Tests/Data/ThermoRichardsMechanics/A2/A2.prj | 2 +- .../BodyForce/square.prj | 2 +- .../LiakopoulosHM/liakopoulos.prj | 4 +-- .../liakopoulos_mixElem_mumps.prj | 2 +- .../Mockup2D/mockup.prj | 2 +- .../RichardsFlow2D/RichardsFlow_2d_small.prj | 2 +- .../TaskCDECOVALEX2023/Decovalex-0.prj | 6 ++-- .../ThermoOsmosis/Column.prj | 2 +- .../TestGasPressureDependentPermeability.cpp | 4 +-- Tests/MaterialLib/TestMPLExponential.cpp | 5 +-- Tests/MaterialLib/TestMPLIdealGasLaw.cpp | 19 +++++++---- .../TestMPLIdealGasLawBinaryMixture.cpp | 10 +++--- Tests/MaterialLib/TestMPLLinear.cpp | 5 +-- Tests/MaterialLib/TestMPLWaterDensity.cpp | 8 ++--- .../TestMPLWaterDensityIAPWSIF97Region4.cpp | 4 +-- .../TestMPLWaterEnthalpyIAPWSIF97Region1.cpp | 2 +- .../TestMPLWaterEnthalpyIAPWSIF97Region4.cpp | 4 +-- .../TestMPLWaterSaturationTemperature.cpp | 2 +- ...estMPLWaterTemperatureIAPWSIF97Region1.cpp | 2 +- .../MaterialLib/TestMPLWaterVapourDensity.cpp | 13 ++++---- .../TH2M/TestTH2MNoPhaseTransition.cpp | 2 +- .../TH2M/TestTH2MPhaseTransition.cpp | 22 ++++++------- 136 files changed, 292 insertions(+), 275 deletions(-) diff --git a/MaterialLib/MPL/Properties/AverageMolarMass.cpp b/MaterialLib/MPL/Properties/AverageMolarMass.cpp index 29e3b211374..86440e30941 100644 --- a/MaterialLib/MPL/Properties/AverageMolarMass.cpp +++ b/MaterialLib/MPL/Properties/AverageMolarMass.cpp @@ -87,7 +87,7 @@ PropertyDataType AverageMolarMass::dValue( ParameterLib::SpatialPosition const& pos, double const t, double const dt) const { - if ((variable != Variable::phase_pressure) && + if ((variable != Variable::gas_phase_pressure) && (variable != Variable::temperature)) { OGS_FATAL( diff --git a/MaterialLib/MPL/Properties/ClausiusClapeyron.cpp b/MaterialLib/MPL/Properties/ClausiusClapeyron.cpp index 86af9b286d5..c8b70f22440 100644 --- a/MaterialLib/MPL/Properties/ClausiusClapeyron.cpp +++ b/MaterialLib/MPL/Properties/ClausiusClapeyron.cpp @@ -101,7 +101,7 @@ PropertyDataType ClausiusClapeyron::dValue( { return 0.; } - if (variable == Variable::phase_pressure) + if (variable == Variable::gas_phase_pressure) { return 0.; } diff --git a/MaterialLib/MPL/Properties/Density/WaterDensityIAPWSIF97Region1.cpp b/MaterialLib/MPL/Properties/Density/WaterDensityIAPWSIF97Region1.cpp index 92cad659901..82316226eda 100644 --- a/MaterialLib/MPL/Properties/Density/WaterDensityIAPWSIF97Region1.cpp +++ b/MaterialLib/MPL/Properties/Density/WaterDensityIAPWSIF97Region1.cpp @@ -25,7 +25,7 @@ PropertyDataType WaterDensityIAPWSIF97Region1::value( ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/, double const /*dt*/) const { - double const p = std::max(0.0, variable_array.phase_pressure); + double const p = std::max(0.0, variable_array.liquid_phase_pressure); double const T = variable_array.temperature; const double tau = ref_T_ / T; const double pi = p / ref_p_; @@ -41,7 +41,7 @@ PropertyDataType WaterDensityIAPWSIF97Region1::dValue( double const /*dt*/) const { const double T = variable_array.temperature; - double const p = std::max(0.0, variable_array.phase_pressure); + double const p = std::max(0.0, variable_array.liquid_phase_pressure); const double tau = ref_T_ / T; const double pi = p / ref_p_; @@ -58,7 +58,7 @@ PropertyDataType WaterDensityIAPWSIF97Region1::dValue( (MaterialLib::PhysicalConstant::SpecificGasConstant:: WaterVapour * T * T * dgamma_dpi); - case Variable::phase_pressure: + case Variable::liquid_phase_pressure: return -gibbs_free_energy_.get_dgamma_dpi_dpi(tau, pi) / (MaterialLib::PhysicalConstant::SpecificGasConstant:: WaterVapour * @@ -67,7 +67,7 @@ PropertyDataType WaterDensityIAPWSIF97Region1::dValue( OGS_FATAL( "WaterDensityIAPWSIF97Region1::dValue is implemented for " "derivatives with " - "respect to temperature or phase_pressure only."); + "respect to temperature or liquid_phase_pressure only."); } } diff --git a/MaterialLib/MPL/Properties/Density/WaterLiquidDensityIAPWSIF97Region4.cpp b/MaterialLib/MPL/Properties/Density/WaterLiquidDensityIAPWSIF97Region4.cpp index d504934b69e..f99fb6d23c7 100644 --- a/MaterialLib/MPL/Properties/Density/WaterLiquidDensityIAPWSIF97Region4.cpp +++ b/MaterialLib/MPL/Properties/Density/WaterLiquidDensityIAPWSIF97Region4.cpp @@ -26,7 +26,7 @@ PropertyDataType WaterLiquidDensityIAPWSIF97Region4::value( ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/, double const /*dt*/) const { - double const p = variable_array.phase_pressure; + double const p = variable_array.liquid_phase_pressure; /// According to the IAPWS-IF97: /// http://www.iapws.org/relguide/IF97-Rev.pdf, diff --git a/MaterialLib/MPL/Properties/Density/WaterVapourDensity.cpp b/MaterialLib/MPL/Properties/Density/WaterVapourDensity.cpp index 4e0bd355435..ec5d054b6f3 100644 --- a/MaterialLib/MPL/Properties/Density/WaterVapourDensity.cpp +++ b/MaterialLib/MPL/Properties/Density/WaterVapourDensity.cpp @@ -44,7 +44,7 @@ PropertyDataType WaterVapourDensity::value( ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/, double const /*dt*/) const { - double const p = variable_array.phase_pressure; + double const p = variable_array.liquid_phase_pressure; double const T = variable_array.temperature; double const water_density = variable_array.density; @@ -56,7 +56,7 @@ PropertyDataType WaterVapourDensity::dValue( ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/, double const /*dt*/) const { - double const p = variable_array.phase_pressure; + double const p = variable_array.liquid_phase_pressure; double const T = variable_array.temperature; double const water_density = variable_array.density; @@ -72,7 +72,7 @@ PropertyDataType WaterVapourDensity::dValue( SpecificGasConstant::WaterVapour); } - if (variable == Variable::phase_pressure) + if (variable == Variable::liquid_phase_pressure) { double const factor = 1.0 / @@ -85,7 +85,7 @@ PropertyDataType WaterVapourDensity::dValue( OGS_FATAL( "WaterVapourDensity::dValue is implemented for derivatives with " - "respect to temperature or phase_pressure only."); + "respect to temperature or liquid_phase_pressure only."); } } // namespace MaterialPropertyLib diff --git a/MaterialLib/MPL/Properties/Density/WaterVapourDensityIAPWSIF97Region4.cpp b/MaterialLib/MPL/Properties/Density/WaterVapourDensityIAPWSIF97Region4.cpp index ff842114b38..efd73690852 100644 --- a/MaterialLib/MPL/Properties/Density/WaterVapourDensityIAPWSIF97Region4.cpp +++ b/MaterialLib/MPL/Properties/Density/WaterVapourDensityIAPWSIF97Region4.cpp @@ -26,7 +26,7 @@ PropertyDataType WaterVapourDensityIAPWSIF97Region4::value( ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/, double const /*dt*/) const { - double const p = variable_array.phase_pressure; + double const p = variable_array.liquid_phase_pressure; /// According to the IAPWS-IF97: /// http://www.iapws.org/relguide/IF97-Rev.pdf, diff --git a/MaterialLib/MPL/Properties/DupuitPermeability.cpp b/MaterialLib/MPL/Properties/DupuitPermeability.cpp index e973eaf9080..a4eac37cc65 100644 --- a/MaterialLib/MPL/Properties/DupuitPermeability.cpp +++ b/MaterialLib/MPL/Properties/DupuitPermeability.cpp @@ -24,7 +24,7 @@ PropertyDataType DupuitPermeability::value( ParameterLib::SpatialPosition const& pos, double const t, double const /*dt*/) const { - double const pressure = variable_array.phase_pressure; + double const pressure = variable_array.liquid_phase_pressure; auto const& permeability_values = parameter_(t, pos); auto const& permeability_variant = fromVector(permeability_values); diff --git a/MaterialLib/MPL/Properties/Enthalpy/WaterEnthalpyIAPWSIF97Region1.cpp b/MaterialLib/MPL/Properties/Enthalpy/WaterEnthalpyIAPWSIF97Region1.cpp index 9eb32839d5a..6f029b0ea4e 100644 --- a/MaterialLib/MPL/Properties/Enthalpy/WaterEnthalpyIAPWSIF97Region1.cpp +++ b/MaterialLib/MPL/Properties/Enthalpy/WaterEnthalpyIAPWSIF97Region1.cpp @@ -31,7 +31,7 @@ PropertyDataType WaterEnthalpyIAPWSIF97Region1::value( ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/, double const /*dt*/) const { - double const p = std::max(0.0, variable_array.phase_pressure); + double const p = std::max(0.0, variable_array.liquid_phase_pressure); double const T = variable_array.temperature; double const tau = ref_T_ / T; @@ -47,7 +47,7 @@ PropertyDataType WaterEnthalpyIAPWSIF97Region1::dValue( ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/, double const /*dt*/) const { - double const p = std::max(0.0, variable_array.phase_pressure); + double const p = std::max(0.0, variable_array.liquid_phase_pressure); double const T = variable_array.temperature; double const tau = ref_T_ / T; diff --git a/MaterialLib/MPL/Properties/Enthalpy/WaterLiquidEnthalpyIAPWSIF97Region4.cpp b/MaterialLib/MPL/Properties/Enthalpy/WaterLiquidEnthalpyIAPWSIF97Region4.cpp index 3ca429f9f63..fc186f1108e 100644 --- a/MaterialLib/MPL/Properties/Enthalpy/WaterLiquidEnthalpyIAPWSIF97Region4.cpp +++ b/MaterialLib/MPL/Properties/Enthalpy/WaterLiquidEnthalpyIAPWSIF97Region4.cpp @@ -25,7 +25,7 @@ PropertyDataType WaterLiquidEnthalpyIAPWSIF97Region4::value( ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/, double const /*dt*/) const { - double const p = variable_array.phase_pressure; + double const p = variable_array.liquid_phase_pressure; /// According to the IAPWS-IF97: /// http://www.iapws.org/relguide/IF97-Rev.pdf, diff --git a/MaterialLib/MPL/Properties/Enthalpy/WaterVapourEnthalpyIAPWSIF97Region4.cpp b/MaterialLib/MPL/Properties/Enthalpy/WaterVapourEnthalpyIAPWSIF97Region4.cpp index 438a76189a0..8592f5a1753 100644 --- a/MaterialLib/MPL/Properties/Enthalpy/WaterVapourEnthalpyIAPWSIF97Region4.cpp +++ b/MaterialLib/MPL/Properties/Enthalpy/WaterVapourEnthalpyIAPWSIF97Region4.cpp @@ -25,7 +25,7 @@ PropertyDataType WaterVapourEnthalpyIAPWSIF97Region4::value( ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/, double const /*dt*/) const { - double const p = variable_array.phase_pressure; + double const p = variable_array.liquid_phase_pressure; /// According to the IAPWS-IF97: /// http://www.iapws.org/relguide/IF97-Rev.pdf, diff --git a/MaterialLib/MPL/Properties/GasPressureDependentPermeability.cpp b/MaterialLib/MPL/Properties/GasPressureDependentPermeability.cpp index 515a562926b..2d07104ca62 100644 --- a/MaterialLib/MPL/Properties/GasPressureDependentPermeability.cpp +++ b/MaterialLib/MPL/Properties/GasPressureDependentPermeability.cpp @@ -57,7 +57,7 @@ PropertyDataType GasPressureDependentPermeability::value( ParameterLib::SpatialPosition const& pos, double const t, double const /*dt*/) const { - double const gas_pressure = variable_array.phase_pressure; + double const gas_pressure = variable_array.gas_phase_pressure; auto k_data = k0_(t, pos); diff --git a/MaterialLib/MPL/Properties/IdealGasLaw.cpp b/MaterialLib/MPL/Properties/IdealGasLaw.cpp index b6c64147247..82dda4e57e8 100644 --- a/MaterialLib/MPL/Properties/IdealGasLaw.cpp +++ b/MaterialLib/MPL/Properties/IdealGasLaw.cpp @@ -29,7 +29,7 @@ PropertyDataType IdealGasLaw::value( double const /*dt*/) const { const double gas_constant = MaterialLib::PhysicalConstant::IdealGasConstant; - const double pressure = variable_array.phase_pressure; + const double pressure = variable_array.gas_phase_pressure; const double temperature = variable_array.temperature; const double molar_mass = variable_array.molar_mass; @@ -44,7 +44,7 @@ PropertyDataType IdealGasLaw::dValue( double const /*dt*/) const { const double gas_constant = MaterialLib::PhysicalConstant::IdealGasConstant; - const double pressure = variable_array.phase_pressure; + const double pressure = variable_array.gas_phase_pressure; const double temperature = variable_array.temperature; const double molar_mass = variable_array.molar_mass; // todo: add molar mass derivatives @@ -56,7 +56,7 @@ PropertyDataType IdealGasLaw::dValue( temperature; } - if (variable == Variable::phase_pressure) + if (variable == Variable::gas_phase_pressure) { // extend to take pressure-dependent molar mass into account return molar_mass / gas_constant / temperature; @@ -75,13 +75,13 @@ PropertyDataType IdealGasLaw::d2Value( double const /*t*/, double const /*dt*/) const { const double gas_constant = MaterialLib::PhysicalConstant::IdealGasConstant; - const double pressure = variable_array.phase_pressure; + const double pressure = variable_array.gas_phase_pressure; const double temperature = variable_array.temperature; const double molar_mass = variable_array.molar_mass; // todo: add molar mass derivatives - if ((variable1 == Variable::phase_pressure) && - (variable2 == Variable::phase_pressure)) + if ((variable1 == Variable::gas_phase_pressure) && + (variable2 == Variable::gas_phase_pressure)) { // d2rho_dp2 // extend to take pressure-dependent molar mass into account @@ -95,10 +95,10 @@ PropertyDataType IdealGasLaw::d2Value( return 2. * molar_mass * pressure / gas_constant / temperature / temperature / temperature; } - if (((variable1 == Variable::phase_pressure) && + if (((variable1 == Variable::gas_phase_pressure) && (variable2 == Variable::temperature)) || ((variable1 == Variable::temperature) && - (variable2 == Variable::phase_pressure))) + (variable2 == Variable::gas_phase_pressure))) { // d2rho_dpdT or d2rho_dTdp // extend to take pressure-temperature-dependent molar mass into account diff --git a/MaterialLib/MPL/Properties/IdealGasLawBinaryMixture.cpp b/MaterialLib/MPL/Properties/IdealGasLawBinaryMixture.cpp index 0303507e671..f4b5e1da889 100644 --- a/MaterialLib/MPL/Properties/IdealGasLawBinaryMixture.cpp +++ b/MaterialLib/MPL/Properties/IdealGasLawBinaryMixture.cpp @@ -28,7 +28,7 @@ PropertyDataType IdealGasLawBinaryMixture::value( double const /*dt*/) const { const double R = MaterialLib::PhysicalConstant::IdealGasConstant; - const double pGR = variable_array.phase_pressure; + const double pGR = variable_array.gas_phase_pressure; const double T = variable_array.temperature; const double MG = variable_array.molar_mass; @@ -41,14 +41,14 @@ PropertyDataType IdealGasLawBinaryMixture::dValue( double const /*dt*/) const { const double R = MaterialLib::PhysicalConstant::IdealGasConstant; - const double pGR = variable_array.phase_pressure; + const double pGR = variable_array.gas_phase_pressure; const double T = variable_array.temperature; const double MG = variable_array.molar_mass; const double dMG_dx = variable_array.molar_mass_derivative; switch (variable) { - case Variable::phase_pressure: + case Variable::gas_phase_pressure: return MG / R / T + pGR / R / T * dMG_dx; case Variable::capillary_pressure: return pGR / R / T * dMG_dx; diff --git a/MaterialLib/MPL/Properties/WaterSaturationTemperatureIAPWSIF97Region4.cpp b/MaterialLib/MPL/Properties/WaterSaturationTemperatureIAPWSIF97Region4.cpp index 793221ed1c3..180e9c9ad32 100644 --- a/MaterialLib/MPL/Properties/WaterSaturationTemperatureIAPWSIF97Region4.cpp +++ b/MaterialLib/MPL/Properties/WaterSaturationTemperatureIAPWSIF97Region4.cpp @@ -21,7 +21,7 @@ PropertyDataType WaterSaturationTemperatureIAPWSIF97Region4::value( ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/, double const /*dt*/) const { - double const p = variable_array.phase_pressure; + double const p = variable_array.liquid_phase_pressure; /// According to the IAPWS-IF97: /// http://www.iapws.org/relguide/IF97-Rev.pdf, diff --git a/MaterialLib/MPL/Properties/WaterTemperatureIAPWSIF97Region1.cpp b/MaterialLib/MPL/Properties/WaterTemperatureIAPWSIF97Region1.cpp index cf5e22467de..a88eafdf1c7 100644 --- a/MaterialLib/MPL/Properties/WaterTemperatureIAPWSIF97Region1.cpp +++ b/MaterialLib/MPL/Properties/WaterTemperatureIAPWSIF97Region1.cpp @@ -48,7 +48,7 @@ PropertyDataType WaterTemperatureIAPWSIF97Region1::value( ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/, double const /*dt*/) const { - double const p = std::max(0.0, variable_array.phase_pressure); + double const p = std::max(0.0, variable_array.liquid_phase_pressure); double const h = variable_array.enthalpy; static constexpr double ref_h_ = 2500e3; ///< reference enthalpy in J/kg. diff --git a/MaterialLib/MPL/VariableType.h b/MaterialLib/MPL/VariableType.h index f11624e8eb0..c2b802e11fd 100644 --- a/MaterialLib/MPL/VariableType.h +++ b/MaterialLib/MPL/VariableType.h @@ -42,7 +42,7 @@ enum class Variable : int molar_mass, molar_mass_derivative, molar_fraction, - phase_pressure, + gas_phase_pressure, porosity, solid_grain_pressure, stress, @@ -72,7 +72,7 @@ static const std::array( - vars, MaterialPropertyLib::Variable::phase_pressure, + vars, + MaterialPropertyLib::Variable::liquid_phase_pressure, pos, t, dt); const double drho_dC = @@ -845,7 +846,7 @@ class LocalAssemblerData : public ComponentTransportLocalAssemblerInterface NumLib::shapeFunctionInterpolate(local_p, N, p_int_pt); vars.concentration = C_int_pt; - vars.phase_pressure = p_int_pt; + vars.liquid_phase_pressure = p_int_pt; // porosity { @@ -881,7 +882,8 @@ class LocalAssemblerData : public ComponentTransportLocalAssemblerInterface const double drho_dp = phase[MaterialPropertyLib::PropertyType::density] .template dValue( - vars, MaterialPropertyLib::Variable::phase_pressure, + vars, + MaterialPropertyLib::Variable::liquid_phase_pressure, pos, t, dt); const double drho_dC = phase[MaterialPropertyLib::PropertyType::density] @@ -986,7 +988,7 @@ class LocalAssemblerData : public ComponentTransportLocalAssemblerInterface NumLib::shapeFunctionInterpolate(local_p, N, p_int_pt); vars.concentration = C_int_pt; - vars.phase_pressure = p_int_pt; + vars.liquid_phase_pressure = p_int_pt; if (_process_data.temperature) { @@ -1076,9 +1078,10 @@ class LocalAssemblerData : public ComponentTransportLocalAssemblerInterface const double drho_dp = phase[MaterialPropertyLib::PropertyType::density] - .template dValue( - vars, MaterialPropertyLib::Variable::phase_pressure, - pos, t, dt); + .template dValue(vars, + MaterialPropertyLib::Variable:: + liquid_phase_pressure, + pos, t, dt); local_K.noalias() += N_t_N * ((R_times_phi * drho_dp * p_dot) * w) - @@ -1182,7 +1185,7 @@ class LocalAssemblerData : public ComponentTransportLocalAssemblerInterface double const cdot_ip = (c_ip - N.dot(c_prev)) / dt; - vars.phase_pressure = p_ip; + vars.liquid_phase_pressure = p_ip; vars.concentration = c_ip; // porosity @@ -1211,7 +1214,8 @@ class LocalAssemblerData : public ComponentTransportLocalAssemblerInterface auto const drho_dp = phase[MaterialPropertyLib::PropertyType::density] .template dValue( - vars, MaterialPropertyLib::Variable::phase_pressure, + vars, + MaterialPropertyLib::Variable::liquid_phase_pressure, pos, t, dt); auto const drho_dc = phase[MaterialPropertyLib::PropertyType::density] @@ -1301,7 +1305,7 @@ class LocalAssemblerData : public ComponentTransportLocalAssemblerInterface double const p_ip = N.dot(p); double const c_ip = N.dot(c); - vars.phase_pressure = p_ip; + vars.liquid_phase_pressure = p_ip; vars.concentration = c_ip; if (_process_data.temperature) @@ -1543,7 +1547,7 @@ class LocalAssemblerData : public ComponentTransportLocalAssemblerInterface NumLib::shapeFunctionInterpolate(p_nodal_values, N, p_int_pt); vars.concentration = C_int_pt; - vars.phase_pressure = p_int_pt; + vars.liquid_phase_pressure = p_int_pt; vars.porosity = porosity; // TODO (naumov) Temporary value not used by current material @@ -1616,7 +1620,7 @@ class LocalAssemblerData : public ComponentTransportLocalAssemblerInterface double p_int_pt; NumLib::shapeFunctionInterpolate(local_p, shape_matrices.N, p_int_pt); - vars.phase_pressure = p_int_pt; + vars.liquid_phase_pressure = p_int_pt; // TODO (naumov) Temporary value not used by current material models. // Need extension of secondary variables interface. @@ -1767,7 +1771,7 @@ class LocalAssemblerData : public ComponentTransportLocalAssemblerInterface double const c_ip = N.dot(c); vars.concentration = c_ip; - vars.phase_pressure = p_ip; + vars.liquid_phase_pressure = p_ip; vars.porosity = phi; double const dt = std::numeric_limits::quiet_NaN(); diff --git a/ProcessLib/HT/HTFEM.h b/ProcessLib/HT/HTFEM.h index 36fb68354c4..b57e8fc8f54 100644 --- a/ProcessLib/HT/HTFEM.h +++ b/ProcessLib/HT/HTFEM.h @@ -122,7 +122,7 @@ class HTFEM : public HTLocalAssemblerInterface p_int_pt); vars.temperature = T_int_pt; - vars.phase_pressure = p_int_pt; + vars.liquid_phase_pressure = p_int_pt; auto const& medium = *_process_data.media_map.getMedium(_element.getID()); @@ -284,7 +284,7 @@ class HTFEM : public HTLocalAssemblerInterface NumLib::shapeFunctionInterpolate(local_T, N, T_int_pt); vars.temperature = T_int_pt; - vars.phase_pressure = p_int_pt; + vars.liquid_phase_pressure = p_int_pt; // TODO (naumov) Temporary value not used by current material // models. Need extension of secondary variables interface. diff --git a/ProcessLib/HT/MonolithicHTFEM.h b/ProcessLib/HT/MonolithicHTFEM.h index 42e632bd120..c4d456265d0 100644 --- a/ProcessLib/HT/MonolithicHTFEM.h +++ b/ProcessLib/HT/MonolithicHTFEM.h @@ -136,7 +136,7 @@ class MonolithicHTFEM : public HTFEM NumLib::shapeFunctionInterpolate(local_x, N, T_int_pt, p_int_pt); vars.temperature = T_int_pt; - vars.phase_pressure = p_int_pt; + vars.liquid_phase_pressure = p_int_pt; vars.liquid_saturation = 1.0; // \todo the argument to getValue() has to be changed for non diff --git a/ProcessLib/HT/StaggeredHTFEM-impl.h b/ProcessLib/HT/StaggeredHTFEM-impl.h index f123ad7411f..62466d04ffd 100644 --- a/ProcessLib/HT/StaggeredHTFEM-impl.h +++ b/ProcessLib/HT/StaggeredHTFEM-impl.h @@ -94,7 +94,7 @@ void StaggeredHTFEM::assembleHydraulicEquation( NumLib::shapeFunctionInterpolate(local_T, N, T_int_pt); vars.temperature = T_int_pt; - vars.phase_pressure = p_int_pt; + vars.liquid_phase_pressure = p_int_pt; vars.liquid_saturation = 1.0; @@ -109,8 +109,8 @@ void StaggeredHTFEM::assembleHydraulicEquation( const double dfluid_density_dp = liquid_phase.property(MaterialPropertyLib::PropertyType::density) .template dValue( - vars, MaterialPropertyLib::Variable::phase_pressure, pos, t, - dt); + vars, MaterialPropertyLib::Variable::liquid_phase_pressure, + pos, t, dt); // Use the viscosity model to compute the viscosity auto const viscosity = @@ -223,7 +223,7 @@ void StaggeredHTFEM::assembleHeatTransportEquation( NumLib::shapeFunctionInterpolate(local_T, N, T_at_xi); vars.temperature = T_at_xi; - vars.phase_pressure = p_at_xi; + vars.liquid_phase_pressure = p_at_xi; vars.liquid_saturation = 1.0; diff --git a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h index 5f3bffe46f4..bd1e0cad9c4 100644 --- a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h +++ b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h @@ -37,7 +37,7 @@ void LiquidFlowLocalAssembler::assemble( vars.temperature = medium[MaterialPropertyLib::PropertyType::reference_temperature] .template value(vars, pos, t, dt); - vars.phase_pressure = std::numeric_limits::quiet_NaN(); + vars.liquid_phase_pressure = std::numeric_limits::quiet_NaN(); GlobalDimMatrixType const permeability = MaterialPropertyLib::formEigenTensor( medium[MaterialPropertyLib::PropertyType::permeability].value( @@ -87,7 +87,7 @@ Eigen::Vector3d LiquidFlowLocalAssembler::getFlux( double pressure = 0.0; NumLib::shapeFunctionInterpolate(local_x, shape_matrices.N, pressure); - vars.phase_pressure = pressure; + vars.liquid_phase_pressure = pressure; GlobalDimMatrixType const intrinsic_permeability = MaterialPropertyLib::formEigenTensor( @@ -149,7 +149,7 @@ void LiquidFlowLocalAssembler:: double p = 0.; NumLib::shapeFunctionInterpolate(local_x, ip_data.N, p); - vars.phase_pressure = p; + vars.liquid_phase_pressure = p; // Compute density: auto const fluid_density = @@ -161,8 +161,8 @@ void LiquidFlowLocalAssembler:: auto const ddensity_dpressure = liquid_phase[MaterialPropertyLib::PropertyType::density] .template dValue( - vars, MaterialPropertyLib::Variable::phase_pressure, pos, t, - dt); + vars, MaterialPropertyLib::Variable::liquid_phase_pressure, + pos, t, dt); auto const porosity = medium[MaterialPropertyLib::PropertyType::porosity] @@ -240,7 +240,7 @@ LiquidFlowLocalAssembler::getIntPtDarcyVelocity( vars.temperature = medium[MaterialPropertyLib::PropertyType::reference_temperature] .template value(vars, pos, t, dt); - vars.phase_pressure = std::numeric_limits::quiet_NaN(); + vars.liquid_phase_pressure = std::numeric_limits::quiet_NaN(); GlobalDimMatrixType const permeability = MaterialPropertyLib::formEigenTensor( @@ -297,7 +297,7 @@ void LiquidFlowLocalAssembler:: auto const& ip_data = _ip_data[ip]; double p = 0.; NumLib::shapeFunctionInterpolate(local_x, ip_data.N, p); - vars.phase_pressure = p; + vars.liquid_phase_pressure = p; // Compute density: auto const fluid_density = diff --git a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportFEM-impl.h b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportFEM-impl.h index 2d455693ec7..06d0652ba12 100644 --- a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportFEM-impl.h +++ b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportFEM-impl.h @@ -133,7 +133,7 @@ void LocalAssemblerData::assemble( pos, t, dt); vars.concentration = C_int_pt; - vars.phase_pressure = p_int_pt; + vars.liquid_phase_pressure = p_int_pt; // \todo the argument to getValue() has to be changed for non // constant storage model @@ -292,7 +292,7 @@ LocalAssemblerData::getIntPtDarcyVelocity( if (_process_data.has_gravity) { vars.concentration = C_int_pt; - vars.phase_pressure = p_int_pt; + vars.liquid_phase_pressure = p_int_pt; auto const rho_w = phase[MaterialPropertyLib::PropertyType::density] .template value(vars, pos, t, dt); auto const b = _process_data.specific_body_force; diff --git a/ProcessLib/RichardsFlow/RichardsFlowFEM.h b/ProcessLib/RichardsFlow/RichardsFlowFEM.h index 19561b32102..4f41ab08850 100644 --- a/ProcessLib/RichardsFlow/RichardsFlowFEM.h +++ b/ProcessLib/RichardsFlow/RichardsFlowFEM.h @@ -173,7 +173,7 @@ class LocalAssemblerData : public RichardsFlowLocalAssemblerInterface double p_int_pt = 0.0; NumLib::shapeFunctionInterpolate(local_x, _ip_data[ip].N, p_int_pt); - vars.phase_pressure = p_int_pt; + vars.liquid_phase_pressure = p_int_pt; vars.capillary_pressure = -p_int_pt; auto const permeability = @@ -201,7 +201,8 @@ class LocalAssemblerData : public RichardsFlowLocalAssemblerInterface liquid_phase .property(MaterialPropertyLib::PropertyType::density) .template dValue( - vars, MaterialPropertyLib::Variable::phase_pressure, + vars, + MaterialPropertyLib::Variable::liquid_phase_pressure, pos, t, dt); auto const storage = medium.property(MaterialPropertyLib::PropertyType::storage) @@ -313,7 +314,7 @@ class LocalAssemblerData : public RichardsFlowLocalAssemblerInterface { double p_int_pt = 0.0; NumLib::shapeFunctionInterpolate(local_x, _ip_data[ip].N, p_int_pt); - vars.phase_pressure = p_int_pt; + vars.liquid_phase_pressure = p_int_pt; vars.capillary_pressure = -p_int_pt; double const Sw = diff --git a/ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h b/ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h index 30a9d207ac0..8ac0b4eb982 100644 --- a/ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h +++ b/ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h @@ -312,7 +312,7 @@ void RichardsMechanicsLocalAssemblerproperty(MPL::PropertyType::reference_temperature) @@ -636,11 +636,12 @@ void RichardsMechanicsLocalAssembler< // // pressure equation, pressure part. // - auto const beta_LR = 1 / rho_LR * - liquid_phase.property(MPL::PropertyType::density) - .template dValue( - variables, MPL::Variable::phase_pressure, - x_position, t, dt); + auto const beta_LR = + 1 / rho_LR * + liquid_phase.property(MPL::PropertyType::density) + .template dValue(variables, + MPL::Variable::liquid_phase_pressure, + x_position, t, dt); double const a0 = S_L * (alpha - phi) * beta_SR; // Volumetric average specific storage of the solid and fluid phases. @@ -798,7 +799,7 @@ void RichardsMechanicsLocalAssemblerproperty(MPL::PropertyType::reference_temperature) .template value(variables, x_position, t, dt); @@ -1039,11 +1040,12 @@ void RichardsMechanicsLocalAssembler( - variables, MPL::Variable::phase_pressure, - x_position, t, dt); + auto const beta_LR = + 1 / rho_LR * + liquid_phase.property(MPL::PropertyType::density) + .template dValue(variables, + MPL::Variable::liquid_phase_pressure, + x_position, t, dt); double const a0 = (alpha - phi) * beta_SR; double const specific_storage_a_p = S_L * (phi * beta_LR + S_L * a0); @@ -1571,7 +1573,7 @@ void RichardsMechanicsLocalAssemblerproperty(MPL::PropertyType::reference_temperature) diff --git a/ProcessLib/SteadyStateDiffusion/SteadyStateDiffusionFEM.h b/ProcessLib/SteadyStateDiffusion/SteadyStateDiffusionFEM.h index 7de0fc8991d..df6b1339cc4 100644 --- a/ProcessLib/SteadyStateDiffusion/SteadyStateDiffusionFEM.h +++ b/ProcessLib/SteadyStateDiffusion/SteadyStateDiffusionFEM.h @@ -116,7 +116,7 @@ class LocalAssemblerData : public SteadyStateDiffusionLocalAssemblerInterface double p_int_pt = 0.0; NumLib::shapeFunctionInterpolate(local_x, sm.N, p_int_pt); - vars.phase_pressure = p_int_pt; + vars.liquid_phase_pressure = p_int_pt; auto const k = MaterialPropertyLib::formEigenTensor( medium.property(MaterialPropertyLib::PropertyType::diffusion) .value(vars, pos, t, dt)); @@ -159,7 +159,7 @@ class LocalAssemblerData : public SteadyStateDiffusionLocalAssemblerInterface .template value(vars, pos, t, dt); double pressure = 0.0; NumLib::shapeFunctionInterpolate(local_x, shape_matrices.N, pressure); - vars.phase_pressure = pressure; + vars.liquid_phase_pressure = pressure; auto const k = MaterialPropertyLib::formEigenTensor( medium.property(MaterialPropertyLib::PropertyType::diffusion) @@ -227,7 +227,7 @@ class LocalAssemblerData : public SteadyStateDiffusionLocalAssemblerInterface pos.setIntegrationPoint(i); NumLib::shapeFunctionInterpolate(local_x, _shape_matrices[i].N, pressure); - vars.phase_pressure = pressure; + vars.liquid_phase_pressure = pressure; auto const k = MaterialPropertyLib::formEigenTensor( medium.property(MaterialPropertyLib::PropertyType::diffusion) diff --git a/ProcessLib/StokesFlow/StokesFlowFEM.h b/ProcessLib/StokesFlow/StokesFlowFEM.h index 22100998ab1..e359c12c20d 100644 --- a/ProcessLib/StokesFlow/StokesFlowFEM.h +++ b/ProcessLib/StokesFlow/StokesFlowFEM.h @@ -188,7 +188,7 @@ class LocalAssemblerData : public StokesFlowLocalAssemblerInterface NumLib::shapeFunctionInterpolate(local_p, N_p, p_int_pt); - vars.phase_pressure = p_int_pt; + vars.liquid_phase_pressure = p_int_pt; // Use the viscosity model to compute the viscosity auto const mu = phase[MaterialPropertyLib::PropertyType::viscosity] diff --git a/ProcessLib/TH2M/PhaseTransitionModels/NoPhaseTransition.cpp b/ProcessLib/TH2M/PhaseTransitionModels/NoPhaseTransition.cpp index d5fc22546f1..032a66331e0 100644 --- a/ProcessLib/TH2M/PhaseTransitionModels/NoPhaseTransition.cpp +++ b/ProcessLib/TH2M/PhaseTransitionModels/NoPhaseTransition.cpp @@ -44,7 +44,7 @@ PhaseTransitionModelVariables NoPhaseTransition::updateConstitutiveVariables( ParameterLib::SpatialPosition pos, double const t, double const dt) const { // primary variables - auto const pGR = variables.phase_pressure; + auto const pGR = variables.gas_phase_pressure; auto const T = variables.temperature; auto const& liquid_phase = medium->phase("AqueousLiquid"); @@ -116,8 +116,8 @@ PhaseTransitionModelVariables NoPhaseTransition::updateConstitutiveVariables( cv.drho_GR_dp_GR = gas_phase.property(MaterialPropertyLib::PropertyType::density) .template dValue( - variables, MaterialPropertyLib::Variable::phase_pressure, pos, - t, dt); + variables, MaterialPropertyLib::Variable::gas_phase_pressure, + pos, t, dt); cv.drho_LR_dp_LR = liquid_phase[MaterialPropertyLib::PropertyType::density] .template dValue( diff --git a/ProcessLib/TH2M/PhaseTransitionModels/PhaseTransition.cpp b/ProcessLib/TH2M/PhaseTransitionModels/PhaseTransition.cpp index ea5d99ec6f8..938aae4acdc 100644 --- a/ProcessLib/TH2M/PhaseTransitionModels/PhaseTransition.cpp +++ b/ProcessLib/TH2M/PhaseTransitionModels/PhaseTransition.cpp @@ -98,7 +98,7 @@ PhaseTransitionModelVariables PhaseTransition::updateConstitutiveVariables( ParameterLib::SpatialPosition pos, double const t, const double dt) const { // primary variables - auto const pGR = variables.phase_pressure; + auto const pGR = variables.gas_phase_pressure; auto const pCap = variables.capillary_pressure; auto const T = variables.temperature; auto const pLR = pGR - pCap; @@ -225,8 +225,8 @@ PhaseTransitionModelVariables PhaseTransition::updateConstitutiveVariables( cv.drho_GR_dp_GR = gas_phase.property(MaterialPropertyLib::PropertyType::density) .template dValue( - variables, MaterialPropertyLib::Variable::phase_pressure, pos, - t, dt); + variables, MaterialPropertyLib::Variable::gas_phase_pressure, + pos, t, dt); auto const dMG_dpCap = dxnWG_dpCap * dMG; variables.molar_mass_derivative = dMG_dpCap; @@ -331,8 +331,8 @@ PhaseTransitionModelVariables PhaseTransition::updateConstitutiveVariables( solute_component .property(MaterialPropertyLib::PropertyType::henry_coefficient) .template dValue( - variables, MaterialPropertyLib::Variable::phase_pressure, pos, - t, dt); + variables, MaterialPropertyLib::Variable::gas_phase_pressure, + pos, t, dt); // Concentration of the dissolved gas as amount of substance of the // mixture component C related to the total volume of the liquid phase. diff --git a/ProcessLib/TH2M/TH2MFEM-impl.h b/ProcessLib/TH2M/TH2MFEM-impl.h index fa59f746c1c..2d8cd1d27e5 100644 --- a/ProcessLib/TH2M/TH2MFEM-impl.h +++ b/ProcessLib/TH2M/TH2MFEM-impl.h @@ -158,7 +158,7 @@ std::vector> TH2MLocalAssembler< MPL::VariableArray vars; MPL::VariableArray vars_prev; vars.temperature = T; - vars.phase_pressure = pGR; + vars.gas_phase_pressure = pGR; vars.capillary_pressure = pCap; vars.liquid_phase_pressure = pLR; diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPLocalAssembler-impl.h b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPLocalAssembler-impl.h index 5febeba6387..b1707b0a473 100644 --- a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPLocalAssembler-impl.h +++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPLocalAssembler-impl.h @@ -167,7 +167,7 @@ void ThermalTwoPhaseFlowWithPPLocalAssembler:: IdealGasConstant * T_int_pt; vars.temperature = T_int_pt; vars.capillary_pressure = pc_int_pt; - vars.phase_pressure = pg_int_pt; + vars.gas_phase_pressure = pg_int_pt; auto const& medium = *_process_data.media_map.getMedium(this->_element.getID()); diff --git a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM-impl.h b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM-impl.h index 8477226eb32..8e4c36a2d9c 100644 --- a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM-impl.h +++ b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM-impl.h @@ -200,7 +200,7 @@ ConstitutiveRelationsValues ThermoHydroMechanicsLocalAssembler< vars.temperature = T_int_pt; double const p_int_pt = N.dot(p); - vars.phase_pressure = p_int_pt; + vars.liquid_phase_pressure = p_int_pt; vars.liquid_saturation = 1.0; @@ -254,8 +254,8 @@ ConstitutiveRelationsValues ThermoHydroMechanicsLocalAssembler< auto const drho_dp = liquid_phase.property(MaterialPropertyLib::PropertyType::density) .template dValue( - vars, MaterialPropertyLib::Variable::phase_pressure, x_position, - t, dt); + vars, MaterialPropertyLib::Variable::liquid_phase_pressure, + x_position, t, dt); crv.fluid_compressibility = 1 / fluid_density * drho_dp; diff --git a/ProcessLib/ThermoRichardsFlow/ThermoRichardsFlowFEM-impl.h b/ProcessLib/ThermoRichardsFlow/ThermoRichardsFlowFEM-impl.h index f3805644612..2685655c2ac 100644 --- a/ProcessLib/ThermoRichardsFlow/ThermoRichardsFlowFEM-impl.h +++ b/ProcessLib/ThermoRichardsFlow/ThermoRichardsFlowFEM-impl.h @@ -139,7 +139,7 @@ void ThermoRichardsFlowLocalAssembler:: NumLib::shapeFunctionInterpolate(-p_L, N, p_cap_ip); variables.capillary_pressure = p_cap_ip; - variables.phase_pressure = -p_cap_ip; + variables.liquid_phase_pressure = -p_cap_ip; // Note: temperature dependent saturation model is not considered so // far. @@ -252,7 +252,7 @@ void ThermoRichardsFlowLocalAssembler:: NumLib::shapeFunctionInterpolate(-p_L_prev, N, p_cap_prev_ip); variables.capillary_pressure = p_cap_ip; - variables.phase_pressure = -p_cap_ip; + variables.liquid_phase_pressure = -p_cap_ip; variables.temperature = T_ip; auto& S_L = _ip_data[ip].saturation; @@ -278,7 +278,8 @@ void ThermoRichardsFlowLocalAssembler:: double const drho_LR_dp = liquid_phase[MPL::PropertyType::density].template dValue( - variables, MPL::Variable::phase_pressure, x_position, t, dt); + variables, MPL::Variable::liquid_phase_pressure, x_position, t, + dt); auto const beta_LR = drho_LR_dp / rho_LR; S_L = medium[MPL::PropertyType::saturation].template value( @@ -523,9 +524,9 @@ void ThermoRichardsFlowLocalAssembler:: x_position, t, dt); double const drho_wv_dp = gas_phase->property(MPL::PropertyType::density) - .template dValue(variables, - MPL::Variable::phase_pressure, - x_position, t, dt); + .template dValue( + variables, MPL::Variable::liquid_phase_pressure, + x_position, t, dt); auto const f_Tv = gas_phase ->property( @@ -745,7 +746,7 @@ void ThermoRichardsFlowLocalAssembler::assemble( NumLib::shapeFunctionInterpolate(-p_L_prev, N, p_cap_prev_ip); variables.capillary_pressure = p_cap_ip; - variables.phase_pressure = -p_cap_ip; + variables.liquid_phase_pressure = -p_cap_ip; variables.temperature = T_ip; auto& S_L = _ip_data[ip].saturation; @@ -770,7 +771,8 @@ void ThermoRichardsFlowLocalAssembler::assemble( double const drho_LR_dp = liquid_phase[MPL::PropertyType::density].template dValue( - variables, MPL::Variable::phase_pressure, x_position, t, dt); + variables, MPL::Variable::liquid_phase_pressure, x_position, t, + dt); auto const beta_LR = drho_LR_dp / rho_LR; S_L = medium[MPL::PropertyType::saturation].template value( @@ -980,9 +982,9 @@ void ThermoRichardsFlowLocalAssembler::assemble( x_position, t, dt); double const drho_wv_dp = gas_phase->property(MaterialPropertyLib::density) - .template dValue(variables, - MPL::Variable::phase_pressure, - x_position, t, dt); + .template dValue( + variables, MPL::Variable::liquid_phase_pressure, + x_position, t, dt); auto const f_Tv = gas_phase ->property( @@ -1227,7 +1229,7 @@ void ThermoRichardsFlowLocalAssembler:: NumLib::shapeFunctionInterpolate(-p_L_prev, N, p_cap_prev_ip); variables.capillary_pressure = p_cap_ip; - variables.phase_pressure = -p_cap_ip; + variables.liquid_phase_pressure = -p_cap_ip; variables.temperature = T_ip; diff --git a/ProcessLib/ThermoRichardsMechanics/ConstitutiveCommon/FluidThermalExpansion.cpp b/ProcessLib/ThermoRichardsMechanics/ConstitutiveCommon/FluidThermalExpansion.cpp index 4a57b4f2d85..14f78e3b716 100644 --- a/ProcessLib/ThermoRichardsMechanics/ConstitutiveCommon/FluidThermalExpansion.cpp +++ b/ProcessLib/ThermoRichardsMechanics/ConstitutiveCommon/FluidThermalExpansion.cpp @@ -29,7 +29,7 @@ void FluidThermalExpansionModel::eval( namespace MPL = MaterialPropertyLib; MPL::VariableArray variables; - variables.phase_pressure = -p_cap_data.p_cap; + variables.liquid_phase_pressure = -p_cap_data.p_cap; variables.temperature = T_data.T; double const phi = poro_data.phi; diff --git a/ProcessLib/ThermoRichardsMechanics/ConstitutiveCommon/LiquidDensity.cpp b/ProcessLib/ThermoRichardsMechanics/ConstitutiveCommon/LiquidDensity.cpp index e30fccfbcc7..774624e1d63 100644 --- a/ProcessLib/ThermoRichardsMechanics/ConstitutiveCommon/LiquidDensity.cpp +++ b/ProcessLib/ThermoRichardsMechanics/ConstitutiveCommon/LiquidDensity.cpp @@ -21,7 +21,7 @@ void LiquidDensityModel::eval( { namespace MPL = MaterialPropertyLib; MPL::VariableArray variables; - variables.phase_pressure = -p_cap_data.p_cap; + variables.liquid_phase_pressure = -p_cap_data.p_cap; variables.temperature = T_data.T; auto const& liquid_phase = media_data.liquid; @@ -29,10 +29,10 @@ void LiquidDensityModel::eval( out.rho_LR = liquid_phase.property(MPL::PropertyType::density) .template value(variables, x_t.x, x_t.t, x_t.dt); - out.drho_LR_dp = - liquid_phase.property(MPL::PropertyType::density) - .template dValue(variables, MPL::Variable::phase_pressure, - x_t.x, x_t.t, x_t.dt); + out.drho_LR_dp = liquid_phase.property(MPL::PropertyType::density) + .template dValue( + variables, MPL::Variable::liquid_phase_pressure, + x_t.x, x_t.t, x_t.dt); out.drho_LR_dT = liquid_phase.property(MPL::PropertyType::density) diff --git a/ProcessLib/ThermoRichardsMechanics/ConstitutiveCommon/TRMVaporDiffusion.cpp b/ProcessLib/ThermoRichardsMechanics/ConstitutiveCommon/TRMVaporDiffusion.cpp index a7c17a5430d..e173cfcc3f0 100644 --- a/ProcessLib/ThermoRichardsMechanics/ConstitutiveCommon/TRMVaporDiffusion.cpp +++ b/ProcessLib/ThermoRichardsMechanics/ConstitutiveCommon/TRMVaporDiffusion.cpp @@ -40,7 +40,7 @@ void TRMVaporDiffusionModel::eval( namespace MPL = MaterialPropertyLib; MPL::VariableArray variables; variables.temperature = T_data.T; - variables.phase_pressure = -p_cap_data.p_cap; + variables.liquid_phase_pressure = -p_cap_data.p_cap; variables.density = rho_L_data.rho_LR; variables.liquid_saturation = S_L_data.S_L; @@ -64,8 +64,8 @@ void TRMVaporDiffusionModel::eval( double const drho_wv_dp = gas_phase->property(MaterialPropertyLib::density) .template dValue(variables, - MPL::Variable::phase_pressure, x_t.x, - x_t.t, x_t.dt); + MPL::Variable::liquid_phase_pressure, + x_t.x, x_t.t, x_t.dt); auto const f_Tv = gas_phase ->property( diff --git a/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h b/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h index c8906ebc8fb..0d9f565ce04 100644 --- a/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h +++ b/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h @@ -123,7 +123,7 @@ void ThermoRichardsMechanicsLocalAssembler::assemble( _pressure_wet[ip] = pn_int_pt - pc_int_pt; MPL::VariableArray variables; - variables.phase_pressure = pn_int_pt; + variables.gas_phase_pressure = pn_int_pt; variables.capillary_pressure = pc_int_pt; variables.temperature = _process_data.temperature(t, pos)[0]; variables.molar_mass = @@ -142,7 +142,7 @@ void TwoPhaseFlowWithPPLocalAssembler::assemble( auto const drhononwet_dpn = gas_phase.property(MPL::PropertyType::density) .template dValue( - variables, MPL::Variable::phase_pressure, pos, t, dt); + variables, MPL::Variable::gas_phase_pressure, pos, t, dt); auto const k_rel_wet = medium.property(MPL::PropertyType::relative_permeability) diff --git a/Tests/Data/HydroMechanics/A2/A2.prj b/Tests/Data/HydroMechanics/A2/A2.prj index c58badeb9ac..ff6cdb7d80e 100644 --- a/Tests/Data/HydroMechanics/A2/A2.prj +++ b/Tests/Data/HydroMechanics/A2/A2.prj @@ -58,7 +58,7 @@ -6.0e-4 - phase_pressure + liquid_phase_pressure 4e6 0.5e-9 diff --git a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D.prj b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D.prj index 31e5f86b36b..7d249cd499c 100644 --- a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D.prj +++ b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D.prj @@ -50,7 +50,7 @@ Linear 1.0e3 - phase_pressure + gas_phase_pressure 2.125e6 2.75e-8 diff --git a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1DMono.prj b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1DMono.prj index 6104bc82091..46cd7167a1e 100644 --- a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1DMono.prj +++ b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1DMono.prj @@ -47,7 +47,7 @@ Linear 1e3 - phase_pressure + gas_phase_pressure 2.125e6 2.75e-8 diff --git a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1DMono_python.prj b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1DMono_python.prj index 3a36f9369d1..8e19d46f74f 100644 --- a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1DMono_python.prj +++ b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1DMono_python.prj @@ -66,7 +66,7 @@ https://www.opengeosys.org/docs/benchmarks/hydro-mechanics/injectionproduction/ Linear 1e3 - phase_pressure + gas_phase_pressure 2.125e6 2.75e-8 diff --git a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1DMono_python_Neumann.prj b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1DMono_python_Neumann.prj index 55824794399..e355b859e82 100644 --- a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1DMono_python_Neumann.prj +++ b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1DMono_python_Neumann.prj @@ -67,7 +67,7 @@ https://www.opengeosys.org/docs/benchmarks/hydro-mechanics/injectionproduction/ Linear 1e3 - phase_pressure + gas_phase_pressure 2.125e6 2.75e-8 diff --git a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D_MFront.prj b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D_MFront.prj index e27807b8659..9c6fa7dbdf2 100644 --- a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D_MFront.prj +++ b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D_MFront.prj @@ -53,7 +53,7 @@ Linear 1.0e3 - phase_pressure + gas_phase_pressure 2.125e6 2.75e-8 diff --git a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D_python.prj b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D_python.prj index 90fac44e3c3..d8f70b56d39 100644 --- a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D_python.prj +++ b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D_python.prj @@ -69,7 +69,7 @@ https://www.opengeosys.org/docs/benchmarks/hydro-mechanics/injectionproduction/ Linear 1.0e3 - phase_pressure + gas_phase_pressure 2.125e6 2.75e-8 diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj index 097b738cddd..960a35c450a 100644 --- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj +++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj @@ -55,7 +55,7 @@ 0.0 - phase_pressure + liquid_phase_pressure 0 5e-5 diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj index 8aca946e143..f69782408eb 100644 --- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj +++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj @@ -49,14 +49,14 @@ density Function - 1 + 0.026 * concentration + 5e-5 * (phase_pressure - 0.5) + 1 + 0.026 * concentration + 5e-5 * (liquid_phase_pressure - 0.5) concentration 0.026 - phase_pressure + liquid_phase_pressure 5e-5 @@ -69,7 +69,7 @@ 0.026 - phase_pressure + liquid_phase_pressure 0.5 5e-5 diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj index a6ce39c5211..7de824146b3 100644 --- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj +++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj @@ -55,7 +55,7 @@ 0.026 - phase_pressure + liquid_phase_pressure 0.5 2e-5 diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj index fd4cecf9f72..6878197c31e 100644 --- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj +++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj @@ -55,7 +55,7 @@ 0.026 - phase_pressure + liquid_phase_pressure 0.5 2e-5 diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj index 6252a3d269b..8fbdaa2ed89 100644 --- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj +++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj @@ -55,7 +55,7 @@ .026 - phase_pressure + liquid_phase_pressure 0 5e-5 diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj index d404ce84ad5..2ee4dfec194 100644 --- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj +++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj @@ -55,7 +55,7 @@ 1 - phase_pressure + liquid_phase_pressure 0 5e-5 diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionAndStorage.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionAndStorage.prj index 404823d0038..9345463d9ba 100644 --- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionAndStorage.prj +++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionAndStorage.prj @@ -56,7 +56,7 @@ 0.0 - phase_pressure + liquid_phase_pressure 0 5e-5 diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvection.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvection.prj index 9dfd040a0ee..5d61e705903 100644 --- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvection.prj +++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvection.prj @@ -56,7 +56,7 @@ 0.026 - phase_pressure + liquid_phase_pressure 0.5 5e-5 diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDecay.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDecay.prj index ab17bddfdd6..5a25c6147d7 100644 --- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDecay.prj +++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDecay.prj @@ -56,7 +56,7 @@ 0.026 - phase_pressure + liquid_phase_pressure 0.5 2e-5 diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion.prj index 6176c93cd2a..3069c5de9b1 100644 --- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion.prj +++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion.prj @@ -56,7 +56,7 @@ 0.026 - phase_pressure + liquid_phase_pressure 0.5 2e-5 diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj index 70077f28037..de0b8aff186 100644 --- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj +++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj @@ -56,7 +56,7 @@ 0.026 - phase_pressure + liquid_phase_pressure 0 5e-5 diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion_3Components.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion_3Components.prj index fb5bc0cc89a..e95dff23a8e 100644 --- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion_3Components.prj +++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion_3Components.prj @@ -98,7 +98,7 @@ 0.026 - phase_pressure + liquid_phase_pressure 0.5 2e-5 diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndGravityAndDispersionHalf.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndGravityAndDispersionHalf.prj index 8f2f4258f54..c2d9307bc86 100644 --- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndGravityAndDispersionHalf.prj +++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndGravityAndDispersionHalf.prj @@ -56,7 +56,7 @@ 1 - phase_pressure + liquid_phase_pressure 0 5e-5 diff --git a/Tests/Data/Parabolic/ComponentTransport/Theis/theis.prj b/Tests/Data/Parabolic/ComponentTransport/Theis/theis.prj index b7877db3cc0..d104a38f4c7 100644 --- a/Tests/Data/Parabolic/ComponentTransport/Theis/theis.prj +++ b/Tests/Data/Parabolic/ComponentTransport/Theis/theis.prj @@ -62,7 +62,7 @@ 0 - phase_pressure + liquid_phase_pressure 0 5.0968E-08 diff --git a/Tests/Data/Parabolic/LiquidFlow/InclinedMeshElements/1Din3D/line_fractures_in_3D.prj b/Tests/Data/Parabolic/LiquidFlow/InclinedMeshElements/1Din3D/line_fractures_in_3D.prj index 2110c2992b3..10b6b4a5b23 100644 --- a/Tests/Data/Parabolic/LiquidFlow/InclinedMeshElements/1Din3D/line_fractures_in_3D.prj +++ b/Tests/Data/Parabolic/LiquidFlow/InclinedMeshElements/1Din3D/line_fractures_in_3D.prj @@ -38,7 +38,7 @@ Linear 1000.0 - phase_pressure + liquid_phase_pressure 1e5 diff --git a/Tests/Data/Parabolic/LiquidFlow/InclinedMeshElements/FractureIn3D/fractures_in_3D.prj b/Tests/Data/Parabolic/LiquidFlow/InclinedMeshElements/FractureIn3D/fractures_in_3D.prj index 24ec9a02aa2..23345a5f13f 100644 --- a/Tests/Data/Parabolic/LiquidFlow/InclinedMeshElements/FractureIn3D/fractures_in_3D.prj +++ b/Tests/Data/Parabolic/LiquidFlow/InclinedMeshElements/FractureIn3D/fractures_in_3D.prj @@ -39,7 +39,7 @@ Linear 1000.0 - phase_pressure + liquid_phase_pressure 1e5 @@ -88,7 +88,7 @@ Linear 1000.0 - phase_pressure + liquid_phase_pressure 1e5 @@ -137,7 +137,7 @@ Linear 1000.0 - phase_pressure + liquid_phase_pressure 1e5 diff --git a/Tests/Data/Parabolic/LiquidFlow/InclinedMeshElements/Inclined2DMesh/transient_flow_in_inclined_2D_plane.prj b/Tests/Data/Parabolic/LiquidFlow/InclinedMeshElements/Inclined2DMesh/transient_flow_in_inclined_2D_plane.prj index f0402c9b974..5623c4544c4 100644 --- a/Tests/Data/Parabolic/LiquidFlow/InclinedMeshElements/Inclined2DMesh/transient_flow_in_inclined_2D_plane.prj +++ b/Tests/Data/Parabolic/LiquidFlow/InclinedMeshElements/Inclined2DMesh/transient_flow_in_inclined_2D_plane.prj @@ -35,7 +35,7 @@ Linear 1000.0 - phase_pressure + liquid_phase_pressure 1e5 diff --git a/Tests/Data/RichardsMechanics/A2.prj b/Tests/Data/RichardsMechanics/A2.prj index c155c2603d1..1742ca14448 100644 --- a/Tests/Data/RichardsMechanics/A2.prj +++ b/Tests/Data/RichardsMechanics/A2.prj @@ -59,7 +59,7 @@ -6.0e-4 - phase_pressure + liquid_phase_pressure 4e6 0.5e-9 diff --git a/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos.prj b/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos.prj index 18f173bdbcc..05fb9bf0365 100644 --- a/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos.prj +++ b/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos.prj @@ -48,7 +48,7 @@ Linear 1e3 - phase_pressure + liquid_phase_pressure 0 5e-10 diff --git a/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos_QN.prj b/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos_QN.prj index d4519180f7f..3fc0eff9be0 100644 --- a/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos_QN.prj +++ b/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos_QN.prj @@ -68,7 +68,7 @@ Linear 1e3 - phase_pressure + liquid_phase_pressure 0 5e-10 diff --git a/Tests/Data/RichardsMechanics/RichardsFlow_2d_quasinewton.prj b/Tests/Data/RichardsMechanics/RichardsFlow_2d_quasinewton.prj index a58292b0d20..50d7e2ddb53 100644 --- a/Tests/Data/RichardsMechanics/RichardsFlow_2d_quasinewton.prj +++ b/Tests/Data/RichardsMechanics/RichardsFlow_2d_quasinewton.prj @@ -46,7 +46,7 @@ Linear 1 - phase_pressure + liquid_phase_pressure -5000 0.45454545454545454545e-300 diff --git a/Tests/Data/RichardsMechanics/RichardsFlow_2d_richardsflow.prj b/Tests/Data/RichardsMechanics/RichardsFlow_2d_richardsflow.prj index 144387f8b70..c73a366b4b2 100644 --- a/Tests/Data/RichardsMechanics/RichardsFlow_2d_richardsflow.prj +++ b/Tests/Data/RichardsMechanics/RichardsFlow_2d_richardsflow.prj @@ -34,7 +34,7 @@ Linear 1 - phase_pressure + liquid_phase_pressure -5000 0.45454545454545454545e-300 diff --git a/Tests/Data/RichardsMechanics/RichardsFlow_2d_small.prj b/Tests/Data/RichardsMechanics/RichardsFlow_2d_small.prj index 4839d171d4d..b871b548e73 100644 --- a/Tests/Data/RichardsMechanics/RichardsFlow_2d_small.prj +++ b/Tests/Data/RichardsMechanics/RichardsFlow_2d_small.prj @@ -41,7 +41,7 @@ Linear 1 - phase_pressure + liquid_phase_pressure -5000 0.45454545454545454545e-300 diff --git a/Tests/Data/RichardsMechanics/RichardsFlow_2d_small_masslumping.prj b/Tests/Data/RichardsMechanics/RichardsFlow_2d_small_masslumping.prj index 56875d404c6..82291a1ebaa 100644 --- a/Tests/Data/RichardsMechanics/RichardsFlow_2d_small_masslumping.prj +++ b/Tests/Data/RichardsMechanics/RichardsFlow_2d_small_masslumping.prj @@ -37,7 +37,7 @@ Linear 1 - phase_pressure + liquid_phase_pressure -5000 0.45454545454545454545e-300 diff --git a/Tests/Data/RichardsMechanics/alternative_mass_balance_anzInterval_10.prj b/Tests/Data/RichardsMechanics/alternative_mass_balance_anzInterval_10.prj index 8a37eb3d43a..684de268d72 100644 --- a/Tests/Data/RichardsMechanics/alternative_mass_balance_anzInterval_10.prj +++ b/Tests/Data/RichardsMechanics/alternative_mass_balance_anzInterval_10.prj @@ -41,7 +41,7 @@ Linear 1e3 - phase_pressure + liquid_phase_pressure 0 5e-10 diff --git a/Tests/Data/RichardsMechanics/bishops_effective_stress_power_law.prj b/Tests/Data/RichardsMechanics/bishops_effective_stress_power_law.prj index fd041f6853e..3b6be65ffae 100644 --- a/Tests/Data/RichardsMechanics/bishops_effective_stress_power_law.prj +++ b/Tests/Data/RichardsMechanics/bishops_effective_stress_power_law.prj @@ -49,7 +49,7 @@ Linear 1 - phase_pressure + liquid_phase_pressure 0.1 1 diff --git a/Tests/Data/RichardsMechanics/bishops_effective_stress_saturation_cutoff.prj b/Tests/Data/RichardsMechanics/bishops_effective_stress_saturation_cutoff.prj index bc3f3374637..f1d721cf6fc 100644 --- a/Tests/Data/RichardsMechanics/bishops_effective_stress_saturation_cutoff.prj +++ b/Tests/Data/RichardsMechanics/bishops_effective_stress_saturation_cutoff.prj @@ -49,7 +49,7 @@ Linear 1 - phase_pressure + liquid_phase_pressure 0.1 1 diff --git a/Tests/Data/RichardsMechanics/confined_compression_fully_saturated.prj b/Tests/Data/RichardsMechanics/confined_compression_fully_saturated.prj index bbf811e58ad..0d77f18bbdf 100644 --- a/Tests/Data/RichardsMechanics/confined_compression_fully_saturated.prj +++ b/Tests/Data/RichardsMechanics/confined_compression_fully_saturated.prj @@ -48,7 +48,7 @@ Linear 1e-6 - phase_pressure + liquid_phase_pressure 0 1e-100 diff --git a/Tests/Data/RichardsMechanics/confined_compression_fully_saturated_restart.prj b/Tests/Data/RichardsMechanics/confined_compression_fully_saturated_restart.prj index 7a4c1482226..fc56797a5b4 100644 --- a/Tests/Data/RichardsMechanics/confined_compression_fully_saturated_restart.prj +++ b/Tests/Data/RichardsMechanics/confined_compression_fully_saturated_restart.prj @@ -48,7 +48,7 @@ Linear 1e-6 - phase_pressure + liquid_phase_pressure 0 1e-100 diff --git a/Tests/Data/RichardsMechanics/deformation_dependent_porosity.prj b/Tests/Data/RichardsMechanics/deformation_dependent_porosity.prj index fe77d29ef96..3d1c064d9c8 100644 --- a/Tests/Data/RichardsMechanics/deformation_dependent_porosity.prj +++ b/Tests/Data/RichardsMechanics/deformation_dependent_porosity.prj @@ -49,7 +49,7 @@ Linear 1 - phase_pressure + liquid_phase_pressure 0 1 diff --git a/Tests/Data/RichardsMechanics/deformation_dependent_porosity_swelling.prj b/Tests/Data/RichardsMechanics/deformation_dependent_porosity_swelling.prj index c4e1754e819..49d74983556 100644 --- a/Tests/Data/RichardsMechanics/deformation_dependent_porosity_swelling.prj +++ b/Tests/Data/RichardsMechanics/deformation_dependent_porosity_swelling.prj @@ -52,7 +52,7 @@ Linear 1 - phase_pressure + liquid_phase_pressure 0 1 diff --git a/Tests/Data/RichardsMechanics/flow_fully_saturated.prj b/Tests/Data/RichardsMechanics/flow_fully_saturated.prj index 1784c0c58d8..54c9f0893bc 100644 --- a/Tests/Data/RichardsMechanics/flow_fully_saturated.prj +++ b/Tests/Data/RichardsMechanics/flow_fully_saturated.prj @@ -41,7 +41,7 @@ Linear 1 - phase_pressure + liquid_phase_pressure 0 1e-100 diff --git a/Tests/Data/RichardsMechanics/flow_fully_saturated_anisotropic.prj b/Tests/Data/RichardsMechanics/flow_fully_saturated_anisotropic.prj index 60f3ce19817..a828ff8414e 100644 --- a/Tests/Data/RichardsMechanics/flow_fully_saturated_anisotropic.prj +++ b/Tests/Data/RichardsMechanics/flow_fully_saturated_anisotropic.prj @@ -41,7 +41,7 @@ Linear 1 - phase_pressure + liquid_phase_pressure 0 1e-100 diff --git a/Tests/Data/RichardsMechanics/flow_fully_saturated_coordinate_system.prj b/Tests/Data/RichardsMechanics/flow_fully_saturated_coordinate_system.prj index 9c4063a52ef..02e80614196 100644 --- a/Tests/Data/RichardsMechanics/flow_fully_saturated_coordinate_system.prj +++ b/Tests/Data/RichardsMechanics/flow_fully_saturated_coordinate_system.prj @@ -41,7 +41,7 @@ Linear 1 - phase_pressure + liquid_phase_pressure 0 1e-100 diff --git a/Tests/Data/RichardsMechanics/flow_fully_saturated_linear.prj b/Tests/Data/RichardsMechanics/flow_fully_saturated_linear.prj index 9a0a041a461..07dab475802 100644 --- a/Tests/Data/RichardsMechanics/flow_fully_saturated_linear.prj +++ b/Tests/Data/RichardsMechanics/flow_fully_saturated_linear.prj @@ -41,7 +41,7 @@ Linear 1 - phase_pressure + liquid_phase_pressure 0 1e-100 diff --git a/Tests/Data/RichardsMechanics/gravity.prj b/Tests/Data/RichardsMechanics/gravity.prj index f2c996a772b..ac95c9243e1 100644 --- a/Tests/Data/RichardsMechanics/gravity.prj +++ b/Tests/Data/RichardsMechanics/gravity.prj @@ -48,7 +48,7 @@ Linear 1e3 - phase_pressure + liquid_phase_pressure 10000 0.45454545454545454545e-9 diff --git a/Tests/Data/RichardsMechanics/mechanics_linear.prj b/Tests/Data/RichardsMechanics/mechanics_linear.prj index 7d20ba38ee5..a58706b6815 100644 --- a/Tests/Data/RichardsMechanics/mechanics_linear.prj +++ b/Tests/Data/RichardsMechanics/mechanics_linear.prj @@ -54,7 +54,7 @@ Linear 1e-6 - phase_pressure + liquid_phase_pressure 0 1e-100 diff --git a/Tests/Data/RichardsMechanics/orthotropic_power_law_permeability_xyz.prj b/Tests/Data/RichardsMechanics/orthotropic_power_law_permeability_xyz.prj index 7d498cb91a4..05429e1cccb 100644 --- a/Tests/Data/RichardsMechanics/orthotropic_power_law_permeability_xyz.prj +++ b/Tests/Data/RichardsMechanics/orthotropic_power_law_permeability_xyz.prj @@ -50,7 +50,7 @@ Linear 1 - phase_pressure + liquid_phase_pressure 0 1 diff --git a/Tests/Data/RichardsMechanics/orthotropic_swelling_xy.prj b/Tests/Data/RichardsMechanics/orthotropic_swelling_xy.prj index ae0b6a3d7e9..b25c3885d5b 100644 --- a/Tests/Data/RichardsMechanics/orthotropic_swelling_xy.prj +++ b/Tests/Data/RichardsMechanics/orthotropic_swelling_xy.prj @@ -50,7 +50,7 @@ Linear 1 - phase_pressure + liquid_phase_pressure 0 0.1 diff --git a/Tests/Data/RichardsMechanics/orthotropic_swelling_xyz.prj b/Tests/Data/RichardsMechanics/orthotropic_swelling_xyz.prj index 22294e3f779..4240332141d 100644 --- a/Tests/Data/RichardsMechanics/orthotropic_swelling_xyz.prj +++ b/Tests/Data/RichardsMechanics/orthotropic_swelling_xyz.prj @@ -53,7 +53,7 @@ Linear 1 - phase_pressure + liquid_phase_pressure 0 0.1 diff --git a/Tests/Data/RichardsMechanics/rotated_consolidation.prj b/Tests/Data/RichardsMechanics/rotated_consolidation.prj index 77ea8363601..cb44e9788d7 100644 --- a/Tests/Data/RichardsMechanics/rotated_consolidation.prj +++ b/Tests/Data/RichardsMechanics/rotated_consolidation.prj @@ -64,7 +64,7 @@ Linear 1e3 - phase_pressure + liquid_phase_pressure 0 1e-9 diff --git a/Tests/Data/TH2M/H2M/OrthotropicSwelling/square.prj b/Tests/Data/TH2M/H2M/OrthotropicSwelling/square.prj index 1b1f09e5b90..871afb280bd 100644 --- a/Tests/Data/TH2M/H2M/OrthotropicSwelling/square.prj +++ b/Tests/Data/TH2M/H2M/OrthotropicSwelling/square.prj @@ -72,7 +72,7 @@ Linear 1 - phase_pressure + gas_phase_pressure 0 0.1 diff --git a/Tests/Data/TH2M/HM/flow_fully_saturated.prj b/Tests/Data/TH2M/HM/flow_fully_saturated.prj index cbc93139e2a..36903d0786e 100644 --- a/Tests/Data/TH2M/HM/flow_fully_saturated.prj +++ b/Tests/Data/TH2M/HM/flow_fully_saturated.prj @@ -70,7 +70,7 @@ Linear 1 - phase_pressure + gas_phase_pressure 0 1e-100 diff --git a/Tests/Data/TH2M/HM/flow_fully_saturated_gas.prj b/Tests/Data/TH2M/HM/flow_fully_saturated_gas.prj index c5d87805a7f..bc0ff250642 100644 --- a/Tests/Data/TH2M/HM/flow_fully_saturated_gas.prj +++ b/Tests/Data/TH2M/HM/flow_fully_saturated_gas.prj @@ -70,7 +70,7 @@ Linear 1 - phase_pressure + gas_phase_pressure 0 1e-100 diff --git a/Tests/Data/TH2M/M/M_2d_neumann/M_2d_neumann.prj b/Tests/Data/TH2M/M/M_2d_neumann/M_2d_neumann.prj index 2edb077244d..a1e38a4e46f 100644 --- a/Tests/Data/TH2M/M/M_2d_neumann/M_2d_neumann.prj +++ b/Tests/Data/TH2M/M/M_2d_neumann/M_2d_neumann.prj @@ -82,7 +82,7 @@ Linear 10 - phase_pressure + gas_phase_pressure 100000 0.0001 @@ -112,7 +112,7 @@ Linear 1000 - phase_pressure + gas_phase_pressure 100000 0 diff --git a/Tests/Data/TH2M/TH/idealGasLaw/compression_gas.prj b/Tests/Data/TH2M/TH/idealGasLaw/compression_gas.prj index 80c62af7605..e1735593668 100644 --- a/Tests/Data/TH2M/TH/idealGasLaw/compression_gas.prj +++ b/Tests/Data/TH2M/TH/idealGasLaw/compression_gas.prj @@ -91,7 +91,7 @@ Linear 1 - phase_pressure + gas_phase_pressure 1000000 0.0001 diff --git a/Tests/Data/TH2M/TH2M/Ansicht_Simple_1e2/A2_THM.prj b/Tests/Data/TH2M/TH2M/Ansicht_Simple_1e2/A2_THM.prj index 1d0fe05a2a6..a251f4d979b 100644 --- a/Tests/Data/TH2M/TH2M/Ansicht_Simple_1e2/A2_THM.prj +++ b/Tests/Data/TH2M/TH2M/Ansicht_Simple_1e2/A2_THM.prj @@ -59,7 +59,7 @@ -6.0e-4 - phase_pressure + gas_phase_pressure 4e6 0.5e-9 diff --git a/Tests/Data/TH2M/TH2M/Ansicht_Simple_1e2/A2_TRM.prj b/Tests/Data/TH2M/TH2M/Ansicht_Simple_1e2/A2_TRM.prj index b0b2bfdb22e..fa9c2df8021 100644 --- a/Tests/Data/TH2M/TH2M/Ansicht_Simple_1e2/A2_TRM.prj +++ b/Tests/Data/TH2M/TH2M/Ansicht_Simple_1e2/A2_TRM.prj @@ -59,7 +59,7 @@ -6.0e-4 - phase_pressure + gas_phase_pressure 4e6 0.5e-9 diff --git a/Tests/Data/ThermoHydroMechanics/A2/A2.prj b/Tests/Data/ThermoHydroMechanics/A2/A2.prj index 012e028b72c..771c45df5e3 100644 --- a/Tests/Data/ThermoHydroMechanics/A2/A2.prj +++ b/Tests/Data/ThermoHydroMechanics/A2/A2.prj @@ -59,7 +59,7 @@ -6.0e-4 - phase_pressure + liquid_phase_pressure 4e6 0.5e-9 diff --git a/Tests/Data/ThermoHydroMechanics/A2/A2_heating.prj b/Tests/Data/ThermoHydroMechanics/A2/A2_heating.prj index 5f4b7d0c54f..36ebc67b06c 100644 --- a/Tests/Data/ThermoHydroMechanics/A2/A2_heating.prj +++ b/Tests/Data/ThermoHydroMechanics/A2/A2_heating.prj @@ -61,7 +61,7 @@ -6.0e-4 - phase_pressure + liquid_phase_pressure 4e6 0.5e-9 diff --git a/Tests/Data/ThermoHydroMechanics/BGRaCreepAndInitialStressAtIP_AREHS/arehs-salt-THM01_0.prj b/Tests/Data/ThermoHydroMechanics/BGRaCreepAndInitialStressAtIP_AREHS/arehs-salt-THM01_0.prj index c571667542f..de4a53eb253 100644 --- a/Tests/Data/ThermoHydroMechanics/BGRaCreepAndInitialStressAtIP_AREHS/arehs-salt-THM01_0.prj +++ b/Tests/Data/ThermoHydroMechanics/BGRaCreepAndInitialStressAtIP_AREHS/arehs-salt-THM01_0.prj @@ -81,7 +81,7 @@ Linear 1000.0 - phase_pressure + liquid_phase_pressure 1e5 @@ -169,7 +169,7 @@ Linear 1000.0 - phase_pressure + liquid_phase_pressure 1e5 @@ -257,7 +257,7 @@ Linear 1000.0 - phase_pressure + liquid_phase_pressure 1e5 @@ -350,7 +350,7 @@ Linear 1000.0 - phase_pressure + liquid_phase_pressure 1e5 diff --git a/Tests/Data/ThermoHydroMechanics/HeatingHomogeneousDomain/hex_THM.prj b/Tests/Data/ThermoHydroMechanics/HeatingHomogeneousDomain/hex_THM.prj index ae02df13aec..a19417ed2bb 100644 --- a/Tests/Data/ThermoHydroMechanics/HeatingHomogeneousDomain/hex_THM.prj +++ b/Tests/Data/ThermoHydroMechanics/HeatingHomogeneousDomain/hex_THM.prj @@ -52,15 +52,15 @@ density Function - 1002.6 * exp(4.5e-10 * (phase_pressure - 1.e+5)-2.0e-4*(temperature-273.15)) + 1002.6 * exp(4.5e-10 * (liquid_phase_pressure - 1.e+5)-2.0e-4*(temperature-273.15)) temperature - -0.20052 * exp(4.5e-10 * (phase_pressure - 1.e+5)-2.0e-4*(temperature-273.15)) + -0.20052 * exp(4.5e-10 * (liquid_phase_pressure - 1.e+5)-2.0e-4*(temperature-273.15)) - phase_pressure - 4.5117e-07 * exp(4.5e-10 * (phase_pressure - 1.e+5)-2.0e-4*(temperature-273.15)) + liquid_phase_pressure + 4.5117e-07 * exp(4.5e-10 * (liquid_phase_pressure - 1.e+5)-2.0e-4*(temperature-273.15)) @@ -74,7 +74,7 @@ -0.0037978499999999998 * exp(1808.5 / temperature) / (temperature * temperature) - phase_pressure + liquid_phase_pressure 0.0 diff --git a/Tests/Data/ThermoHydroMechanics/Linear/Storage/cube_incompressible_fluid.prj b/Tests/Data/ThermoHydroMechanics/Linear/Storage/cube_incompressible_fluid.prj index 667ef35e285..aa2225d9ead 100644 --- a/Tests/Data/ThermoHydroMechanics/Linear/Storage/cube_incompressible_fluid.prj +++ b/Tests/Data/ThermoHydroMechanics/Linear/Storage/cube_incompressible_fluid.prj @@ -58,7 +58,7 @@ -3.98e-4 - phase_pressure + liquid_phase_pressure 0.0 0.0 diff --git a/Tests/Data/ThermoHydroMechanics/Linear/Storage/cube_isochoric_heat-up.prj b/Tests/Data/ThermoHydroMechanics/Linear/Storage/cube_isochoric_heat-up.prj index 8868c5132ea..bcb0c2067d4 100644 --- a/Tests/Data/ThermoHydroMechanics/Linear/Storage/cube_isochoric_heat-up.prj +++ b/Tests/Data/ThermoHydroMechanics/Linear/Storage/cube_isochoric_heat-up.prj @@ -58,7 +58,7 @@ -3.98e-4 - phase_pressure + liquid_phase_pressure 0.0 1.0e-10 diff --git a/Tests/Data/ThermoHydroMechanics/Linear/ThermoOsmosis/Column.prj b/Tests/Data/ThermoHydroMechanics/Linear/ThermoOsmosis/Column.prj index b2d7006295b..421113fda5a 100644 --- a/Tests/Data/ThermoHydroMechanics/Linear/ThermoOsmosis/Column.prj +++ b/Tests/Data/ThermoHydroMechanics/Linear/ThermoOsmosis/Column.prj @@ -56,7 +56,7 @@ -3.0e-4*1000 - phase_pressure + liquid_phase_pressure 0.303e-9*1000 diff --git a/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/cube_ortho_phi0.0.prj b/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/cube_ortho_phi0.0.prj index 927130bd733..3e39732b0a0 100644 --- a/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/cube_ortho_phi0.0.prj +++ b/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/cube_ortho_phi0.0.prj @@ -57,7 +57,7 @@ -3.98e-4 - phase_pressure + liquid_phase_pressure 0.0 1e-4 diff --git a/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/cube_ortho_phi0.183.prj b/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/cube_ortho_phi0.183.prj index 1e824426c5c..c5be19d09d5 100644 --- a/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/cube_ortho_phi0.183.prj +++ b/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/cube_ortho_phi0.183.prj @@ -57,7 +57,7 @@ -3.98e-4 - phase_pressure + liquid_phase_pressure 0.0 3e-15 diff --git a/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/cube_ortho_phi0.183_petsc.prj b/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/cube_ortho_phi0.183_petsc.prj index 13c415c78d1..54a64976391 100644 --- a/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/cube_ortho_phi0.183_petsc.prj +++ b/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/cube_ortho_phi0.183_petsc.prj @@ -57,7 +57,7 @@ -3.98e-4 - phase_pressure + liquid_phase_pressure 0.0 3e-15 diff --git a/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/square_ortho_phi0.0.prj b/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/square_ortho_phi0.0.prj index 8f692100322..bfa8b423a80 100644 --- a/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/square_ortho_phi0.0.prj +++ b/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/square_ortho_phi0.0.prj @@ -50,7 +50,7 @@ -3.98e-4 - phase_pressure + liquid_phase_pressure 0.0 1e-4 diff --git a/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/square_ortho_phi0.183.prj b/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/square_ortho_phi0.183.prj index b0d76e0a3a3..9e3f0ee9a4d 100644 --- a/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/square_ortho_phi0.183.prj +++ b/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/square_ortho_phi0.183.prj @@ -50,7 +50,7 @@ -3.98e-4 - phase_pressure + liquid_phase_pressure 0.0 2e-15 diff --git a/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRcustom_unsaturated.prj b/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRcustom_unsaturated.prj index b09f9e617f6..fe1680aa76f 100644 --- a/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRcustom_unsaturated.prj +++ b/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRcustom_unsaturated.prj @@ -52,7 +52,7 @@ -3.98e-4 - phase_pressure + liquid_phase_pressure 1e5 4.5999999999999996e-10 diff --git a/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRhyd_saturated.prj b/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRhyd_saturated.prj index b5956277184..8e610aedfc6 100644 --- a/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRhyd_saturated.prj +++ b/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRhyd_saturated.prj @@ -52,7 +52,7 @@ -3.98e-4 - phase_pressure + liquid_phase_pressure 1e5 4.5999999999999996e-10 diff --git a/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRhyd_unsaturated.prj b/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRhyd_unsaturated.prj index 23cdd148977..c13da37730e 100644 --- a/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRhyd_unsaturated.prj +++ b/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRhyd_unsaturated.prj @@ -52,7 +52,7 @@ -3.98e-4 - phase_pressure + liquid_phase_pressure 1e5 4.5999999999999996e-10 diff --git a/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRhyd_unsaturated_bishopstest.prj b/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRhyd_unsaturated_bishopstest.prj index 60c3aea8b8f..a7989e47e7d 100644 --- a/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRhyd_unsaturated_bishopstest.prj +++ b/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRhyd_unsaturated_bishopstest.prj @@ -52,7 +52,7 @@ -3.98e-4 - phase_pressure + liquid_phase_pressure 1e5 4.5999999999999996e-10 diff --git a/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRuni_saturated.prj b/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRuni_saturated.prj index 0a34b90a474..5cc8ff37186 100644 --- a/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRuni_saturated.prj +++ b/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRuni_saturated.prj @@ -52,7 +52,7 @@ -3.98e-4 - phase_pressure + liquid_phase_pressure 1e5 4.5999999999999996e-10 diff --git a/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRuni_unsaturated.prj b/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRuni_unsaturated.prj index 7d342020fae..269c65dfaa7 100644 --- a/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRuni_unsaturated.prj +++ b/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRuni_unsaturated.prj @@ -52,7 +52,7 @@ -3.98e-4 - phase_pressure + liquid_phase_pressure 1e5 4.5999999999999996e-10 diff --git a/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRuni_unsaturated_bishopstest.prj b/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRuni_unsaturated_bishopstest.prj index d5920915fc7..b22dedb3a60 100644 --- a/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRuni_unsaturated_bishopstest.prj +++ b/Tests/Data/ThermoRichardsFlow/SimplifiedMechanics/TRuni_unsaturated_bishopstest.prj @@ -52,7 +52,7 @@ -3.98e-4 - phase_pressure + liquid_phase_pressure 1e5 4.5999999999999996e-10 diff --git a/Tests/Data/ThermoRichardsFlow/TaskCDECOVALEX2023/Decovalex-0-TRF.prj b/Tests/Data/ThermoRichardsFlow/TaskCDECOVALEX2023/Decovalex-0-TRF.prj index aef19802af0..b2d05d757a6 100644 --- a/Tests/Data/ThermoRichardsFlow/TaskCDECOVALEX2023/Decovalex-0-TRF.prj +++ b/Tests/Data/ThermoRichardsFlow/TaskCDECOVALEX2023/Decovalex-0-TRF.prj @@ -79,7 +79,7 @@ -4e-4 - phase_pressure + liquid_phase_pressure 1e5 @@ -228,7 +228,7 @@ -4e-4 - phase_pressure + liquid_phase_pressure 1e5 @@ -379,7 +379,7 @@ -4e-4 - phase_pressure + liquid_phase_pressure 1e5 diff --git a/Tests/Data/ThermoRichardsFlow/TaskCDECOVALEX2023/WithPicardNonLinearSolverAndPETSc/Decovalex-0-TRF.prj b/Tests/Data/ThermoRichardsFlow/TaskCDECOVALEX2023/WithPicardNonLinearSolverAndPETSc/Decovalex-0-TRF.prj index 38a8b669827..d2495c2eda4 100644 --- a/Tests/Data/ThermoRichardsFlow/TaskCDECOVALEX2023/WithPicardNonLinearSolverAndPETSc/Decovalex-0-TRF.prj +++ b/Tests/Data/ThermoRichardsFlow/TaskCDECOVALEX2023/WithPicardNonLinearSolverAndPETSc/Decovalex-0-TRF.prj @@ -79,7 +79,7 @@ -4e-4 - phase_pressure + liquid_phase_pressure 1e5 @@ -228,7 +228,7 @@ -4e-4 - phase_pressure + liquid_phase_pressure 1e5 @@ -379,7 +379,7 @@ -4e-4 - phase_pressure + liquid_phase_pressure 1e5 diff --git a/Tests/Data/ThermoRichardsFlow/ThermoOsmosis/Column.prj b/Tests/Data/ThermoRichardsFlow/ThermoOsmosis/Column.prj index a90be054612..dcb3f0efe18 100644 --- a/Tests/Data/ThermoRichardsFlow/ThermoOsmosis/Column.prj +++ b/Tests/Data/ThermoRichardsFlow/ThermoOsmosis/Column.prj @@ -50,7 +50,7 @@ -3.0e-4*1000 - phase_pressure + liquid_phase_pressure 0.303e-9*1000 diff --git a/Tests/Data/ThermoRichardsMechanics/A2/A2.prj b/Tests/Data/ThermoRichardsMechanics/A2/A2.prj index 78e12af64a5..bf0a90623f5 100644 --- a/Tests/Data/ThermoRichardsMechanics/A2/A2.prj +++ b/Tests/Data/ThermoRichardsMechanics/A2/A2.prj @@ -62,7 +62,7 @@ -6.0e-4 - phase_pressure + liquid_phase_pressure 4e6 0.5e-9 diff --git a/Tests/Data/ThermoRichardsMechanics/BodyForce/square.prj b/Tests/Data/ThermoRichardsMechanics/BodyForce/square.prj index 09b4c1c342e..1b7bcb4e912 100644 --- a/Tests/Data/ThermoRichardsMechanics/BodyForce/square.prj +++ b/Tests/Data/ThermoRichardsMechanics/BodyForce/square.prj @@ -49,7 +49,7 @@ Linear 999.1 - phase_pressure + liquid_phase_pressure 1.0e5 4.6511627906976743e-10 diff --git a/Tests/Data/ThermoRichardsMechanics/LiakopoulosHM/liakopoulos.prj b/Tests/Data/ThermoRichardsMechanics/LiakopoulosHM/liakopoulos.prj index 71107c9d8e5..ec0d378ab44 100644 --- a/Tests/Data/ThermoRichardsMechanics/LiakopoulosHM/liakopoulos.prj +++ b/Tests/Data/ThermoRichardsMechanics/LiakopoulosHM/liakopoulos.prj @@ -48,10 +48,10 @@ density Function - 1e3 * (1 + 5e-10 * (phase_pressure - 0)) + temperature - temperature + 1e3 * (1 + 5e-10 * (liquid_phase_pressure - 0)) + temperature - temperature - phase_pressure + liquid_phase_pressure 1e3 * 5e-10 diff --git a/Tests/Data/ThermoRichardsMechanics/LiakopoulosPETSc/liakopoulos_mixElem_mumps.prj b/Tests/Data/ThermoRichardsMechanics/LiakopoulosPETSc/liakopoulos_mixElem_mumps.prj index 8122f7001b7..383a061dfbe 100644 --- a/Tests/Data/ThermoRichardsMechanics/LiakopoulosPETSc/liakopoulos_mixElem_mumps.prj +++ b/Tests/Data/ThermoRichardsMechanics/LiakopoulosPETSc/liakopoulos_mixElem_mumps.prj @@ -49,7 +49,7 @@ Linear 1e3 - phase_pressure + liquid_phase_pressure 0 5e-10 diff --git a/Tests/Data/ThermoRichardsMechanics/Mockup2D/mockup.prj b/Tests/Data/ThermoRichardsMechanics/Mockup2D/mockup.prj index 4644080c34e..442b7411cad 100644 --- a/Tests/Data/ThermoRichardsMechanics/Mockup2D/mockup.prj +++ b/Tests/Data/ThermoRichardsMechanics/Mockup2D/mockup.prj @@ -63,7 +63,7 @@ Linear 1.e3 - phase_pressure + liquid_phase_pressure 0 1.e-10 diff --git a/Tests/Data/ThermoRichardsMechanics/RichardsFlow2D/RichardsFlow_2d_small.prj b/Tests/Data/ThermoRichardsMechanics/RichardsFlow2D/RichardsFlow_2d_small.prj index b550bdce11f..02b646e0280 100644 --- a/Tests/Data/ThermoRichardsMechanics/RichardsFlow2D/RichardsFlow_2d_small.prj +++ b/Tests/Data/ThermoRichardsMechanics/RichardsFlow2D/RichardsFlow_2d_small.prj @@ -42,7 +42,7 @@ Linear 1 - phase_pressure + liquid_phase_pressure -5000 0.45454545454545454545e-300 diff --git a/Tests/Data/ThermoRichardsMechanics/TaskCDECOVALEX2023/Decovalex-0.prj b/Tests/Data/ThermoRichardsMechanics/TaskCDECOVALEX2023/Decovalex-0.prj index 022f5f667d0..a14f6d653f0 100644 --- a/Tests/Data/ThermoRichardsMechanics/TaskCDECOVALEX2023/Decovalex-0.prj +++ b/Tests/Data/ThermoRichardsMechanics/TaskCDECOVALEX2023/Decovalex-0.prj @@ -104,7 +104,7 @@ -4e-4 - phase_pressure + liquid_phase_pressure 1e5 @@ -243,7 +243,7 @@ -4e-4 - phase_pressure + liquid_phase_pressure 1e5 @@ -384,7 +384,7 @@ -4e-4 - phase_pressure + liquid_phase_pressure 1e5 diff --git a/Tests/Data/ThermoRichardsMechanics/ThermoOsmosis/Column.prj b/Tests/Data/ThermoRichardsMechanics/ThermoOsmosis/Column.prj index d20cee32a17..d8d90340789 100644 --- a/Tests/Data/ThermoRichardsMechanics/ThermoOsmosis/Column.prj +++ b/Tests/Data/ThermoRichardsMechanics/ThermoOsmosis/Column.prj @@ -57,7 +57,7 @@ -3.0e-4*1000 - phase_pressure + liquid_phase_pressure 0.303e-9*1000 diff --git a/Tests/MaterialLib/TestGasPressureDependentPermeability.cpp b/Tests/MaterialLib/TestGasPressureDependentPermeability.cpp index 9b3dfec994a..a4ac3f1eaab 100644 --- a/Tests/MaterialLib/TestGasPressureDependentPermeability.cpp +++ b/Tests/MaterialLib/TestGasPressureDependentPermeability.cpp @@ -44,7 +44,7 @@ TEST(MaterialPropertyLib, GasPressureDependentPermeability) { double const p_gas = 2.5e6; - vars.phase_pressure = p_gas; + vars.gas_phase_pressure = p_gas; auto const k = MPL::formEigenTensor<3>(k_model.value(vars, pos, t, dt)); double const k_expected = 1.312500000000000000e-20; @@ -60,7 +60,7 @@ TEST(MaterialPropertyLib, GasPressureDependentPermeability) { double const p_gas = 4.5e6; - vars.phase_pressure = p_gas; + vars.gas_phase_pressure = p_gas; auto const k = MPL::formEigenTensor<3>(k_model.value(vars, pos, t, dt)); double const k_expected = 1.990000000000000000000e-18; diff --git a/Tests/MaterialLib/TestMPLExponential.cpp b/Tests/MaterialLib/TestMPLExponential.cpp index bca348531d6..71888024487 100644 --- a/Tests/MaterialLib/TestMPLExponential.cpp +++ b/Tests/MaterialLib/TestMPLExponential.cpp @@ -111,8 +111,9 @@ TEST(MaterialPropertyLib, Exponential) p.template value(variable_array, pos, time, dt), y_offset + y_ref * (std::exp(factor * (T - reference_condition))), 1.e-10); - ASSERT_EQ(p.template dValue( - variable_array, MPL::Variable::phase_pressure, pos, time, dt), + ASSERT_EQ(p.template dValue(variable_array, + MPL::Variable::liquid_phase_pressure, + pos, time, dt), 0.0); ASSERT_NEAR(p.template dValue( variable_array, MPL::Variable::temperature, pos, time, dt), diff --git a/Tests/MaterialLib/TestMPLIdealGasLaw.cpp b/Tests/MaterialLib/TestMPLIdealGasLaw.cpp index be73bf8fdbf..539c7105174 100644 --- a/Tests/MaterialLib/TestMPLIdealGasLaw.cpp +++ b/Tests/MaterialLib/TestMPLIdealGasLaw.cpp @@ -60,7 +60,7 @@ TEST(MaterialPropertyLib, IdealGasLawOfPurePhase) auto const& gas_phase = medium->phase("Gas"); MaterialPropertyLib::VariableArray variable_array; - variable_array.phase_pressure = pressure_norm; + variable_array.gas_phase_pressure = pressure_norm; variable_array.temperature = temperature_norm; variable_array.molar_mass = molar_mass_air; @@ -81,14 +81,17 @@ TEST(MaterialPropertyLib, IdealGasLawOfPurePhase) auto const d_rho_dp = gas_phase.property(MaterialPropertyLib::PropertyType::density) .template dValue( - variable_array, MaterialPropertyLib::Variable::phase_pressure, - pos, time, dt); + variable_array, + MaterialPropertyLib::Variable::gas_phase_pressure, pos, time, + dt); auto const d_rho2_dp2 = gas_phase.property(MaterialPropertyLib::PropertyType::density) .template d2Value( - variable_array, MaterialPropertyLib::Variable::phase_pressure, - MaterialPropertyLib::Variable::phase_pressure, pos, time, dt); + variable_array, + MaterialPropertyLib::Variable::gas_phase_pressure, + MaterialPropertyLib::Variable::gas_phase_pressure, pos, time, + dt); auto const d_rho2_dT2 = gas_phase.property(MaterialPropertyLib::PropertyType::density) @@ -100,12 +103,14 @@ TEST(MaterialPropertyLib, IdealGasLawOfPurePhase) gas_phase.property(MaterialPropertyLib::PropertyType::density) .template d2Value( variable_array, MaterialPropertyLib::Variable::temperature, - MaterialPropertyLib::Variable::phase_pressure, pos, time, dt); + MaterialPropertyLib::Variable::gas_phase_pressure, pos, time, + dt); auto const d_rho2_dpdT = gas_phase.property(MaterialPropertyLib::PropertyType::density) .template d2Value( - variable_array, MaterialPropertyLib::Variable::phase_pressure, + variable_array, + MaterialPropertyLib::Variable::gas_phase_pressure, MaterialPropertyLib::Variable::temperature, pos, time, dt); ASSERT_NEAR(density_norm_air, density, 1.e-10); diff --git a/Tests/MaterialLib/TestMPLIdealGasLawBinaryMixture.cpp b/Tests/MaterialLib/TestMPLIdealGasLawBinaryMixture.cpp index ddec11402d0..acd6606ce3b 100644 --- a/Tests/MaterialLib/TestMPLIdealGasLawBinaryMixture.cpp +++ b/Tests/MaterialLib/TestMPLIdealGasLawBinaryMixture.cpp @@ -106,7 +106,7 @@ TEST(MaterialPropertyLib, IdealGasLawBinaryMixture) { for (double T = T_min; T <= T_max; T += 0.25) { - vars.phase_pressure = pGR; + vars.gas_phase_pressure = pGR; vars.capillary_pressure = pCap; vars.temperature = T; @@ -129,7 +129,7 @@ TEST(MaterialPropertyLib, IdealGasLawBinaryMixture) vars.molar_mass_derivative = dMG[gas_pressure]; auto const drhoGR_dpGR = std::get(density_model.dValue( - vars, MPL::Variable::phase_pressure, pos, t, dt)); + vars, MPL::Variable::gas_phase_pressure, pos, t, dt)); vars.molar_mass_derivative = dMG[capillary_pressure]; auto const drhoGR_dpCap = std::get(density_model.dValue( @@ -147,13 +147,13 @@ TEST(MaterialPropertyLib, IdealGasLawBinaryMixture) // Perturbation of gas pressure auto const eps_pGR = 10.; - vars.phase_pressure = pGR + eps_pGR; + vars.gas_phase_pressure = pGR + eps_pGR; vars.molar_mass = molarMass(pGR + eps_pGR, pCap, T); auto rhoGR_plus = std::get(density_model.value(vars, pos, t, dt)); - vars.phase_pressure = pGR - eps_pGR; + vars.gas_phase_pressure = pGR - eps_pGR; vars.molar_mass = molarMass(pGR - eps_pGR, pCap, T); auto rhoGR_minus = @@ -164,7 +164,7 @@ TEST(MaterialPropertyLib, IdealGasLawBinaryMixture) central_difference(rhoGR_plus, rhoGR_minus, eps_pGR), 1.e-10); - vars.phase_pressure = pGR; + vars.gas_phase_pressure = pGR; // Perturbation of capillary pressure auto const eps_pCap = 1.; diff --git a/Tests/MaterialLib/TestMPLLinear.cpp b/Tests/MaterialLib/TestMPLLinear.cpp index fbe75374a7c..3e80f03aeef 100644 --- a/Tests/MaterialLib/TestMPLLinear.cpp +++ b/Tests/MaterialLib/TestMPLLinear.cpp @@ -33,8 +33,9 @@ TEST(MaterialPropertyLib, Linear) y_ref * (1 + m * (variable_array.temperature - x_ref)), 1.e-10); ASSERT_EQ(std::get(linear_property.dValue( - variable_array, MaterialPropertyLib::Variable::phase_pressure, - pos, time, dt)), + variable_array, + MaterialPropertyLib::Variable::liquid_phase_pressure, pos, + time, dt)), 0.0); ASSERT_NEAR(std::get(linear_property.dValue( variable_array, MaterialPropertyLib::Variable::temperature, diff --git a/Tests/MaterialLib/TestMPLWaterDensity.cpp b/Tests/MaterialLib/TestMPLWaterDensity.cpp index e00214d3cdf..2854acd17dd 100644 --- a/Tests/MaterialLib/TestMPLWaterDensity.cpp +++ b/Tests/MaterialLib/TestMPLWaterDensity.cpp @@ -39,7 +39,7 @@ TEST(Material, checkWaterDensityIAPWSIF97Region1_) double const t = std::numeric_limits::quiet_NaN(); double const dt = std::numeric_limits::quiet_NaN(); variable_array.temperature = T; - variable_array.phase_pressure = p; + variable_array.liquid_phase_pressure = p; const double rho_expected = 890.98496087498256; @@ -50,8 +50,8 @@ TEST(Material, checkWaterDensityIAPWSIF97Region1_) const double drho_dT = property.template dValue( variable_array, MaterialPropertyLib::Variable::temperature, pos, t, dt); const double drho_dp = property.template dValue( - variable_array, MaterialPropertyLib::Variable::phase_pressure, pos, t, - dt); + variable_array, MaterialPropertyLib::Variable::liquid_phase_pressure, + pos, t, dt); const double perturbation = 1.e-4; @@ -62,7 +62,7 @@ TEST(Material, checkWaterDensityIAPWSIF97Region1_) ASSERT_NEAR((rho_T1 - rho_expected) / perturbation, drho_dT, 1.e-6); // Test the differentiation: with respect to pressure: - variable_array.phase_pressure += perturbation; + variable_array.liquid_phase_pressure += perturbation; const double rho_p1 = property.template value(variable_array, pos, t, dt); ASSERT_NEAR((rho_p1 - rho_T1) / perturbation, drho_dp, 1.e-6); diff --git a/Tests/MaterialLib/TestMPLWaterDensityIAPWSIF97Region4.cpp b/Tests/MaterialLib/TestMPLWaterDensityIAPWSIF97Region4.cpp index 9f6760981b3..740ea3b4e1b 100644 --- a/Tests/MaterialLib/TestMPLWaterDensityIAPWSIF97Region4.cpp +++ b/Tests/MaterialLib/TestMPLWaterDensityIAPWSIF97Region4.cpp @@ -44,7 +44,7 @@ TEST(Material, checkWaterLiquidDensityIAPWSIF97Region4) for (int i = 0; i < 4; i++) { - variable_array.phase_pressure = p[i]; + variable_array.liquid_phase_pressure = p[i]; ASSERT_NEAR(expected_rho[i], property.template value(variable_array, pos, t, dt), 1.e-9); @@ -76,7 +76,7 @@ TEST(Material, checkWaterVapourDensityIAPWSIF97Region4) for (int i = 0; i < 4; i++) { - variable_array.phase_pressure = p[i]; + variable_array.liquid_phase_pressure = p[i]; ASSERT_NEAR(expected_rho[i], property.template value(variable_array, pos, t, dt), 1.e-9); diff --git a/Tests/MaterialLib/TestMPLWaterEnthalpyIAPWSIF97Region1.cpp b/Tests/MaterialLib/TestMPLWaterEnthalpyIAPWSIF97Region1.cpp index bf7b641bd80..ded58fb4aad 100644 --- a/Tests/MaterialLib/TestMPLWaterEnthalpyIAPWSIF97Region1.cpp +++ b/Tests/MaterialLib/TestMPLWaterEnthalpyIAPWSIF97Region1.cpp @@ -48,7 +48,7 @@ TEST(Material, checkWaterEnthalpyIAPWSIF97Region1) double const T_i = temperatures[i]; double const p_i = pressures[i]; - variable_array.phase_pressure = p_i; + variable_array.liquid_phase_pressure = p_i; variable_array.temperature = T_i; ASSERT_NEAR( diff --git a/Tests/MaterialLib/TestMPLWaterEnthalpyIAPWSIF97Region4.cpp b/Tests/MaterialLib/TestMPLWaterEnthalpyIAPWSIF97Region4.cpp index b8226838e3e..8d6a9e312dc 100644 --- a/Tests/MaterialLib/TestMPLWaterEnthalpyIAPWSIF97Region4.cpp +++ b/Tests/MaterialLib/TestMPLWaterEnthalpyIAPWSIF97Region4.cpp @@ -44,7 +44,7 @@ TEST(Material, checkWaterLiquidEnthalpyIAPWSIF97Region4) for (int i = 0; i < 4; i++) { - variable_array.phase_pressure = p[i]; + variable_array.liquid_phase_pressure = p[i]; ASSERT_NEAR(expected_h[i], property.template value(variable_array, pos, t, dt), 1.e-6); @@ -76,7 +76,7 @@ TEST(Material, checkWaterVapourEnthalpyIAPWSIF97Region4) for (int i = 0; i < 4; i++) { - variable_array.phase_pressure = p[i]; + variable_array.liquid_phase_pressure = p[i]; ASSERT_NEAR( expected_h[i], property.template value(variable_array, pos, t, dt) / 1e3, diff --git a/Tests/MaterialLib/TestMPLWaterSaturationTemperature.cpp b/Tests/MaterialLib/TestMPLWaterSaturationTemperature.cpp index 9849a45ebaf..c2787c9c654 100644 --- a/Tests/MaterialLib/TestMPLWaterSaturationTemperature.cpp +++ b/Tests/MaterialLib/TestMPLWaterSaturationTemperature.cpp @@ -45,7 +45,7 @@ TEST(Material, checkSaturationTemperatureIAPWSIF97Region4) for (std::size_t i = 0; i < pressures.size(); i++) { - variable_array.phase_pressure = pressures[i]; + variable_array.liquid_phase_pressure = pressures[i]; ASSERT_NEAR(expected_Ts[i], property.template value(variable_array, pos, t, dt), 1.e-6); diff --git a/Tests/MaterialLib/TestMPLWaterTemperatureIAPWSIF97Region1.cpp b/Tests/MaterialLib/TestMPLWaterTemperatureIAPWSIF97Region1.cpp index c272b8f53e9..7ab230d16e2 100644 --- a/Tests/MaterialLib/TestMPLWaterTemperatureIAPWSIF97Region1.cpp +++ b/Tests/MaterialLib/TestMPLWaterTemperatureIAPWSIF97Region1.cpp @@ -44,7 +44,7 @@ TEST(Material, checkWaterTemperatureIAPWSIF97Region1) for (int i = 0; i < 4; i++) { - variable_array.phase_pressure = p[i]; + variable_array.liquid_phase_pressure = p[i]; variable_array.enthalpy = h[i]; ASSERT_NEAR(expected_T[i], diff --git a/Tests/MaterialLib/TestMPLWaterVapourDensity.cpp b/Tests/MaterialLib/TestMPLWaterVapourDensity.cpp index 91298e57935..ada9e5882bc 100644 --- a/Tests/MaterialLib/TestMPLWaterVapourDensity.cpp +++ b/Tests/MaterialLib/TestMPLWaterVapourDensity.cpp @@ -39,7 +39,7 @@ TEST(MaterialPropertyLib, WaterVapourDensity) double const t = std::numeric_limits::quiet_NaN(); double const dt = std::numeric_limits::quiet_NaN(); variable_array.temperature = T; - variable_array.phase_pressure = p; + variable_array.liquid_phase_pressure = p; variable_array.density = rho_w; // The derivative of the water vapour with respect of temperature @@ -100,7 +100,7 @@ TEST(MaterialPropertyLib, WaterVapourDensity) double const p_i = pressures[i]; variable_array.temperature = T; - variable_array.phase_pressure = p_i; + variable_array.liquid_phase_pressure = p_i; double const rho_vw = property.template value(variable_array, pos, t, dt); @@ -110,12 +110,12 @@ TEST(MaterialPropertyLib, WaterVapourDensity) << " and for computed water vapour density " << rho_vw; double const dp = 1.0e-3; - variable_array.phase_pressure = p_i - dp; + variable_array.liquid_phase_pressure = p_i - dp; double const rho_vw0 = property.template value(variable_array, pos, t, dt); - variable_array.phase_pressure = p_i + dp; + variable_array.liquid_phase_pressure = p_i + dp; double const rho_vw1 = property.template value(variable_array, pos, t, dt); @@ -123,8 +123,9 @@ TEST(MaterialPropertyLib, WaterVapourDensity) 0.5 * (rho_vw1 - rho_vw0) / dp; double const analytic_drho_wv_dp = property.template dValue( - variable_array, MaterialPropertyLib::Variable::phase_pressure, - pos, t, dt); + variable_array, + MaterialPropertyLib::Variable::liquid_phase_pressure, pos, t, + dt); ASSERT_LE(std::fabs(approximated_drho_wv_dp - analytic_drho_wv_dp), 1e-7) diff --git a/Tests/ProcessLib/TH2M/TestTH2MNoPhaseTransition.cpp b/Tests/ProcessLib/TH2M/TestTH2MNoPhaseTransition.cpp index e50514172e8..393b090ae11 100644 --- a/Tests/ProcessLib/TH2M/TestTH2MNoPhaseTransition.cpp +++ b/Tests/ProcessLib/TH2M/TestTH2MNoPhaseTransition.cpp @@ -84,7 +84,7 @@ TEST(ProcessLib, TH2MNoPhaseTransition) double const pCap = 1000000.; double const T = 333.; - variable_array.phase_pressure = pGR; + variable_array.gas_phase_pressure = pGR; variable_array.capillary_pressure = pCap; variable_array.temperature = T; diff --git a/Tests/ProcessLib/TH2M/TestTH2MPhaseTransition.cpp b/Tests/ProcessLib/TH2M/TestTH2MPhaseTransition.cpp index 857174ed2c8..06ad794d7cf 100644 --- a/Tests/ProcessLib/TH2M/TestTH2MPhaseTransition.cpp +++ b/Tests/ProcessLib/TH2M/TestTH2MPhaseTransition.cpp @@ -217,7 +217,7 @@ TEST(ProcessLib, TH2MPhaseTransition) auto const& cv = ptm->cv; // Perturb gas pressure - variable_array.phase_pressure = pGR + eps_pGR; + variable_array.gas_phase_pressure = pGR + eps_pGR; ptm->computeConstitutiveVariables(medium.get(), variable_array, pos, time, dt); @@ -227,7 +227,7 @@ TEST(ProcessLib, TH2MPhaseTransition) auto rhoCGR_plus = ptm->cv.rhoCGR; auto rhoWGR_plus = ptm->cv.rhoWGR; - variable_array.phase_pressure = pGR - eps_pGR; + variable_array.gas_phase_pressure = pGR - eps_pGR; ptm->computeConstitutiveVariables(medium.get(), variable_array, pos, time, dt); @@ -238,7 +238,7 @@ TEST(ProcessLib, TH2MPhaseTransition) auto rhoWGR_minus = ptm->cv.rhoWGR; // Unperturbed primary variables - variable_array.phase_pressure = pGR; + variable_array.gas_phase_pressure = pGR; variable_array.capillary_pressure = pCap; variable_array.temperature = T; @@ -283,7 +283,7 @@ TEST(ProcessLib, TH2MPhaseTransition) rhoWGR_minus = ptm->cv.rhoWGR; // Unperturbed primary variables - variable_array.phase_pressure = pGR; + variable_array.gas_phase_pressure = pGR; variable_array.capillary_pressure = pCap; variable_array.temperature = T; @@ -330,7 +330,7 @@ TEST(ProcessLib, TH2MPhaseTransition) rhoWGR_minus = ptm->cv.rhoWGR; // Unperturbed primary variables - variable_array.phase_pressure = pGR; + variable_array.gas_phase_pressure = pGR; variable_array.capillary_pressure = pCap; variable_array.temperature = T; @@ -454,7 +454,7 @@ TEST(ProcessLib, TH2MPhaseTransitionConstRho) auto const& cv = ptm->cv; // Perturb gas pressure - variable_array.phase_pressure = pGR + eps_pGR; + variable_array.gas_phase_pressure = pGR + eps_pGR; ptm->computeConstitutiveVariables(medium.get(), variable_array, pos, time, dt); @@ -463,7 +463,7 @@ TEST(ProcessLib, TH2MPhaseTransitionConstRho) auto rhoCGR_plus = ptm->cv.rhoCGR; auto rhoWGR_plus = ptm->cv.rhoWGR; - variable_array.phase_pressure = pGR - eps_pGR; + variable_array.gas_phase_pressure = pGR - eps_pGR; ptm->computeConstitutiveVariables(medium.get(), variable_array, pos, time, dt); @@ -473,7 +473,7 @@ TEST(ProcessLib, TH2MPhaseTransitionConstRho) auto rhoWGR_minus = ptm->cv.rhoWGR; // Unperturbed primary variables - variable_array.phase_pressure = pGR; + variable_array.gas_phase_pressure = pGR; variable_array.capillary_pressure = pCap; variable_array.temperature = T; @@ -515,7 +515,7 @@ TEST(ProcessLib, TH2MPhaseTransitionConstRho) rhoWGR_minus = ptm->cv.rhoWGR; // Unperturbed primary variables - variable_array.phase_pressure = pGR; + variable_array.gas_phase_pressure = pGR; variable_array.capillary_pressure = pCap; variable_array.temperature = T; @@ -559,7 +559,7 @@ TEST(ProcessLib, TH2MPhaseTransitionConstRho) rhoWGR_minus = ptm->cv.rhoWGR; // Unperturbed primary variables - variable_array.phase_pressure = pGR; + variable_array.gas_phase_pressure = pGR; variable_array.capillary_pressure = pCap; variable_array.temperature = T; @@ -632,4 +632,4 @@ TEST(ProcessLib, TH2MPhaseTransitionConstRho) ASSERT_NEAR(viscosity_air, cv.muGR, 1.0e-10); ASSERT_NEAR(viscosity_water, cv.muLR, 1.0e-10); } -} \ No newline at end of file +} From a410d48904850598a92d1db06ce5a859d2cc481f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Buchwald?= Date: Thu, 23 Nov 2023 21:17:54 +0100 Subject: [PATCH 2/3] [PL/HM] Use gas and liquid phase pressures The current process formulation allows for both phase (one or another) to be simulated. Therefore the same phase pressure is written to both variables. The fluid type is set from first element and subsequently it is ensured that for all elements it is the same. --- .../CreateHydroMechanicsProcess.cpp | 26 ++++++++++- .../HydroMechanics/HydroMechanicsFEM-impl.h | 44 ++++++++++++------- .../HydroMechanicsProcessData.h | 3 ++ 3 files changed, 57 insertions(+), 16 deletions(-) diff --git a/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp b/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp index a2fba3a9c57..decc8a08f72 100644 --- a/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp +++ b/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp @@ -214,10 +214,33 @@ std::unique_ptr createHydroMechanicsProcess( MaterialPropertyLib::density}; std::array const requiredSolidProperties = {MaterialPropertyLib::density}; + // setting default to suppress -Wmaybe-uninitialized warning + MaterialPropertyLib::Variable phase_pressure = + MaterialPropertyLib::Variable::liquid_phase_pressure; for (auto const& element_id : mesh.getElements() | MeshLib::views::ids) { media_map.checkElementHasMedium(element_id); auto const& medium = *media_map.getMedium(element_id); + if (element_id == 0) + { + phase_pressure = + medium.hasPhase("Gas") + ? MaterialPropertyLib::Variable::gas_phase_pressure + : MaterialPropertyLib::Variable::liquid_phase_pressure; + } + else + { + auto const phase_pressure_tmp = + medium.hasPhase("Gas") + ? MaterialPropertyLib::Variable::gas_phase_pressure + : MaterialPropertyLib::Variable::liquid_phase_pressure; + if (phase_pressure != phase_pressure_tmp) + { + OGS_FATAL( + "You are mixing liquid and gas phases in your model domain." + "OGS does not yet know how to handle this."); + } + } checkRequiredProperties(medium, requiredMediumProperties); checkRequiredProperties(fluidPhase(medium), requiredFluidProperties); checkRequiredProperties(medium.phase("Solid"), requiredSolidProperties); @@ -245,7 +268,8 @@ std::unique_ptr createHydroMechanicsProcess( coupling_scheme, hydraulic_process_id, mechanics_related_process_id, - use_taylor_hood_elements}; + use_taylor_hood_elements, + phase_pressure}; SecondaryVariableCollection secondary_variables; diff --git a/ProcessLib/HydroMechanics/HydroMechanicsFEM-impl.h b/ProcessLib/HydroMechanics/HydroMechanicsFEM-impl.h index 84a6505f543..74d6fb6fc7d 100644 --- a/ProcessLib/HydroMechanics/HydroMechanicsFEM-impl.h +++ b/ProcessLib/HydroMechanics/HydroMechanicsFEM-impl.h @@ -184,6 +184,7 @@ void HydroMechanicsLocalAssemblerphase("Solid"); auto const& fluid = fluidPhase(*medium); + auto const& phase_pressure = _process_data.phase_pressure; MPL::VariableArray vars; auto const T_ref = @@ -219,7 +220,10 @@ void HydroMechanicsLocalAssembler(vars, x_position, t, dt); - auto const beta_p = - fluid.property(MPL::PropertyType::density) - .template dValue(vars, MPL::Variable::phase_pressure, - x_position, t, dt) / - rho_fr; + auto const beta_p = fluid.property(MPL::PropertyType::density) + .template dValue(vars, phase_pressure, + x_position, t, dt) / + rho_fr; // Set mechanical variables for the intrinsic permeability model // For stress dependent permeability. @@ -425,7 +428,10 @@ std::vector const& HydroMechanicsLocalAssembler< x_position.setIntegrationPoint(ip); double const p_int_pt = _ip_data[ip].N_p.dot(p); - vars.phase_pressure = p_int_pt; + + // setting both vars equal to enable MPL access for gas and liquid + // properties + vars.liquid_phase_pressure = vars.gas_phase_pressure = p_int_pt; auto const alpha = medium->property(MPL::PropertyType::biot_coefficient) .template value(vars, x_position, t, dt); @@ -531,6 +537,7 @@ void HydroMechanicsLocalAssembler(vars, x_position, t, dt); - auto const beta_p = - fluid.property(MPL::PropertyType::density) - .template dValue(vars, MPL::Variable::phase_pressure, - x_position, t, dt) / - rho_fr; + auto const beta_p = fluid.property(MPL::PropertyType::density) + .template dValue(vars, phase_pressure, + x_position, t, dt) / + rho_fr; auto const K_over_mu = K / mu; @@ -724,7 +733,9 @@ void HydroMechanicsLocalAssemblerproperty(MPL::PropertyType::biot_coefficient) .template value(vars, x_position, t, dt); @@ -1174,7 +1185,10 @@ void HydroMechanicsLocalAssemblerproperty(MPL::PropertyType::biot_coefficient) .template value(vars, x_position, t, dt); double const p_int_pt = _ip_data[ip].N_p.dot(p); - vars.phase_pressure = p_int_pt; + + // setting both vars equal to enable MPL access for gas and liquid + // properties + vars.liquid_phase_pressure = vars.gas_phase_pressure = p_int_pt; // Set mechanical variables for the intrinsic permeability model // For stress dependent permeability. diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcessData.h b/ProcessLib/HydroMechanics/HydroMechanicsProcessData.h index 089e14d2eea..42f448db00e 100644 --- a/ProcessLib/HydroMechanics/HydroMechanicsProcessData.h +++ b/ProcessLib/HydroMechanics/HydroMechanicsProcessData.h @@ -16,6 +16,7 @@ #include #include "MaterialLib/MPL/MaterialSpatialDistributionMap.h" +#include "MaterialLib/MPL/VariableType.h" #include "ParameterLib/Parameter.h" namespace MaterialLib @@ -90,6 +91,8 @@ struct HydroMechanicsProcessData const bool use_taylor_hood_elements; + MaterialPropertyLib::Variable phase_pressure; + MeshLib::PropertyVector* pressure_interpolated = nullptr; std::array*, 3> principal_stress_vector = { nullptr, nullptr, nullptr}; From 47c849c0752d196996a35e85b044d5fe72285e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Buchwald?= Date: Thu, 23 Nov 2023 23:32:31 +0100 Subject: [PATCH 3/3] [PL/HHPrho] Using gas and liquid phase pressures The formulation of the process requires the ideal gas law (which is available on for gas_phase_pressure) to be written as a function in the MoMaS tests. --- .../TwoPhaseFlowWithPrhoLocalAssembler-impl.h | 5 +++-- .../TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_quad.prj | 13 ++++++++++++- .../MoMaS/Twophase_MoMaS_quad_adaptive_dt.prj | 13 ++++++++++++- .../TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_small.prj | 13 ++++++++++++- 4 files changed, 39 insertions(+), 5 deletions(-) diff --git a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler-impl.h b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler-impl.h index c535d331c19..96fcc8eb1c4 100644 --- a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler-impl.h +++ b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler-impl.h @@ -100,7 +100,7 @@ void TwoPhaseFlowWithPrhoLocalAssembler::assemble( MPL::VariableArray variables; - variables.phase_pressure = pl_int_pt; + variables.liquid_phase_pressure = pl_int_pt; variables.temperature = temperature; variables.molar_mass = gas_phase.property(MPL::PropertyType::molar_mass) @@ -145,7 +145,8 @@ void TwoPhaseFlowWithPrhoLocalAssembler::assemble( double const rho_wet = rho_h2o + rho_h2_wet; _saturation[ip] = Sw; - _pressure_nonwetting[ip] = pl_int_pt + pc; + variables.gas_phase_pressure = _pressure_nonwetting[ip] = + pl_int_pt + pc; // Assemble M matrix // nonwetting diff --git a/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_quad.prj b/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_quad.prj index 586eaf245f9..8b181f6a675 100644 --- a/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_quad.prj +++ b/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_quad.prj @@ -81,7 +81,18 @@ density - IdealGasLaw + Function + + liquid_phase_pressure * 0.002 / 8.3144621 / temperature + + + liquid_phase_pressure + 0.002 / 8.3144621 / temperature + + + temperature + -liquid_phase_pressure * 0.002 / 8.3144621 / temperature / temperature + molar_mass diff --git a/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_quad_adaptive_dt.prj b/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_quad_adaptive_dt.prj index d03a70f1989..b659670e2d3 100644 --- a/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_quad_adaptive_dt.prj +++ b/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_quad_adaptive_dt.prj @@ -81,7 +81,18 @@ density - IdealGasLaw + Function + + liquid_phase_pressure * 0.002 / 8.3144621 / temperature + + + liquid_phase_pressure + 0.002 / 8.3144621 / temperature + + + temperature + -liquid_phase_pressure * 0.002 / 8.3144621 / temperature / temperature + molar_mass diff --git a/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_small.prj b/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_small.prj index 18f7faced5e..6fd20c9a371 100644 --- a/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_small.prj +++ b/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_small.prj @@ -81,7 +81,18 @@ density - IdealGasLaw + Function + + liquid_phase_pressure * 0.002 / 8.3144621 / temperature + + + liquid_phase_pressure + 0.002 / 8.3144621 / temperature + + + temperature + -liquid_phase_pressure * 0.002 / 8.3144621 / temperature / temperature + molar_mass