OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-01 03:37:15 -06:00
Code Issues Packages Projects Releases Wiki Activity
17,540 Commits 25 Branches 60 Tags 288 MiB
8e6d8ee317
Commit Graph

17540 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Magne Sjaastad
f67d736c05 Bump to dev.02 2024-10-04 15:44:12 +02:00
Magne Sjaastad
b9448c2430
Additional Openssl adjustments 2024-10-04 15:28:42 +02:00
Kristian Bendiksen
d01ef325fa GA: Remove Qt5 builds for AppFwkUnitTest jobs. 2024-10-04 15:27:43 +02:00
Kristian Bendiksen
3797aa8211 Qt6: Fix usage of deprecated QApplication::fontMetrics() 2024-10-04 15:27:43 +02:00
Kristian Bendiksen
bf1c7f4b04 Qt6: Fix deprecated QVariant::type() calls. 
Use recommended QMetaData::type().id() instead.
 2024-10-04 15:27:43 +02:00
Kristian Bendiksen
58656f900b Qt6: string-related deprecations. 2024-10-04 15:27:43 +02:00
Kristian Bendiksen
835cf4a53c Qt6: Fix QMouseEvent.x() and .y() deprecation. 2024-10-04 15:27:43 +02:00
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
Magne Sjaastad
0a44f0f6ae Bump to 2024.09.1 2024-10-02 10:43:27 +02:00
Magne Sjaastad
ea85dca234 #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 10:43:27 +02:00
Magne Sjaastad
2bad8e89ce #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 10:43:27 +02:00
Magne Sjaastad
7d84c1190d Regression Test: Find relevant objects and show them in Property Editor 2024-10-02 10:43:27 +02:00
Magne Sjaastad
f8ce59a4b4 #11731 Remove creation of same groups twice in RimWellLogExtractionCurve 2024-10-02 10:43:27 +02:00
Magne Sjaastad
da37687c77 #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 10:43:27 +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