Commit Graph

9431 Commits

Author SHA1 Message Date
Joakim Hove
3bc490b693 Add method RegionCache::wells()
The method RegionCache::wells() will output the wells with the first connection
in region region_id.
2020-11-21 08:58:39 +01:00
Joakim Hove
44d9261258
Merge pull request #2122 from joakim-hove/summary-oip
Add const Inplace& argument to Summary::eval()
2020-11-20 14:12:34 +01:00
Joakim Hove
7a0b020c43 Add Inplace argument to Summary::eval() 2020-11-20 12:42:30 +01:00
Bård Skaflestad
f190387431
Merge pull request #1522 from bska/output-preferred-phase
Restart File: Output Well's Preferred Phase
2020-11-20 00:59:33 +01:00
Bård Skaflestad
2fb768e727 Simplify Preferred Phase Extraction
Well::getPreferredPhase() now knows that the preferred phase for
injectors is the injected phase.  There is no need to special-case
injectors here.
2020-11-19 17:28:40 +01:00
Bård Skaflestad
c76878520a Load Well's Preferred Phase from Restart File 2020-11-19 17:28:40 +01:00
Bård Skaflestad
9a669f5400 Restart File: Output Well's Preferred Phase
Note: We're missing the 'LIQUID' option (integer value 4) since

    Well::getPreferredPhase()

does not return that value.

Also, while here, remove the previously misattributed IWEL[15] item.
This item is the well's preferred phase, not the prediction control.
Finally, don't assign the active control mode to the history control.
That was a mistake.
2020-11-19 17:28:40 +01:00
Joakim Hove
767f77e8c8
Merge pull request #2114 from joakim-hove/summary-oip
Add container to hold on to Original in place values
2020-11-19 17:12:51 +01:00
Joakim Hove
20be6aa6d9
Merge pull request #2121 from bska/fix-fmtout-segfault
Don't Overrun Formatting Buffer in 'doub_string_ecl'
2020-11-19 16:25:52 +01:00
Joakim Hove
bb3be75dc5 Add container class Inplace to manage aggregated region properties 2020-11-19 16:23:36 +01:00
Joakim Hove
955869e81d
Merge pull request #2085 from joakim-hove/igrp-2
AggregateGroupData - refactoring
2020-11-19 16:23:14 +01:00
Bård Skaflestad
cdc1361a03 Don't Overrun Formatting Buffer in 'doub_string_ecl'
We would write outside the allocated buffer, and fail to write the
nul terminator, when presented with inputs of very small size
(denormalized numbers in the order of 1.0e-101 or smaller).  Switch
to using std::snprintf and expand the buffer size to work around
this problem.

While here, also fix a subtle issue in determining whether or not we
should insert the exponent character 'D' into the formatted output.
Since we add one upon formatting the number, we also need to use a
non-symmetric condition for the 'D' character lest we fail to output
correctly formatted versions of

    -2.9440373045442E-100 (=> -0.29440373045442D-99)
    -2.9440373045442E+99  (=> -0.29440373045442+100)
