If for example pybind11 or python changes the type of exception thrown
and we expect a different (the old one) in our boost test, then the python
of pybind11 is left in an unusable condition and the next attempt of
running might produce hard to debug exception, This happened on Debian
bookworm (pybind 2.10.3, python 3.11) for syntax errors.
This commit adds the expected behaviour for all-defaulted records in
ROCK, provided the all-defaulted records are not the first of the
keyword. Similarly to, e.g. PVTW, all-defaulted records are treated as
copies of the immediately preceding record.
In other words, given
ROCK
-- REF. PRES COMPRESSIBILITY
280.000 5.6E-5 /
/
the second record is supposed to be a copy of the first.
This commit adds a special case for handling the dynamic nature of
the number of records in the ROCK keyword. In particular, if the
ROCKOPTS keyword is NOT entered before ROCK, then the number of
records is NTPVT--item 2 from TABDIMS. Conversely, when ROCKOPTS is
entered before ROCK, the number of records in the latter depends on
the setting in item 3 of ROCKOPTS.
This interaction cannot be easily captured in our JSON-based models,
so we introduce a special size class, SPECIAL_CASE_ROCK, that only
applies to the ROCK keyword and implement the logic in a dedicated
function in 'Parser.cpp'. Once we have determined the correct
number of records, we form a RawKeyword of type FIXED and defer
further processing to the existing handling of fixed-sized keywords.
Add a selection of unit tests to exercise the new behaviour.
If there is an EDITNNCR entry and a NNC entry for the same cell pair
then the EDITNNCR entry is not be represented inernally but we simply
overwrite the transmissibility of the corresponding NNC entry.
If there is an EDITNNC entry and an EDITNNCR entry for the same cell
pair then the EDITNNC entry is removed while internalizing EDITNNCR.
Order matters for EDITNNCR entries in the sense that later specified
values will overwrite previous entries when we internalize.
Note that similar to EDITNNC only the first 7 options are represented
and the rest is ignored by OPM flow.
Note that EDITNNCR entries for neighboring cells are ignored (like for
EDITNNC).
MINPVFIL is an OPM Flow specific keyword that is not used by the simulator, and thus it should be deleted.
Previously, we moved the checks that only allow either the MINPV or MINPORV keywords to be used in the input deck to the JSON keyword files. This was done to avoid confusion over which global limits are being applied.
Note that if the MINPVV keyword is also in the input deck then these limits are applied post processing the global limits defined by the MINPV/MINPORV keywords. This behavior is unchanged by this PR.
The PR is marked as WIP to give developers time to object for the removal of MINPVFIL keyword.
We support constant flux aquifers (AQUFLUX keyword) entered both in
the SOLUTION and in the SCHEDULE sections. The primary structural
change is that we have to support analytic aquifers being introduced
dynamically, whence the connection information (xCAQ) must be
captured without knowing the full set of analytic aquifers. We
therefore allocate those output arrays purely from the maximum sizes
entered in the RUNSPEC section whereas we defer determining the
maximum aquifer ID to the point of capturing the dynamic values.
The xAAQ values for constant flux aquifers amount to a new aquifer
type integer value (=2) in IAAQ[11] and the flux value in SAAQ[0].
The inner loop is always across the model layers while we ensure
that the 'outer' loop always iterates over an index range that is at
least as large as that of the 'middle' loop. This follows from
recent work on compatibility prompted by real field models with the
constant flux analytic aquifer type.
Thanks to [at]tskille for the additional insight.
