OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,768 Commits 18 Branches 75 Tags 73 MiB
645b3b3eaa
Commit Graph

11768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Blatt
180b7cb664
Merge pull request #3027 from bska/attribute-missing-kw-terminator 
Attribute Missing Terminator to Keyword/File/Line
 2022-05-19 15:32:44 +02:00
Paul Egberts
d11d7d6ca0 Joule-Thomson keywords for gas, oil and water 2022-05-18 16:16:57 +02:00
Bård Skaflestad
462457fb39 Attribute Missing Terminator to Keyword/File/Line 
This will hopefully aid the user in resolving the underlying issue.
 2022-05-10 22:01:21 +02:00
Bård Skaflestad
f7ea7674c0 Provide Accessor for WGRUPCON's Raw Phase Value 
Needed for restart file compatibility.
 2022-05-10 10:03:27 +02:00
Bård Skaflestad
c91bde8182
Merge pull request #3005 from bska/weltarg-uda 
Save and Restore UDAs From WELTARG Keyword
 2022-05-09 14:09:30 +02:00
Bård Skaflestad
0e2623d6dd List WCONPROD UDAs in Order of Increasing Enum Values 
The entries for WRAT and GRAT were listed in reverse order.
 2022-05-09 12:24:30 +02:00
Bård Skaflestad
b9e9112c6b Distinguish Well/Group Injection/Production UDA Controls 
This avoids add-on logic at the call site to identify UDAs in
WELTARG keywords.

Suggested by: [at]atgeirr
 2022-05-09 12:05:28 +02:00
Bård Skaflestad
b9eaa3a6aa Save and Restore UDAs From WELTARG Keyword 
This commit hooks the WELTARG UDA support code up to the main path
for saving and reloading the IUAD/IUAP restart arrays.
 2022-05-09 11:33:07 +02:00
Bård Skaflestad
f751c46f10 Count Active UDAs From WELTARG Keyword 
This commit introduces a new overload of the updateUDQActive member
function of the WellInjectionProperties and WellProductionProperties
classes.  The new overload is specifically targeted at accounting
for any active UDAs in WELTARG records.  It is possible to have
"regular" UDAs introduced in WCONPROD/WCONINJE and also a separate
set of UDAs attributed to WELTARG at the same time so we need to be
able to distinguish the two cases.

Call the new overload from the WELTARG keyword handler.
 2022-05-09 11:33:07 +02:00
Bård Skaflestad
14a6a5a4c3 Generate Units of Measurements for WELTARG UDAs 
In preparation of loading such UDAs from the restart file.
 2022-05-09 11:33:07 +02:00
Bård Skaflestad
25ede43bf7 Implement UDQ::*_control in Terms of UDQ::keyword 
This replaces the cost of maintaining sets of switch/case statements
with some additional runtime cost of looking up the corresponding
keyword in a std::map<>, but these functions are not called in inner
loops so the extra cost is justified.
 2022-05-09 11:33:07 +02:00
Bård Skaflestad
f4fde15e67 Support Recognizing UDAs in WELTARG Keyword 
This commit extends the set of supported UDQ enumators to include
those of the WELTARG keyword.  This is in preparation of adding
restart file support for such cases.
 2022-05-09 11:33:07 +02:00
Bård Skaflestad
f467ed7251 Identify More UDA Integer Values 
In particular, identify UDA control codes for RESV, BHP, and THP in
WCONPROD as well as BHP and THP in WCONINJE.
 2022-05-09 11:33:07 +02:00
Bård Skaflestad
d9ca1fe86f Increase Integer Literal Readability 
Use C++14's digit separator character (single quote).
 2022-05-09 11:33:07 +02:00
Atgeirr Flø Rasmussen
9a07a5d419
Merge pull request #3024 from atgeirr/use-invoke-result 
Use std::invoke and friends instead of the deprecated std::result_of.
 2022-05-09 11:31:11 +02:00
Atgeirr Flø Rasmussen
7e9e3e26eb Use std::invoke and friends instead of the deprecated std::result_of. 2022-05-09 10:26:29 +02:00
Markus Blatt
84ef4f6aa3
Merge pull request #3023 from blattms/skip-shared-libs 
Do not hard-code shared-libs in package configuration if not needed.
 2022-05-06 14:00:38 +02:00
Markus Blatt
cec7cffe7a Do not hard-code shared-libs in package configuration if not needed. 
We usually list all libraries that might be needed for linking in the
CMake package configuration files. This is needed when building static
libraries as we do not yet use CMake targets (which would allow to
list them differently). As we are doing this unconditionally and
also including the ones listed in modules that we depend on, changing
a library (e.g. moving from Python 3.9 to 3.10) requires a complete
rebuild of all modules to get rid of the stale dependency on
libpython3.9.

At least when building shared libraries listing the dependencies is
not needed and this patch simply removes all shared libraries form the
list in the CMake package configuration file. Thus we only need to
recompile the modules that have direct dependency on a stale library.
 2022-05-06 10:49:46 +02:00
Bård Skaflestad
9a51b6ec7c
Merge pull request #3020 from hakonhagland/python_rates 
Adds a `get_production_properties()` method to the Python interface to Opm::Schedule
 2022-05-05 17:52:46 +02:00
Bård Skaflestad
d345098471
Merge pull request #3019 from blattms/better-actionx-udq-unsupported-message 
Improve error message for unsupported categories for UDQ/ACTIONX
 2022-05-05 17:23:03 +02:00
