Commit Graph

9471 Commits

Author SHA1 Message Date
Tor Harald Sandve
e0f4337a9d Fix gaslift output
Use value from WCONPROD as default. The simulator does not set the alqvalue if gas optimization is not used
Multiply with efficiency factor when accumulation group rates
2020-11-30 10:11:26 +01:00
Joakim Hove
718faaf43b
Merge pull request #2135 from joakim-hove/inplace-at
Make sure original_inplace can be safely accessed
2020-11-26 14:31:26 +01:00
Joakim Hove
f395629dd5
Merge pull request #2131 from jalvestad/swel-cor
Correction of SWEL to handle zero rates in WCONHIST and WELOPEN SHUT
2020-11-26 14:07:32 +01:00
Arne Morten Kvarving
15ecabd6e1
Merge pull request #2136 from akva2/test-pypi
Some fixes to pypi packaging
2020-11-26 12:15:55 +01:00
Arne Morten Kvarving
edeef07018 remove unused file 2020-11-26 12:07:04 +01:00
Bård Skaflestad
e98872a543
Merge pull request #2137 from akva2/janitoring
add explicit defaults to quell warnings

Supersedes and closes #2134
2020-11-26 11:47:56 +01:00
Arne Morten Kvarving
e3a63c294b add explicit defaults to quell warnings 2020-11-26 11:27:31 +01:00
Joakim Hove
491d816656 Make sure ROEW summary keywords are evaluated last 2020-11-26 10:54:24 +01:00
Joakim Hove
77ec5ffa5d Make sure original_inplace can be safely accessed 2020-11-26 07:43:00 +01:00
Bård Skaflestad
a3df631aab
Merge pull request #2128 from bska/wpi-smry-output
Support Outputting Preferred Phase PI to Summary File
2020-11-26 01:30:36 +01:00
Bård Skaflestad
0422f38d23 WPI Summary Output: Address Review Comments
Add an explicit case for 'OIL' and throw an exception if the
"preferred" phase is not supported.
2020-11-25 22:17:52 +01:00
Arne Morten Kvarving
b7fdffa12d disable building tests in pypi-packages 2020-11-25 12:20:02 +01:00
Arne Morten Kvarving
87698342d8 add export of build results from pypi docker 2020-11-25 11:57:10 +01:00
Arne Morten Kvarving
62bb1bc196 add python3.9 to pypi 2020-11-25 11:57:02 +01:00
Bård Skaflestad
a14c4184a9 Support Outputting Preferred Phase PI to Summary File
This commit adds support for outputting the productivity index of
a well's preferred phase at the well and connection levels to the
summary file (keywords 'WPI' and 'CPI').

Update unit tests accordingly.
2020-11-24 16:10:02 +01:00
Bård Skaflestad
a4e05aee47 Recognize Productivity Index Summary Config Node Type 2020-11-24 16:10:02 +01:00
Jostein Alvestad
fa1dbe2e28 rewriting of parts of SWEL code 2020-11-24 15:56:32 +01:00
Joakim Hove
08f8685bd1
Merge pull request #2127 from joakim-hove/summary-rhpv
Support summary keyword RHPV
2020-11-24 15:28:29 +01:00
Joakim Hove
9b0b03d6d3
Merge pull request #2126 from joakim-hove/udq-type-cast
Udq type cast
2020-11-24 14:28:25 +01:00
Joakim Hove
52df226da9
Merge pull request #2130 from bska/report-size-mismatch
Report Element Counts for Solution Vector Size Mismatch
2020-11-24 14:05:26 +01:00
Joakim Hove
ef5c51cee7 RHPV 2020-11-24 12:10:05 +01:00
Joakim Hove
b5012898d8
Merge pull request #2124 from joakim-hove/summary-roew
Summary roew
2020-11-24 11:49:11 +01:00
Joakim Hove
fa3b740d1d UDQ Cast can cast to both lhs type and rhs type 2020-11-24 11:48:17 +01:00
Joakim Hove
74cedd95e2 Add accessor to get UDQ assign objects 2020-11-24 11:48:17 +01:00
Bård Skaflestad
1c726b85c9 Use LIBFMT to Log Restart File Output
The library knows how to format 'std::tm{}' objects using format
strings from 'std::strftime()' which means we get month names for
free.

Existing report format:
    Restart file written for report step:  4/39.  Date: 2018/12/15

New report format:
    Restart file written for report step 4/39, date = 15-Dec-2018 00:00:00
2020-11-24 11:29:21 +01:00
Jostein Alvestad
b22334f08a correction of an unintended change in test_AggregateWellData.cpp 2020-11-24 10:54:58 +01:00
Jostein Alvestad
f2e32fa436 Added unit tests for corrections 2020-11-24 10:49:47 +01:00
Jostein Alvestad
366c0a544b corrections to SWEL for WCONHIST wells and shut wells 2020-11-23 15:53:45 +01:00
Bård Skaflestad
1fa5f3ce81 Report Element Counts for Solution Vector Size Mismatch
This makes it slightly easier to diagnose output errors.
2020-11-23 12:56:40 +01:00
Joakim Hove
12aa1f7c59 Start to implement ROEW 2020-11-23 11:02:02 +01:00
Joakim Hove
60920dd487 Ensure that WOPT is added to SummaryConfig when requesting ROEW 2020-11-23 11:02:02 +01:00
Joakim Hove
f7cb068f66 Add public get for UnitSystem from Schedule 2020-11-23 11:02:02 +01:00
Joakim Hove
8e83deef26
Merge pull request #2123 from joakim-hove/region-cache-wells
Add method RegionCache::wells()
2020-11-23 11:00:22 +01:00
Joakim Hove
0ff78a1bd6
Merge pull request #2125 from joakim-hove/serializer-vector
Serializer vector
2020-11-23 10:59:10 +01:00
Joakim Hove
174c16058c Changes in SummaryState deserialize: Use internal variables directly 2020-11-21 09:33:33 +01:00
Joakim Hove
c7e734ab41 Fix bug SummaryState::erase_xxx_var() 2020-11-21 09:33:33 +01:00
Joakim Hove
18d01d1999 Use ordered set for wells and groups member 2020-11-21 09:33:33 +01:00
Joakim Hove
25beb52f68 Add operator== to SummaryState 2020-11-21 09:33:33 +01:00
Joakim Hove
8f65921753 Add put_vector() and get_vector() methods to Serializer 2020-11-21 09:33:33 +01:00
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
315d9d30e0 Rename put<K,T> and get<K,T> -> put_map() and get_map() 2020-11-20 15:47:52 +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