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

EclipseState: export the IMPTVD and IMKRVD tables

Browse Source 
and also fix a small build bug in these table classes. I don't know
why they have not been also fully dealt with in the recent table code
refactoring...
This commit is contained in:
Andreas Lauser
2014-09-24 12:39:27 +02:00
parent 20c9a616e0
commit b4ff0efff8
4 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,6 +73,14 @@ namespace Opm {
return m_enptvdTables;
}
const std::vector<ImkrvdTable>& EclipseState::getImkrvdTables() const {
return m_imkrvdTables;
}
const std::vector<ImptvdTable>& EclipseState::getImptvdTables() const {
return m_imptvdTables;
}
const std::vector<PlyadsTable>& EclipseState::getPlyadsTables() const {
return m_plyadsTables;
}
@@ -148,6 +156,8 @@ namespace Opm {
void EclipseState::initTables(DeckConstPtr deck) {
initSimpleTables(deck, "ENKRVD", m_enkrvdTables);
initSimpleTables(deck, "ENPTVD", m_enptvdTables);
initSimpleTables(deck, "IMKRVD", m_imkrvdTables);
initSimpleTables(deck, "IMPTVD", m_imptvdTables);
initSimpleTables(deck, "PLYADS", m_plyadsTables);
initSimpleTables(deck, "PLYMAX", m_plymaxTables);
initSimpleTables(deck, "PLYROCK", m_plyrockTables);

6
opm/parser/eclipse/EclipseState/EclipseState.hpp
View File

@@ -32,6 +32,8 @@
#include <opm/parser/eclipse/EclipseState/Tables/EnkrvdTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/EnptvdTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/ImkrvdTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/ImptvdTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PlyadsTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PlymaxTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PlyrockTable.hpp>
@@ -85,6 +87,8 @@ namespace Opm {
// not present in the deck, the corresponding vector is of size zero.
const std::vector<EnkrvdTable>& getEnkrvdTables() const;
const std::vector<EnptvdTable>& getEnptvdTables() const;
const std::vector<ImkrvdTable>& getImkrvdTables() const;
const std::vector<ImptvdTable>& getImptvdTables() const;
const std::vector<PlyadsTable>& getPlyadsTables() const;
const std::vector<PlymaxTable>& getPlymaxTables() const;
const std::vector<PlyrockTable>& getPlyrockTables() const;
@@ -186,6 +190,8 @@ namespace Opm {
std::vector<EnkrvdTable> m_enkrvdTables;
std::vector<EnptvdTable> m_enptvdTables;
std::vector<ImkrvdTable> m_imkrvdTables;
std::vector<ImptvdTable> m_imptvdTables;
std::vector<PlyadsTable> m_plyadsTables;
std::vector<PlymaxTable> m_plymaxTables;
std::vector<PlyrockTable> m_plyrockTables;

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

@@ -50,7 +50,8 @@ namespace Opm {
recordIdx,
/*firstEntityOffset=*/0);
ParentType::checkNonDefaultable("DEPTH", /*isAscending=*/true);
ParentType::checkNonDefaultable("DEPTH");
ParentType::checkMonotonic("DEPTH", /*isAscending=*/true);
ParentType::applyDefaultsLinear("KRWMAX");
ParentType::applyDefaultsLinear("KRGMAX");
ParentType::applyDefaultsLinear("KROMAX");

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

@@ -50,7 +50,8 @@ namespace Opm {
"SOGCRIT"},
recordIdx,
/*firstEntityOffset=*/0);
ParentType::checkNonDefaultable("DEPTH", /*isAscending=*/true);
ParentType::checkNonDefaultable("DEPTH");
ParentType::checkMonotonic("DEPTH", /*isAscending=*/true);
ParentType::applyDefaultsLinear("SWCO");
ParentType::applyDefaultsLinear("SWCRIT");
ParentType::applyDefaultsLinear("SGCO");