OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-13 17:32:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

changed: make has_brine contexpr

Browse Source 
and use if constexpr to eliminate some code
This commit is contained in:
Arne Morten Kvarving committed 2021-05-11 12:52:44 +02:00
1 parent f48ee17d59
commit ceb9bb4311
2 files changed
+12 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

opm/simulators/wells/WellInterface.hpp
+1 -1
View File
@@ -115,7 +115,7 @@ namespace Opm
// flag for polymer molecular weight related
static const bool has_polymermw = getPropValue<TypeTag, Properties::EnablePolymerMW>();
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 contiZfracEqIdx = Indices::contiZfracEqIdx;
static const int contiPolymerEqIdx = Indices::contiPolymerEqIdx;
opm/simulators/wells/WellInterface_impl.hpp
+11 -11
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;
}