From bc966fa32ac8cfb43954f6d9b7ff5254d3036641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Tue, 14 Jun 2022 15:14:19 +0200 Subject: [PATCH] Get actnum vector as it exists in FieldProps without modification. --- opm/input/eclipse/EclipseState/Grid/FieldProps.hpp | 1 + src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp | 2 +- src/opm/input/eclipse/EclipseState/Grid/FieldProps.cpp | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/opm/input/eclipse/EclipseState/Grid/FieldProps.hpp b/opm/input/eclipse/EclipseState/Grid/FieldProps.hpp index 36c8ce20a..387e8d297 100644 --- a/opm/input/eclipse/EclipseState/Grid/FieldProps.hpp +++ b/opm/input/eclipse/EclipseState/Grid/FieldProps.hpp @@ -389,6 +389,7 @@ public: const std::string& default_region() const; std::vector actnum(); + const std::vector& actnumRaw() const; template static bool supported(const std::string& keyword); diff --git a/src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp b/src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp index f1c01d662..f88a9e6b3 100644 --- a/src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp @@ -1174,7 +1174,7 @@ EclipseGrid::EclipseGrid(const Deck& deck, const int * actnum) if (deck.hasKeyword()) { EclipseGrid topologyOnlyGrid(static_cast(*this)); FieldProps fp(deck, topologyOnlyGrid); - actnumVector = fp.actnum(); + actnumVector = fp.actnumRaw(); if (actnumVector.size() != this->getCartesianSize()) throw std::invalid_argument("ACTNUM vector has wrong size"); diff --git a/src/opm/input/eclipse/EclipseState/Grid/FieldProps.cpp b/src/opm/input/eclipse/EclipseState/Grid/FieldProps.cpp index 3f978b5ca..85f6c1670 100644 --- a/src/opm/input/eclipse/EclipseState/Grid/FieldProps.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/FieldProps.cpp @@ -1176,6 +1176,11 @@ std::vector FieldProps::actnum() { } +const std::vector& FieldProps::actnumRaw() const { + return m_actnum; +} + + void FieldProps::scanGRIDSection(const GRIDSection& grid_section) { Box box(*this->grid_ptr);