From 8ca34797b03a070182d1f4f2cd373834c9278644 Mon Sep 17 00:00:00 2001
From: Boyan Meng <meng.boyan@ufz.de>
Date: Fri, 12 Nov 2021 18:08:37 +0100
Subject: [PATCH] [PL/T2PF] Remove old gas density input
---
.../CreateTwoPhaseFlowMaterialProperties.cpp | 8 ++------
.../TwoPhaseFlowWithPPMaterialProperties.cpp | 11 -----------
.../TwoPhaseFlowWithPPMaterialProperties.h | 2 --
.../HeatPipe/Twophase_HeatPipe_quad_curve_large.prj | 4 ----
.../HeatPipe/Twophase_HeatPipe_quad_curve_small.prj | 4 ----
5 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.cpp b/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.cpp
index 857682891a0..1256b3e9ec3 100644
--- a/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.cpp
+++ b/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.cpp
@@ -43,10 +43,6 @@ createTwoPhaseFlowMaterialProperties(
//! \ogs_file_param{material__twophase_flow__material_property__fluid__liquid_density}
auto const& rho_conf = fluid_config.getConfigSubtree("liquid_density");
auto liquid_density = MaterialLib::Fluid::createFluidDensityModel(rho_conf);
- //! \ogs_file_param{material__twophase_flow__material_property__fluid__gas_density}
- auto const& rho_gas_conf = fluid_config.getConfigSubtree("gas_density");
- auto gas_density =
- MaterialLib::Fluid::createFluidDensityModel(rho_gas_conf);
//! \ogs_file_param{material__twophase_flow__material_property__fluid__liquid_viscosity}
auto const& mu_conf = fluid_config.getConfigSubtree("liquid_viscosity");
auto liquid_viscosity = MaterialLib::Fluid::createViscosityModel(mu_conf);
@@ -130,8 +126,8 @@ createTwoPhaseFlowMaterialProperties(
return std::forward_as_tuple(
std::make_unique<TwoPhaseFlowWithPPMaterialProperties>(
material_ids, std::move(liquid_density),
- std::move(liquid_viscosity), std::move(gas_density),
- std::move(gas_viscosity), std::move(intrinsic_permeability_models),
+ std::move(liquid_viscosity), std::move(gas_viscosity),
+ std::move(intrinsic_permeability_models),
std::move(porosity_models), std::move(storage_models),
std::move(capillary_pressure_models),
std::move(relative_permeability_models)),
diff --git a/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.cpp b/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.cpp
index 80c0f9b79b5..0b17cecd31a 100644
--- a/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.cpp
+++ b/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.cpp
@@ -32,7 +32,6 @@ TwoPhaseFlowWithPPMaterialProperties::TwoPhaseFlowWithPPMaterialProperties(
MeshLib::PropertyVector<int> const* material_ids,
std::unique_ptr<MaterialLib::Fluid::FluidProperty>&& liquid_density,
std::unique_ptr<MaterialLib::Fluid::FluidProperty>&& liquid_viscosity,
- std::unique_ptr<MaterialLib::Fluid::FluidProperty>&& gas_density,
std::unique_ptr<MaterialLib::Fluid::FluidProperty>&& gas_viscosity,
std::vector<std::unique_ptr<MaterialLib::PorousMedium::Permeability>>&&
intrinsic_permeability_models,
@@ -49,7 +48,6 @@ TwoPhaseFlowWithPPMaterialProperties::TwoPhaseFlowWithPPMaterialProperties(
: _material_ids(material_ids),
_liquid_density(std::move(liquid_density)),
_liquid_viscosity(std::move(liquid_viscosity)),
- _gas_density(std::move(gas_density)),
_gas_viscosity(std::move(gas_viscosity)),
_intrinsic_permeability_models(std::move(intrinsic_permeability_models)),
_porosity_models(std::move(porosity_models)),
@@ -81,15 +79,6 @@ double TwoPhaseFlowWithPPMaterialProperties::getLiquidDensity(
return _liquid_density->getValue(vars);
}
-double TwoPhaseFlowWithPPMaterialProperties::getGasDensity(const double p,
- const double T) const
-{
- ArrayType vars;
- vars[static_cast<int>(MaterialLib::Fluid::PropertyVariableType::T)] = T;
- vars[static_cast<int>(MaterialLib::Fluid::PropertyVariableType::p)] = p;
- return _gas_density->getValue(vars);
-}
-
double TwoPhaseFlowWithPPMaterialProperties::getLiquidViscosity(
const double p, const double T) const
{
diff --git a/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.h b/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.h
index 5cce8068a52..27f19500b12 100644
--- a/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.h
+++ b/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.h
@@ -56,8 +56,6 @@ public:
liquid_density,
std::unique_ptr<MaterialLib::Fluid::FluidProperty>&&
liquid_viscosity,
- std::unique_ptr<MaterialLib::Fluid::FluidProperty>&&
- gas_density,
std::unique_ptr<MaterialLib::Fluid::FluidProperty>&&
gas_viscosity,
std::vector<std::unique_ptr<MaterialLib::PorousMedium::Permeability>>&&
diff --git a/Tests/Data/Parabolic/ThermalTwoPhaseFlowPP/HeatPipe/Twophase_HeatPipe_quad_curve_large.prj b/Tests/Data/Parabolic/ThermalTwoPhaseFlowPP/HeatPipe/Twophase_HeatPipe_quad_curve_large.prj
index e87b53fdbc9..28ff6d10d90 100644
--- a/Tests/Data/Parabolic/ThermalTwoPhaseFlowPP/HeatPipe/Twophase_HeatPipe_quad_curve_large.prj
+++ b/Tests/Data/Parabolic/ThermalTwoPhaseFlowPP/HeatPipe/Twophase_HeatPipe_quad_curve_large.prj
@@ -23,10 +23,6 @@
<type>Constant</type>
<value> 1.e3 </value>
</liquid_density>
- <gas_density>
- <type>IdealGasLaw</type>
- <molar_mass> 0.029 </molar_mass>
- </gas_density>
<liquid_viscosity>
<type>Constant</type>
<value> 2.938e-4 </value>
diff --git a/Tests/Data/Parabolic/ThermalTwoPhaseFlowPP/HeatPipe/Twophase_HeatPipe_quad_curve_small.prj b/Tests/Data/Parabolic/ThermalTwoPhaseFlowPP/HeatPipe/Twophase_HeatPipe_quad_curve_small.prj
index 343acf90182..737869b0cca 100644
--- a/Tests/Data/Parabolic/ThermalTwoPhaseFlowPP/HeatPipe/Twophase_HeatPipe_quad_curve_small.prj
+++ b/Tests/Data/Parabolic/ThermalTwoPhaseFlowPP/HeatPipe/Twophase_HeatPipe_quad_curve_small.prj
@@ -23,10 +23,6 @@
<type>Constant</type>
<value> 1.e3 </value>
</liquid_density>
- <gas_density>
- <type>IdealGasLaw</type>
- <molar_mass> 0.029 </molar_mass>
- </gas_density>
<liquid_viscosity>
<type>Constant</type>
<value> 2.938e-4 </value>
--
GitLab