Skip to content
Snippets Groups Projects
Commit 43286c08 authored by wenqing's avatar wenqing
Browse files

[MPL/PropertyType] Added a new type, relative_permeability_nonwetting_phase

parent 60404bea
No related branches found
No related tags found
No related merge requests found
...@@ -89,8 +89,7 @@ std::unique_ptr<MaterialPropertyLib::Property> createProperty( ...@@ -89,8 +89,7 @@ std::unique_ptr<MaterialPropertyLib::Property> createProperty(
if (boost::iequals(property_type, "EmbeddedFracturePermeability")) if (boost::iequals(property_type, "EmbeddedFracturePermeability"))
{ {
return createEmbeddedFracturePermeability(geometry_dimension, return createEmbeddedFracturePermeability(geometry_dimension, config);
config);
} }
if (boost::iequals(property_type, if (boost::iequals(property_type,
...@@ -131,6 +130,11 @@ std::unique_ptr<MaterialPropertyLib::Property> createProperty( ...@@ -131,6 +130,11 @@ std::unique_ptr<MaterialPropertyLib::Property> createProperty(
return createRelPermBrooksCorey(config); return createRelPermBrooksCorey(config);
} }
if (boost::iequals(property_type, "RelPermBrooksCoreyNonwettingPhase"))
{
return createRelPermBrooksCoreyNonwettingPhase(config);
}
if (boost::iequals(property_type, "SaturationLiakopoulos")) if (boost::iequals(property_type, "SaturationLiakopoulos"))
{ {
return createSaturationLiakopoulos(config); return createSaturationLiakopoulos(config);
...@@ -167,6 +171,12 @@ std::unique_ptr<MaterialPropertyLib::Property> createProperty( ...@@ -167,6 +171,12 @@ std::unique_ptr<MaterialPropertyLib::Property> createProperty(
return createRelPermUdell(config); return createRelPermUdell(config);
} }
if (boost::iequals(property_type,
"RelativePermeabilityUdellNonwettingPhase"))
{
return createRelPermUdellNonwettingPhase(config);
}
if (boost::iequals(property_type, "SaturationDependentHeatConduction")) if (boost::iequals(property_type, "SaturationDependentHeatConduction"))
{ {
return createSaturationDependentHeatConduction(config); return createSaturationDependentHeatConduction(config);
......
...@@ -71,6 +71,7 @@ enum PropertyType : int ...@@ -71,6 +71,7 @@ enum PropertyType : int
reference_temperature, reference_temperature,
reference_pressure, reference_pressure,
relative_permeability, relative_permeability,
relative_permeability_nonwetting_phase,
residual_gas_saturation, residual_gas_saturation,
residual_liquid_saturation, residual_liquid_saturation,
/// specify retardation factor used in component transport process. /// specify retardation factor used in component transport process.
...@@ -236,6 +237,10 @@ inline PropertyType convertStringToProperty(std::string const& inString) ...@@ -236,6 +237,10 @@ inline PropertyType convertStringToProperty(std::string const& inString)
{ {
return PropertyType::relative_permeability; return PropertyType::relative_permeability;
} }
if (boost::iequals(inString, "relative_permeability_nonwetting_phase"))
{
return PropertyType::relative_permeability_nonwetting_phase;
}
if (boost::iequals(inString, "residual_gas_saturation")) if (boost::iequals(inString, "residual_gas_saturation"))
{ {
return PropertyType::residual_gas_saturation; return PropertyType::residual_gas_saturation;
...@@ -348,6 +353,7 @@ static const std::array<std::string, PropertyType::number_of_properties> ...@@ -348,6 +353,7 @@ static const std::array<std::string, PropertyType::number_of_properties>
"reference_temperature", "reference_temperature",
"reference_pressure", "reference_pressure",
"relative_permeability", "relative_permeability",
"relative_permeability_nonwetting_phase",
"residual_gas_saturation", "residual_gas_saturation",
"residual_liquid_saturation", "residual_liquid_saturation",
"retardation_factor", "retardation_factor",
......
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