Commit Graph

14687 Commits

Author SHA1 Message Date
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
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
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
Bård Skaflestad
5114c6ff9f Fix Dimension of D-Factor Correlation 'A' Coefficient
We were missing the 'Area' component.
2023-11-03 10:36:01 +01:00
Arne Morten Kvarving
3470f41564
Merge pull request #3746 from bska/remove-unused-sparse-schedule-grid
Remove SparseScheduleGrid Component
2023-11-03 07:01:38 +01:00
Bård Skaflestad
a589cf4795
Merge pull request #3741 from blattms/more-support-for-actionx-wlist
Support WLIST for all allowed well keywords in ACTIONX.
2023-11-03 00:13:37 +01:00
Bård Skaflestad
d253d357dd Remove SparseScheduleGrid Component
Introduced in commit 4134b9870, this was never used anywhere and
never connected to the build system.
2023-11-02 22:40:51 +01:00
Arne Morten Kvarving
b27c199cb9
Merge pull request #3742 from daavid00/clang
Fix to linker error in building tests (clang, macOS)
2023-11-01 10:32:18 +01:00
David Landa Marban
9588947ee3 Fix to linker error in building tests (clang, macOS) 2023-11-01 10:04:23 +01:00
Markus Blatt
0f1abcbe7c Support WLIST for all allowed well keywords in ACTIONX.
When first evaluating ACTIONX the WLISTS might not even exist.
In addition they may be empty.

We support WLIST for the following well keywords in ACTIONX:

COMPDAT, COMPLUMP, WCONINJE, WCONPROD, WECON, WEFAC, WELOPEN, WELPI,
WELSPECS, WELTARG, WGRUPCON, WPIMULT, WSEGVALV, WTEST,
WTMULT,  WELSPECS

These keywords that probably allow WLIST, still insist they are never empty:
WELTRAJ, COMPTRAJ, CSKIN, WCONHIST, WCONINJH, WFOAM, WINJMULT,
WINJTEMP, WLIFTOPT, WMICP, WINJCLN, WINJDAM, WINJFCNC, WPMITAB,
WPOLYMER, WSALT, WSEGSICD, WSEGAICD, WSKPTAB, WSOLVENT, WTEMP,
WTRACER, WVFPDP, WVFPEXP, WWPAVE, WPAVEDEP, WRFT, WRFTPLT

These are currently not allowed in ACTIONX.
2023-10-31 20:03:59 +01:00
Bård Skaflestad
e2c8d5536c
Merge pull request #3661 from totto82/addWDFAC
Implement support for keyword WDFAC and WDFACCOR
2023-10-31 17:31:23 +01:00
Tor Harald Sandve
80dd2c33a1 Implement support for keyword WDFAC and WDFACCOR
Implement support for DFactor in COMPDAT

Add output of CDFAC
2023-10-31 14:10:45 +01:00
Tor Harald Sandve
111b74e938
Merge pull request #3739 from svenn-t/fix_wellcon_sattab
Fix well connection rel. perm. parameters for two-phase cases
2023-10-31 13:48:16 +01:00
Svenn Tveit
1eeae5efe4 Set correct parameters in two-phase case 2023-10-31 10:45:08 +01:00
Markus Blatt
a5fb8be683
Merge pull request #3728 from akva2/udt_in_udq
Add support for UDT lookups in UDQs
2023-10-30 13:06:48 +01:00
Arne Morten Kvarving
878f5fa72d SummaryNode: flag TU's as user defined nodes 2023-10-30 11:18:58 +01:00
Arne Morten Kvarving
db0f99de77 UDQ: add UDT support 2023-10-30 11:18:58 +01:00
Vegard Kippe
def88224ac Avoid exception for non-group nodes + fix step 2023-10-26 19:31:48 +02:00
Vegard Kippe
7aabc14523 Output of network pressure based on rates at end of timestep in summary vector NPR:* = GNETPR:* 2023-10-26 19:31:48 +02:00
Markus Blatt
aaa8af923c
Merge pull request #3733 from aritorto/missingHeader
Missing header for g++ 12.2.0
2023-10-26 11:41:10 +02:00
Antonella Ritorto
e89c486c7c Missing header for g++ 12.2.0 2023-10-26 10:17:09 +02:00
Bård Skaflestad
96b3799eee
Merge pull request #3712 from blattms/actionx-condition-errors
Better error handling for problems in conditions of ACTIONX.
2023-10-25 16:22:34 +02:00