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

change according to comments in pullrequest

Browse Source
This commit is contained in:
hnil
2019-05-23 09:13:45 +02:00
committed by Atgeirr Flø Rasmussen
parent 3a56213ed8
commit ee482e87a6
4 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,13 +37,13 @@ namespace Ewoms {
*
* \brief The primary variable and equation indices for the black-oil model.
*/
template <unsigned numSolventsV, unsigned numPolymersV, unsigned numEnergyV, unsigned PVOffset, unsigned enableCanonicalCompIdx>
template <unsigned numSolventsV, unsigned numPolymersV, unsigned numEnergyV, unsigned PVOffset, unsigned canonicalCompIdx>
struct BlackOilOnePhaseIndices
{
//! Is phase enabled or not
static const bool oilEnabled = (enableCanonicalCompIdx == 0);
static const bool waterEnabled = (enableCanonicalCompIdx == 1);
static const bool gasEnabled = (enableCanonicalCompIdx == 2);
static const bool oilEnabled = (canonicalCompIdx == 0);
static const bool waterEnabled = (canonicalCompIdx == 1);
static const bool gasEnabled = (canonicalCompIdx == 2);
//! Are solvents involved?
static const bool enableSolvent = numSolventsV > 0;
@@ -116,7 +116,7 @@ struct BlackOilOnePhaseIndices
static unsigned activeToCanonicalComponentIndex(unsigned compIdx)
{
// assumes canonical oil = 0, water = 1, gas = 2;
assert(compIdx < 2);
assert(compIdx == 0);
if(gasEnabled) {
return 2;
} else if (waterEnabled) {