OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get actnum vector as it exists in FieldProps without modification.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2022-06-14 15:14:19 +02:00
parent eca8583358
commit bc966fa32a
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/input/eclipse/EclipseState/Grid/FieldProps.hpp
View File

@ -389,6 +389,7 @@ public:
const std::string& default_region() const; const std::string& default_region() const;
std::vector<int> actnum(); std::vector<int> actnum();
const std::vector<int>& actnumRaw() const;
template <typename T> template <typename T>
static bool supported(const std::string& keyword); static bool supported(const std::string& keyword);

2
src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp
View File

@ -1174,7 +1174,7 @@ EclipseGrid::EclipseGrid(const Deck& deck, const int * actnum)
if (deck.hasKeyword<ParserKeywords::ACTNUM>()) { if (deck.hasKeyword<ParserKeywords::ACTNUM>()) {
EclipseGrid topologyOnlyGrid(static_cast<GridDims&>(*this)); EclipseGrid topologyOnlyGrid(static_cast<GridDims&>(*this));
FieldProps fp(deck, topologyOnlyGrid); FieldProps fp(deck, topologyOnlyGrid);
actnumVector = fp.actnum(); actnumVector = fp.actnumRaw();
if (actnumVector.size() != this->getCartesianSize()) if (actnumVector.size() != this->getCartesianSize())
throw std::invalid_argument("ACTNUM vector has wrong size"); throw std::invalid_argument("ACTNUM vector has wrong size");

5
src/opm/input/eclipse/EclipseState/Grid/FieldProps.cpp
View File

@ -1176,6 +1176,11 @@ std::vector<int> FieldProps::actnum() {
} }
const std::vector<int>& FieldProps::actnumRaw() const {
return m_actnum;
}
void FieldProps::scanGRIDSection(const GRIDSection& grid_section) { void FieldProps::scanGRIDSection(const GRIDSection& grid_section) {
Box box(*this->grid_ptr); Box box(*this->grid_ptr);