Commit Graph

17477 Commits

Author SHA1 Message Date
Magne Sjaastad
a04d41b043 Use description as key in vcpkg.json 2024-10-04 13:32:53 +02:00
Magne Sjaastad
8d828fdc84 Disable Octave build temporarily 2024-10-04 13:25:20 +02:00
Magne Sjaastad
226ad98931 Add vcpkg.json used to build OpenSSL3 2024-10-04 13:25:20 +02:00
Jon Jenssen
4e97672e1d Fix incorrect opengl viewport size on Windows if scaling != 100%. To be replaced by proper fix later. 2024-10-03 19:30:53 +02:00
Magne Sjaastad
7362b6a357 Bump to 2024.09.2-dev.01 2024-10-02 15:20:27 +02:00
Magne Sjaastad
aabe7b064d #11735 Use static well path geometry if no simulation well data is available
Crash when creating intersection on a simulation well no well data is present at time step
2024-10-02 15:20:27 +02:00
Magne Sjaastad
eca17ab92e #11737 Set Unknown as the default type for CONFAC
RFT segment results are accessed using a category, either Annulus, Device, Tubing or Unknown. Set the category for CONFAC to Unknown.
2024-10-02 15:20:27 +02:00
Magne Sjaastad
e7a082ac29 Regression Test: Find relevant objects and show them in Property Editor 2024-10-02 15:20:27 +02:00
Magne Sjaastad
f43ecd5e92 #11731 Remove creation of same groups twice in RimWellLogExtractionCurve 2024-10-02 15:20:27 +02:00
Magne Sjaastad
f031a81803 #11731 Detect when a group box have the same name as an existing group box
Detect when a group box have the same name as an existing group box. This is not currently supported, and leads to dangling group boxes in the Property Editor.

Trigger assert and crash when the situation appears.
2024-10-02 15:20:27 +02:00
Kristian Bendiksen
ba9b66d75e Qt6: update to changed name of QButtonGroup signal.
Changed names from buttonClicked to idClicked.
2024-10-02 11:00:33 +02:00
Kristian Bendiksen
b760fcebe2 #11689 Well Target Candidates: generate on well target clusters for single case. 2024-09-30 13:42:28 +02:00
Kristian Bendiksen
13cf450831 Add result calculator for PORV*SOIL, PORV*SGAS, and PORV*(SOIL+SGAS). 2024-09-30 13:42:28 +02:00
Magne Sjaastad
212f5bf5ae
Add support for Qt6 and disable Qt5
Required changes to use Qt6 and disable support for Qt5. There are still some adjustments related to Qt6 to be done, but these changes are not required to make Qt6 compile on relevant systems.

* Build system changes Qt6
* Override enterEvent
* Update QKeySequence
* QtChart changes
* Use QScreen to instepct dotsPerInch
* Add app->quit()
* Required updates for code related to QString
* Use RiaQDateTimeTools
* Required changes related to regular expressions
* Support compile on Qt  < 6.5
When version < 6.5 is found, qt_generate_deploy_app_script() is disabled. Compilation of ResInsight will work, but the install target will be incomplete.
* Octave: add missing header.
* Qt Advanced Docking: force Qt6 where both Qt5 and Qt6 is available.

---------

