OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

renamed saltwater-->brine and removed keywords from missingFeatures

Browse Source
This commit is contained in:
Trine S. Mykkeltvedt
2020-01-09 14:14:38 +01:00
committed by Tor Harald Sandve
parent 5749615bd8
commit 99e7785fb5
20 changed files with 80 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opm/core/props/BlackoilPhases.hpp
+3 -3
View File
@@ -33,11 +33,11 @@ namespace Opm
// sense that they can be active or not and canonical indices can be translated
// to and from active ones. That said, they are not considered by num_phases or
// MaxNumPhases. The crypto phases which are currently implemented are solvent,
// polymer, energy, polymer molecular weight, foam and salt.
// polymer, energy, polymer molecular weight, foam and brine.
static const int NumCryptoPhases = 6;
// enum ComponentIndex { Water = 0, Oil = 1, Gas = 2 };
enum PhaseIndex { Aqua = 0, Liquid = 1, Vapour = 2, Solvent = 3, Polymer = 4, Energy = 5, PolymerMW = 6, Foam = 7, Salt = 8 };
enum PhaseIndex { Aqua = 0, Liquid = 1, Vapour = 2, Solvent = 3, Polymer = 4, Energy = 5, PolymerMW = 6, Foam = 7, Brine = 8 };
};
struct PhaseUsage : public BlackoilPhases
@@ -51,7 +51,7 @@ namespace Opm
// polymer molecular weight
bool has_polymermw;
bool has_foam;
bool has_salt;
bool has_brine;
};
/// Check or assign presence of a formed, free phase. Limited to
opm/core/props/phaseUsageFromDeck.hpp
+5 -5
View File
@@ -123,14 +123,14 @@ namespace Opm
else
pu.phase_pos[BlackoilPhases::Foam] = -1;
// Add salt info
pu.has_salt = phases.active(Phase::SALTWATER);
if (pu.has_salt) {
pu.phase_pos[BlackoilPhases::Salt] = numActivePhases;
// Add brine info
pu.has_brine = phases.active(Phase::BRINE);
if (pu.has_brine) {
pu.phase_pos[BlackoilPhases::Brine] = numActivePhases;
++ numActivePhases;
}
else
pu.phase_pos[BlackoilPhases::Salt] = -1;
pu.phase_pos[BlackoilPhases::Brine] = -1;
return pu;
}