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
Vegard Kippe
87bdf6381c
Apply unit conversion
2023-11-14 15:15:00 +01:00
Vegard Kippe
3d8b7e863e
Avoid unused paramter
2023-11-14 13:34:39 +01:00
Markus Blatt
d3b80422e6
Merge pull request #3757 from blattms/man-pages-release
...
Update and improve man pages for release
2023-11-14 10:06:51 +01:00
Vegard Kippe
a47aee1af5
Resolved test failures (with and without network defined).
2023-11-13 23:26:58 +01:00
Vegard Kippe
9956ef1dfc
Facilitate using network node pressures from restart
2023-11-13 23:26:57 +01:00
Tor Harald Sandve
5309471632
Merge pull request #3750 from daavid00/renamingToEnableVapwat
...
Renaming enableEvaporation to enableVapwat
2023-11-13 15:01:19 +01:00
Kai Bao
d94edc0723
Merge pull request #3702 from vkip/network_multi_root
...
Support networks with multiple fixed-pressure nodes
2023-11-13 14:38:35 +01:00
Vegard Kippe
d5f4ff90c3
Updating warning comment
2023-11-13 12:24:01 +01:00
Vegard Kippe
aaf61d429d
Updating NetworkTests from root() to roots()
2023-11-13 12:24:01 +01:00
Vegard Kippe
7e80ad86aa
Rebase fix
2023-11-13 12:24:01 +01:00
Vegard Kippe
3e075ec92d
Ensure flow from fixed-pressure node in standard network is propagated up.
2023-11-13 12:24:01 +01:00
Vegard Kippe
97b5bc6209
Support networks with multiple fixed-pressure nodes
2023-11-13 12:24:00 +01:00
Atgeirr Flø Rasmussen
f77a337084
Merge pull request #3698 from vkip/parsecontext_handles_nowellmatch
...
Let ParseContext handle what happens if no well match is found
2023-11-13 10:57:22 +01:00
Arne Morten Kvarving
cde9209cf3
Merge pull request #3762 from kjetilly/fail_on_missing_damaris
...
Fail if Damaris is requested and not found
2023-11-10 12:22:13 +01:00
Kjetil Olsen Lye
df80891256
Fail if Damaris is requested and not found
...
In the current setup, `USE_DAMARIS_LIB` is set to `OFF` by default, but setting it to `ON` does not issue an error if Damaris is not found. This issues an error if `USE_DAMARIS_LIB==ON` and Damaris is not found.
2023-11-10 11:59:08 +01:00
Vegard Kippe
0b2403d59c
Let parseContext handle non-matching wells in WLIST (so that --parsing-strictness=low can allow this)
2023-11-10 11:44:59 +01:00