Commit Graph

10049 Commits

Author SHA1 Message Date
Markus Blatt
164f451124 Explictly search for python3 and use that instead PythonInterpret et al.
Otherwise python2 might be found, but OPM needs python3.
2021-03-10 15:57:01 +01:00
Joakim Hove
122f15006c Check OPM_ENABLE_PYTHON and OPM_ENABLE_EMBEDDED_PYTHON 2021-03-10 15:44:45 +01:00
Joakim Hove
d6aa829197 Avoid spurious dependencies if Python is not enabled 2021-03-10 15:44:43 +01:00
Joakim Hove
f8fb46ed84 Source generator should only optionally generate Python binding code 2021-03-10 15:44:18 +01:00
Joakim Hove
0a5301d949
Merge pull request #2319 from jalvestad/rst_wsegaicd
Changes to output Restart data for the WSEGAICD keyword (Eclipse compatible restart file)
2021-03-10 14:59:49 +01:00
Joakim Hove
55fd38d5c9
Merge pull request #2341 from joakim-hove/remove-rst-keyword
Remove unneccesary function RestartConfig::getKeyword()
2021-03-10 14:49:31 +01:00
Joakim Hove
90839c0e16 Remove unneccesary function RestartConfig::getKeyword() 2021-03-10 13:23:16 +01:00
Joakim Hove
bfb1b7d7e5
Merge pull request #2337 from joakim-hove/gconinje-guiderate
Gconinje guiderate
2021-03-10 13:17:32 +01:00
Joakim Hove
2487feb815
Merge pull request #2331 from bska/enumerate-active-by-columns
Add Special Purpose Active Cell Enumeration by Columns
2021-03-10 13:17:10 +01:00
Joakim Hove
e2521495f2 Internalize guide rate when loading GCONINJE keyword 2021-03-10 09:54:50 +01:00
Joakim Hove
6e7d9102c7 Rename enum Group::GuideRateTarget -> Group::GuideRateProdTarget 2021-03-10 09:54:50 +01:00
Joakim Hove
218349a453 Rename GCONINJE guiderate items 2021-03-10 09:54:50 +01:00
Bård Skaflestad
6d18b3b7e6 ActiveIndexByColumn: Remove 'build' Method
Do construction work in constructor instead.

Suggested by: [at]joakim-hove
2021-03-10 09:54:14 +01:00
Joakim Hove
d673f2e555 Add member first_in_month and first_in_year to ScheduleState 2021-03-10 09:49:13 +01:00
Joakim Hove
b151c85f6c Add month_num and year_num members to ScheduleState 2021-03-10 09:26:02 +01:00
Bård Skaflestad
b6b81462d2 Use Sorting to Infer Columnar Active Cell ID
This reduces the space overhead of the build stage from "number of
Cartesian cells" to "number of active cells", at the cost of some
increased processing time (sorting vs. linear traversals).
2021-03-10 09:23:23 +01:00
Bård Skaflestad
d2028e4851 Add Special Purpose Active Cell Enumeration by Columns
The protocol for outputting an aquifer's active cell IDs to the
restart file requires that the cells be enumerated according to
their column.  In particular, the aquifer's notion of a model's
active cells correspond to a cell ordering of the form

    for (i = 0; i < Nx; ++i)
        for (j = 0; j < Ny; ++j)
            for (k = 0; k < Nz; ++k)
                use(X(i, j, k))

instead of the common ordering, sometimes referred to as "natural
ordering"

    for (k = 0; k < Nz; ++k)
        for (j = 0; j < Ny; ++j)
            for (i = 0; i < Nx; ++i)
                use(X(i, j, k))

which is employed elsewhere.

This commit adds a special purpose mapping facility which will
translate active cell IDs from natural ordering to the columnar
enumeration.  The facility is intentionally bare-bones because we
do not expect to use it outside of the restart writing code, and
only in a limited fashion within that context.  We will however
consider adding more features if the need arises.
2021-03-10 09:23:23 +01:00
Tor Harald Sandve
456e94d524 Add event for injection type changed 2021-03-10 08:40:03 +01:00
Jostein Alvestad
97fa62e560 correction for maxAbsoluteRate 2021-03-10 08:38:08 +01:00
Joakim Hove
34ddba52d7 Add member sim_step to ScheduleState 2021-03-10 08:08:43 +01:00
Joakim Hove
69c198271f
Merge pull request #2327 from joakim-hove/summary-invalid-fipnum
Summary invalid fipnum
2021-03-10 07:32:43 +01:00
Joakim Hove
c4b8598b92
Merge pull request #2338 from bska/internalise-aqudims
Partially Internalise AQUDIMS in Runspec
2021-03-10 07:27:45 +01:00
Bård Skaflestad
796318409d Partially Internalise AQUDIMS in Runspec
This commit internalises the items NANAQU (5) and NCAMAX (6) of the
AQUDIMS keyword into a new structure

    AquiferDimensions

