OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,859 Commits 18 Branches 75 Tags 73 MiB
3c23f90cfe
Commit Graph

10859 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jostein Alvestad
f3fbd44b4b changes to allow for opm/units 2021-08-26 12:17:38 +02:00
Jostein Alvestad
30109c1722 correction of units for SACT[3] 2021-08-26 12:17:36 +02:00
Jostein Alvestad
4705cf7eb9 corrections to IACT[2], SACT[3] 2021-08-26 12:17:35 +02:00
Bård Skaflestad
961190c723
Merge pull request #2628 from goncalvesmachadoc/outputVolume 
Add reservoir volumes to Inplace
 2021-08-26 10:21:02 +02:00
Bård Skaflestad
87041776ce
Merge pull request #2626 from joakim-hove/normal-summmary-keys 
Normal summmary keys
 2021-08-25 22:16:17 +02:00
Bård Skaflestad
c2444681d7
Merge pull request #2627 from joakim-hove/udq-units 
Make sure to assign UDQ units for udq loaded from restart file
 2021-08-25 21:35:25 +02:00
Cintia Goncalves Machado
6e386d6245 add reservoir volumes to Inplace 2021-08-25 18:25:10 +02:00
Joakim Hove
9257610869 Make sure to assign UDQ units for udq loaded from restart file 2021-08-25 16:16:54 +02:00
Joakim Hove
3867cde543
Merge pull request #2616 from akva2/default_asserts 
changed: default to asserts enabled in release mode
 2021-08-25 09:42:10 +02:00
Joakim Hove
a07ab41a73 Refactor summary configuration of time vectors to reuse from ACTIONX 2021-08-25 07:29:30 +02:00
Joakim Hove
69e1101b35 Remove automatic DAY, YEAR and MONTH from SummaryState 2021-08-25 06:57:17 +02:00
Joakim Hove
cda7bd3740 Use normal summary keys for time related properties 2021-08-25 06:52:47 +02:00
Joakim Hove
31fa88b53e
Merge pull request #2621 from tskille/extesmry 
Adding python bindings for class ExtESmry
 2021-08-24 23:24:32 +02:00
Joakim Hove
797c1cbde8
Merge pull request #2624 from akva2/janitoring 
Some janitoring
 2021-08-24 11:02:42 +02:00
Arne Morten Kvarving
41867b55fe reduce scope of variables 
also use .empty() instead of comparing strings to ""
 2021-08-24 09:33:22 +02:00
Arne Morten Kvarving
2d20087f17 only declare variable when required 2021-08-24 09:33:22 +02:00
Arne Morten Kvarving
add60560ee pass by const reference 2021-08-24 09:33:22 +02:00
Joakim Hove
7b2b58caa8
Merge pull request #2623 from joakim-hove/actionx-pretty-print 
Fix prefix with output from schedule parse in ACTIONX mode
 2021-08-24 07:39:45 +02:00
Joakim Hove
f4eda06021 Fix prefix with output from schedule parse in ACTIONX mode 2021-08-23 23:01:08 +02:00
Torbjørn Skille
514e3a4a35 Adding python bindings for c++ class ExtESmry 
- Used for loading data from summary file ESMRY
 - python class ESmry supporting both SMSPEC/UNSMRY and ESMRY summary files.
 2021-08-23 22:15:58 +02:00
Bård Skaflestad
981e977da4
Merge pull request #2495 from bska/walq 
Implement WALQ Summary Vector
 2021-08-20 21:41:31 +02:00
Bård Skaflestad
b638ba0f0e Output WGLIR=0 Unless ALQ=GRAT 
This reduces the risk of users misinterpreting the curves since the
unit of measure when plotting the vector will unconditionally be
surface volume rate for gas.

We will revisit this decision if we gain the ability to capture the
actual lift gas injection rate independent of ALQ type.

Suggested by: [at]tskille
 2021-08-20 20:35:12 +02:00
Bård Skaflestad
2ad81c9364 Implement WALQ Summary Vector 2021-08-20 20:35:12 +02:00
Bård Skaflestad
0b5694c05b Check ALQ Type When Accumulating Gas Lift Injection Rate 
This commit adds a guard to the xGLIR accumulation procedure.  In
particular, we do not accumulate anything unless the ALQ type is gas
rate.  We do however output a well-level value if the ALQ type is
gas/liquid ratio.  This guard requires passing the Schedule object
as part of the 'fn_args', so update the call sites accordingly.
 2021-08-20 20:35:12 +02:00
Bård Skaflestad
fcac9edef6 Don't Copy VFP Table To Extract ALQ Type 
We can just extract the ALQ type directly from a reference to a VFP
table instead.
 2021-08-20 20:35:12 +02:00
