Commit Graph

9170 Commits

Author SHA1 Message Date
Bård Skaflestad
3ecf6db2e0 Raise OPM Version to 2020.10 Final 2020-11-17 13:52:05 +01:00
Bård Skaflestad
0a3557a727 Raise OPM Version to 2020.10-rc5 2020-11-06 11:28:43 +01:00
Bård Skaflestad
bf823a4fd4
Merge pull request #2094 from OPM/backport-of-pr-2093
workaround cmake issue
2020-11-06 11:26:05 +01:00
Arne Morten Kvarving
74b4287b6e workaround cmake issue
cmake does not properly interpret the SYSTEM marker in lists of
include directories. this causes issues downstream when using
dunecontrol / the in-tree cmake config files.
2020-11-06 11:23:10 +01:00
Bård Skaflestad
b99dc9b5ec Raise OPM Version to 2020.10-rc4 2020-10-30 17:16:52 +01:00
Bård Skaflestad
fbfeba9b2e Raise OPM Version to 2020.10-rc3 2020-10-29 23:38:57 +01:00
Bård Skaflestad
3448c9c4ec
Merge pull request #2061 from OPM/backport-of-pr-2038
[cmake] Use scotch include dir for parmetis bindings of scotch.
2020-10-28 13:57:42 +01:00
Markus Blatt
4bb23ecf5a [cmake] Use scotch include dir for parmetis bindings of scotch.
The parmetis.h distributed via the parmetis binding of scotch
with Ubuntu 18.04 (libscotchparmetis-dev) includes the header
scotch.h located in /usr/include/scotch/. Therefore our check
of the include file failed. With this commit we check the
parmetis.h header another time with the scotch include path added.
Now parmetis is found on my Ubuntu.
2020-10-28 13:48:57 +01:00
Bård Skaflestad
2ba39f875c
Merge pull request #2057 from OPM/summary-bugfixes
Summary bugfixes
2020-10-27 14:30:29 +01:00
Bård Skaflestad
705930a5ca Don't Treat WPIL as Completion Keyword
WPIL is the productivity index of liquid (water + oil).
2020-10-27 10:12:13 +01:00
Joakim Hove
465a3447c7 Summary function glir should sum over all argument wells 2020-10-27 10:11:20 +01:00
Bård Skaflestad
a1080f8361 Bump version to 2020.10-rc1 2020-10-19 10:29:03 +02:00
Joakim Hove
6e82f3cb7a
Merge pull request #2021 from joakim-hove/no-wells-message
No wells message
2020-10-14 14:23:24 +02:00
Joakim Hove
7f8578ea96
Merge pull request #2020 from joakim-hove/fmwia
Fmwia
2020-10-14 14:22:38 +02:00
Joakim Hove
21d44c09e0
Merge pull request #2019 from joakim-hove/vfpprod-dimension
Dimension string does not accept space
2020-10-14 12:15:49 +02:00
Joakim Hove
e3959c5fa1 Implement number of abondoned injectors: FMWIA 2020-10-14 08:43:03 +02:00
Joakim Hove
2d036144cc Raise OpmInputError for unbalanced quotes 2020-10-14 08:40:10 +02:00
Joakim Hove
2ebc15e8d4 Fix message format for invalid wellname pattern 2020-10-14 08:15:07 +02:00
Joakim Hove
dd34f2d831 Maintain whether a well has ever injected 2020-10-14 00:39:48 +02:00
Joakim Hove
e1698f7be8 Rename test well RFT -> RFTP 2020-10-14 00:12:50 +02:00
Joakim Hove
47c4f5c2e0 Dimension string does not accept space 2020-10-13 22:19:49 +02:00
Joakim Hove
d0416d963d
Merge pull request #2017 from joakim-hove/rst-commits
Rst commits
2020-10-13 15:12:21 +02:00
Joakim Hove
53fe0f2d11 Add guide rate delay and damping to rst header class 2020-10-13 13:11:04 +02:00
Joakim Hove
ead5a19209 Extract update of guide rate model into separate function 2020-10-13 09:52:33 +02:00
Joakim Hove
94c697ccd0 Load boolean flag to indicate whether group control is active 2020-10-13 09:52:33 +02:00
Joakim Hove
60c406397b
Merge pull request #2015 from bska/record-new-connstructure
Record Event if WellConnections Change
2020-10-12 18:24:54 +02:00
Bård Skaflestad
6f20858d73 Record Event if WellConnections Change
This is different from COMPLETION_CHANGE which is unconditionally
recorded when processing COMPDAT.  This event is recorded only when
the Well's internal WellConnections structure actually changes and
informs clients that they may need to rerun any dynamic WELPI
scaling.  Such scaling will not be automatically forwarded onto the
new WellConnections structure.

