mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
adapt one-phase model for brine
This commit is contained in:
parent
587fa71e04
commit
fd023ddb74
@ -37,7 +37,7 @@ namespace Opm {
|
|||||||
*
|
*
|
||||||
* \brief The primary variable and equation indices for the black-oil model.
|
* \brief The primary variable and equation indices for the black-oil model.
|
||||||
*/
|
*/
|
||||||
template <unsigned numSolventsV, unsigned numPolymersV, unsigned numEnergyV, bool enableFoam, unsigned PVOffset, unsigned canonicalCompIdx>
|
template <unsigned numSolventsV, unsigned numPolymersV, unsigned numEnergyV, bool enableFoam, bool enableBrine, unsigned PVOffset, unsigned canonicalCompIdx>
|
||||||
struct BlackOilOnePhaseIndices
|
struct BlackOilOnePhaseIndices
|
||||||
{
|
{
|
||||||
//! Is phase enabled or not
|
//! Is phase enabled or not
|
||||||
@ -66,11 +66,14 @@ struct BlackOilOnePhaseIndices
|
|||||||
//! Number of foam equations to be considered
|
//! Number of foam equations to be considered
|
||||||
static const int numFoam = enableFoam? 1 : 0;
|
static const int numFoam = enableFoam? 1 : 0;
|
||||||
|
|
||||||
|
//! Number of salt equations to be considered
|
||||||
|
static const int numBrine = enableBrine? 1 : 0;
|
||||||
|
|
||||||
//! The number of fluid phases
|
//! The number of fluid phases
|
||||||
static const int numPhases = 1;
|
static const int numPhases = 1;
|
||||||
|
|
||||||
//! The number of equations
|
//! The number of equations
|
||||||
static const int numEq = numPhases + numSolvents + numPolymers + numEnergy + numFoam;
|
static const int numEq = numPhases + numSolvents + numPolymers + numEnergy + numFoam + numBrine;
|
||||||
|
|
||||||
//////////////////////////////
|
//////////////////////////////
|
||||||
// Primary variable indices
|
// Primary variable indices
|
||||||
@ -106,9 +109,13 @@ struct BlackOilOnePhaseIndices
|
|||||||
static const int foamConcentrationIdx =
|
static const int foamConcentrationIdx =
|
||||||
enableFoam ? PVOffset + numPhases + numSolvents + numPolymers : -1000;
|
enableFoam ? PVOffset + numPhases + numSolvents + numPolymers : -1000;
|
||||||
|
|
||||||
|
//! Index of the primary variable for the salt
|
||||||
|
static const int saltConcentrationIdx =
|
||||||
|
enableBrine ? PVOffset + numPhases + numSolvents + numPolymers + numFoam : -1000;
|
||||||
|
|
||||||
//! Index of the primary variable for temperature
|
//! Index of the primary variable for temperature
|
||||||
static const int temperatureIdx =
|
static const int temperatureIdx =
|
||||||
enableEnergy ? PVOffset + numPhases + numSolvents + numPolymers + numFoam: - 1000;
|
enableEnergy ? PVOffset + numPhases + numSolvents + numPolymers + numFoam + numBrine: - 1000;
|
||||||
|
|
||||||
//////////////////////
|
//////////////////////
|
||||||
// Equation indices
|
// Equation indices
|
||||||
@ -153,9 +160,13 @@ struct BlackOilOnePhaseIndices
|
|||||||
static const int contiFoamEqIdx =
|
static const int contiFoamEqIdx =
|
||||||
enableFoam ? PVOffset + numPhases + numSolvents + numPolymers : -1000;
|
enableFoam ? PVOffset + numPhases + numSolvents + numPolymers : -1000;
|
||||||
|
|
||||||
|
//! Index of the continuity equation for the salt component
|
||||||
|
static const int contiBrineEqIdx =
|
||||||
|
enableBrine ? PVOffset + numPhases + numSolvents + numPolymers + numFoam : -1000;
|
||||||
|
|
||||||
//! Index of the continuity equation for energy
|
//! Index of the continuity equation for energy
|
||||||
static const int contiEnergyEqIdx =
|
static const int contiEnergyEqIdx =
|
||||||
enableEnergy ? PVOffset + numPhases + numSolvents + numPolymers + numFoam : -1000;
|
enableEnergy ? PVOffset + numPhases + numSolvents + numPolymers + numFoam + numBrine: -1000;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Opm
|
} // namespace Opm
|
||||||
|
Loading…
Reference in New Issue
Block a user