Håkon Hægland
d2c778739b Add trailing comma 2022-05-05 17:05:35 +02:00
Markus Blatt
68438e3f79 Improve error message for unsupported categories for UDQ/ACTIONX 
We now print
"Keyword category 'Region' (e.g., summary keywords RPR) not supported
by ACTIONX."
instead of
"make_default_nodes does not yet support: RPR"
 2022-05-05 15:43:44 +02:00
Håkon Hægland
d2cf59380e Use more compact std::map constructor 2022-05-05 13:58:04 +02:00
Håkon Hægland
dd19213998 Adds get_production_properties() 
Adds get_production_properties() to the python interface to Schedule.
This method can be used to get information about
Well::WellProductionProperties for a given report step
 2022-05-05 13:04:03 +02:00
Markus Blatt
267f642794
Merge pull request #3018 from totto82/fix_warning_satfunc 
fix warning due to  missing else in satfuncs
 2022-05-03 15:55:24 +02:00
Tor Harald Sandve
db929b509e fix warning due to missing else in satfuncs 2022-05-03 14:48:13 +02:00
Tor Harald Sandve
2b53a25ff6
Merge pull request #2917 from osae/LETkeywords 
LET-based family-I saturation functions.
 2022-05-03 13:37:47 +02:00
Bård Skaflestad
90a451c37d
Merge pull request #3016 from goncalvesmachadoc/addBXPV 
add Block Pore Volumes
 2022-04-30 12:03:39 +02:00
Cintia Goncalves Machado
4f46615caa
Delete unnecessary BXPV from required fields 2022-04-30 08:39:05 +02:00
goncalvesmachadoc
1d3cb8b2bb addBXPVs 2022-04-29 20:26:31 +02:00
Markus Blatt
5107d8c401
Merge pull request #3015 from blattms/install-python-bindings-by-default 
Install python bindings as default.
 2022-04-29 17:12:22 +02:00
Markus Blatt
51b73c1997 Install python bindings as default. 
This is for consistency with opm-simulators, which (always)
installs them if they are built.

Closes #2976
 2022-04-29 12:13:17 +02:00
Markus Blatt
aeb9ae8e1e
Merge pull request #3012 from blattms/make-no-quadmath-just-a-warning 
Make not finding Quadmath non-fatal (e.g. not available on arm64)
 2022-04-29 11:20:35 +02:00
Markus Blatt
b8ab89591a Make not finding Quadmath non-fatal (e.g. not available on arm64) 
Quadmath is usually unused except when a dependency uses it and
explicitly puts QuadMath::QuadMath into their CMake package
configuration file.

On most platforms the compiler has Quadmath available by
default. But on those that don't we should not stop CMake and fail.
Hence now we only print a message that Quadmath is not available.
 2022-04-29 09:18:50 +02:00
Bård Skaflestad
612c156013
Merge pull request #2989 from plgbrts/vapoilwat 
added vaporized_water rate type
 2022-04-28 15:29:34 +02:00
Markus Blatt
ec7aadd511
Merge pull request #3007 from akva2/avoid_some_float_comps 
fixed: avoid direct floating point comparisons in tests
 2022-04-27 17:15:33 +02:00
Markus Blatt
410f2ecc34
Merge pull request #3008 from blattms/spelling-fix 
Spelling fixes (valied -> valid).
 2022-04-27 16:11:19 +02:00
Markus Blatt
7d66ff7c12 Spelling fixes (valied -> valid). 2022-04-27 14:08:53 +02:00
Bård Skaflestad
deffadd92e
Merge pull request #3006 from lindjoha/complump_defaults 
Added default values for I, J, K1 and K2 in COMPLUMP
 2022-04-27 12:40:22 +02:00
Arne Morten Kvarving
4871f618bf fixed: avoid direct floating point comparisons in tests 
we want to compare with an epsilon since these have gone
through calculations
 2022-04-27 12:24:22 +02:00
Øyvind Lind-Johansen
dff5144d6a Added default values for I, J, K1 and K2 2022-04-27 10:23:29 +02:00
Tor Harald Sandve
2eb49a451c
Merge pull request #3003 from bska/fix-update-uda-weltarg 
Update THP Target in Case of THP Control
 2022-04-26 08:41:58 +02:00
Bård Skaflestad
bf259a5444 Update THP Target in Case of THP Control 
Updating the BHP target appears to have been a copy-paste error.
 2022-04-25 12:55:46 +02:00
Tor Harald Sandve
3f34913fb0 implement item 10 WCONINJE 2022-04-21 14:58:44 +02:00
Markus Blatt
3349bac28f
Merge pull request #2997 from blattms/update-manpages 
Cleanup, update and improve man pages for 2022.04
 2022-04-21 11:27:29 +02:00
Markus Blatt
635aafa6f8
Merge pull request #2998 from akva2/jenkins_abs_refs 
added: ability to use jenkins build scripts for release test building
 2022-04-21 11:19:50 +02:00
Arne Morten Kvarving
9f332b87a4 added: ability to use jenkins build scripts for release test building 
we need to be able to specify absolute refs to use for the repos
rather than a pull request number.
 2022-04-21 09:51:43 +02:00
Markus Blatt
5dc5cd10b6 Cleanup, update and improve man pages for 2022.04 2022-04-20 22:09:17 +02:00
Markus Blatt
ecde5ebc8c
Merge pull request #2995 from blattms/use-dune-buildsystem-defaults 
Use dune buildsystem defaults for MPI SuperLU, and Quadmath
 2022-04-20 19:43:09 +02:00
Markus Blatt
85837a71a5 Require UMFPack 
A direct coarse solver of AMG is needed for good convergence and umfpack
was tested to work better than SuperLU previously. Hence we now require it.
 2022-04-20 17:31:24 +02:00