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

14756 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
9a0ccfd853
Merge pull request #3784 from bska/fix-ilbr4-ilbs-take-ii 
Revise Branch Discovery Order for MSW Output
 2023-11-24 16:49:02 +01:00
Bård Skaflestad
2d3fe6061e Revise Branch Discovery Order for MSW Output 
This commit places more conditions on the branch discovery order
than the previous work in commit 6d3ee57dd.  In particular, we now
ensure that branches are discovered ("created") in the order of
increasing segment number of the branch outlet segment.
Furthermore, if multiple branches have the same outlet segment, then
we sort those branches on their increasing branch IDs.

To this end, switch from using a std::queue<int> to using a
std::priority_queue<KickOffPoint>, with the KickOffPoint being a
custom structure holding the kick-off segment, the branch outlet
segment, and the branch ID and a custom operator<() to plug into the
priority_queue<> heap mechanism.

This new sort order changes the result of certain unit tests, but
those changes are expected and desired.
 2023-11-24 16:01:46 +01:00
Bård Skaflestad
f45eb1afbf
Merge pull request #3793 from akva2/handlercontext_separate 
HandlerContext: put in separate compilation unit
 2023-11-24 14:18:03 +01:00
Arne Morten Kvarving
32906b5022 HandlerContext: wpimult_global_factor is never nullptr 
use a reference instead of a pointer
 2023-11-24 13:22:36 +01:00
Arne Morten Kvarving
e334f28cc3 HandlerContext: make target_wellpi private 
add a method getWellPI to obtain value for a given well.
protects the potential null pointer
 2023-11-24 13:22:29 +01:00
Arne Morten Kvarving
2b56daca05 HandlerContext: make welsegs_wells and compsegs_wells private 
to protect the potential nullptr members
 2023-11-24 13:22:29 +01:00
Arne Morten Kvarving
23c3ba7475 HandlerContext: introduce a mark_tran_change method 
make the sim_update pointer member private so we can centralize
checks for nullptrs
 2023-11-24 13:22:29 +01:00
Arne Morten Kvarving
a7f709f9f3 changed: put HandlerContext in separate compile unit 2023-11-24 13:22:29 +01:00
Arne Morten Kvarving
01c1fda1c9 introduce a helper class WelSegsSet 
this wraps the set with the custom comparator. this is
just a internal helper class, does not need to be part of public API.
 2023-11-24 13:22:29 +01:00
Bård Skaflestad
e8fc282b74
Merge pull request #3794 from akva2/libfmt_fetchcontent_super_build 
fixed: downloaded libfmt with a super build
 2023-11-24 13:13:50 +01:00
Arne Morten Kvarving
54d895af29 fixed: downloaded libfmt with a super build 
have to check that it has not been populated before.
we have to push two variables up to the parent scope
 2023-11-24 11:12:04 +01:00
Bård Skaflestad
5a2d3b1f11
Merge pull request #3792 from totto82/mpi_wpimult 
serialize wpimult
 2023-11-24 11:07:09 +01:00
Tor Harald Sandve
f8ca5ca684 serialize wpimult 2023-11-24 10:09:49 +01:00
Bård Skaflestad
659f4d9a9f
Merge pull request #3788 from totto82/wpimult_wdfac 
adapt wdfac for wpimult
 2023-11-23 16:27:57 +01:00
Arne Morten Kvarving
e5ee7d931d
Merge pull request #3790 from akva2/janitoring 
Schedule::handleKeyword: remove unused list
 2023-11-23 16:20:32 +01:00
Arne Morten Kvarving
0469f53056 Schedule::handleKeyword: remove unused list 2023-11-23 15:27:17 +01:00
Tor Harald Sandve
c40efc35f2 adapt wdfac for wpimult 2023-11-23 15:18:45 +01:00
Bård Skaflestad
75a735c6b1
Merge pull request #3786 from akva2/refine_fmt_fetchcontent 
fixed: refine the libfmt fetchcontent approach
 2023-11-22 16:50:54 +01:00
Arne Morten Kvarving
2497c62f25 fixed: refine the libfmt fetchcontent approach 
rather than doing a full MakeAvailable, only download,
prepare then use from source directory
 2023-11-22 15:19:49 +01:00
Bård Skaflestad
be048ca063
Merge pull request #3781 from totto82/wdfac_fix 
Add return of wdfac type
 2023-11-22 14:53:14 +01:00
Tor Harald Sandve
08b41f09d8 Remove trans multiplier from the dake model 2023-11-22 13:59:25 +01:00
Bård Skaflestad
5937ee9a08
Merge pull request #3785 from akva2/vendor_cjson_fetchcontent 
changed: vendor cjson using FetchContent
 2023-11-22 13:32:54 +01:00
Bård Skaflestad
0419aefd60
Merge pull request #3782 from totto82/cgfrs 
Output CGFRF and CGFRS
 2023-11-22 12:52:00 +01:00
