Commit Graph

9404 Commits

Author SHA1 Message Date
Joakim Hove
2a41058eda
Merge pull request #2039 from joakim-hove/rst-tstep
Allow restart date to be at a TSTEP
2020-10-27 18:24:08 +01:00
Joakim Hove
9011ca0e78
Merge pull request #2049 from joakim-hove/udq-leading-sign
Udq leading sign
2020-10-27 17:05:02 +01:00
Joakim Hove
716b4d3bf1 Remove special casing of leading '-' in UDQ parsing 2020-10-27 14:17:12 +01:00
Joakim Hove
e9dadcf93e Extract leading sign when extract UDQ factor 2020-10-27 14:17:12 +01:00
Joakim Hove
0994a1a2fe Add sign member to UDQASTNode and implement operator* 2020-10-27 14:17:12 +01:00
Joakim Hove
524e211247
Merge pull request #2056 from joakim-hove/udq-extra-ficup
Store extra summary parameters from UDQ and restart in common map
2020-10-27 14:16:02 +01:00
Atgeirr Flø Rasmussen
3c1e3b5a30
Merge pull request #2054 from joakim-hove/groups-active-cmode
Rename group production control mode variable
2020-10-27 11:52:42 +01:00
Joakim Hove
8e44859c48
Merge pull request #2055 from bska/fix-wpil-smry
Don't Treat WPIL as Completion Keyword
2020-10-27 08:53:50 +01:00
Joakim Hove
5cb8dfdca0 Store extra summary parameters from UDQ and restart in common map 2020-10-27 08:50:56 +01:00
Bård Skaflestad
509b15a243 Don't Treat WPIL as Completion Keyword
WPIL is the productivity index of liquid (water + oil).
2020-10-27 00:07:38 +01:00
Joakim Hove
45c784f8d8 Add Group active_cmode 2020-10-26 21:01:16 +01:00
Joakim Hove
a81eb8f9d4 Use Group::gconprod_cmode() in AggregateGroupData 2020-10-26 20:47:09 +01:00
Joakim Hove
8e0928cc9d Rename group production control mode variable 2020-10-26 18:46:48 +01:00
Bård Skaflestad
e38b8f5812
Merge pull request #2053 from joakim-hove/fglir
Summary function glir should sum over all argument wells
2020-10-26 15:57:02 +01:00
Joakim Hove
70353f496d Allow restart date to be at a TSTEP 2020-10-26 15:10:10 +01:00
Joakim Hove
908eebb7ed Summary function glir should sum over all argument wells 2020-10-26 15:06:00 +01:00
Joakim Hove
548bed1dc8 Improve error message for failed udq 2020-10-26 11:57:09 +01:00
Joakim Hove
cab2e29724
Merge pull request #2044 from joakim-hove/include-udq-summary
Include udq summary
2020-10-26 11:18:56 +01:00
Joakim Hove
c1a65ef7da
Merge pull request #2046 from joakim-hove/udqdefine-location
Udqdefine location
2020-10-26 10:31:32 +01:00
Joakim Hove
de51e3e3a4 Check that UDQ value is numeric before comparing with zero 2020-10-25 19:16:50 +01:00
Joakim Hove
604cbef5dc USe fmt::format() for error message 2020-10-25 19:12:51 +01:00
Joakim Hove
eb208ffb78 Remove unused UDQDefine constructor 2020-10-24 12:48:43 +02:00
Joakim Hove
5e6c6be3b8 Add location member to UDQDefine 2020-10-24 12:47:55 +02:00
Joakim Hove
508b4e6f96 Scan UDQ expressions to extract required summary keywords 2020-10-24 10:15:58 +02:00
Joakim Hove
5c1604c5f2
Merge pull request #2045 from joakim-hove/include-udq-summary-commits
Include udq summary commits
2020-10-24 10:15:30 +02:00
Bård Skaflestad
9fc6948e05
Merge pull request #2042 from joakim-hove/well-reperf
Changes to well reference depth
2020-10-23 16:49:08 +02:00
Joakim Hove
3fa4c4bbb1 Publish function SummaryConfig::parseKeywordType() 2020-10-23 16:05:55 +02:00
Joakim Hove
b53acbc6a7 Add functionality to extract required summary keys from UDQConfig 2020-10-23 16:05:55 +02:00
Joakim Hove
faa1e7dc4d Add function to return pointers to all unique UDQConfig objects 2020-10-23 16:05:55 +02:00
Joakim Hove
b4388ba203
Merge pull request #2040 from joakim-hove/udq-left-assoc
Ensure that division is left assosiative in UDQ parser
2020-10-23 16:04:45 +02:00
Joakim Hove
b9bd1598d7 Changes to well reference depth
1. The well reference depth should *not* be updated when new connections are
   added with COMPDAT.

