mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
changed: make has_brine contexpr
and use if constexpr to eliminate some code
This commit is contained in:
parent
f48ee17d59
commit
ceb9bb4311
@ -115,7 +115,7 @@ namespace Opm
|
|||||||
// flag for polymer molecular weight related
|
// flag for polymer molecular weight related
|
||||||
static const bool has_polymermw = getPropValue<TypeTag, Properties::EnablePolymerMW>();
|
static const bool has_polymermw = getPropValue<TypeTag, Properties::EnablePolymerMW>();
|
||||||
static constexpr 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 constexpr bool has_brine = getPropValue<TypeTag, Properties::EnableBrine>();
|
||||||
static const int contiSolventEqIdx = Indices::contiSolventEqIdx;
|
static const int contiSolventEqIdx = Indices::contiSolventEqIdx;
|
||||||
static const int contiZfracEqIdx = Indices::contiZfracEqIdx;
|
static const int contiZfracEqIdx = Indices::contiZfracEqIdx;
|
||||||
static const int contiPolymerEqIdx = Indices::contiPolymerEqIdx;
|
static const int contiPolymerEqIdx = Indices::contiPolymerEqIdx;
|
||||||
|
@ -422,19 +422,19 @@ namespace Opm
|
|||||||
WellInterface<TypeTag>::
|
WellInterface<TypeTag>::
|
||||||
wsalt() const
|
wsalt() const
|
||||||
{
|
{
|
||||||
if (!has_brine) {
|
if constexpr (has_brine) {
|
||||||
return 0.0;
|
auto injectorType = well_ecl_.injectorType();
|
||||||
|
|
||||||
|
if (injectorType == InjectorType::WATER) {
|
||||||
|
WellBrineProperties fprop = well_ecl_.getBrineProperties();
|
||||||
|
return fprop.m_saltConcentration;
|
||||||
|
} else {
|
||||||
|
// Not a water injection well => no salt (?).
|
||||||
|
return 0.0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
auto injectorType = well_ecl_.injectorType();
|
return 0.0;
|
||||||
|
|
||||||
if (injectorType == InjectorType::WATER) {
|
|
||||||
WellBrineProperties fprop = well_ecl_.getBrineProperties();
|
|
||||||
return fprop.m_saltConcentration;
|
|
||||||
} else {
|
|
||||||
// Not a water injection well => no salt (?).
|
|
||||||
return 0.0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user