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

Using TableContainer.

Browse Source
This commit is contained in:
Joakim Hove 2015-10-04 09:00:01 +02:00
parent 6ef6dbcf5a
commit 1a0358d85a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opm/polymer/PolymerProperties.hpp
View File

@ -122,7 +122,7 @@ namespace Opm
{
// We assume NTMISC=1
auto tables = eclipseState->getTableManager();
const auto& plymaxTable = tables->getPlymaxTables()[0];
const auto& plymaxTable = tables->getPlymaxTables().getTable<PlymaxTable>(0);
const auto plmixparRecord = deck->getKeyword("PLMIXPAR")->getRecord(0);
// We also assume that each table has exactly one row...
@ -132,7 +132,7 @@ namespace Opm
mix_param_ = plmixparRecord->getItem("TODD_LONGSTAFF")->getSIDouble(0);
// We assume NTSFUN=1
const auto& plyrockTable = tables->getPlyrockTables()[0];
const auto& plyrockTable = tables->getPlymaxTables().getTable<PlyrockTable>(0);
// We also assume that each table has exactly one row...
assert(plyrockTable.numRows() == 1);
@ -144,14 +144,14 @@ namespace Opm
c_max_ads_ = plyrockTable.getMaxAdsorbtionColumn()[0];
// We assume NTPVT=1
const auto& plyviscTable = tables->getPlyviscTables()[0];
const auto& plyviscTable = tables->getPlyviscTables().getTable<PlyviscTable>(0);
c_vals_visc_ = plyviscTable.getPolymerConcentrationColumn();
visc_mult_vals_ = plyviscTable.getViscosityMultiplierColumn();
// We assume NTSFUN=1
const auto& plyadsTable = tables->getPlyadsTables()[0];
const auto& plyadsTable = tables->getPlyadsTables().getTable<PlyadsTable>(0);
c_vals_ads_ = plyadsTable.getPolymerConcentrationColumn();
ads_vals_ = plyadsTable.getAdsorbedPolymerColumn();
@ -160,8 +160,8 @@ namespace Opm
has_shrate_ = deck->hasKeyword("SHRATE");
if (has_plyshlog_) {
// Assuming NTPVT == 1 always due to the limitation of the parser
const auto& plyshlogTable = tables->getPlyshlogTables()[0];
// Assuming NTPVT == 1 always
const auto& plyshlogTable = tables->getPlyshlogTables().getTable<PlyshlogTable>(0);
water_vel_vals_ = plyshlogTable.getWaterVelocityColumn();
shear_vrf_vals_ = plyshlogTable.getShearMultiplierColumn();