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

Added Eclipse3DProperties PRESSURE, SGAS & SWAT.

Browse Source
This commit is contained in:
Joakim Hove
2016-04-26 14:55:12 +02:00
parent 25ef8781c9
commit d32b409c27
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/parser/eclipse/EclipseState/Eclipse3DProperties.cpp
View File

@@ -268,6 +268,10 @@ namespace Opm {
for( const auto& kw : { "IKRGR", "IKRGRX", "IKRGRX-", "IKRGRY", "IKRGRY-", "IKRGRZ", "IKRGRZ-" } )
supportedDoubleKeywords.emplace_back( kw, IKRGRLookup, "1" );
// Solution keywords - required fror enumerated restart.
supportedDoubleKeywords.emplace_back( "PRESSURE", 0.0 , "Pressure" );
supportedDoubleKeywords.emplace_back( "SWAT", 0.0 , "1" );
supportedDoubleKeywords.emplace_back( "SGAS", 0.0 , "1" );
// cell temperature (E300 only, but makes a lot of sense for E100, too)

6
opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp
View File

@@ -258,12 +258,6 @@ BOOST_AUTO_TEST_CASE(IntProperties) {
BOOST_CHECK_EQUAL( true, state.get3DProperties().hasDeckIntGridProperty( "SATNUM" ) );
}
BOOST_AUTO_TEST_CASE(PropertiesNotSupportsFalse) {
DeckPtr deck = createDeck();
EclipseState state( deck, ParseContext() );
const auto& props = state.get3DProperties();
BOOST_CHECK( ! props.supportsGridProperty( "SWAT" ) );
}
BOOST_AUTO_TEST_CASE(GetProperty) {
DeckPtr deck = createDeck();