This is arguably a hack.
2020-10-12 15:10:28 +02:00
Bård Skaflestad
5852270035
Merge pull request #2014 from bska/fix-oob-indexing
Ensure *HEAD Arrays Have Sufficient Size
2020-10-12 14:52:38 +02:00
Bård Skaflestad
810a93ba87 Ensure *HEAD Arrays Have Sufficient Size
The regression test program depends on this.
2020-10-12 13:49:53 +02:00
Bård Skaflestad
b0b8523b2a
Merge pull request #2013 from joakim-hove/schedule-msg
Schedule msg
2020-10-12 11:47:47 +02:00
Bård Skaflestad
6708273616
Merge pull request #2007 from joakim-hove/rst-cmp
Use restart object in regression testing
2020-10-12 11:47:09 +02:00
Joakim Hove
206243c78d Compare string and integere members from well using RestartIO data 2020-10-12 10:11:07 +02:00
Joakim Hove
8f90bf9387 Refactor the log messages emitted while creating the Schedule object
A maximum of N dates keywords are printed to stdout, afterwards logging will
only go to PRT file
2020-10-12 09:59:04 +02:00
Joakim Hove
db052055b2
Merge pull request #2011 from joakim-hove/grid-msg
Grid msg
2020-10-10 10:30:36 +02:00
Joakim Hove
32ac90cb5e Add messages about grid creation 2020-10-10 08:30:48 +02:00
Joakim Hove
36e03cf6b9 Use ParserKeyword::prohibits for COORD / GDFILE / ZCORN 2020-10-10 08:30:48 +02:00
Joakim Hove
fa65ce92d8 Allow loading of RstState for restart files without wells 2020-10-09 15:32:45 +02:00
Bård Skaflestad
79ad189d65
Merge pull request #2008 from joakim-hove/schedule-error-msg
Schedule error msg
2020-10-09 12:30:01 +02:00
Joakim Hove
d3a44ca543 Add proper error message for ill formed dates keyword 2020-10-09 11:40:15 +02:00
Joakim Hove
b273ef389a Make sure strings are joined - remove "," 2020-10-09 11:23:41 +02:00
Joakim Hove
c6068f4e17
Merge pull request #2006 from joakim-hove/keyword-interaction
Keyword interaction
2020-10-08 17:48:28 +02:00
Joakim Hove
a8b510334e
Merge pull request #2002 from bska/welpi
Add Support Infrastructure for WELPI Feature
2020-10-08 17:48:03 +02:00
Bård Skaflestad
70ef0858f7 Store WELPI Scaling Eligibility as Per-Connection Flag
Greatly simplifies logic in container class (WellConnection).

Suggested by: [at]joakim-hove
2020-10-08 11:19:04 +02:00
Bård Skaflestad
f384269133 Represent Assigned PI as an optional<>
Suggested by: [at]joakim-hove
2020-10-08 11:19:04 +02:00
Bård Skaflestad
a077847f69 Create Fully Non-Defaulted Serialization Test Objects
Suggested by [at]akva2.
2020-10-08 11:19:03 +02:00
Bård Skaflestad
fa7d8bc28c Add Support Infrastructure for WELPI Feature
This commit adds logic implementing the static parts of the WELPI
keyword.  We internalize the keyword data, record appropriate events
and provide hooks for dynamically adjusting the per-connection
transmissibility factor (Connection::CF()) when those events occur.
We implement support at three levels

  - WellConnections:
    Add new public member functions prepareWellPIScaling and
    applyWellPIScaling which, respectively, creates bookkeeping
    data to track those connections which are subject to CF scaling
    and actually applies that CF scaling.

  - Well:
    Add new data member 'productivity_index' which holds the 'WELPI'
    data value from the input keyword (converted to SI) and new
    member functions updateWellProductivityIndex and
    applyWellProdIndexScaling.  The first follows the 'update*'
    protocol (return 'true' if state change) and assigns new values
    to 'productivity_index' while the second uses the stored PI
    value and a dynamically calculated effective PI value to rescale
    the pertinent connections' CF value.

  - Schedule:
    Add new member function handleWELPI which internalizes the WELPI
    keyword and its data and records WELPI events for subsequent
    playback in the simulator layer.

Also add a set of unit tests to exercise the new features at all
levels.
2020-10-08 11:19:03 +02:00
Bård Skaflestad
de5e3d90cd Miscellaneous Cleanup Changes
In particular, include standard library headers as needed, fix
function declarations (operator<<() for Well::WellProductionProperties),
and make a few helper functions 'static' to avoid warnings of the
form "no previous declaration for".

For the Schedule's keyword handlers, also switch to storing member
function pointers directly instead of std::function objects.  This
saves space and does not incur function pointer conversions.  Use
std::invoke to call those handlers to avoid having to spell out the
'->*' operator.
2020-10-08 11:19:03 +02:00
Bård Skaflestad
36e3a25782 Use Explicit Powers of Two for Events Enumerators
Suggested by [at]joakim-hove
2020-10-08 11:19:03 +02:00
Bård Skaflestad
cc22c3bcf3 Remove Duplicated Logic in filterConnections
The Schedule::filterConnections() member function contained three
copies of the same loop, possibly as a result of earlier conflict
resolution.  Remove two of those loops.
2020-10-08 11:19:03 +02:00
Joakim Hove
732f19d2a2
Merge pull request #2003 from joakim-hove/rst-group2
Establish group <-> group relationship when loading from restartfile
2020-10-08 10:59:15 +02:00