OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Changed Table code to use TableContainer

Browse Source
This commit is contained in:
Joakim Hove
2015-09-21 18:19:37 +02:00
parent 85d7f6c904
commit a9a42e82be
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opm/autodiff/SolventPropsAdFromDeck.cpp
View File

@@ -55,7 +55,7 @@ SolventPropsAdFromDeck::SolventPropsAdFromDeck(DeckConstPtr deck,
auto tables = eclState->getTableManager(); auto tables = eclState->getTableManager();
// pvt // pvt
const auto& pvdsTables = tables->getPvdsTables(); const TableContainer& pvdsTables = tables->getPvdsTables();
if (!pvdsTables.empty()) { if (!pvdsTables.empty()) {
int numRegions = pvdsTables.size(); int numRegions = pvdsTables.size();
@@ -65,7 +65,7 @@ SolventPropsAdFromDeck::SolventPropsAdFromDeck(DeckConstPtr deck,
inverseBmu_.resize(numRegions); inverseBmu_.resize(numRegions);
for (int regionIdx = 0; regionIdx < numRegions; ++regionIdx) { for (int regionIdx = 0; regionIdx < numRegions; ++regionIdx) {
const Opm::PvdsTable& pvdsTable = pvdsTables[regionIdx]; const Opm::PvdsTable& pvdsTable = pvdsTables.getTable<PvdsTable>(regionIdx);
// Copy data // Copy data
const std::vector<double>& press = pvdsTable.getPressureColumn(); const std::vector<double>& press = pvdsTable.getPressureColumn();
@@ -91,7 +91,7 @@ SolventPropsAdFromDeck::SolventPropsAdFromDeck(DeckConstPtr deck,
OPM_THROW(std::runtime_error, "PVDS must be specified in SOLVENT runs\n"); OPM_THROW(std::runtime_error, "PVDS must be specified in SOLVENT runs\n");
} }
const auto& ssfnTables = tables->getSsfnTables(); const TableContainer& ssfnTables = tables->getSsfnTables();
// relative permeabilty multiplier // relative permeabilty multiplier
if (!ssfnTables.empty()) { if (!ssfnTables.empty()) {
@@ -104,7 +104,7 @@ SolventPropsAdFromDeck::SolventPropsAdFromDeck(DeckConstPtr deck,
krg_.resize(numRegions); krg_.resize(numRegions);
krs_.resize(numRegions); krs_.resize(numRegions);
for (int regionIdx = 0; regionIdx < numRegions; ++regionIdx) { for (int regionIdx = 0; regionIdx < numRegions; ++regionIdx) {
const Opm::SsfnTable& ssfnTable = ssfnTables[regionIdx]; const Opm::SsfnTable& ssfnTable = ssfnTables.getTable<SsfnTable>(regionIdx);
// Copy data // Copy data
const std::vector<double>& solventFraction = ssfnTable.getSolventFractionColumn(); const std::vector<double>& solventFraction = ssfnTable.getSolventFractionColumn();