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

Add support for MISC

Browse Source
This commit is contained in:
Tor Harald Sandve
2015-12-01 10:50:19 +01:00
parent ce595d7592
commit e97c6461e1
4 changed files with 62 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,6 +153,8 @@ namespace Opm {
}
addTables( "SORWMIS", numMiscibleTables);
addTables( "SGCWMIS", numMiscibleTables);
addTables( "MISC", numMiscibleTables);
}
{
@@ -215,9 +217,8 @@ namespace Opm {
numMiscibleTables = static_cast<size_t>(record->getItem<ParserKeywords::MISCIBLE::NTMISC>()->getInt(0));
}
initSimpleTableContainer<SorwmisTable>(deck, "SORWMIS", numMiscibleTables);
addTables( "SORWMIS", numMiscibleTables);
addTables( "SGCWMIS", numMiscibleTables);
initSimpleTableContainer<SgcwmisTable>(deck, "SGCWMIS", numMiscibleTables);
initSimpleTableContainer<MiscTable>(deck, "MISC", numMiscibleTables);
}
initSimpleTableContainer<PvdgTable>(deck, "PVDG", m_tabdims->getNumPVTTables());

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

@@ -62,6 +62,8 @@
#include <opm/parser/eclipse/EclipseState/Tables/TableContainer.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SorwmisTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SgcwmisTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/MiscTable.hpp>
namespace Opm {
@@ -109,6 +111,7 @@ namespace Opm {
const TableContainer& getSorwmisTables() const;
const TableContainer& getSgcwmisTables() const;
const TableContainer& getMiscTables() const;
const std::vector<PvtgTable>& getPvtgTables() const;
const std::vector<PvtoTable>& getPvtoTables() const;