Skip to content
Snippets Groups Projects
Commit 8ca34797 authored by Boyan Meng's avatar Boyan Meng Committed by Dmitri Naumov
Browse files

[PL/T2PF] Remove old gas density input

parent 10c0e15f
No related branches found
No related tags found
No related merge requests found
...@@ -43,10 +43,6 @@ createTwoPhaseFlowMaterialProperties( ...@@ -43,10 +43,6 @@ createTwoPhaseFlowMaterialProperties(
//! \ogs_file_param{material__twophase_flow__material_property__fluid__liquid_density} //! \ogs_file_param{material__twophase_flow__material_property__fluid__liquid_density}
auto const& rho_conf = fluid_config.getConfigSubtree("liquid_density"); auto const& rho_conf = fluid_config.getConfigSubtree("liquid_density");
auto liquid_density = MaterialLib::Fluid::createFluidDensityModel(rho_conf); 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} //! \ogs_file_param{material__twophase_flow__material_property__fluid__liquid_viscosity}
auto const& mu_conf = fluid_config.getConfigSubtree("liquid_viscosity"); auto const& mu_conf = fluid_config.getConfigSubtree("liquid_viscosity");
auto liquid_viscosity = MaterialLib::Fluid::createViscosityModel(mu_conf); auto liquid_viscosity = MaterialLib::Fluid::createViscosityModel(mu_conf);
...@@ -130,8 +126,8 @@ createTwoPhaseFlowMaterialProperties( ...@@ -130,8 +126,8 @@ createTwoPhaseFlowMaterialProperties(
return std::forward_as_tuple( return std::forward_as_tuple(
std::make_unique<TwoPhaseFlowWithPPMaterialProperties>( std::make_unique<TwoPhaseFlowWithPPMaterialProperties>(
material_ids, std::move(liquid_density), material_ids, std::move(liquid_density),
std::move(liquid_viscosity), std::move(gas_density), std::move(liquid_viscosity), std::move(gas_viscosity),
std::move(gas_viscosity), std::move(intrinsic_permeability_models), std::move(intrinsic_permeability_models),
std::move(porosity_models), std::move(storage_models), std::move(porosity_models), std::move(storage_models),
std::move(capillary_pressure_models), std::move(capillary_pressure_models),
std::move(relative_permeability_models)), std::move(relative_permeability_models)),
......
...@@ -32,7 +32,6 @@ TwoPhaseFlowWithPPMaterialProperties::TwoPhaseFlowWithPPMaterialProperties( ...@@ -32,7 +32,6 @@ TwoPhaseFlowWithPPMaterialProperties::TwoPhaseFlowWithPPMaterialProperties(
MeshLib::PropertyVector<int> const* material_ids, MeshLib::PropertyVector<int> const* material_ids,
std::unique_ptr<MaterialLib::Fluid::FluidProperty>&& liquid_density, std::unique_ptr<MaterialLib::Fluid::FluidProperty>&& liquid_density,
std::unique_ptr<MaterialLib::Fluid::FluidProperty>&& liquid_viscosity, 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::unique_ptr<MaterialLib::Fluid::FluidProperty>&& gas_viscosity,
std::vector<std::unique_ptr<MaterialLib::PorousMedium::Permeability>>&& std::vector<std::unique_ptr<MaterialLib::PorousMedium::Permeability>>&&
intrinsic_permeability_models, intrinsic_permeability_models,
...@@ -49,7 +48,6 @@ TwoPhaseFlowWithPPMaterialProperties::TwoPhaseFlowWithPPMaterialProperties( ...@@ -49,7 +48,6 @@ TwoPhaseFlowWithPPMaterialProperties::TwoPhaseFlowWithPPMaterialProperties(
: _material_ids(material_ids), : _material_ids(material_ids),
_liquid_density(std::move(liquid_density)), _liquid_density(std::move(liquid_density)),
_liquid_viscosity(std::move(liquid_viscosity)), _liquid_viscosity(std::move(liquid_viscosity)),
_gas_density(std::move(gas_density)),
_gas_viscosity(std::move(gas_viscosity)), _gas_viscosity(std::move(gas_viscosity)),
_intrinsic_permeability_models(std::move(intrinsic_permeability_models)), _intrinsic_permeability_models(std::move(intrinsic_permeability_models)),
_porosity_models(std::move(porosity_models)), _porosity_models(std::move(porosity_models)),
...@@ -81,15 +79,6 @@ double TwoPhaseFlowWithPPMaterialProperties::getLiquidDensity( ...@@ -81,15 +79,6 @@ double TwoPhaseFlowWithPPMaterialProperties::getLiquidDensity(
return _liquid_density->getValue(vars); 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( double TwoPhaseFlowWithPPMaterialProperties::getLiquidViscosity(
const double p, const double T) const const double p, const double T) const
{ {
......
...@@ -56,8 +56,6 @@ public: ...@@ -56,8 +56,6 @@ public:
liquid_density, liquid_density,
std::unique_ptr<MaterialLib::Fluid::FluidProperty>&& std::unique_ptr<MaterialLib::Fluid::FluidProperty>&&
liquid_viscosity, liquid_viscosity,
std::unique_ptr<MaterialLib::Fluid::FluidProperty>&&
gas_density,
std::unique_ptr<MaterialLib::Fluid::FluidProperty>&& std::unique_ptr<MaterialLib::Fluid::FluidProperty>&&
gas_viscosity, gas_viscosity,
std::vector<std::unique_ptr<MaterialLib::PorousMedium::Permeability>>&& std::vector<std::unique_ptr<MaterialLib::PorousMedium::Permeability>>&&
......
...@@ -23,10 +23,6 @@ ...@@ -23,10 +23,6 @@
<type>Constant</type> <type>Constant</type>
<value> 1.e3 </value> <value> 1.e3 </value>
</liquid_density> </liquid_density>
<gas_density>
<type>IdealGasLaw</type>
<molar_mass> 0.029 </molar_mass>
</gas_density>
<liquid_viscosity> <liquid_viscosity>
<type>Constant</type> <type>Constant</type>
<value> 2.938e-4 </value> <value> 2.938e-4 </value>
......
...@@ -23,10 +23,6 @@ ...@@ -23,10 +23,6 @@
<type>Constant</type> <type>Constant</type>
<value> 1.e3 </value> <value> 1.e3 </value>
</liquid_density> </liquid_density>
<gas_density>
<type>IdealGasLaw</type>
<molar_mass> 0.029 </molar_mass>
</gas_density>
<liquid_viscosity> <liquid_viscosity>
<type>Constant</type> <type>Constant</type>
<value> 2.938e-4 </value> <value> 2.938e-4 </value>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment