Commit Graph

2545 Commits

Author SHA1 Message Date
Kristian Bendiksen
7148ccdc41 Contour Map: Fix crash when not filtering by visibility. 2024-11-13 15:36:44 +01:00
Kristian Bendiksen
5588f8f0f9 Statistics contour map: Add UI for selection result aggregation type. 2024-11-13 15:36:44 +01:00
Kristian Bendiksen
88ded4f7a0 Refactor: improve names of result aggregation enum options. 2024-11-13 15:36:44 +01:00
Kristian Bendiksen
c16bc11c03 Add configurable "relative sample spacing". 2024-11-13 15:36:44 +01:00
Kristian Bendiksen
e2940e4eaf Contour Statistics Map: Compute results 2024-11-13 15:36:44 +01:00
Kristian Bendiksen
c4dd4865f4 Add StatisticsContourMap pdm object, and menu item. 2024-11-13 15:36:44 +01:00
Kristian Bendiksen
c2ec023720 Add utility for finding min/max of vector. 2024-11-13 15:36:44 +01:00
Kristian Bendiksen
8e6d8ee317 Contour Map: Fix incorrect null guard. 2024-11-13 15:36:44 +01:00
Magne Sjaastad
8b221c26ab Discard display of delta curves if data is missing
Add a flag used to control if missing data from either of the ensembles will return no data, or use zero if data is missing.
2024-11-13 15:18:10 +01:00
Magne Sjaastad
7550b8702c Rename delta ensemble and case
Rename to RimDeltaSummaryCase and inherit RifSummaryReaderInterface
Rename to RimDeltaSummaryEnsemble

Remove obsolete RifDerivedEnsembleReader
2024-11-13 15:18:10 +01:00
Magne Sjaastad
11a3c66a0b Make sure the vector name is visible for delta ensemble curves 2024-11-13 15:18:10 +01:00
Magne Sjaastad
b0344a1e72 Logging: Skip identical messages logged close in time
There can be situations where multiple identical log messages are computed in a short time interval. Default time interval is set to 1 second, if the message is reported after this interval, the message is added to the log.
2024-11-13 15:18:10 +01:00
Kristian Bendiksen
f5437e6c72 Refactor: extract computation for contour map projection. 2024-11-07 13:13:20 +01:00
Magne Sjaastad
d2cd425ad0 11867 Do not assume that the first reported time step is initial time step 2024-11-07 12:02:25 +01:00
Magne Sjaastad
94d6f81b0f
Improve Quick Access
* Add css to checked menu items
* Improve icons
* Use group name for field if found
* Add quick access fields for IJK Filter
* Add tree selection for selection of multiple fields
2024-11-07 09:36:24 +01:00
Magne Sjaastad
67e6df28b5 #11857 Make sure the summary curve type is updated
Always compute curve type Rate or Accumulated based on address if Auto curve type is set.
2024-11-06 07:16:07 +01:00
Magne Sjaastad
1cbdbfa7df Remove waitUntilWorkIsDone as this can cause eternal loops 2024-11-06 07:16:07 +01:00
Jon Jenssen
8ff8264d11 Use window icons to show toggle state in windows menu 2024-11-05 15:34:07 +01:00
Magne Sjaastad
1a3cb1f241 Fix missing include and bump version 2024-11-04 18:31:18 +01:00
Magne Sjaastad
9ed4318470 Avoid redraw of 3D views during summary import 2024-11-04 17:34:49 +01:00
Magne Sjaastad
71b0ae1a16 Remove duplicated code in RiaPlotWindowRedrawScheduler 2024-11-04 17:34:49 +01:00
Magne Sjaastad
59df1a655e #11851 Initialize OpenGL when main window is created 2024-11-04 17:34:49 +01:00
Magne Sjaastad
275526a64a Remove unused includes
Remove unused includes, mostly AppEnum.h
2024-11-04 09:54:23 +01:00
Magne Sjaastad
7fe945e68d #11842 Fix drag/drop of VFP plot into multiplot
Remove the deprecated plot collection
Make sure the dropped plot is visible in the multi plot
2024-11-04 08:47:21 +01:00
Magne Sjaastad
a05645e966 #11844 Quick Access adjustments
Show the Quick Access menu only for objects that implements RimFieldQuickAccessInterface
Show the fields made available by RimFieldQuickAccessInterface
2024-11-04 08:46:55 +01:00
Magne Sjaastad
4cf6a26083
Improve draw performance for active cell grid
* Show timing for geoBuilder.generateSurface()
* Check state of element vector result before geometry is created

* Improve performance for isFaceVisible
Avoid calling costly function cell() when possible
Remove check on fault geometry as this does not affect the visualization

