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

Merge branch 'master' into specialkeywords

Browse Source 
Conflicts:
	opm/parser/eclipse/EclipseState/EclipseState.hpp
This commit is contained in:
Atle Haugan
2014-01-30 15:05:01 +01:00
parent 825e976566 49604cf631
commit 1dd448b178
22 changed files with 497 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opm/parser/eclipse/EclipseState/EclipseState.cpp
View File

@@ -47,17 +47,17 @@ namespace Opm {
void EclipseState::initPhases(DeckConstPtr deck) {
if (deck->hasKeyword("OIL"))
phases.insert(PhaseEnum::OIL);
phases.insert(Phase::PhaseEnum::OIL);
if (deck->hasKeyword("GAS"))
phases.insert(PhaseEnum::GAS);
phases.insert(Phase::PhaseEnum::GAS);
if (deck->hasKeyword("WATER"))
phases.insert(PhaseEnum::WATER);
phases.insert(Phase::PhaseEnum::WATER);
}
bool EclipseState::hasPhase(enum PhaseEnum phase) const {
bool EclipseState::hasPhase(enum Phase::PhaseEnum phase) const {
return (phases.count(phase) == 1);
}