OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #479 from flikka/update-phase-enum

Browse Source 
Updated Namespace of PhaseEnum from opm-parser
This commit is contained in:
Joakim Hove 2014-01-28 12:20:05 -08:00
commit 8c8ba4e113
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/core/props/phaseUsageFromDeck.hpp
View File

@ -39,13 +39,13 @@ namespace Opm
std::fill(pu.phase_used, pu.phase_used + BlackoilPhases::MaxNumPhases, 0); std::fill(pu.phase_used, pu.phase_used + BlackoilPhases::MaxNumPhases, 0);
// Discover phase usage. // Discover phase usage.
if (eclipseState->hasPhase(PhaseEnum::WATER)) { if (eclipseState->hasPhase(Phase::PhaseEnum::WATER)) {
pu.phase_used[BlackoilPhases::Aqua] = 1; pu.phase_used[BlackoilPhases::Aqua] = 1;
} }
if (eclipseState->hasPhase(PhaseEnum::OIL)) { if (eclipseState->hasPhase(Phase::PhaseEnum::OIL)) {
pu.phase_used[BlackoilPhases::Liquid] = 1; pu.phase_used[BlackoilPhases::Liquid] = 1;
} }
if (eclipseState->hasPhase(PhaseEnum::GAS)) { if (eclipseState->hasPhase(Phase::PhaseEnum::GAS)) {
pu.phase_used[BlackoilPhases::Vapour] = 1; pu.phase_used[BlackoilPhases::Vapour] = 1;
} }
pu.num_phases = 0; pu.num_phases = 0;