Co-authored-by: magnesj <1793152+magnesj@users.noreply.github.com>
Co-authored-by: Kristian Bendiksen <kristian.bendiksen@gmail.com>
2024-09-30 11:21:17 +02:00
Kristian Bendiksen
596ab564c8 Fix "nonnull asserts" warnings on gcc 13.
The C++ standard guarantees that the this pointer is never nullptr
in valid programs.
2024-09-27 14:42:53 +02:00
Kristian Bendiksen
69d947309a Ubuntu 24.04 support: modernize pip install, and silence gcc 13 warnings. 2024-09-27 14:42:53 +02:00
Magne Sjaastad
300dbdebc7 Bump to 2024.09.1-dev.01 2024-09-27 12:47:15 +02:00
Magne Sjaastad
8d0883cd9c
Merge pull request #11728 from OPM/main
Merge from main
2024-09-27 11:32:39 +02:00
Magne Sjaastad
0a0c8fbbe3
Merge pull request #11727 from OPM/dev
2024.09
2024-09-27 11:31:46 +02:00
Magne Sjaastad
5c60fa7b88 Prepare for 2024.09
Add keywords and update license info
2024-09-27 10:39:53 +02:00
Magne Sjaastad
d7022fb5f7 Guard null pointer access 2024-09-27 10:39:53 +02:00
Magne Sjaastad
b4c7dd411b Make sure curve type rate/acc is calculated for existing project files 2024-09-27 10:39:53 +02:00
Magne Sjaastad
ee8925edc6 Prepare for 2024.09
Add keywords and update license info
2024-09-27 10:38:10 +02:00
Magne Sjaastad
360a635cda Guard null pointer access 2024-09-27 10:38:10 +02:00
Magne Sjaastad
67adab8ad3 Make sure curve type rate/acc is calculated for existing project files 2024-09-27 10:38:10 +02:00
Magne Sjaastad
e9044c5912
Merge dev into main before release 2024-09-25 09:11:12 +02:00
Magne Sjaastad
f54be2783f Bump to 2024.09-RC_03 2024-09-24 14:50:11 +02:00
Magne Sjaastad
d2a160f793 Make RFT pressure data more robust
Replace tab with space, and fix an out of bounds bug.
2024-09-24 14:49:10 +02:00
Magne Sjaastad
a870fceb42 Intersection: Make sure property filtered geometry is visible
When an intersection geometry is filtered by property filters, make sure that the static geometry is hidden.
2024-09-24 14:49:10 +02:00
Magne Sjaastad
19354ac7b2 Revert "Make sure intersection calculations are done before legend update"
This reverts commit a0997821c6.
2024-09-24 14:49:10 +02:00
Magne Sjaastad
e1864bf93b Disable experimental settings for only load active cells 2024-09-24 14:49:10 +02:00
Magne Sjaastad
12ae4dbaaa Improve detection of special *FIP* property names
Make sure RFIP* and SFIP* are not treated as category results
2024-09-24 14:49:10 +02:00
jonjenssen
de573a83cc Support another special case for coordinates 2024-09-24 14:24:53 +02:00
Magne Sjaastad
d44cd19951 Bump to 2024.09-RC_02 2024-09-24 07:45:10 +02:00
Magne Sjaastad
a0997821c6 Make sure intersection calculations are done before legend update
The legend categories can be filtered to only visible categories. This requires the geometry generators to do intersection calculations, as the legend is created based on intersected cells.
2024-09-24 07:45:10 +02:00
Magne Sjaastad
3cb55cacb2 Keep grid visibility unchanged when adding filter 2024-09-24 07:45:10 +02:00
Magne Sjaastad
7486f20e98 Exclude some statistics results from category classification
Avoid FIPOIL_MEAN and similar as a category result.
2024-09-24 07:45:10 +02:00
Magne Sjaastad
9b150ca38a Make sure statistics cases are displayed in an Eclipse view 2024-09-24 07:45:10 +02:00
Magne Sjaastad
5792a3a53f Fix version number 2024-09-19 14:03:57 +02:00
Magne Sjaastad
b5c0201702 Bump to 2024.09-RC_01 2024-09-19 13:55:40 +02:00
Magne Sjaastad
c65e15fad1 #11693 Add enum to control zoom operation when case is changed 2024-09-19 13:54:23 +02:00
Magne Sjaastad
864d20bf0d #11715 Replace assert with a warning message 2024-09-19 12:47:29 +02:00
Magne Sjaastad
80b112f4ce #11713 Polygon filter: Use a ray from point in polygon both up and down
Make sure that a polygon defined below the grid can be used to filter grid cells
2024-09-19 12:47:19 +02:00
Magne Sjaastad
2c98438528 #11708 Summary: Improve robustness for statistics calculations
There can be incomplete realizations in an ensemble. Make sure that the calculation is robust for all variants of incomplete curves.

Use RiaTimeHistoryCurveMerger to ensure one definition of time steps and extraction of curve values to be used to compute ensemble statistics.

Remove unused function.
2024-09-19 10:23:02 +02:00
Magne Sjaastad
48070f6539 #11706 Use connection depths when plotting connection data
The plotting of curve values for connections to a segment fails in some cases. The current implementation finds the segment a connection is attached to, and use the depth (both MD and TVD) information from this segment. This method is not working in all cases.

Use the reported location of connections attached to segments based on CONLENST and CONLENEN. When measured depth is requested, use these values. There might be gaps in the reported segment sequence.

Use CONDEPTH when TVD depth is requested.

Use CONBRNO to find the branch number, and then use lookup table branchIdsAndOneBasedBranchIndices to find the branch index. Use the branch index to filter the results for requested branch.

The number of values in CON* result values is different to result values for SEG* results.
2024-09-19 10:21:58 +02:00
jonjenssen
e006fe52c9
2d intersection view filter support (#11711)
Enable filters in 2d intersection view. Controlled by "Use Cell Filters for Intersections" setting in Intersection Collection properties
2024-09-19 08:41:57 +02:00
Magne Sjaastad
f95b085419 Bump to dev.21 2024-09-16 10:20:50 +02:00
Magne Sjaastad
89bd3a8c90 #11357 Reorganize menu in 3D view
Simplify menu text for range filter
Reorganize to improve readability
Simplify cell filter menu in Project Tree
2024-09-16 09:53:23 +02:00
Magne Sjaastad
9d66e6195e
Release adjustments
* Use appendMenuItems instead of ContextCommandBuilder
* Specify RimEclipseCaseCollection menu features once
* Add function to enable up/down arrows for combo box
* Guard crash when closing project
* Improve UI for grid case ensemble
- Create a view for the first case in the ensemble
- Show case name in view title
- Enable up/down buttons to Eclipse case
* Make sure 3D views in grid ensemble are created on project load
2024-09-16 09:49:22 +02:00
Magne Sjaastad
1f80503f01 #9405 Update window title when required 2024-09-14 17:28:04 +02:00