Commit Graph

14756 Commits

Author SHA1 Message Date
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
Bård Skaflestad
b640b53d36
Merge pull request #3760 from akva2/fix_build_old_boost
Fix build with older versions of boost
2023-11-10 11:08:55 +01:00
Arne Morten Kvarving
fa670d7042 fixed: earlier boosts did not support command line parameter separation
for older versions we will thus see '--' as argv[1] and the actual
parameter as argv[2].
2023-11-10 10:23:30 +01:00
Arne Morten Kvarving
2fec8a3c16 fixed: adjust compare_at_tolerance namespace for earlier boost 2023-11-10 10:23:30 +01:00
Arne Morten Kvarving
f8781f276e fixed: adjust include path of float_point_comparison for earlier boost 2023-11-10 10:23:30 +01:00
Arne Morten Kvarving
e2c20a6712 fixed: BOOST_DATA_TEST_CASE was added in boost 1.67
use a loop for earlier versions
2023-11-10 10:23:30 +01:00
Arne Morten Kvarving
f1fc44563a fixed: earlier boosts only accepts boost::mpl::list for BOOST_AUTO_TEST_TEMPLATE 2023-11-10 10:23:30 +01:00
Bård Skaflestad
5bc38dab24
Merge pull request #3758 from blattms/fix-segfault-arraylist-without-file
Fix segmentation fault if file name is missing after arraylist command.
2023-11-10 09:51:56 +01:00
Bård Skaflestad
7baccd0318
Merge pull request #3701 from vkip/extra_network_output
Allow output of network pressure based on rates at end of timestep
2023-11-09 23:04:34 +01:00
Markus Blatt
c908561d7f Update and improve man pages for release 2023-11-09 16:31:25 +01:00
Markus Blatt
796a6416ca Fix segmentation fault if file name is missing after arraylist command. 2023-11-09 15:54:11 +01:00
Bård Skaflestad
8b2be3d797
Merge pull request #3756 from akva2/fipconfig_rptsol
EclipseConfig: add FIPConfig for RPTSOL
2023-11-09 14:38:41 +01:00
Arne Morten Kvarving
5e39ab31da added: FIPConfig for RPTSOL in EclipseConfig 2023-11-09 12:11:49 +01:00
Bård Skaflestad
7ba929f1d0
Merge pull request #3753 from akva2/fipconfig
added: FIPConfig class
2023-11-09 12:10:40 +01:00
Arne Morten Kvarving
47122446e6 use strong enum for FIP output fields 2023-11-09 10:44:23 +01:00
Arne Morten Kvarving
3f08071eae added: FIPConfig class
this parses FIP related flags from RPT(SCHED|SOL)
2023-11-09 10:35:21 +01:00
Kai Bao
16c6ee3bbb
Merge pull request #3695 from vkip/grupnet_reroute_hack
Allow rerouting in standard and extended network
2023-11-08 19:58:07 +01:00
Vegard Kippe
d2a34573e3 Better way of getting max number of groups 2023-11-08 17:59:37 +01:00
Bård Skaflestad
552fe8950f
Merge pull request #3755 from bska/usys-const-mem-fn
Make UnitSystem::*_si(string) Const Members
2023-11-08 17:24:25 +01:00
Bård Skaflestad
d9a1d7fe62 Make UnitSystem::*_si(string) Const Members
There is no need for these to require that the UnitSystem be mutable.
2023-11-08 16:10:36 +01:00
Bård Skaflestad
af4b985eb2
Merge pull request #3730 from totto82/addSurfaceDensityOutput
Add info about surface density from CO2STORE model
2023-11-08 14:59:56 +01:00
Vegard Kippe
96b0b09b14 Addressing final comments and test failures. 2023-11-08 11:58:01 +01:00
Vegard Kippe
f8a38064e1 Re-introducing throws on undefined nodes 2023-11-07 23:50:25 +01:00
David Landa Marban
ab2b3faf0a Renaming enableEvaporation to enableVapwat 2023-11-07 18:34:44 +01:00
Bård Skaflestad
980ac2599a
Merge pull request #3747 from akva2/fbhpdef
implement support for FBHPDEF
2023-11-07 14:54:11 +01:00
Vegard Kippe
3519a3a9ab Re-introduced logic_error if node is not defined 2023-11-07 12:09:55 +01:00
Vegard Kippe
0ae1588e00 Addressing review comments, in particular, ensuring that extended network is not updated with a GRUPTREE update. 2023-11-07 11:28:36 +01:00
Vegard Kippe
4192c19d3c Restart fix 2023-11-07 11:28:35 +01:00
Vegard Kippe
01890670da Bugfix + first steps on restart 2023-11-07 11:28:35 +01:00
Vegard Kippe
aa2220979b Working version (but not pretty) 2023-11-07 11:28:35 +01:00
Vegard Kippe
0aa0af9f57 Allow rerouting in standard network 2023-11-07 11:28:35 +01:00
Arne Morten Kvarving
3875736795 implement support for FBHPDEF 2023-11-07 10:32:38 +01:00
Arne Morten Kvarving
33c529652b
Merge pull request #3748 from akva2/schedulestate_avoid_duplicate
ScheduleState: avoid duplicate const/mutable implementation
2023-11-03 14:38:19 +01:00
Bård Skaflestad
5b6b82aa2c
Merge pull request #3743 from bska/dfac-corr-unit
Fix Dimension of D-Factor Correlation 'A' Coefficient
2023-11-03 13:46:15 +01:00
Arne Morten Kvarving
e82875644a ScheduleState: avoid duplicate const/mutable implementation 2023-11-03 13:13:58 +01:00