diff --git a/examples/wells_example.cpp b/examples/wells_example.cpp index 8be7c7aa..af0c2031 100644 --- a/examples/wells_example.cpp +++ b/examples/wells_example.cpp @@ -46,7 +46,7 @@ try // Define rock and fluid properties IncompPropertiesFromDeck incomp_properties(deck, eclipseState, *grid.c_grid()); - RockCompressibility rock_comp(deck, eclipseState); + RockCompressibility rock_comp(eclipseState); // Finally handle the wells WellsManager wells(eclipseState , 0 , *grid.c_grid(), incomp_properties.permeability()); diff --git a/opm/core/props/rock/RockCompressibility.cpp b/opm/core/props/rock/RockCompressibility.cpp index 36d28abe..a4546e4a 100644 --- a/opm/core/props/rock/RockCompressibility.cpp +++ b/opm/core/props/rock/RockCompressibility.cpp @@ -41,8 +41,7 @@ namespace Opm rock_comp_ = param.getDefault("rock_compressibility", 0.0)/unit::barsa; } - RockCompressibility::RockCompressibility(const Opm::Deck& deck, - const Opm::EclipseState& eclipseState, + RockCompressibility::RockCompressibility(const Opm::EclipseState& eclipseState, const bool is_io_rank) : pref_(0.0), rock_comp_(0.0) @@ -61,21 +60,19 @@ namespace Opm } else { transmult_ = rocktabTable.getColumn("PV_MULT_TRANX").vectorCopy(); } - } else if (deck.hasKeyword("ROCK")) { - const auto& rockKeyword = deck.getKeyword("ROCK"); + } else if (!tables.getRockTable().empty()) { + const auto& rockKeyword = tables.getRockTable(); if (rockKeyword.size() != 1) { if (is_io_rank) { OpmLog::warning("Can only handle a single region in ROCK (" + std::to_string(rockKeyword.size()) + " regions specified)." - + " Ignoring all except for the first.\n" - + "In file " + rockKeyword.getFileName() - + ", line " + std::to_string(rockKeyword.getLineNumber()) + "\n"); + + " Ignoring all except for the first.\n"); } } - pref_ = rockKeyword.getRecord(0).getItem("PREF").getSIDouble(0); - rock_comp_ = rockKeyword.getRecord(0).getItem("COMPRESSIBILITY").getSIDouble(0); + pref_ = rockKeyword[0].reference_pressure; + rock_comp_ = rockKeyword[0].compressibility; } else { OpmLog::warning("No rock compressibility data found in deck (ROCK or ROCKTAB)."); } diff --git a/opm/core/props/rock/RockCompressibility.hpp b/opm/core/props/rock/RockCompressibility.hpp index 771521dc..c851b636 100644 --- a/opm/core/props/rock/RockCompressibility.hpp +++ b/opm/core/props/rock/RockCompressibility.hpp @@ -20,7 +20,6 @@ #ifndef OPM_ROCKCOMPRESSIBILITY_HEADER_INCLUDED #define OPM_ROCKCOMPRESSIBILITY_HEADER_INCLUDED -#include #include #include @@ -35,8 +34,7 @@ namespace Opm public: /// Construct from input deck. /// Looks for the keywords ROCK and ROCKTAB. - RockCompressibility(const Opm::Deck& deck, - const Opm::EclipseState& eclipseState, + RockCompressibility(const Opm::EclipseState& eclipseState, const bool is_io_rank = true); /// Construct from parameters.