Commit Graph

10295 Commits

Author SHA1 Message Date
Joakim Hove
0eb1b95fc3 Handle commandline argument --output-interval 2021-03-27 07:51:41 +01:00
Joakim Hove
d14cd52a5e Remove stale functionality RestartConfig / DynamicState 2021-03-27 07:51:41 +01:00
Joakim Hove
546523e229 Add new class RSTConfig for configuration of restart. 2021-03-27 07:51:41 +01:00
Joakim Hove
d25962ba80
Merge pull request #2378 from bska/configure-requisite-aquifer-summary-output
Configure Aquifer Summary Output Needed for Restart
2021-03-26 16:02:41 +01:00
Bård Skaflestad
621f0a443a Configure Aquifer Summary Output Needed for Restart
The summary vectors

    AAQP (pressure), AAQR (rate), AAQT (volume)

must be available for output to the restart file's "XAAQ" array for
all analytic aquifers.  Additionally, the summary vectors

    AAQTD (dimensionless time), AAQPD (dimensionless pressure)

must be available for restart output to "XAAQ" in the case of
Carter-Tracy aquifers.

This commit ensures that those values are always calculated and
stored in the SummaryState.
2021-03-26 15:24:23 +01:00
Bård Skaflestad
0f7d44ea13 Use Same Evaluation Factory for All Vectors
In particular, switch to using the Evaluator::Factory object for the
"required" restart vectors too.  This is in preparation of including
aquifer-related summary vectors into the set of required restart
vectors.
2021-03-26 15:24:23 +01:00
Bård Skaflestad
d0855bd995 Harmonise Required Segment Vector Implementation
Use pattern from the well, group, and field-level implementation.
While here, also switch to passing a default-constructed optional
instead of an empty string for the "fip_region".
2021-03-26 15:24:23 +01:00
Atgeirr Flø Rasmussen
9a9efa50f3
Merge pull request #2388 from joakim-hove/update-license
Update license header to GPL V3
2021-03-26 14:52:40 +01:00
Joakim Hove
eeddd663a5 Uddate license header to GPL V3 2021-03-26 12:42:30 +01:00
Joakim Hove
12dd9d321b
Merge pull request #2384 from joakim-hove/actionx-affected-wells
Schedule::applyAction() will return a set of wells affected
2021-03-25 17:03:49 +01:00
Joakim Hove
9bfdf709b7 Schedule::applyAction() will return a set of wells affected 2021-03-25 12:00:08 +01:00
Joakim Hove
da8df340b2
Merge pull request #2383 from joakim-hove/remove-first-rst-step
Remove unused function first_rst_step()
2021-03-25 10:53:10 +01:00
Bård Skaflestad
19183bdd6c
Merge pull request #2379 from joakim-hove/aquifer-grid-order
Aquifer grid order
2021-03-25 09:41:29 +01:00
Bård Skaflestad
704b3edfe7
Merge pull request #2373 from joakim-hove/aggregate-conn-data
Aggregate conn data
2021-03-25 09:31:56 +01:00
Joakim Hove
cfc552f39c Remove unused function first_rst_step() 2021-03-25 08:28:30 +01:00
Joakim Hove
2247b45872 Use SummaryState for connection rates in restart output 2021-03-25 07:21:31 +01:00
Joakim Hove
b6e739cd7e Register connection variables as required for restart 2021-03-25 07:21:31 +01:00
Joakim Hove
39e5ca32c0 Add summary evaluation support for CPR 2021-03-25 07:21:31 +01:00
Joakim Hove
ee86cf0196 Register summary evaluator for COIR 2021-03-25 07:21:31 +01:00
Joakim Hove
04242353c7 Use {} for optional string instead of "" 2021-03-25 07:21:31 +01:00
Joakim Hove
14fe6a5700
Merge pull request #2382 from joakim-hove/move-rst-tests
Move restart tests and use Schedule::write_rst_file()
2021-03-25 07:18:08 +01:00
Joakim Hove
f31a080fb6
Merge pull request #2374 from bska/aquct-dimless-time-and-press-smry
Support CT-Aquifer Dimensionless P/T Summary Vectors
2021-03-25 07:17:23 +01:00
Joakim Hove
6eddc4c088 Move restart tests and use Schedule::write_rst_file() 2021-03-24 18:15:47 +01:00
Joakim Hove
7c1b5b8b21 Add warning about aquifers connected to inactive cells 2021-03-24 13:08:27 +01:00
Joakim Hove
e8d4d99e6b Interleave ACTNUM modifications and Aquifer configuration 2021-03-24 13:08:27 +01:00
Bård Skaflestad
70457e1433 Support CT-Aquifer Dimensionless P/T Summary Vectors
This commit adds support for calculating and outputting the
CT-specific summary vectors "AAQTD" (dimensionless time, real time
divided by aquifer's time constant) and "AAQPD" (dimensionless
pressure-influence function evaluated at dimensionless time).
2021-03-24 11:43:25 +01:00
Joakim Hove
602dc07181
Merge pull request #2381 from joakim-hove/simplify-rst-test
Simplify test fixture
2021-03-24 10:27:57 +01:00
Markus Blatt
b7dc593092
Merge pull request #2359 from blattms/support-system-pybind
Support system pybind
2021-03-24 10:09:37 +01:00
Joakim Hove
e2ef6bc662 Simplify test fixture 2021-03-24 09:40:04 +01:00
Bård Skaflestad
37aee167eb
Merge pull request #2377 from joakim-hove/rst-test-fix
Fix test assert and temporarily disable
2021-03-23 15:51:06 +01:00
Joakim Hove
a62d73a424
Merge pull request #2376 from joakim-hove/rst-test-fixtures
Update test fixtures
2021-03-23 13:02:48 +01:00
Joakim Hove
227a07ed06 Fix test assert and temporarily disable 2021-03-23 11:40:32 +01:00
Joakim Hove
8258d65900 Update test fixtures 2021-03-23 09:33:06 +01:00
Joakim Hove
6609ca265c
Merge pull request #2372 from joakim-hove/summary-state-connections
Add special treatment of connection variables in SummaryState
2021-03-23 07:22:45 +01:00
Joakim Hove
5f91bfa7d0
Merge pull request #2375 from GitPaean/aquifer_cell_volumes
function to ouput the cell volume for numerical aquifer cells
2021-03-22 22:33:30 +01:00
Kai Bao
2a67eb44ed function to ouput the cell volume for numerical aquifer cells 2021-03-22 15:18:47 +01:00
Joakim Hove
596c3a9db3
Merge pull request #2370 from joakim-hove/actionx-prt-prefix
Add prefix the schedule messages to highlight ACTIONX rerun
2021-03-22 10:54:27 +01:00
Joakim Hove
12c63f7346 Use Summarystate::update_conn_var from Summary 2021-03-21 15:21:41 +01:00
Joakim Hove
5b3787ec46 Add special treatment of connection variables in SummaryState 2021-03-21 15:20:45 +01:00
Joakim Hove
d2cb2eeec4 Add prefix the schedule messages to highlight ACTIONX rerun 2021-03-19 22:30:37 +01:00
Bård Skaflestad
77f058645f
Merge pull request #2368 from jalvestad/intehead_corrections
Corrections to InteHead to account for ROCKOPTS data and Well lists
2021-03-19 21:14:53 +01:00
Markus Blatt
1c311150a5 Prevent newline in PYTHON_INCLUDE_DIR.
It breaks the docker pypi build.
2021-03-19 20:18:58 +01:00
Markus Blatt
f8c6fabb2d Use system's pybind11 if available. 2021-03-19 20:18:58 +01:00
Jostein Alvestad
278cd0a240 eliminated WellDims and used WellTableDims instead 2021-03-19 13:59:40 +01:00
Jostein Alvestad
d0f177d94c corrections to inteHead - rockopts, well lists 2021-03-19 13:59:39 +01:00
Joakim Hove
70a658c91d
Merge pull request #2367 from joakim-hove/well-cmode
Add shortcuts to get injectorcontrols from Well
2021-03-19 12:48:42 +01:00
Tor Harald Sandve
61ad81b701
Merge pull request #2315 from bska/record-dynamic-status
Record Dynamic Well Status in Output Wells
2021-03-19 09:07:38 +01:00
Joakim Hove
f345d37dd1 Add shortcuts to get injectorcontrols from Well 2021-03-18 19:30:09 +01:00
Bård Skaflestad
89e3efb2e4 Record Dynamic Well Status in Output Wells
This commit adds a new data member

    Well::Status dynamicStatus

to the data::Well object.  This member records the simulator's
notion of a well's open/shut/stop status and is especially needed to
support WECON-type status changes once the simulator maintains both
open and shut wells.

While here, also change multiple summary primitives to not look up
the same values repeatedly.
2021-03-18 17:26:33 +01:00
Joakim Hove
27b4110314
Merge pull request #2355 from totto82/guideRateInj
Add guiderate for injection groups
2021-03-18 17:04:34 +01:00