2. The well reference depth should be recalculated when the well is updated with
   the WELSPECS keyword.
2020-10-23 15:25:38 +02:00
Joakim Hove
58e859fb11
Merge pull request #2043 from joakim-hove/eclipsegrid-remove-test
Remove not interesting test code
2020-10-22 20:23:47 +02:00
Joakim Hove
0a0f30133d Remove not interesting test code 2020-10-22 18:52:05 +02:00
Joakim Hove
7a21769ca1
Merge pull request #2041 from akva2/janitoring
quell unused parameter warning
2020-10-22 17:22:24 +02:00
Arne Morten Kvarving
be84d23da4 quell unused parameter warning 2020-10-22 14:53:25 +02:00
Joakim Hove
80a023794e Ensure that division is left assosiative in UDQ parser 2020-10-22 14:40:32 +02:00
Joakim Hove
4a806533db
Merge pull request #1915 from goncalvesmachadoc/addSpyderwebGrid
add Spiderweb grid
2020-10-22 14:08:01 +02:00
Joakim Hove
d9a7d6326f
Merge pull request #2033 from joakim-hove/rst-group-commits
Rst group commits
2020-10-22 09:25:56 +02:00
Joakim Hove
f6077809c7 Init GuideRateModel from restart file 2020-10-22 08:18:47 +02:00
Joakim Hove
5a91c73b8e
Merge pull request #2035 from joakim-hove/igrp-guide-rate
Igrp guide rate
2020-10-22 08:06:56 +02:00
Joakim Hove
0894f7e774
Merge pull request #2032 from joakim-hove/MULTIREG
Multireg
2020-10-22 08:06:37 +02:00
Joakim Hove
ee7f50a51d
Merge pull request #2037 from joakim-hove/udq-define-order
Make sure UDQ define statements are evaluated in definition order
2020-10-21 17:32:55 +02:00
Markus Blatt
8951ff3130 [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-21 14:36:39 +02:00
Joakim Hove
85f7380721
Merge pull request #2030 from joakim-hove/default-group
Use optional - and default to self - for reinj and voidage groups
2020-10-21 13:58:07 +02:00
Joakim Hove
413a16157c Make sure UDQ define statements are evaluated in definition order 2020-10-21 13:49:07 +02:00
Joakim Hove
ba4082b2b9
Merge pull request #2034 from joakim-hove/udq-assign-define
Udq assign define
2020-10-21 11:45:41 +02:00
Joakim Hove
3f2e41ba99 Add member guide_rate_def to Group object loaded from restart file 2020-10-21 10:31:44 +02:00
Joakim Hove
c8efb7fd3b Use named constants when saving GuideRate defintion to IGRP 2020-10-21 09:47:16 +02:00
Joakim Hove
67f24bd3a7 When loading from restart: set wells active control also for SHUT 2020-10-20 22:48:08 +02:00
Joakim Hove
5c6fa9cc51 Add Group update events after loading from restart file 2020-10-20 22:46:28 +02:00