* Performance: Avoid traversal of all cells when computing visibility
When we have an active cell grid, we can skip checking for inactive and invalid state.
Use the list of active grid cells when looping through cells.
2024-11-03 13:38:03 +01:00
Magne Sjaastad
9a1c54c7d6 Add debug timers to import of UNRST files 2024-10-31 19:05:10 +01:00
jonjenssen
d7d1026841 Fix build issue 2024-10-31 15:08:59 +01:00
jonjenssen
da683bed9e Move Rig well related things to subfolder and update include statements 2024-10-31 15:08:59 +01:00
Magne Sjaastad
7677466d29 Make sure plot create from Python is visible 2024-10-30 13:54:03 +01:00
Jon Jenssen
4468e89ded Ignore empty branches and invalid cells 2024-10-29 18:17:31 +01:00
Magne Sjaastad
2154c0ae3b Use updated API for total cell count 2024-10-29 18:17:31 +01:00
Jon Jenssen
8a2a1c218b Some performance updates 2024-10-29 18:17:31 +01:00
jonjenssen
f7ecd38592 Add some friends to protect direct access to internal cell storage 2024-10-29 18:17:31 +01:00
jonjenssen
f21d1545f8 Some cleanup 2024-10-29 18:17:31 +01:00
jonjenssen
db66ec82de Some clean up and fixes 2024-10-29 18:17:31 +01:00
jonjenssen
78d82acb41 Add specialiced active cell subgrids 2024-10-29 18:17:31 +01:00
jonjenssen
88118ee4e1 Privatize grid cell array 2024-10-29 18:17:31 +01:00
jonjenssen
69878f54d3 Work in progress 2024-10-29 18:17:31 +01:00
Magne Sjaastad
95365ad5d0 Add timing support to logger 2024-10-29 14:33:48 +01:00
Magne Sjaastad
4f921b62b6 Remove misleading and confusing error message 2024-10-29 10:29:29 +01:00
Magne Sjaastad
2814b92055
Qt6: Adjustments (#11804)
* Qt6: Avoid insertWidget, use addWidget
In Qt6, the insertWidget function checks if the index parameter is valid based on current widgets present in the layout. This is error prone, and use addWidget to avoid manual counting of index.

* Disable use of Qt keyword foreach

* Replace use of QRegExp with QRegularExpression
Replace use of QRegExp with QRegularExpression
Remove dependency on qt5compat module
Simplify an expression based on review

* Remove Qt5 ifdefs

* Guard access out of bounds seen in debug build

* Avoid reuse of string variable

* Disconnect all signals from the QOpenGLContext
The call stack when this assert happens indicates that there are more signals to be disconnected from the object. Crash is fixed by disconnecting all signals.

Assert seen in debug build:

ASSERT failure in caf::Viewer: "Called object is not of the correct type (class destructor may have already run)", file C:\Qt\6.6.3\msvc2019_64\include\QtCore/qobjectdefs_impl.h, line 130

* Fix issue related to delete of a linked view
Guard null pointer use in view linker. Remove complicated cleanup in destructor in Rim3dVew.
2024-10-28 13:09:18 +01:00
Magne Sjaastad
1f2b180ab7 #11812 Multi-segment RFT plot: Make sure reservoir Pressure is plotted 2024-10-24 12:18:35 +02:00
Magne Sjaastad
a9ea615bf0 Add support for increase of serial number when data is assigned to a SUMO case 2024-10-24 08:50:26 +02:00
Magne Sjaastad
c795eccf0b Align the search expression with sumo explorer 2024-10-24 08:50:26 +02:00
Kristian Bendiksen
293e19d820 Refactor: make contour map calculation easier to reuse. 2024-10-23 14:46:52 +02:00
Magne Sjaastad
fd0ebd989b Improve performance when computing interpolated values
Use OpenMP when computing interpolated values for a curve.
Use std::lower_bound to quickly find a relevant start index, avoids starting from 0 each time.
2024-10-23 12:38:22 +02:00
Magne Sjaastad
581b268928 Use hash of input do control if calculation is required
Add hash functions
Add serial number to SummaryReaderInterface
Add hash for RimSummaryCase

Use hash based on input parameters to control caching of data in RimEnsembleStatisticsCase::calculate  and RimEnsembleCurveSet::appendOptionItemsForSummaryAddresses
2024-10-23 12:38:22 +02:00
Magne Sjaastad
da4d4c66b1 #11798 Use type definition from ClipperLib to avoid overflow
When converting a cvf::Vec3d to an integer vector, the platform int type was used as an intermediate variable. This caused overflow for large double values.
2024-10-22 10:39:04 +02:00
Magne Sjaastad
df091336e0 Move summary tools into separate folder 2024-10-22 07:28:43 +02:00
Magne Sjaastad
95b2f2bbd1 Add icons 2024-10-21 14:11:22 +02:00
Magne Sjaastad
eee00ee508 Update default dock state for Quick Access 2024-10-21 14:11:22 +02:00
Magne Sjaastad
2befcf6417 Create quick access objects when opening project and some objects
Create quick access for Eclipse view, IJK slice filters and property filters
Create quick access objects for existing projects automatically
2024-10-21 14:11:22 +02:00
Magne Sjaastad
2e305bd762 Add quick access dock widget 2024-10-21 14:11:22 +02:00
Magne Sjaastad
4ff5aaf381 Add quick access data model objects 2024-10-21 14:11:22 +02:00
Magne Sjaastad
5ffd7f3f61 Move Show Disks from Visibility group into Disk group 2024-10-21 12:52:42 +02:00
Magne Sjaastad
c3d60869bd Improve support for network vectors
Show all text if summary address contains multiple : for network addresses
Consolidate replace of tokens in summary address
2024-10-21 09:38:33 +02:00
Magne Sjaastad
2aaea1e6db Fix crash when curve data is missing 2024-10-21 09:38:33 +02:00
Magne Sjaastad
77c789a179 Improve performance when creating multiple plots 2024-10-21 09:38:33 +02:00
Magne Sjaastad
04799e044e Fix missing prefix seen in unity builds 2024-10-20 16:35:39 +02:00
Kristian Bendiksen
ebc805ab65 Refactor: Extractor contour polygon tools. 2024-10-17 13:45:18 +02:00
Kristian Bendiksen
c636a80fe2 Refactor: simplify conditionals. 2024-10-17 08:23:22 +02:00
Kristian Bendiksen
4c3fb3cc47 Janitor: clean up includes. 2024-10-17 08:23:22 +02:00
Kristian Bendiksen
a8d56417f6 Refactor: Extract RigContourMapGrid object. 2024-10-17 08:23:22 +02:00
Magne Sjaastad
da321830a7 Janitor: Fix some minor GUI issues
Use appendMenu instead of context command builder
Remove case name from import grid feature
Fix shortcut for feature
2024-10-16 14:32:36 +02:00
Magne Sjaastad
4fd9edc7a5 Select realization in Data Sources when clicking on curve 2024-10-16 14:32:36 +02:00
Magne Sjaastad
42d700ff7d Remove unused code 2024-10-16 14:32:36 +02:00
Magne Sjaastad
2619f1a33a #11771 Highlight all curves for a realization when picking
When selecting a single curve in an ensemble, select and highlight all curves connected to this realization.
2024-10-16 14:32:36 +02:00
Magne Sjaastad
23cf3fef3a Call closeProject before quit to ensure a clean shutdown 2024-10-16 14:32:36 +02:00
jonjenssen
2fe432b43d Make sure launching external processes works after switch to qt6 2024-10-15 14:58:48 +02:00
Magne Sjaastad
360024c4bc Make sure the insertWidget function inserts at the correct index
Insert the first widget at index 1 causes crash in Qt6
2024-10-14 09:19:21 +02:00
Magne Sjaastad
709ec7378e
#11768 Show current time step in result plot 2024-10-14 09:08:47 +02:00
Magne Sjaastad
8d42b321d3 Use copy_if_different to avoid build errors 2024-10-14 08:53:28 +02:00
Magne Sjaastad
4719090b5f Define long names for summary vectors in JSON files 2024-10-14 08:53:28 +02:00
Magne Sjaastad
0330c3cacd #11761 Add special parsing of SLAVES keyword as the default parsing fails 2024-10-10 11:41:40 +02:00
Magne Sjaastad
ca4a7b9000
Remove obsolete code related to Qt5
* Remove bundling of openssl1.1
* Remove obsolete compile flags
* Remove use of obsolete RimCommandObject
* Use QColor::isValidColorName
QColor::isValidColor is deprecated in Qt 6.6, QColor::isValidColorName was introduced in 6.4

* Make sure debug DLLs are copied when required
* Remove Qt5 from AppFwk
* Remove obsolete copy of Qt  DLLs
2024-10-07 10:16:48 +02:00
Kristian Bendiksen
c75990551a #11746 Simplify layout to silence warning from Qt.
Fixes #11746
2024-10-04 16:47:06 +02:00
Kristian Bendiksen
835cf4a53c Qt6: Fix QMouseEvent.x() and .y() deprecation. 2024-10-04 15:27:43 +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
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
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
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
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
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