OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,212 Commits 18 Branches 75 Tags
250c8b7a1c256195aeab27a11bae2ca719cbf232
Commit Graph

14212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
250c8b7a1c Merge pull request #3458 from hnil/changed_hyst 
Changed hyst
 2023-06-14 10:34:34 +02:00
hnil
12da4dbe02 --changed for bska comments. All tests ok locally 2023-06-14 09:31:20 +02:00
Markus Blatt
90497b745b Merge pull request #3556 from akva2/multflt_grid_and_edit 
fixed: properly combine MULTFLT from GRID and EDIT
 2023-06-14 07:16:02 +02:00
Bård Skaflestad
809c9be8dd Merge pull request #3566 from GitPaean/throw_multiple_segment_abs 
we do not support entering multiple segments with ABS type in keyword WELSEGS.
 2023-06-13 17:02:34 +02:00
hnil
b50cef1af2 added fix based on review 2023-06-13 14:39:42 +02:00
hnil
f8d652f758 - fixed missing return after adding change 2023-06-13 14:39:42 +02:00
hnil
d0422bfc74 -- added bool return value of hysteresis update. 
-- this make it possible to localy update intensive quanities if something changed.
 2023-06-13 14:39:42 +02:00
Kai Bao
30f0a358f1 we do not support entering multiple segments with ABS type 
in keyword WELSEGS.

Before we fix it, we throw here.
 2023-06-13 10:44:09 +02:00
Bård Skaflestad
dd34926062 Merge pull request #3558 from bska/wbp-source-values 
Add Container for Dynamic WBPn Source Values
 2023-06-10 11:36:19 +02:00
Bård Skaflestad
c7d6604d98 Add Container for Dynamic WBPn Source Values 
This commit adds a new container class,

    PAvgDynamicSourceData

which wraps a single vector<double> which in turn backs source data
items for

    - pressure values
    - fluid mixture densities
    - dynamic pore-volumes

at a collection of source locations-active cells or well reservoir
connections.  We provide read-only and read-write accessors to the
underlying data items for a single source location through subscript
operator (read only) and named assignment (set(), read-write) member
functions.  The latter is available only when the underlying range
of data values is mutable (e.g., SourceDataSpan<double>) as opposed
to immutable (e.g., SourceDataSpan<const double>).
 2023-06-09 15:42:46 +02:00
Bård Skaflestad
46415cebed Merge pull request #3557 from bska/wbp-comm-api-change 
Prepare for Revised Implementation of WBPn
 2023-06-09 15:13:35 +02:00
Bård Skaflestad
89bc182876 Prepare for Revised Implementation of WBPn 
This initial commit changes the Summary class's API for consuming
block-averaged well level pressure values (summary keywords WBPn).
The former approach was intended to consume a collection of source
values--pressures, densities, and pore-volumes--and then to defer
calculation of the WBPn summary vectors to the Summary class.

This commit introduces a 'WellBlockAvgPress' container class which
holds precomputed WBPn results and the intention is to move the
calculation to the simulator side for greater parallelism.
 2023-06-09 13:29:10 +02:00
Tor Harald Sandve
ba0845c5f3 Merge pull request #3526 from plgbrts/well-control 
Allow NONE for item 7 in GCONPROD
 2023-06-09 10:50:57 +02:00
Arne Morten Kvarving
78c527fb53 Merge pull request #3567 from akva2/embedded_params 
fixed: avoid unused parameters when built without embedded python
 2023-06-08 12:55:50 +02:00
Arne Morten Kvarving
e4b609c294 fixed: avoid unused parameters when built without embedded python 2023-06-08 12:01:27 +02:00
Arne Morten Kvarving
9cb247058e Merge pull request #3564 from bska/fix-embedded-python-test 
Fix Embedded Python Test
 2023-06-08 11:47:18 +02:00
Bård Skaflestad
9cf61a57b4 Merge pull request #3565 from totto82/addFPRP 
add missing FPRP and RPRP
 2023-06-08 11:29:16 +02:00
Arne Morten Kvarving
ca6cab5c54 Merge pull request #3563 from bska/omit-rsm-version-information 
Omit OPM Version Information in RSM File
 2023-06-08 10:42:32 +02:00
Tor Harald Sandve
0221ac9932 add missing FPRP and RPRP 2023-06-08 10:23:53 +02:00
Arne Morten Kvarving
b7a888fcfa fixed: properly combine MULTFLT from GRID and EDIT 2023-06-08 10:12:41 +02:00
Bård Skaflestad
1bde14655a Omit OPM Version Information in RSM File 
The version information leads to long install times and doesn't
really provide any benefit to the user.
 2023-06-08 10:09:23 +02:00
Bård Skaflestad
3e08b187ff Don't Return Constant Objects 
There's no longer any reason to return 'const string', since that
inhibits move semantics.  While here, also reorder the include
statements and split a few long lines.
 2023-06-08 10:08:22 +02:00
