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

Merge pull request #1534 from akva2/internalize_plmixpar

Browse Source 
internalize PLMIXPAR
This commit is contained in:
Arne Morten Kvarving 2020-03-05 13:10:24 +01:00 committed by GitHub
commit d47a064c1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
opm/parser/eclipse/EclipseState/Tables/FlatTable.hpp
View File

@ -93,6 +93,20 @@ struct PvcdoTable : public FlatTable< PVCDORecord > {
using FlatTable< PVCDORecord >::FlatTable;
};
struct PlmixparRecord {
static constexpr std::size_t size = 1;
double todd_langstaff;
bool operator==(const PlmixparRecord& data) const {
return todd_langstaff == data.todd_langstaff;
}
};
struct PlmixparTable : public FlatTable< PlmixparRecord> {
using FlatTable< PlmixparRecord >::FlatTable;
};
struct TlmixparRecord {
static constexpr std::size_t size = 2;

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

@ -71,6 +71,7 @@ namespace Opm {
const PvcdoTable& pvcdoTable,
const DensityTable& densityTable,
const RockTable& rockTable,
const PlmixparTable& plmixparTable,
const TlmixparTable& tlmixparTable,
const ViscrefTable& viscrefTable,
const WatdentTable& watdentTable,
@ -179,6 +180,7 @@ namespace Opm {
const DensityTable& getDensityTable() const;
const RockTable& getRockTable() const;
const ViscrefTable& getViscrefTable() const;
const PlmixparTable& getPlmixparTable() const;
const TlmixparTable& getTlmixparTable() const;
const WatdentTable& getWatdentTable() const;
const std::map<int, PlymwinjTable>& getPlymwinjTables() const;
@ -426,6 +428,7 @@ namespace Opm {
PvcdoTable m_pvcdoTable;
DensityTable m_densityTable;
RockTable m_rockTable;
PlmixparTable m_plmixparTable;
TlmixparTable m_tlmixparTable;
ViscrefTable m_viscrefTable;
WatdentTable m_watdentTable;

12
src/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp
View File

@ -104,6 +104,7 @@ namespace Opm {
const PvcdoTable& pvcdoTable,
const DensityTable& densityTable,
const RockTable& rockTable,
const PlmixparTable& plmixparTable,
const TlmixparTable& tlmixparTable,
const ViscrefTable& viscrefTable,
const WatdentTable& watdentTable,
@ -137,6 +138,7 @@ namespace Opm {
m_pvcdoTable(pvcdoTable),
m_densityTable(densityTable),
m_rockTable(rockTable),
m_plmixparTable(plmixparTable),
m_tlmixparTable(tlmixparTable),
m_viscrefTable(viscrefTable),
m_watdentTable(watdentTable),
@ -237,6 +239,10 @@ namespace Opm {
this->stcond.pressure = stcondKeyword.getRecord(0).getItem("PRESSURE").getSIDouble(0);
}
if (deck.hasKeyword<ParserKeywords::PLMIXPAR>()) {
this->m_plmixparTable = PlmixparTable(deck.getKeyword("PLMIXPAR"));
}
if (deck.hasKeyword<ParserKeywords::TLMIXPAR>()) {
this->m_tlmixparTable = TlmixparTable(deck.getKeyword("TLMIXPAR"));
}
@ -255,6 +261,7 @@ namespace Opm {
m_pvtwTable = data.m_pvtwTable;
m_pvcdoTable = data.m_pvcdoTable;
m_densityTable = data.m_densityTable;
m_plmixparTable = data.m_plmixparTable;
m_tlmixparTable = data.m_tlmixparTable;
m_viscrefTable = data.m_viscrefTable;
m_watdentTable = data.m_watdentTable;
@ -1024,6 +1031,10 @@ namespace Opm {
return getTables("TLPMIXPA");
}
const PlmixparTable& TableManager::getPlmixparTable() const {
return m_plmixparTable;
}
const TlmixparTable& TableManager::getTlmixparTable() const {
return m_tlmixparTable;
}
@ -1103,6 +1114,7 @@ namespace Opm {
m_pvtwTable == data.m_pvtwTable &&
m_pvcdoTable == data.m_pvcdoTable &&
m_densityTable == data.m_densityTable &&
m_plmixparTable == data.m_plmixparTable &&
m_tlmixparTable == data.m_tlmixparTable &&
m_viscrefTable == data.m_viscrefTable &&
m_watdentTable == data.m_watdentTable &&

1
src/opm/parser/eclipse/EclipseState/Tables/Tables.cpp
View File

@ -1338,6 +1338,7 @@ template FlatTable< PVTWRecord >::FlatTable( const DeckKeyword& );
template FlatTable< PVCDORecord >::FlatTable( const DeckKeyword& );
template FlatTable< ROCKRecord >::FlatTable( const DeckKeyword& );
template FlatTable< VISCREFRecord >::FlatTable( const DeckKeyword& );
template FlatTable< PlmixparRecord>::FlatTable( const DeckKeyword& );
template FlatTable< TlmixparRecord>::FlatTable( const DeckKeyword& );
template FlatTable< WATDENTRecord >::FlatTable( const DeckKeyword& );