From 5b77bcd4a0c10bd547a7ba49a8061cfc61fcc794 Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Wed, 5 Feb 2014 15:23:05 +0100 Subject: [PATCH] handle the ROCK keywords using the new opm-parser utility class --- opm/core/props/rock/RockCompressibility.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/opm/core/props/rock/RockCompressibility.cpp b/opm/core/props/rock/RockCompressibility.cpp index 0f2cefecb..1144d701e 100644 --- a/opm/core/props/rock/RockCompressibility.cpp +++ b/opm/core/props/rock/RockCompressibility.cpp @@ -26,6 +26,7 @@ #include #include +#include #include @@ -94,13 +95,12 @@ namespace Opm poromult_ = rocktabTable.getPoreVolumeMultiplierColumn(); transmult_ = rocktabTable.getTransmisibilityMultiplierColumn(); } else if (newParserDeck->hasKeyword("ROCK")) { - Opm::DeckKeywordConstPtr rockKeyword = newParserDeck->getKeyword("ROCK"); - if (rockKeyword->size() != 1) + Opm::RockTable rockTable(newParserDeck->getKeyword("ROCK")); + if (rockTable.numRows() != 1) OPM_THROW(std::runtime_error, "Can only handle a single region in ROCK."); - Opm::DeckRecordConstPtr rockRecord = rockKeyword->getRecord(0); - pref_ = rockRecord->getItem(0)->getSIDouble(0); - rock_comp_ = rockRecord->getItem(1)->getSIDouble(0); + pref_ = rockTable.getPressureColumn()[0]; + rock_comp_ = rockTable.getCompressibilityColumn()[0]; } else { std::cout << "**** warning: no rock compressibility data found in deck (ROCK or ROCKTAB)." << std::endl; }