Commit Graph

8476 Commits

Author SHA1 Message Date
Williham Williham Totland
5e981cc74b Corrects all_nodes implementation. 2020-05-04 18:29:48 +02:00
Williham Williham Totland
54ced2e368 Implements Group Level report. 2020-05-04 18:29:48 +02:00
Williham Williham Totland
8af0d505cf Implements GTNode::level and GTNode::all_nodes. 2020-05-04 18:29:08 +02:00
Joakim Hove
c22a7e5b46
Merge pull request #1765 from wito/group-hierarchy-report
Implementing Group Hierarchy Report
2020-05-04 18:27:33 +02:00
Joakim Hove
44af497f8a
Merge pull request #1771 from joakim-hove/welspecs-report-refactor
Use proper Connection::perf_range() when creating WELSPECS MSW report
2020-05-04 12:19:23 +02:00
Joakim Hove
c8e81f32fb
Merge pull request #1763 from joakim-hove/weltarg-uda
Weltarg uda
2020-05-04 11:54:19 +02:00
Joakim Hove
afc7f5d2f2 Use proper Connection::perf_range() when creating WELSPECS MSW report 2020-05-04 10:46:32 +02:00
Joakim Hove
9b370dcad1
Merge pull request #1739 from wito/welspecs-report-refactor
Add Unit System awareness to WELSPECS reports
2020-05-04 10:46:20 +02:00
Joakim Hove
35dc429aa4 Sort IUAD output vectr on UDQ input index 2020-05-04 10:23:16 +02:00
Joakim Hove
5c2a8b9fc4 Update UDQActive when UDA is used in WELTARG 2020-05-04 10:23:00 +02:00
Joakim Hove
9a4c8f754e Change type of new value argument in WELTARG to UDA 2020-05-04 08:29:34 +02:00
Håvard Berland
f6318ee271 WELTARG keyword can have UDA-data in E100 2020-05-04 08:29:34 +02:00
Joakim Hove
ef77be1508 Refactor ScheduleTests to use fixture function 2020-05-04 08:29:34 +02:00
Joakim Hove
4fa0c93ff7
Merge pull request #1759 from joakim-hove/rename-segdist
Connection - Segment interaction implemented with optional pair
2020-05-01 08:52:03 +02:00
Bård Skaflestad
021d946a96
Merge pull request #1769 from joakim-hove/is-udq-regexp
Update regexp to allow for digits in UDQ name
2020-04-30 16:32:17 +02:00
Joakim Hove
8b70e42e0f Connection - Segment interaction implemented with optional pair 2020-04-30 14:54:21 +02:00
Joakim Hove
94defc8a08
Merge pull request #1768 from atgeirr/add-missing-include
Add missing include statement.
2020-04-30 12:28:19 +02:00
Joakim Hove
29dd594d48 Update regexp to allow for digits in UDQ name 2020-04-30 12:10:34 +02:00
Joakim Hove
b8ab03b22b
Merge pull request #1767 from joakim-hove/remove-unused-include
Remove #include which is not needed
2020-04-30 12:03:39 +02:00
Atgeirr Flø Rasmussen
b9cdaafed3 Add missing include statement. 2020-04-30 11:55:32 +02:00
Williham Williham Totland
87ca9077ea Implements group hierarchy data subreport. 2020-04-30 10:27:12 +02:00
Joakim Hove
57cfeeb854 Remove #include which is not needed 2020-04-30 10:23:44 +02:00
Joakim Hove
e4c6cc3de0
Merge pull request #1764 from akva2/fix_focal_packaging
changed: remove multiarch-support predepends
2020-04-30 10:21:15 +02:00
Williham Williham Totland
4663e49e23 Group hierarchy report interface. 2020-04-30 09:33:06 +02:00
Arne Morten Kvarving
58269dd675 changed: remove multiarch-support predepends
no longer required in ubuntu bionic, and breaks ubuntu focal,
and in any case it is support by both platforms.
2020-04-30 09:12:50 +02:00
Bård Skaflestad
fc69eb7b72
Merge pull request #1746 from joakim-hove/network
Network
2020-04-29 17:00:54 +02:00
Joakim Hove
c7008d329a Add class ExtNetwork for extended networks 2020-04-29 15:45:18 +02:00
Bård Skaflestad
27b348b013
Merge pull request #1749 from bska/fix-krgr
Fix Default Value Initializers for Field Properties KR*R
2020-04-29 14:32:58 +02:00
Bård Skaflestad
79bb8386d3 Sat-Func Initializers: Add End-Point Unit Tests
Exercises the initializers for SW{L,CR,U}, SO{W,G}CR, SG{L,CR,U}, as
well as the function values KRW, KRWR, KRG, KRGR, KRO, KRORW, KRORG
and capillary pressure function values PCW and PCG.

Example data from region one (1) of

    opm-tests/model1/include/sattab_basemod1.sattab

Example phrased both as family I (S*OF) and as family II (S*FN, SOF3).
2020-04-29 13:33:51 +02:00
Bård Skaflestad
146be0aa21 SOGCR: Pull SGOF Handling Into Initializer
This is in any case needed to calculate correct KRGR default values
in runs using family I saturation function keywords (S*OF) and also
removes the need to apply the special 'subtract_swl' operation in
this case.  Overall this is a simplification of the code since we
now have all saturation end-points available when initializing
saturation function field properties.
2020-04-29 13:33:51 +02:00
Bård Skaflestad
137ef7a17b Sat-Func Initializers: Use RawTableEndPoints for KRGR
This commit reimplements the findKrgr helper function in terms of
the RawTableEndPoints aggregate.  In particular, this commit aims to
underscore the fact that KRGR is the relative permeability of gas at
the displacing saturation

    1 - Socr - Swco

