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

9404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
064559b9e4 Add UnitSystem member to Schedule class 
Mkae Section and KeywordIndex members in HandleContext optional.
 2020-11-02 21:27:18 +01:00
Bård Skaflestad
1d73d07f19
Merge pull request #2076 from joakim-hove/rm-printf 
Remove extra printf
 2020-11-02 19:19:10 +01:00
Joakim Hove
30bbee6e69
Merge pull request #2072 from alfbr/new-line 
Added newline where natural.
 2020-11-02 16:40:13 +01:00
Joakim Hove
7b8590f7ee Remove extra printf 2020-11-02 16:37:56 +01:00
Joakim Hove
5316d193ea White space 2020-11-02 14:44:05 +01:00
Joakim Hove
f3e9a02123 Add additional connection in testdata 2020-11-02 14:44:05 +01:00
Joakim Hove
64b9a49a20 Use multiline string literal for test data 2020-11-02 14:44:05 +01:00
Joakim Hove
f02437cdcb Use name based lookup in function getijk() 2020-11-02 14:44:05 +01:00
Joakim Hove
7d596e4e41 Make function parseKeyworType() in SummaryConfig public 2020-11-02 14:44:05 +01:00
Joakim Hove
a8f5dc6354 Add SummaryConfig::operator[](const std::size_t index) 2020-11-02 14:12:05 +01:00
Joakim Hove
0805249185
Merge pull request #2070 from joakim-hove/get-completion-connection 
Get connections from global index
 2020-11-02 14:04:05 +01:00
Alf Birger Rustad
a2cfd9a525 Added newline where natural. 2020-11-02 13:43:13 +01:00
Joakim Hove
855decfa56 Add summary variable WWIRT 2020-11-02 10:29:31 +01:00
Joakim Hove
5193cc48c6
Merge pull request #2067 from joakim-hove/group-uda 
Group uda
 2020-11-02 10:05:18 +01:00
Joakim Hove
9844b73bdb Add functions to get/query connections from global index 2020-11-02 07:57:19 +01:00
Joakim Hove
14df089f14 Use WellMatcher() in Schedule::wellNames() 2020-10-31 09:04:32 +01:00
Joakim Hove
7ef7e3017e Add class WellMatcher and use it UDQ evaluation 2020-10-30 22:17:59 +01:00
Joakim Hove
9bec2673ad Explicitly delete UDAValue::operator=() 2020-10-30 17:19:02 +01:00
Joakim Hove
f34f221be8 Properly initialize UDA values for group production and injection 2020-10-30 17:19:02 +01:00
Joakim Hove
d27e31ee84
Merge pull request #2062 from joakim-hove/summary-config-extra 
Use general datatype for extra data in summary keywords
 2020-10-30 17:18:23 +01:00
Joakim Hove
3a8694fee1
Merge pull request #2064 from bska/deferred-welpi-uconv 
Defer Unit Conversion for WELPI Values
 2020-10-30 17:18:06 +01:00
Bård Skaflestad
94af88c3a1 Switch Back to Consuming Strictly SI Convention PI Values 
Heed advice from [at]joakim-hove to keep client code as close to
strictly SI as possible.  We must nevertheless continue to store the
raw (input/output units) requested PI value internally as this is
the only way to ensure that both the client and implementation has
consistent view of the well's preferred phase.  This means pushing
the unit conversion into Well::getWellPIScalingFactor().

Thanks to [at]joakim-hove for pointing out that the Well already
maintains an internal UnitSystem data member which makes the process
of converting the PI units trivial.
 2020-10-30 15:16:31 +01:00
Bård Skaflestad
354351daee Record General Event When Processing WELPI 
This commit ensures that we record a general, Schedule-level

    WELL_PRODUCTIVITY_INDEX

event in addition to the well-specific event already recorded when
we encounter a WELPI keyword.  We need this information in order to
trigger a PI calculation across all MPI processes in opm-simulators.
 2020-10-30 15:16:31 +01:00
Bård Skaflestad
54e2eb5597 Store Raw WELPI in Well::productivity_index 
This makes the interface less convenient to use, but it is the only
way to guarantee that we have a consistent notion of preferred phase
for injectors.  The downside is that the users of

    Well::getWellPIScalingFactor()

must convert the argument to raw/input units before calling the
function.
 2020-10-30 15:16:31 +01:00