Bård Skaflestad
ff4db11528 Handle Case of Nonexistent NumPy Module 
The NumPy module might not be available on the host system.  In that
situation the PYINPUT_BASIC unit test would fail with a segmentation
violation.  Guard against this problem by catching ImportError and
checking if the result deck has 'DX' instead of blindly asserting
that 'DX' exists.
 2023-06-08 09:24:27 +02:00
Bård Skaflestad
222e6133b1 Catch Up to Changed Semantics of Certain Member Functions 
In particular Python::exec() now returns 'false' instead of throwing
an exception if we don't have 'EMBEDDED_PYTHON'.  Similarly for the
Python::Python constructor when called with an 'Enable::ON' argument.
 2023-06-08 09:23:22 +02:00
Bård Skaflestad
45e4762302 Emit Useful Diagnostic Message if Test Fails 
While here, also mark a few objects 'const' and reorder the headers.
 2023-06-08 09:19:32 +02:00
Bård Skaflestad
7692a5401d Merge pull request #3561 from hnil/no_python_onemore 
Remove throw in normal runs
 2023-06-07 11:29:57 +02:00
hnil
dea519c89a -- add config.h 2023-06-07 10:35:13 +02:00
Markus Blatt
cd1831be94 Merge pull request #3509 from blattms/install-co2brinepvt 
Also install co2brinepvt as we install the manpage.
 2023-06-07 10:29:03 +02:00
hnil
47f6b6ffb2 -- hopefully removed the python throw 2023-06-07 10:24:06 +02:00
Tor Harald Sandve
5a08a17978 Merge pull request #3504 from hakonhagland/wvfpdp 
Add support for WVFPDP
 2023-06-05 09:13:49 +02:00
Håkon Hægland
5a99e005fb Fixed naming convention 2023-06-02 09:24:59 +02:00
Håkon Hægland
2f260fe90a Fixed SWell indices 2023-06-02 09:24:59 +02:00
Håkon Hægland
0d38acebaf Set correct default value 2023-06-02 09:24:59 +02:00
Håkon Hægland
5463420a85 Add support for WVFPDP 2023-06-02 09:24:59 +02:00
Bård Skaflestad
d036f6aaaa Merge pull request #3553 from akva2/pvt_set_vappars 
added: setters for the vappars in pvt classes
 2023-06-01 19:03:48 +02:00
Bård Skaflestad
e30fce2c9f Merge pull request #3552 from akva2/janitoring 
Some janitoring
 2023-06-01 18:59:35 +02:00
Arne Morten Kvarving
39006ecd71 added: setters for the vappars in pvt classes 2023-06-01 11:03:20 +02:00
Arne Morten Kvarving
6700e08c84 avoid dead store 2023-06-01 09:38:45 +02:00
Arne Morten Kvarving
f64f587055 mark variable maybe_unused to avoid dead store warnings 2023-06-01 09:38:45 +02:00
Arne Morten Kvarving
237b63e674 reduce scope of variables to avoid dead store warnings 2023-06-01 09:38:45 +02:00
Arne Morten Kvarving
5ab4c3dfa0 initialize variables 2023-06-01 09:38:45 +02:00
Arne Morten Kvarving
19f103db9b check pointer to avoid nullptr dereference sca warning 
the assert above is a noop under normal conditions
 2023-06-01 09:38:45 +02:00
Arne Morten Kvarving
1492182866 make variable constexpr to avoid dead store warning 2023-06-01 09:38:45 +02:00
Arne Morten Kvarving
ba4d3271c4 remove unnecessary initialization 2023-06-01 09:35:10 +02:00
Bård Skaflestad
03d31409e5 Merge pull request #3550 from akva2/vappars_solution_section 
fixed: apply VAPPARS from SOLUTION section
 2023-05-31 17:12:47 +02:00
Arne Morten Kvarving
89ce51af81 added: unit test for VAPPARS in SOLUTION section 
also revise existing test using SCHEDULE to check
that level 0 is UNDEF
 2023-05-31 15:49:23 +02:00
Arne Morten Kvarving
51aecfb2de fixed: apply VAPPARS from SOLUTION section 2023-05-31 15:13:55 +02:00
Bård Skaflestad
24ce7e05a7 Merge pull request #3549 from blattms/fix-string-preplace-empty-dunecommon_CXXFLGAS 
[cmake] Make sure that string(REPLACE ...) always has 4 arguments.
 2023-05-31 12:51:07 +02:00
Bård Skaflestad
682e6d8763 Merge pull request #3541 from akva2/test_spline_janitoring 
test_spline: convert to boost::test
 2023-05-30 14:21:47 +02:00
Bård Skaflestad
d61c9c7b99 Merge pull request #3501 from bska/check-wsegdims-consistency 
Test Dynamic Segment Dimensions Against WSEGDIMS Limits
 2023-05-30 12:39:55 +02:00