OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,650 Commits 18 Branches 75 Tags 73 MiB
bc3c3490bb
Commit Graph

9650 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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