Commit Graph

19 Commits

Author SHA1 Message Date
Bård Skaflestad
4381eca9ac Rename Analytic Aquifer Structure Data Members
This commit renames various data members of the *_data structures to
aid the reader who may not be intimately familiar with the details
of the analytic models.  We switch the 'initial_pressure' into an
optional<double> instead of a pair<bool,double> with 'std::nullopt'
representing defaulted initial aquifer pressure values in the input
file.

We also add logic and private data members to compute/store aquifer
time constants, mass density of water, water viscosity and, in the
case of Carter-Tracy aquifers, also the influx constant 'beta'.
This centralises the requisite logic which reduces the risk of
subtle errors.

In the case of defaulted initial pressures, we support deferred
calculation of aquifer properties until the equilibrium pressure is
known.  Users are then expected to assign a value to the initial
pressure members and call 'finishInitialisation()' to derive those
properties.

While here, also switch to using raw string literals instead of
concatenated and escaped literals for the embedded deck strings in
the ParserTests.
2021-06-22 16:36:45 +02:00
Bård Skaflestad
8eb9bee6ed Track AQUNUM Records for Restart Purposes
When forming restart arrays for numerical aquifers (IAQN and RAQN)
we need to know the total number of records in the input AQUNUM
keyword as well as the record ID of each individual record.  This
commit adds a tracking mechanism for this information.

While here, also add unit tests that verify that we've correctly
interpreted the AQUNUM records.
2021-05-18 21:17:33 +02:00
Bård Skaflestad
79b1f97640 Provide Means of Linearising All Aquifer IDs in a Model
This commit adds two helper functions

    std::vector<int> analyticAquiferIDs(const AquiferConfig&)
    std::vector<int> numericAquiferIDs(const AquiferConfig&)

which return the numeric IDs of the model's analytic and numeric
aquifers respectively.  These are useful for configuring aquifer
summary keywords of the form

    AAQR
    /

that do not list individual aquifer IDs and for identifying issues
in the input file when a summary keyword that does list its aquifer
IDs refers to an aquifer of incorrect category (e.g., ID of numeric
aquifer in an analytic aquifer summary keyword).

While here, also add more unit test coverage to the AquiferConfig
object.  In particular, add a unit test that includes aquifers at
all.
2021-05-16 12:15:46 +02:00
Arne Morten Kvarving
1ef8fd987b JFunc: forward types to avoid includes 2021-04-27 12:45:24 +02:00
Kai Bao
b3f53b2f04 renaming function names for numerical aquifers
following reviewing comment.
2021-04-21 09:35:54 +02:00
Kai Bao
4e911f1c88 splitting generation of the numerical aquifer connections to two steps
generate all the connections specified in the deck records first, then
filter out the wrong ones using processed grid later. The refactoring is
to avoid using the Deck explicitly in opm-grid.
2021-04-20 00:35:17 +02:00
Kai Bao
08539cdcd6 fixing AquiferTests 2021-04-14 21:11:10 +02:00
Joakim Hove
4535b69e0d Remove multiplier from aquifer cell 2021-02-16 09:58:51 +01:00
Joakim Hove
3032df0739 Implement add and multiply semantics for repeated AQUANCON keywords 2021-02-15 13:11:06 +01:00
Joakim Hove
79375ecc9c Use face area as default influx coefficient for aquifer connection 2021-02-14 20:55:28 +01:00
Kai Bao
e5277221c7 adding more tests in AquiferTests for numerical aquifer 2021-02-08 09:40:25 +01:00
Kai Bao
667f20df70 addressing reviewing comments in OPM/opm-common#2252 2021-02-05 14:40:38 +01:00
Kai Bao
abbb56c173 addressing review comments for OPM/opm-common#2246 2021-01-27 22:50:50 +01:00
Kai Bao
35bc7293f1 adding a test for numerical aquifer 2021-01-27 22:49:03 +01:00
Kai Bao
b9ae495bce moving Aquifer related to Aquifer folder 2021-01-08 23:17:36 +01:00
Williham Williham Totland
6d2f8cca5c Adds type information to integer literals. 2020-09-29 13:54:21 +02:00
Joakim Hove
01aa3692fa Add AquiferConfig to EclipseState 2020-02-18 18:07:02 +01:00
Joakim Hove
7daf77ef59 Added AquiferConfig class 2020-02-18 15:30:09 +01:00
Joakim Hove
32227236fa Refactor AQUANCON implementation 2020-02-18 07:33:05 +01:00