Bård Skaflestad
6b9f0817a8 Prune Duplicate Summary Keyword 
Keyword 'WGLIR' was already present earlier in the list.
 2021-08-20 20:35:12 +02:00
Joakim Hove
c21bde269a
Merge pull request #2619 from joakim-hove/uda-rst-trivial 
Uda rst trivial
 2021-08-20 15:43:45 +02:00
Joakim Hove
815606651e Slightly simplify logic test 2021-08-20 14:29:45 +02:00
Joakim Hove
aff9cb74d1 Add UDQConfig::operator[](std::size_t insert_index) 2021-08-20 14:29:45 +02:00
Joakim Hove
3ab7179305 Add UDQInput::operator== 2021-08-20 14:29:45 +02:00
Joakim Hove
d2b1c99663 Use std::variant instead of pointers 2021-08-20 14:29:45 +02:00
Joakim Hove
9a883f1907 Remove unused variable - check vector size directly 2021-08-20 14:29:44 +02:00
Joakim Hove
cdb92013dd Add function to convert from integer code to UDAControl type 2021-08-20 14:29:16 +02:00
Joakim Hove
5e60927477 Rename uad -> uda 2021-08-20 14:29:16 +02:00
Joakim Hove
c087c725b6 Remove unused members wg_keys and udq_keys from UDQActive 2021-08-20 14:29:16 +02:00
Joakim Hove
c4896a0f49 Add missing this-> 2021-08-20 14:29:16 +02:00
Joakim Hove
e1ff4b4682 Rename UDQActive::Record -> UDQActive::OutputRecord 2021-08-20 14:29:16 +02:00
Joakim Hove
1ce143e479 Rename UDQActive::get_iuad() -> iuad() 2021-08-20 14:29:16 +02:00
Joakim Hove
a0ad7883c7 Remove unused size query functions 2021-08-20 14:29:14 +02:00
Joakim Hove
f5f3957177
Merge pull request #2617 from tskille/egrid_mapaxes 
Adding support for handling MAPAXES and MAPUNITS
 2021-08-20 13:12:15 +02:00
Bård Skaflestad
fe27c58b0b
Merge pull request #2526 from bska/restart-load-analytic-aquifer 
Load Analytic Aquifer Objects From Restart File
 2021-08-19 22:29:36 +02:00
Bård Skaflestad
6db9e150e1
Merge pull request #2618 from joakim-hove/store-action-results 
Store action results
 2021-08-19 20:48:49 +02:00
Bård Skaflestad
0d35d64aea Load Analytic Aquifer Objects from Restart File 
This commit adds support for creating the analytic aquifer objects

    Opm::AquiferCT
    Opm::Aquifetp
    Opm::Aquancon
    Opm::AquiferConfig

from information stored in the restart vectors

    {I,S,X}AAQ
    {I,S}CAQ

We add a new helper class

    Opm::RestartIO::RstAquifer

which contain the same data members as the '*_data' structures of
the analytic aquifer objects.  Those analytic aquifer objects then
get friendship from the '*_data' structures in order to assign the
private members from the corresponding restart information.  We
finally add a gateway to EclipseState that consumes an RstAquifer
instance and overwrites the internal AquiferConfig object when the
restarted run contains analytic aquifers.

Update RstState constructor API to meet requirements of RstAquifer,
notably by adding an EclipseGrid parameter.  That in turn is needed
by the RstAquifer to translate connection (I,J,K) tuples to active
cell IDs.

Note that if an analytic aquifer does not have any connections then
this facility will not load said aquifer.  That may be a problem
when plotting summary curves, but we will address the issue later if
it comes up.
 2021-08-19 20:34:19 +02:00
Bård Skaflestad
d1b1cebdf5 Support Retrieving Non-Zero Restart Vector Occurrence 
Needed to load connection information for analytic aquifers (xCAQ).
 2021-08-19 20:34:19 +02:00
Bård Skaflestad
e4a485844f Load Numeric Aquifer Data From Restart File 
Needed to get continuous 'ANQT' curves in restarted runs.
 2021-08-19 20:34:19 +02:00
Joakim Hove
9862d88b12 Remove unused UDQActive::operator[] 2021-08-19 17:01:31 +02:00
Joakim Hove
ec66eeee17 Remove trailing whitespace 2021-08-19 16:21:27 +02:00
Joakim Hove
3c434b2d49 Use const ref 2021-08-19 16:21:27 +02:00
Joakim Hove
41ea258752 Use fmt to create error messages 2021-08-19 16:21:27 +02:00
Joakim Hove
86311f3735 Use stored Action result when updating ZWEL 2021-08-19 15:53:31 +02:00