Arne Morten Kvarving
d9ca8694ae changed: vendor cjson using FetchContent 2023-11-22 10:46:13 +01:00
Tor Harald Sandve
9c680a0dcf Output C[OG]FRF and C[OG]FRS 2023-11-22 10:17:44 +01:00
Tor Harald Sandve
e362e1018d refactoring wdfac getDfactor 2023-11-22 09:17:59 +01:00
Arne Morten Kvarving
5a9d1f84b7
Merge pull request #3783 from akva2/vendor_fmt_fetchcontent 
changed: vendor libfmt using FetchContent
 2023-11-22 09:06:12 +01:00
Arne Morten Kvarving
76d769960e changed: vendor libfmt using FetchContent 2023-11-22 08:21:05 +01:00
Tor Harald Sandve
98220372eb Add return of wdfac type 2023-11-21 17:49:08 +01:00
Arne Morten Kvarving
fcb438aed4
Merge pull request #3780 from akva2/fix_comma 
fixed: erroneous comma placement
 2023-11-20 15:55:53 +01:00
Arne Morten Kvarving
d283967f27 fixed: erroneous comma placement 2023-11-20 15:19:11 +01:00
Bård Skaflestad
7502808265
Merge pull request #3778 from akva2/fix_boost_version_check 
fixed: adjust boost version check
 2023-11-17 14:16:52 +01:00
Bård Skaflestad
a74b146841
Merge pull request #3777 from akva2/fix_perf_range_deref 
fixed: pass through perf-range as an optional
 2023-11-17 14:02:58 +01:00
Bård Skaflestad
1b435f3af7
Merge pull request #3776 from akva2/esmry_fix_oob 
ESmry: fix out-of-bounds vector access
 2023-11-17 13:33:38 +01:00
Arne Morten Kvarving
fc5a2fbea6 fixed: adjust boost version check 
1.66 already has the boost::fpc scope
 2023-11-17 13:01:57 +01:00
Arne Morten Kvarving
a725a5a85c fixed: pass throug perf-range as an optional 
we should not dereference it for STDW where it is expected
to be empty
 2023-11-17 12:58:37 +01:00
Arne Morten Kvarving
1427275abd avoid copying strings 2023-11-17 12:37:52 +01:00
Arne Morten Kvarving
63a04d14e5 fixed: make sure vector has expected size 
this comes from input that can be shorter (e.g. in the test
it only holds day-month-year).
 2023-11-17 12:37:05 +01:00
Bård Skaflestad
c9cecb9036
Merge pull request #3773 from totto82/fixWDFAC 
Fix for connection D factors
 2023-11-17 09:05:36 +01:00
Atgeirr Flø Rasmussen
e0e308ea43
Merge pull request #3737 from daavid00/dispersivity 
Support for mechanical dispersion
 2023-11-17 08:49:48 +01:00
Atgeirr Flø Rasmussen
5184bdc64e
Merge pull request #3726 from bska/csrgraph-permit-self-connection 
Make Self Connection Behaviour Configurable
 2023-11-17 08:28:27 +01:00
David Landa Marban
0d993ebd6a Support for mechanical dispersion 2023-11-16 16:54:56 +01:00
Bård Skaflestad
8a4735efcb Make Self Connection Behaviour Configurable 
This commit adds a new class template argument,

    bool PermitSelfConnections

with a default value of 'false', that enables client code to
configure whether or not function

    addConnection(v1, v2)

creates a connection from v1 to v2 if v1 == v2.  The default state
preserves the current behaviour which ignores such connections.

Permitting self connections makes the class slightly more general to
uses cases outside inter-region flow accumulation.
 2023-11-16 15:10:59 +01:00
Arne Morten Kvarving
003560e00d
Merge pull request #3774 from akva2/pypi_3.11_3.12 
pypi: build for python 3.11 and 3.12
 2023-11-16 14:11:12 +01:00
Arne Morten Kvarving
65e77738a9 pypi: build for python 3.11 and 3.12 2023-11-16 12:40:53 +01:00
Arne Morten Kvarving
0d69176609
Merge pull request #3671 from akva2/vendor_pybind11_fetchcontent 
changed: vendor pybind11 using FetchContent
 2023-11-16 11:54:59 +01:00
Tor Harald Sandve
780a0cffbc Support connection D factor 
If positive the D factor is threated a well D factor
If negative it is threated as a connction D factor (no scaling)
 2023-11-16 11:23:38 +01:00
Arne Morten Kvarving
e2566b1487 changed: vendor pybind11 using FetchContent 2023-11-16 09:49:34 +01:00
Bård Skaflestad
3ff7fffb04
Merge pull request #3738 from vkip/network_restart_use_node_pressures 
Facilitate using network node pressures from restart
 2023-11-15 09:34:54 +01:00
Vegard Kippe
1d8c5640a2 Resolve test failures 2023-11-14 18:05:40 +01:00