Commit Graph

138 Commits

Author SHA1 Message Date
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
jonjenssen
88118ee4e1 Privatize grid cell array 2024-10-29 18:17:31 +01:00
Kristian Bendiksen
ebc805ab65 Refactor: Extractor contour polygon tools. 2024-10-17 13:45:18 +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
64a559756f Improve visual appearance for depth surface
- disable intersection geometry with cell property colors
- allow opacity
- set default color to blue, as most user use this plane for oil-water contact
2024-08-28 09:22:55 +02:00
Magne Sjaastad
83443ae2ff Guard use of empty OpenGL context 2024-08-23 17:07:48 +02:00
Jon Jenssen
7651952c89 Fix regression test crash 2024-08-21 16:59:32 +02:00
Magne Sjaastad
ea17b1ec07 #11482 Add fault mesh line thickness option 2024-06-07 11:13:10 +02:00
jonjenssen
2e4ca390c7
Remove old polygon annotations. (#11404)
* Remove old polygon annotations from GUI. 
* Upgrade old annotation objects to new polygon objects on load.
2024-05-01 10:50:19 +02:00
Kristian Bendiksen
b5666c333a Refactor connection between cases and views.
Eclipse grid views and contour maps are not longer a child of the case.
The views are not separate collections (one for grid and one for contour maps)
on root level.
2024-04-15 16:10:43 +02:00
Kristian Bendiksen
eeecc41ad1 Fix typo. 2024-04-10 13:34:41 +02:00
Kristian Bendiksen
c402142e58 Refactor: extract duplicated code. 2024-04-10 13:34:41 +02:00
Kristian Bendiksen
eb02e9e0a5 #11332 2D Intersection Views: Improve automatic depth resolution. 2024-04-10 13:34:41 +02:00
Kristian Bendiksen
7836181ad1 Refactor: use lambda instead of define. 2024-04-10 13:34:41 +02:00
Magne Sjaastad
7190d781d0 Grid Case Statistics: Show well data from first realization 2024-03-21 09:32:09 +01:00
jonjenssen
fb5758a363
Support both AND and OR operations when combining range and index filters (#11275)
Support both AND and OR operations when combining range and index filters
2024-03-11 20:02:47 +01:00
Magne Sjaastad
28d281e1d6
Use polygon as data source for intersection
- Use polygon as data source for intersection
- Add padlock icon
- Show padlock icon on read only polygons
- Add Fwk function appendMenuItems() to make it possible to define context menu content in a PdmObject
- Context menu "Create Polygon Intersection"
- Updates to make visualization consistent with object and object collection enabled state
2024-02-25 09:21:48 +01:00
Magne Sjaastad
a3d520e26e
Use project polygons from polygon cell filter
* Use RimPolygonInView to edit locally defined polygon
* Add scaling to polygon in view
* Move polygon line visualization to RimGridView
* Rename to polygonInViewCollection
* Show appearance for local polygon
2024-02-22 15:13:29 +01:00
Magne Sjaastad
573a8f78cf Update bounding box of parts in polyline part manager
The part visualization was missing in some cases due to an invalid bounding box
2024-02-16 15:51:19 +01:00
Magne Sjaastad
7d601ac067 #11109 Improve visualization of MSW with valve branches
Increase default segment threshold to 4
Add an optional setting to override the default value
Use this threshold to merge short branches into parent branch
2024-01-26 09:32:42 +01:00
Kristian Bendiksen
544e6974e7 Refactor: improve interface for finding intersecting cells. 2024-01-03 13:00:09 +01:00
jonjenssen
1fab743d56
INP import updates (#10952)
Support reading element type results
Automatically load properties from INP include files generated by Fault Reactivation Model exporter
Some refactoring of element and result types.
2023-12-14 08:46:41 +01:00
jonjenssen
2b795bf499
Fault reactivation gridding update (#10855)
Rewrite grid generator - grid based on eclipse model layers in reservoir.
2023-11-20 15:39:17 +01:00
Kristian Bendiksen
5bba0eaea8 #10690 Fractures: Show Perforation Interval for azimuth fractures.
Fixes #10690.
2023-11-20 09:30:32 +01:00
Magne Sjaastad
10189da362
Fix display of intersection lines in 3D view
* 10675 Fix missing intersection line geometry
* Change to list of visible surface intersection lines
* Enable surface intersection band for any intersection
* Show labels for intersection curves in 3D

The polylines are defined in the display coordinate system without Z-scaling. The z-scaling is applied to the visualization parts using Part::setTransform(Transform* transform)
The annotation objects are defined by display coordinates, so apply the Z-scaling to the coordinates.

* Improve naming of surfaces
* Use scaling factor of 1.0 for flat intersection views
2023-10-03 09:04:46 +02:00
Magne Sjaastad
21843820e6
Update clang-tidy.yml
* Make sure clang-tidy action use .clang-tidy config file
Use add-paths to instruct create-pull-request to a sub folder to avoid diff from Qt and vcpkg

* Use empty() in macro to avoid clang-tidy warning
* Add NOLINT to CAF_ASSERT
* Add NOLINT to cvfAssert
2023-10-03 09:04:08 +02:00
Kristian Bendiksen
959c9d48fa #10649 ApplicationLibCode: Use collection.empty() instead of comparing with size 2023-09-27 10:16:37 +02:00
Magne Sjaastad
c22b8b2e1f
Remove duplicated code
* Use annotation tools from part manager
* Set version to 2023.06.01-dev.06
2023-09-13 09:43:03 +02:00
Magne Sjaastad
f4c61c9edb Changes based on review 2023-09-13 08:29:15 +02:00
Magne Sjaastad
f18eb29552 Add optional measured depth labels to well path 2023-09-13 08:29:15 +02:00
Magne Sjaastad
3e340361e8 Add annotation label support to surface intersection lines 2023-09-13 08:29:15 +02:00
Magne Sjaastad
4475f7b0f4 Add annotation label data structures 2023-09-13 08:29:15 +02:00
Magne Sjaastad
94c1b110fb Compute measured depth at the first visible well path geometry 2023-09-13 08:29:15 +02:00
Magne Sjaastad
f931021385
Minor seismic surface lines fixes
* Support continuous lines along the seismic surface
* Make sure watertight surface include all cells
* Remove unused function and mark with static
* Invert surface intersection line visibility control
2023-09-11 07:56:08 +02:00
magnesj
4f279a1af3 Fixes by clang-tidy 2023-09-07 07:52:54 +02:00
Kristian Bendiksen
a6d2bff77b Fix incorrect merge. 2023-09-06 13:51:59 +02:00
jonjenssen
32326bfa9b Add fault reactivation modeling 2023-09-06 13:51:59 +02:00
Magne Sjaastad
6a8b15daa8 Add optional surface intersection lines onto seismic geometry 2023-08-31 13:50:39 +02:00
Magne Sjaastad
fb75d0471e Move line and surface intersection methods to RigSurfaceResampler 2023-08-31 13:50:39 +02:00
jonjenssen
0a807618b9
Cell filter performance improvement (#10550)
* Speed up eclipse and geomech cell filters
2023-08-29 14:41:55 +02:00
Magne Sjaastad
bb293539d5
Additional refactoring for POR-Bar result handling
* Always use element-nodal for POR calculations
* Add RigFemAddressDefines
Add special handling for "POR-Bar" result, always use element_nodal

* 9362 Show unit text "sg" when normalized by hydrostatic pressure
2023-08-23 13:29:54 +02:00
jonjenssen
2172199999
Add seismic 3d view (#10472)
* Show seismic, surfaces, annotations and wellpaths in new view not requiring a grid loaded first.
2023-08-07 16:35:59 +02:00
Kristian Bendiksen
5bf2c2a89d #10367 Janitor: Remove unneccessary 'this' pointers 2023-08-07 13:38:27 +02:00
jonjenssen
17f09878d2
Enable filters for curve intersections (#10329)
* Enable cell filters
* Enable property filters
* Clean up fault collection interface and use similar setting for controlling filters as in intersection collection
* Enable cell/property filters on geomech intersections
* Enable cell and property filters for box intersections
2023-06-05 07:33:04 +02:00
jonjenssen
1063d7f3d3
Add support for K filter to polyline intersections (#10302)
* Add support for K filter to polyline intersections
2023-05-25 08:14:43 +02:00
Jørgen Herje
b83fe73395
Displacement curves fault faces (#10243) 2023-05-22 11:37:57 +02:00
Magne Sjaastad
54f0a832de
Janitor: Remove unused includes 2023-05-15 15:43:01 +02:00
Magne Sjaastad
0c90f67dcc
Change API for PdmObjectHandle and PdmFieldHandle
* Refactor interface to PdmObjectHandle and PdmFieldHandle
Return objects instead of passing in structures as parameters

* Add nodiscard to several functions
* Remove redundant this->
* Rename to ptrReferencedObjectsByType
2023-05-12 21:41:34 +02:00
Magne Sjaastad
5ee764af48
Refactor result definition 2023-05-11 08:37:58 +02:00