hooked up to the 'Runspec' class.  This is in preparation of adding
restart output for analytic aquifers (Carter-Tracy and Fetkovich).
2021-03-09 22:29:00 +01:00
Joakim Hove
e3b54278a0
Merge pull request #2336 from bska/tidy-aquancon-repr
Don't Needlessly Copy AQUANCON Objects
2021-03-09 20:12:13 +01:00
Joakim Hove
b197ac7a3f
Merge pull request #2317 from joakim-hove/parserkeywords-container
Add container of builtin keywords
2021-03-09 20:11:33 +01:00
Bård Skaflestad
cab51ed57e
Merge pull request #2334 from joakim-hove/restart-config-testing
Use schedule object in testing of restart configuration
2021-03-09 18:04:47 +01:00
Bård Skaflestad
0c2a435b94 Don't Needlessly Copy AQUANCON Objects
Return the operator[]() data by reference-to-const instead of as a
freshly created vector object.

While here, also (slightly) reduce the compilation overhead of this
module (and its users) by forward declaring interface types and
moving the actual include statements to the .CPP file.
2021-03-09 16:19:05 +01:00
Jostein Alvestad
f84c42104a further improvements to the code - segmentType 2021-03-09 15:50:04 +01:00
Jostein Alvestad
01fa2af160 corrections and comments to code to explaing logic 2021-03-09 15:50:02 +01:00
Jostein Alvestad
941de32084 changes to boost test values due to changes in the test-dataset 2021-03-09 15:50:00 +01:00
Jostein Alvestad
e96778c440 changes in test-dataset and initial adaptions to the new data set, plus corrections for ScalingFactor 2021-03-09 15:49:58 +01:00
Jostein Alvestad
8a5a159450 Added changes to output restart data to support WSEGAICD input 2021-03-09 15:49:55 +01:00
Joakim Hove
84d5dbde0e Make the Builtin class available from Python 2021-03-09 12:22:39 +01:00
Joakim Hove
f584901da4 Add class Builtin with all the compiled keywords 2021-03-09 12:22:39 +01:00
Joakim Hove
0d07a250d8 Use schedule object in testing of restart configuration 2021-03-09 12:19:46 +01:00
Bård Skaflestad
dd7d8748e0
Merge pull request #2333 from joakim-hove/restart-config-testing
Use multiline string literals
2021-03-09 09:12:26 +01:00
Joakim Hove
2dbf7ff281 Use multiline string literals 2021-03-09 08:25:36 +01:00
Joakim Hove
1ecf10a6ab
Merge pull request #2332 from joakim-hove/schedule-output-interval
Add optional argument to override output interval - EBOS paramstyle
2021-03-09 07:26:02 +01:00
Joakim Hove
298e565862
Merge pull request #2329 from tskille/esmry_fixes
Improved robustness for locating multiple result files
2021-03-08 22:10:23 +01:00
Torbjørn Skille
8f123f3519 Improved robustness for locating multiple result files 2021-03-08 19:36:12 +01:00
Joakim Hove
66b6b35925
Merge pull request #2330 from bska/accept-temporary-cartdims
Accept Temporary 'Dimension' Arguments in EclipseGrid Constructor
2021-03-08 19:31:25 +01:00
Joakim Hove
9369690615 Add overide output interval argument to RestartConfig 2021-03-08 18:16:42 +01:00
Joakim Hove
9d18afb45e Add optional argument to override output interval - EBOS paramstyle 2021-03-08 17:43:04 +01:00
Bård Skaflestad
050e2c6c9e Accept Temporary 'Dimension' Arguments in EclipseGrid Constructor
There's no need to require that the client creates an actual,
mutable array object on the stack (or elsewhere) in order to form an
EclipseGrid instance.

This is nevertheless mostly to make it easier to use the COORD/ZCORN
constructor usable in unit tests.
2021-03-08 16:52:34 +01:00
Joakim Hove
18dca82a8b Handle empty regions in summary region results 2021-03-08 16:29:56 +01:00
Joakim Hove
47f292bd93 Handle undefined fipnum definition in summary keywords like RPR__ABC 2021-03-08 12:30:41 +01:00
Joakim Hove
8a901f2700
Merge pull request #2326 from joakim-hove/summary-add-fp
Add fieldprops argument to SummaryConfig constructor
2021-03-08 12:25:13 +01:00
Joakim Hove
9c0b375e60
Merge pull request #2325 from OPM/restart-config-private
Hide RestartConfig as private member of Schedule class
2021-03-08 12:24:27 +01:00
Joakim Hove
48b366b1f9 Add fieldprops argument to SummaryConfig constructor 2021-03-08 08:23:01 +01:00
Joakim Hove
b5183b1d76 Hide RestartConfig as private member of Schedule class 2021-03-07 11:27:09 +01:00