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 new EclipseState API, made ->s into .s

Browse Source
This commit is contained in:
Pål Grønås Drange
2016-04-11 09:15:06 +02:00
parent 391bda4711
commit 77fc26475b
7 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
opm/polymer/PolymerProperties.hpp
View File

@@ -130,8 +130,8 @@ namespace Opm
void readFromDeck(Opm::DeckConstPtr deck, Opm::EclipseStateConstPtr eclipseState)
{
// We assume NTMISC=1
auto tables = eclipseState->getTableManager();
const auto& plymaxTable = tables->getPlymaxTables().getTable<PlymaxTable>(0);
const auto& tables = eclipseState->getTableManager();
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...
@@ -141,7 +141,7 @@ namespace Opm
mix_param_ = plmixparRecord.getItem("TODD_LONGSTAFF").getSIDouble(0);
// We assume NTSFUN=1
const auto& plyrockTable = tables->getPlyrockTables().getTable<PlyrockTable>(0);
const auto& plyrockTable = tables.getPlyrockTables().getTable<PlyrockTable>(0);
// We also assume that each table has exactly one row...
assert(plyrockTable.numRows() == 1);
@@ -153,14 +153,14 @@ namespace Opm
c_max_ads_ = plyrockTable.getMaxAdsorbtionColumn()[0];
// We assume NTPVT=1
const auto& plyviscTable = tables->getPlyviscTables().getTable<PlyviscTable>(0);
const auto& plyviscTable = tables.getPlyviscTables().getTable<PlyviscTable>(0);
c_vals_visc_ = plyviscTable.getPolymerConcentrationColumn().vectorCopy( );
visc_mult_vals_ = plyviscTable.getViscosityMultiplierColumn().vectorCopy( );
// We assume NTSFUN=1
const auto& plyadsTable = tables->getPlyadsTables().getTable<PlyadsTable>(0);
const auto& plyadsTable = tables.getPlyadsTables().getTable<PlyadsTable>(0);
c_vals_ads_ = plyadsTable.getPolymerConcentrationColumn().vectorCopy( );
ads_vals_ = plyadsTable.getAdsorbedPolymerColumn().vectorCopy( );
@@ -170,7 +170,7 @@ namespace Opm
if (has_plyshlog_) {
// Assuming NTPVT == 1 always
const auto& plyshlogTable = tables->getPlyshlogTables().getTable<PlyshlogTable>(0);
const auto& plyshlogTable = tables.getPlyshlogTables().getTable<PlyshlogTable>(0);
water_vel_vals_ = plyshlogTable.getWaterVelocityColumn().vectorCopy( );
shear_vrf_vals_ = plyshlogTable.getShearMultiplierColumn().vectorCopy( );