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

Add support for PMISC

Browse Source
This commit is contained in:
Tor Harald Sandve
2015-12-01 11:09:58 +01:00
parent e97c6461e1
commit 9badf045a9
5 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
opm/parser/eclipse/CMakeLists.txt
View File

@@ -279,6 +279,7 @@ EclipseState/Tables/TableContainer.hpp
EclipseState/Tables/SorwmisTable.hpp
EclipseState/Tables/SgcwmisTable.hpp
EclipseState/Tables/MiscTable.hpp
EclipseState/Tables/PmiscTable.hpp
#
Utility/WconinjeWrapper.hpp
Utility/CompdatWrapper.hpp

4
opm/parser/eclipse/EclipseState/Tables/TableManager.cpp
View File

@@ -154,6 +154,8 @@ namespace Opm {
addTables( "SORWMIS", numMiscibleTables);
addTables( "SGCWMIS", numMiscibleTables);
addTables( "MISC", numMiscibleTables);
addTables( "PMISC", numMiscibleTables);
}
@@ -219,6 +221,8 @@ namespace Opm {
initSimpleTableContainer<SorwmisTable>(deck, "SORWMIS", numMiscibleTables);
initSimpleTableContainer<SgcwmisTable>(deck, "SGCWMIS", numMiscibleTables);
initSimpleTableContainer<MiscTable>(deck, "MISC", numMiscibleTables);
initSimpleTableContainer<PmiscTable>(deck, "PMISC", numMiscibleTables);
}
initSimpleTableContainer<PvdgTable>(deck, "PVDG", m_tabdims->getNumPVTTables());

2
opm/parser/eclipse/EclipseState/Tables/TableManager.hpp
View File

@@ -63,6 +63,8 @@
#include <opm/parser/eclipse/EclipseState/Tables/SorwmisTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SgcwmisTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/MiscTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PmiscTable.hpp>

23
opm/parser/eclipse/IntegrationTests/ParseMiscible.cpp
View File

@@ -198,3 +198,26 @@ BOOST_AUTO_TEST_CASE(PARSE_MISC)
BOOST_CHECK_EQUAL(0.1, miscTable3.getSolventFractionColumn()[1]);
BOOST_CHECK_EQUAL(0.5, miscTable3.getMiscibilityColumn()[1]);
}
const char *pmiscData = "\n\
MISCIBLE\n\
1 3 /\n\
\n\
PMISC\n\
100 0.0 \n\
200 0.5 \n\
500 1.0 /\n\
\n";
BOOST_AUTO_TEST_CASE(PARSE_PMISC)
{
ParserPtr parser(new Parser());
// test table input
DeckPtr deck = parser->parseString(pmiscData, ParseMode());
Opm::PmiscTable pmiscTable;
pmiscTable.initFORUNITTESTONLY(deck->getKeyword("PMISC")->getRecord(0)->getItem(0));
BOOST_CHECK_EQUAL(3U, pmiscTable.getOilPhasePressureColumn().size());
BOOST_CHECK_EQUAL(200*1e5, pmiscTable.getOilPhasePressureColumn()[1]);
BOOST_CHECK_EQUAL(0.5, pmiscTable.getMiscibilityColumn()[1]);
}

5
opm/parser/share/keywords/000_Eclipse100/P/PMISC Normal file
View File

@@ -0,0 +1,5 @@
{"name" : "PMISC" , "sections" : ["PROPS"], "size" : {"keyword" : "MISCIBLE" , "item" : "NTMISC"},
"items" : [
{"name":"DATA", "value_type":"DOUBLE", "size_type" : "ALL" , "dimension" : ["Pressure","1"]}
]
}