2020-11-19 11:46:37 +01:00
Joakim Hove
f2bdde4b73 Minor refactor 2020-11-19 11:42:17 +01:00
Joakim Hove
f64f8fd30e Remove code which just resets default value -1 2020-11-19 11:42:17 +01:00
Joakim Hove
25731a67dd Minor refactor of function 2020-11-19 11:42:17 +01:00
Joakim Hove
618595e538 Rewrite branching logic in AggregateGroupData 2020-11-19 11:42:17 +01:00
Joakim Hove
2ae5d6634d Use std::optional<Group> when searching upwards for control group 2020-11-19 11:42:17 +01:00
Joakim Hove
05814ad90e Simplified initialization 2020-11-19 11:42:17 +01:00
Joakim Hove
4ca4e865c9 Rename pctl_mode -> active_cmode 2020-11-19 11:42:17 +01:00
Joakim Hove
a65bb1e969 Rename prod_cmode -> deck_cmode 2020-11-19 11:42:17 +01:00
Joakim Hove
ee662f8e38 Store GroupProductionControls in local variable 2020-11-19 11:42:17 +01:00
Joakim Hove
b28ed60b02 Reactor function groupProductionControllable() 2020-11-19 11:42:17 +01:00
Joakim Hove
4e5cc1c94d Refactor function groupInjectionControllable() 2020-11-19 11:42:17 +01:00
Joakim Hove
2820efc463 Extract assignment of GCONPROD cmode to separate function 2020-11-19 11:42:17 +01:00
Joakim Hove
2b6ffeb068 Refactor IGRP StaticContrib 2020-11-19 11:42:17 +01:00
Joakim Hove
5746c068c5 Add names for group type and level index 2020-11-19 11:42:17 +01:00
Bård Skaflestad
5338a1dd13
Merge pull request #2120 from joakim-hove/summary-store-ref
Store references to EclipseState and Schedule in Summary class
2020-11-19 11:00:06 +01:00
Joakim Hove
bd766a0277 Store references to EclipseState and Schedule in Summary class 2020-11-19 07:19:57 +01:00
Tor Harald Sandve
506ce18537
Merge pull request #2012 from osae/kwPVTEXTBO
New kw PVTSOL to accomodate an extension of the black oil model.
2020-11-18 14:00:43 +01:00
Joakim Hove
b8179b943d
Merge pull request #2115 from joakim-hove/all-connections-inactive
Automatically shut wells with no connections
2020-11-18 06:49:35 +01:00
Joakim Hove
e2cdd4d5e1
Merge pull request #2117 from joakim-hove/summaryconfig-rhpv
Load summary keyword RHPV_xxx
2020-11-17 22:20:46 +01:00
Joakim Hove
61c879e8cb Load summary keyword RHPV_xxx 2020-11-17 15:15:26 +01:00
Joakim Hove
91275cc0a5 Automatically shut wells with no connections 2020-11-17 14:55:48 +01:00
Joakim Hove
785a14dd25
Merge pull request #2116 from akva2/janitoring
fixed: initializer list order
2020-11-17 13:28:29 +01:00
Arne Morten Kvarving
ec2294ee77 fixed: initializer list order 2020-11-17 12:21:29 +01:00
Joakim Hove
8ffb918650
Merge pull request #2112 from joakim-hove/udq-update
Support UDQ UPDATE
2020-11-17 10:31:47 +01:00
Arne Morten Kvarving
a5a521e295
Merge pull request #2103 from akva2/build_flow_poly
build flow_poly on jenkins
2020-11-17 09:49:26 +01:00
Ove Sævareid
e489f1aced Serialize PvtsolTable. 2020-11-16 20:18:05 +01:00
Ove Sævareid
58aa93dcfe New kw PVTSOL to accomodate an extension of the back oil model. 2020-11-16 20:18:05 +01:00
Joakim Hove
c46488236a
Merge pull request #2110 from joakim-hove/actionx-welpi
Actionx welpi
2020-11-16 18:12:53 +01:00
Joakim Hove
278c2182bd Handle WELPI keyword in ACTIONX blocks 2020-11-16 16:55:34 +01:00
Joakim Hove
e4ab6c43ce
Merge pull request #2107 from joakim-hove/rrpv
Rrpv
2020-11-16 10:37:12 +01:00
Joakim Hove
bd9df4ec54
Merge pull request #2111 from joakim-hove/warnings
Warnings
2020-11-16 10:36:08 +01:00
Joakim Hove
ed5ed62203 Parse summary keyword ROEW_xxx 2020-11-16 07:12:59 +01:00
Joakim Hove
b2da0228b1 Support UDQ UPDATE action 2020-11-15 10:03:34 +01:00
Joakim Hove
e0e5ed1f91 Make sure UDQ can use also special summary values like TIME 2020-11-15 10:02:34 +01:00
Joakim Hove
e9e56fc5b5 Remove constructor declaration without implementation 2020-11-15 10:00:36 +01:00
Joakim Hove
25739a846c Suppress unused warning with (void) 2020-11-13 18:08:24 +01:00
Joakim Hove
7f2c06f5b0 Fix serialization object 2020-11-13 18:03:15 +01:00
Joakim Hove
e35febde59
Merge pull request #2108 from joakim-hove/actionx-gconinje
Hanlde GCONINJE in ACTIONX block
2020-11-13 17:48:05 +01:00