changed: make has_brine contexpr

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 f48ee17d59
commit ceb9bb4311
2 changed files with 12 additions and 12 deletions

View File

@@ -422,19 +422,19 @@ namespace Opm
WellInterface<TypeTag>::
wsalt() const
{
if (!has_brine) {
return 0.0;
if constexpr (has_brine) {
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();
if (injectorType == InjectorType::WATER) {
WellBrineProperties fprop = well_ecl_.getBrineProperties();
return fprop.m_saltConcentration;
} else {
// Not a water injection well => no salt (?).
return 0.0;
}
return 0.0;
}