Commit Graph

140 Commits

Author SHA1 Message Date
Jørgen Herje
d4dddb0c95 Backup 2024-04-09 10:45:46 +02:00
Jørgen Herje
ecf9e67b68 Fix incorrect setting of num buckets 2024-04-05 14:59:25 +02:00
Jørgen Herje
7b2a458d31 Minor adjustment
- Refactor welding in grid surface endpoint
- Add missing include
2024-04-04 14:09:11 +02:00
Jørgen Herje
614a9f1213 Prevent duplicated nodes in vertex array of intersection response 2024-04-04 09:10:44 +02:00
Jørgen Herje
985e2e21ee Split generation of surface vertices and fault vertices for getGirdSurface 2024-03-22 15:37:30 +01:00
Jørgen Herje
7ca4bd7ce3 Merge remote-tracking branch 'origin/dev' into grid-geometry-extraction 2024-03-14 08:31:07 +01:00
Jørgen Herje
ae6131e92e Fix missing fault faces in GetGridSurface() endpoint
Adjust name of python files
2024-03-13 12:47:47 +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
Jørgen Herje
4520fe1bbc Fix incorrect segment data
- Missing polygonToCellIndexMap
- Incorrect polygonIndices
2024-03-11 14:57:59 +01:00
Jørgen Herje
f5dbee792f Fix memory leakage for CutAlongPolyline 2024-03-11 14:34:41 +01:00
Jørgen Herje
0ed0d81765 Minor cleanup - WIP 2024-03-08 15:25:05 +01:00
jorgenherje
6a10b6f326 Set hard coded string for mock model, and fix Ubuntu build error 2024-03-07 13:05:10 +01:00
Jørgen Herje
8f50da0212 Backup - WIP 2024-03-06 15:32:23 +01:00
Jørgen Herje
548d74720e Adjust according to build warnings/errors 2024-03-06 08:02:40 +01:00
Jørgen Herje
1bdc8e95a1 BACKUP Testing to create enclosing polygon from triangles per cell - WIP 2024-03-05 15:23:46 +01:00
Jørgen Herje
091bd8163a Initial testing of CutAlongPloyline - WIP 2024-02-28 16:10:36 +01:00
Jørgen Herje
e0118b5715 Merge remote-tracking branch 'origin/dev' into grid-geometry-extraction 2024-02-27 12:48:43 +01:00
Jørgen Herje
f9f4bc1e86 Refactor code
Make use of calculateCurrentTotalCellVisibility for eclipse view to get surface vertices. Prevent usage of individual grid part managers in gRPC-service.
2024-02-26 16:00:23 +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
Jørgen Herje
76f2607190 Initial GetGridSurface with IJK-filter 2024-02-22 14:10:37 +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