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

TableContainer for SGFN, SWFN and SSFN tables.

Browse Source
This commit is contained in:
Joakim Hove
2015-09-21 08:56:49 +02:00
parent 836ea66a49
commit 9c9e9f48fd
6 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,21 +171,15 @@ namespace Opm {
initSimpleTableContainer<SlgofTable>(deck, "SLGOF" , m_tabdims->getNumSatTables());
initSimpleTableContainer<Sof2Table>(deck, "SOF2" , m_tabdims->getNumSatTables());
initSimpleTableContainer<Sof3Table>(deck, "SOF3" , m_tabdims->getNumSatTables());
initSimpleTableContainer<SwfnTable>(deck, "SWFN" , m_tabdims->getNumSatTables());
initSimpleTableContainer<SgfnTable>(deck, "SGFN" , m_tabdims->getNumSatTables());
initSimpleTableContainer<SsfnTable>(deck, "SSFN" , m_tabdims->getNumSatTables());
/*****************************************************************/
//initSimpleTable(deck, "SWOF", m_swofTables);
//initSimpleTable(deck, "SGOF", m_sgofTables);
//initSimpleTable(deck, "SLGOF", m_slgofTables);
//initSimpleTable(deck, "SOF2", m_sof2Tables);
//initSimpleTable(deck, "SOF3", m_sof3Tables);
initSimpleTable(deck, "PVDG", m_pvdgTables);
initSimpleTable(deck, "PVDO", m_pvdoTables);
initSimpleTable(deck, "SWFN", m_swfnTables);
initSimpleTable(deck, "SGFN", m_sgfnTables);
initSimpleTable(deck, "SSFN", m_ssfnTables);
initSimpleTable(deck, "PVDS", m_pvdsTables);
initSimpleTable(deck, "PLYADS", m_plyadsTables);
initSimpleTable(deck, "PLYVISC", m_plyviscTables);
@@ -442,6 +436,19 @@ namespace Opm {
return getTables("SOF3");
}
const TableContainer& TableManager::getSwfnTables() const {
return getTables("SWFN");
}
const TableContainer& TableManager::getSgfnTables() const {
return getTables("SGFN");
}
const TableContainer& TableManager::getSsfnTables() const {
return getTables("SSFN");
}
const std::vector<PvdgTable>& TableManager::getPvdgTables() const {
return m_pvdgTables;
}
@@ -450,18 +457,6 @@ namespace Opm {
return m_pvdoTables;
}
const std::vector<SwfnTable>& TableManager::getSwfnTables() const {
return m_swfnTables;
}
const std::vector<SgfnTable>& TableManager::getSgfnTables() const {
return m_sgfnTables;
}
const std::vector<SsfnTable>& TableManager::getSsfnTables() const {
return m_ssfnTables;
}
const std::vector<PvdsTable>& TableManager::getPvdsTables() const {
return m_pvdsTables;
}