Bård Skaflestad
6f124fb478 Revert "Capture Preferred Phase When Processing WELPI Keyword" 
There and back again.  We don't actually need the preferred phase at
the time of encountering the WELPI request.  [at]joakim-hove was
right, the preferred phase of an injector must reflect the state at
the same report step as the WELPI keyword.  In other words, if the
injected phase is reset at the same report step as a WELPI keyword,
then the new preferred phase must be that of the new injected phase.

This reverts commit 3eef45e87d.
 2020-10-30 15:16:31 +01:00
Bård Skaflestad
038c2bd2e0
Merge pull request #2068 from bska/msw-allconn 
MSW: Support Connection Results for All Connections
 2020-10-30 14:24:22 +01:00
Joakim Hove
279871df05 Add missing #include 2020-10-30 13:36:08 +01:00
Bård Skaflestad
62a39877be Address Review Comments 
Add comments on a function and rename a variable.
 2020-10-30 11:47:11 +01:00
Bård Skaflestad
14c566d99b MSW: Support Connection Results for All Connections 
The current code that aggregates flow rates from connection to
segment levels assumes that the simulator generates connection
results for the open connections only.  Relax this restriction as
upcoming work in the context of WELPI will require generating at
least the CTFs even for shut connections.
 2020-10-30 11:37:31 +01:00
Joakim Hove
e613a7c31d Use std::optional<std::string> for fip_region member 2020-10-30 11:30:05 +01:00
Joakim Hove
96f9362f59
Merge pull request #2066 from joakim-hove/rst-pressure-drop-model 
Load MSW pressure drop model fro restart file
 2020-10-30 11:07:58 +01:00
Joakim Hove
78b544afdf
Merge pull request #2063 from joakim-hove/completion-util 
Add function bool Well::hasCompletion( int )
 2020-10-30 10:17:34 +01:00
Joakim Hove
00af07ceed Load MSW pressure drop model fro restart file 2020-10-29 11:34:56 +01:00
Bård Skaflestad
8d3e419162
Merge pull request #2065 from joakim-hove/meta-error-message 
Improve error message for unhandled meta summary keyword
 2020-10-29 10:25:48 +01:00
Joakim Hove
c83e4820bc Improve error message for unhandled meta summary keyword 2020-10-29 08:57:25 +01:00
Joakim Hove
ed5d20d90e Add utility functions to query/get completion data 2020-10-28 16:00:56 +01:00
Joakim Hove
03efa3d2e1
Merge pull request #2060 from goncalvesmachadoc/outtemp 
add extra thermal summary keywords
 2020-10-28 14:26:22 +01:00
Joakim Hove
24a9dbf4c6
Merge pull request #2058 from joakim-hove/rst-commits2 
Rst commits2
 2020-10-28 14:24:59 +01:00
Cintia Goncalves Machado
957d5d3840 add extra thermal summary keywords 2020-10-28 13:28:37 +01:00
Markus Blatt
e5f191ede8
Merge pull request #2038 from blattms/fix-scotch-parmetis 
[cmake] Use scotch include dir for parmetis bindings of scotch.
 2020-10-28 12:28:50 +01:00
Joakim Hove
1f7ec57895 Use named constants in IGRP access 2020-10-27 20:50:12 +01:00
Joakim Hove
92bf4a96ea Separately load active and requested group control from restart file 
Use named constants for access to IGRP vector
 2020-10-27 20:48:03 +01:00
Joakim Hove
30a897e89d
Merge pull request #2047 from joakim-hove/gconprod-item10 
Blank string is default rate in GCONPROD
 2020-10-27 19:50:14 +01:00
Joakim Hove
e5519c456c
Merge pull request #2050 from joakim-hove/udq-cast-error 
Improve error message for invalid udq_cast()
 2020-10-27 19:49:51 +01:00
Joakim Hove
a90feb6bb7 Blank string is default rate in GCONPROD 2020-10-27 18:51:36 +01:00
Joakim Hove
d301274e89 Improve warning for UDQ missing unit 2020-10-27 18:50:47 +01:00
Joakim Hove
4f02dc5173 Add try catch block around UDQ eval 2020-10-27 18:50:47 +01:00
Joakim Hove
82afbf070c Improve error message for invalid udq_cast() 2020-10-27 18:50:47 +01:00
Joakim Hove
0f28d7c199
Merge pull request #2051 from joakim-hove/improve-udq-error-message 
Improve error message for failed udq
 2020-10-27 18:28:28 +01:00
Joakim Hove
404e2b095e
Merge pull request #2048 from joakim-hove/thp-uda 
Thp uda
 2020-10-27 18:26:59 +01:00