OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

make all canonicalToActiveComponentIndex variants constexpr

Browse Source
This commit is contained in:
Arne Morten Kvarving
2025-02-03 15:27:29 +01:00
parent 1671d060c8
commit 45d27f446c
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/models/blackoil/blackoilonephaseindices.hh
View File

@@ -179,7 +179,7 @@ struct BlackOilOnePhaseIndices
//////////////////////
//! \brief returns the index of "active" component
static unsigned canonicalToActiveComponentIndex(unsigned /*compIdx*/)
static constexpr unsigned canonicalToActiveComponentIndex(unsigned /*compIdx*/)
{
return 0;
}

12
opm/models/blackoil/blackoiltwophaseindices.hh
View File

@@ -28,6 +28,8 @@
#ifndef EWOMS_BLACK_OIL_TWO_PHASE_INDICES_HH
#define EWOMS_BLACK_OIL_TWO_PHASE_INDICES_HH
#include <opm/common/utility/ConstexprAssert.hpp>
#include <cassert>
namespace Opm {
@@ -179,20 +181,20 @@ struct BlackOilTwoPhaseIndices
//////////////////////
//! \brief returns the index of "active" component
static unsigned canonicalToActiveComponentIndex(unsigned compIdx)
static constexpr unsigned canonicalToActiveComponentIndex(const unsigned compIdx)
{
// assumes canonical oil = 0, water = 1, gas = 2;
if (!gasEnabled) {
assert(compIdx != 2);
constexpr_assert(compIdx != 2);
// oil = 0, water = 1
return compIdx;
} else if (!waterEnabled) {
assert(compIdx != 1);
constexpr_assert(compIdx != 1);
// oil = 0, gas = 1
return compIdx / 2;
} else {
assert(!oilEnabled);
assert(compIdx != 0);
constexpr_assert(!oilEnabled);
constexpr_assert(compIdx != 0);
}
// water = 0, gas = 1;