OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-26 01:01:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

changed: make has_foam contexpr

Browse Source 
and use if constexpr to eliminate some code
This commit is contained in:
Arne Morten Kvarving 2021-05-11 12:28:10 +02:00
parent 73ccb42634
commit f48ee17d59
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/simulators/wells/WellInterface.hpp
View File

@ -114,7 +114,7 @@ namespace Opm
static const bool has_temperature = getPropValue<TypeTag, Properties::EnableTemperature>();
// flag for polymer molecular weight related
static const bool has_polymermw = getPropValue<TypeTag, Properties::EnablePolymerMW>();
static const bool has_foam = getPropValue<TypeTag, Properties::EnableFoam>();
static constexpr bool has_foam = getPropValue<TypeTag, Properties::EnableFoam>();
static const bool has_brine = getPropValue<TypeTag, Properties::EnableBrine>();
static const int contiSolventEqIdx = Indices::contiSolventEqIdx;
static const int contiZfracEqIdx = Indices::contiZfracEqIdx;

22
opm/simulators/wells/WellInterface_impl.hpp
View File

@ -400,19 +400,19 @@ namespace Opm
WellInterface<TypeTag>::
wfoam() const
{
if (!has_foam) {
return 0.0;
if constexpr (has_foam) {
auto injectorType = well_ecl_.injectorType();
if (injectorType == InjectorType::GAS) {
WellFoamProperties fprop = well_ecl_.getFoamProperties();
return fprop.m_foamConcentration;
} else {
// Not a gas injection well => no foam.
return 0.0;
}
}
auto injectorType = well_ecl_.injectorType();
if (injectorType == InjectorType::GAS) {
WellFoamProperties fprop = well_ecl_.getFoamProperties();
return fprop.m_foamConcentration;
} else {
// Not a gas injection well => no foam.
return 0.0;
}
return 0.0;
}