This fact is hopefully more apparent in this revised than the
existing implementation since we now rely explicitly on evaluating
the 'KrgColumn' at an index derived from looking up that saturation
value in the pertinent saturation column.
2020-04-29 13:33:51 +02:00
Bård Skaflestad
c8048021d1 Sat-Func Initializers: Use RawTableEndPoints for KRWR
This commit reimplements the findKrwr helper function in terms of
the RawTableEndPoints aggregate.  In particular, this commit aims to
underscore the fact that KRWR is the relative permeability of water
at the displacing saturation

    1 - Socr - Sgco

This fact is hopefully more apparent in this revised than the
existing implementation since we now rely explicitly on evaluating
the 'KrwColumn' at an index derived from looking up that saturation
value in the pertinent saturation column.
2020-04-29 13:33:51 +02:00
Bård Skaflestad
58764a6ec6 Sat-Func Initializers: Use RawTableEndPoints for KRORW
This commit reimplements the findKrorw helper function in terms of
the RawTableEndPoints aggregate.  In particular, this commit aims to
underscore the fact that KRORW is the relative permeability of oil
in the Oil/Water system at the displacing saturation

    1 - Swcr - Sgco

This fact is hopefully more apparent in this revised than the
existing implementation since we now rely explicitly on evaluating
the 'KrowColumn' at an index derived from looking up that saturation
value in the pertinent saturation column.
2020-04-29 13:33:51 +02:00
Bård Skaflestad
b17b4c1375 Sat-Func Initializers: Use RawTableEndPoints for KRORG
This commit reimplements the findKrorg helper function in terms of
the RawTableEndPoints aggregate.  In particular, this commit aims to
underscore the fact that KRORG is the relative permeability of oil
in the Oil/Gas system at the displacing saturation

    1 - Sgcr - Swco

This fact is hopefully more apparent in this revised than the
existing implementation since we now rely explicitly on evaluating
the 'KrogColumn' at an index derived from looking up that saturation
value in the pertinent saturation column.
2020-04-29 13:33:51 +02:00
Bård Skaflestad
3817524f52 Sat-Func Initializers: Adjust Whitespace and Fix a Variable Name
The name 'max_krw' reflects the actual value better than the
existing name 'krwr'.
2020-04-29 13:33:51 +02:00
Bård Skaflestad
f6cfadd62f Sat-Func Initializers: Use Precalculated Endpoints Where Possible 2020-04-29 13:33:51 +02:00
Bård Skaflestad
af34e083c2 Sat-Func Initializers: Include <algorithm> and <iterator>
Needed to bring in declarations of std::distance, std::reverse, and
std::upper_bound.
2020-04-29 13:33:51 +02:00
Bård Skaflestad
2984cca164 Sat-Func Properties: Provide All Raw Endpoints to All Initializers
This is in preparation of fixing the initializers for the KR*R
properties.  The default values here generally depend on critical
and connate saturations of other phases extracted from the raw input
table values.  This commit therefore creates an aggregate structure

    RawTableEndPoints

that collects the connate gas and water saturations, the full set of
critical saturations, and the maximum gas and water saturations from
all input tables (meaning for all regions and drainage/imbibition
regime designators).  Each *Endpoint() function furthermore gets a
new parameter of this type to preserve a uniform signature.

Note that we currently calculate the complete set of these endpoints
for each call to satfunc::init(), but may choose to expose this
structure to the caller at a later time in order to reduce the
overhead of these repeated calculations.
2020-04-29 13:33:51 +02:00
Bård Skaflestad
6615030fab Sat-Func Region Apply: Remove 'ACTNUM' Pointer
We always call these functions on all active cells so there's no
need to have checks for ACTNUM-like cell subsets.
2020-04-29 13:33:51 +02:00
Bård Skaflestad
a4fc7ab05d Sat-func Region Apply: Split Region ID Check out to Helper
Mostly to reduce cognitive load when reading the *Apply() functions'
implementations.
2020-04-29 13:33:51 +02:00
Bård Skaflestad
8f64405ace Reduce Saturation Function Initialization API
The individual property initialization functions aren't used
directly anymore.  Put them in an anonymous namespace in the
implementation file so that no client can take their address.  This
is in preparation of adding TOLCRIT support.
2020-04-29 13:33:51 +02:00
Markus Blatt
eeb63d8694
Merge pull request #1758 from blattms/mark-openmp-as-prereq
Mark OpenMP as prerequisite for opm-common
2020-04-29 12:57:02 +02:00
Williham Williham Totland
cb8ddfd8aa Minor style consistency tweaks. 2020-04-29 11:30:30 +02:00
Joakim Hove
8201728973
Merge pull request #1760 from joakim-hove/python-package-path
Python files should go in $PREFIX/dist-packages on debian
2020-04-29 10:49:20 +02:00
Williham Williham Totland
77a0ee13ac Implements perf range. 2020-04-29 10:15:23 +02:00
Joakim Hove
512c2e4c1e Python files should go in $PREFIX/dist-packages on debian 2020-04-29 10:03:08 +02:00
Williham Williham Totland
a4111fa672 Projects the unit system from the callsite. 2020-04-29 08:40:17 +02:00
Williham Williham Totland
78c19a3aba Minor style tweaks. 2020-04-29 08:33:26 +02:00
Williham Williham Totland
fbe9d0dec2 Refactors number formatting. 2020-04-29 08:33:26 +02:00
Williham Williham Totland
305b4b21a7 Implements unit conversion for connection factor. 2020-04-29 08:33:26 +02:00