OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,495 Commits 18 Branches 75 Tags 73 MiB
64fb589ec6
Commit Graph

8495 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
64fb589ec6 Use string based parent *name* in GTNode instead of pointer 2020-05-07 20:08:39 +02:00
Joakim Hove
310bd82b8b
Merge pull request #1778 from joakim-hove/gas-lift-opt 
Internalize keywords for Gas Lift Optimization
 2020-05-07 20:07:58 +02:00
Joakim Hove
e05e6f83ea
Merge pull request #1772 from atgeirr/fix-starttime-actionx 
Fix start-time of ACTIONX actions.
 2020-05-07 18:38:26 +02:00
Joakim Hove
18cd60cd86
Merge pull request #1780 from berland/solvdirs-size 
Add size to SOLVDIRS json
 2020-05-07 16:33:23 +02:00
Joakim Hove
7fe89422e2 Internalize keywords for gas lift optimization 2020-05-07 16:29:42 +02:00
Håvard Berland
8346941b92 Add size to SOLVDIRS json 2020-05-07 15:35:49 +02:00
Joakim Hove
b311cef875
Merge pull request #1776 from joakim-hove/zwel-fix 
Make sure the action name is only added to ZWEL when it is true
 2020-05-07 11:04:18 +02:00
Bård Skaflestad
3065218e6d
Merge pull request #1779 from joakim-hove/fixup-network 
Fix: integrate ExtNetwork instance in Schedule serialization
 2020-05-07 09:56:00 +02:00
Joakim Hove
ea14bf2298 Fix: integrate ExtNetwork instance in Schedule serialization 2020-05-06 21:10:52 +02:00
Joakim Hove
3c879dd5dc ActionResult will not access wells if overall false 2020-05-06 12:48:38 +02:00
Joakim Hove
dc9ba1dc56 Minor white space cleanup 2020-05-05 19:13:32 +02:00
Joakim Hove
c073ad2d8b Make sure Action result is checked before wells are considered 2020-05-05 19:03:22 +02:00
Joakim Hove
352cc5797b Make sure the action name is only added to ZWEL when it is true 2020-05-05 18:00:29 +02:00
Bård Skaflestad
26cdff10fc
Merge pull request #1775 from totto82/fixSolvent 
Allow for mixing of SOF2 from familiy 2 and family 1 for 3p + solvent
 2020-05-05 15:14:44 +02:00
Tor Harald Sandve
c73c83d317 Allow for mixing of SOF2 from familiy 2 and family 1 for 3p solvent models 2020-05-05 11:52:30 +02:00
Atgeirr Flø Rasmussen
5e985cfaf3 Fix start-time of ACTIONX actions. 2020-05-05 10:09:09 +02:00
Joakim Hove
94ab966c1b
Merge pull request #1774 from atgeirr/fix-actionx-testcase 
Remove group list in test file
 2020-05-05 09:11:44 +02:00
Atgeirr Flø Rasmussen
3cb39f8bd4 We do not handle lists of groups. 
Addressed by removing such a list (replace with the single
group matching pattern) in a test case.
 2020-05-05 08:28:10 +02:00
Joakim Hove
f8e7c4eee0
Merge pull request #1773 from joakim-hove/group-level-report 
Group level report
 2020-05-04 21:46:53 +02:00
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