Commit Graph

369 Commits

Author SHA1 Message Date
jonjenssen
8567841b87
Add support for mobile oil/gas/hc columns (#12129)
* Add support for calculating mobile oil/gas/hc columns in contour maps
2025-02-07 07:24:54 +01:00
Magne Sjaastad
28d3050433
#11871 Remove simulation well fractures and completion export 2025-02-03 18:19:03 +01:00
Magne Sjaastad
0c8a056b0d #12121 Fix wrong display of fracture values in grid cross plot 2025-02-03 15:50:21 +01:00
jonjenssen
cbab1b256f
Support filtering by formation/polygon when calculating statistics (#12086)
* Support loading formation names when importing an ensemble
* Enable support for formation filtering when calculating contour map
* Add option to limit calculation area to a selection of polygons
2025-01-29 01:36:29 +01:00
Magne Sjaastad
ca0179d118
Remove obsolete CMake statements
When using modern CMake and Qt6 we can remove obsolete source_group() and QT_MOC_HEADERS
2025-01-28 07:01:42 +01:00
Magne Sjaastad
882e64f790 Add helper class for polygon and 2D binary image operations 2025-01-19 16:19:55 +01:00
Magne Sjaastad
62bb40c4f4 Add optional parameter 2025-01-19 16:19:55 +01:00
Magne Sjaastad
d37bc104e4
Contour Map: Add optional value filtering
* #12071 Contour Map: Add optional value filtering 
* Move management of min/max values to common base class
2025-01-16 13:52:03 +01:00
jonjenssen
b999faf293
Statistics Contourmap UI updates (#12060)
* Enable time step selections and controls in view
* Support loading just what we need for statistics contour maps by using custom reader settings
* Close case once done with it unless there are active views.
* Add selection of user interface case (for result selection, display of wells, faults...)
* Avoid int overflow for nested progresses by using double
* Improve auto naming
* Misc. UI improvements
2025-01-14 21:52:54 +01:00
Magne Sjaastad
8a55b4cd20 #12021 Compute fault distance for active cells 2025-01-06 07:23:28 +01:00
Magne Sjaastad
46515b107f #12021 Wrong calculation of INDEX_IJK
INDEX_I INDEX_J INDEX_K are result properties computed by ResInsight. When using opm-common, only active cells are defined. In this situation, the computation fails.

Change the implementation to compute these values only for active cells. This will also improve performance and use less memory.
2025-01-06 07:23:28 +01:00
Magne Sjaastad
c4c4078e09 #12017 Add caching of well target result data
Write data to welltargetdata.GRDECL in a subfolder of the project. Import this data when project is load. The data in this cache is owerwritten when the project is saved.
2025-01-02 08:06:50 +01:00
Kristian Bendiksen
d1aec2f1cb #12005 Well Target Candidates: Move ensemble grid under generator in Project Tree 2024-12-23 10:02:19 +01:00
Kristian Bendiksen
1abd0afe6e Well Target Candidates: misc improvements.
Improvements:
 * Well Target Candidates: Add filtering by binary result
 * Well Target Candidates: make result grid cell count configurable.
 * Well Target Candidates: Improve ui ordering.
 * Well Target Candidates: compute probability, and simplify vector names.
 * Optimization: Avoid expensive unintended duplication of data
2024-12-20 10:25:15 +01:00
Kristian Bendiksen
fb90844901 Generate well target candidates statistics for ensembles. 2024-12-18 12:28:20 +01:00
Kristian Bendiksen
4f3b7d2675 Janitor: reduce scope of loop indexes. 2024-12-18 12:28:20 +01:00
Kristian Bendiksen
925403764e Add Statistics Contour Map for eclipse grid ensembles. 2024-12-10 15:28:26 +01:00
Magne Sjaastad
26a30ffa50 Make sure fault geometry always is visible
The check for fault was removed in 4cf6a26083

This causes wrong visualization when a range filter is active and a fault is present along the filter.

There is some performance issues seen when profiling this code, needs more investigation.
2024-11-27 12:29:12 +01:00
Kristian Bendiksen
1199d761ee Contour map geomech: fix bug with visibility map 2024-11-26 17:35:05 +01:00
jonjenssen
036ed8b70e Make sure we only loop over active grids local cells when calculating visibility 2024-11-22 11:46:00 +01:00
Kristian Bendiksen
8da0690096 Refactor: Decouple RivContourMapProjectionPartMgr and RimContourMapProjection 2024-11-20 14:52:27 +01:00
Magne Sjaastad
06fb3e1241 #11895 Always show Oil Saturation as available
If no SOIL is found on file, compute based on available SWAT and SGAS.
2024-11-19 13:08:04 +01:00
Kristian Bendiksen
a305464748 Refactor: Split out triangle generation from contour map 2024-11-18 09:12:44 +01:00
Kristian Bendiksen
7148ccdc41 Contour Map: Fix crash when not filtering by visibility. 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
e2940e4eaf Contour Statistics Map: Compute results 2024-11-13 15:36:44 +01:00
Kristian Bendiksen
f5437e6c72 Refactor: extract computation for contour map projection. 2024-11-07 13:13:20 +01:00
Magne Sjaastad
275526a64a Remove unused includes
Remove unused includes, mostly AppEnum.h
2024-11-04 09:54:23 +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
jonjenssen
da683bed9e Move Rig well related things to subfolder and update include statements 2024-10-31 15:08:59 +01:00
Jon Jenssen
4468e89ded Ignore empty branches and invalid cells 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
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
Kristian Bendiksen
293e19d820 Refactor: make contour map calculation easier to reuse. 2024-10-23 14:46:52 +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
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
a8d56417f6 Refactor: Extract RigContourMapGrid object. 2024-10-17 08:23:22 +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
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
Jon Jenssen
8ea818f03e Don't skip loading data if one or more timesteps are missing. 2024-09-10 18:30:17 +02:00