OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,689 Commits 27 Branches 61 Tags 309 MiB
8d28e86bce
Commit Graph

4235 Commits

Author SHA1 Message Date
Jacob Støren
3cc8ff82d1 #3764 Add annotation related icons 2018-11-28 15:40:28 +01:00
Bjørn Erik Jensen
b6b96e62f6 Annotations. Fix crash 2018-11-28 15:27:32 +01:00
Bjørn Erik Jensen
76e8aa9652 #3773 Annotations. Remove annotation color factory class 2018-11-28 15:15:42 +01:00
Bjørn Erik Jensen
bbec88b5d1 #3773 Annotations. Set default color for line based annotations 2018-11-28 15:00:34 +01:00
Jacob Støren
0148fc2279 #3724 Reload and recreate visualization when changing file 2018-11-28 14:36:17 +01:00
Jacob Støren
04754d394f #3776 Add toggle to text and reach circles annotations 2018-11-28 14:36:17 +01:00
Bjørn Erik Jensen
30b34bbe67 Annotations. Fixed polyline vectors. Use explicit naming 2018-11-28 14:21:40 +01:00
Bjørn Erik Jensen
10aae368d3 #3775 Annotations. Use depth in GUI, not z, for used defined polylines as well 2018-11-28 13:21:59 +01:00
Bjørn Erik Jensen
02eea4bc84 #3775 Annotations. Use depth in GUI, not z 2018-11-28 13:10:11 +01:00
Jacob Støren
0f384cf4f7 #3724 Split the line annotation classes into separate files. Cleaned up includes 2018-11-28 12:10:08 +01:00
Bjørn Erik Jensen
c3dd6a14a7 #3763 Annotations. Define annotation plane Z for global annotations 2018-11-28 11:58:38 +01:00
Bjørn Erik Jensen
aae3665539 #3755 Annotations. Reach circle name field 2018-11-28 07:45:53 +01:00
Bjørn Erik Jensen
4685d5981d Merge branch 'dev' into dev-deeper 2018-11-28 07:10:56 +01:00
Jacob Støren
29e6e08779 #3724 Added cycling default color to polyline import. Set default line thickness to 2. 
Refactored away unneccesary complexity. loadAndUpdate when opening project file. Toggle now working
 2018-11-27 17:54:42 +01:00
Bjørn Erik Jensen
d138770a2a 3767 Annotations. Feature for deleting annotations 2018-11-27 15:44:00 +01:00
Bjørn Erik Jensen
e6685e139a #3758 Annotations. Fix header info. Remove unneccessary includes 2018-11-27 14:43:25 +01:00
Bjørn Erik Jensen
d8142e3c75 #3758 Annotations. Add appearance settings to line based annotations 2018-11-27 14:27:19 +01:00
Gaute Lindkvist
5498c2f466 #3766 Hide blank grid children in GeoMech cases 2018-11-27 13:40:19 +01:00
Jacob Støren
8873cdb1f7 #3757, #3723 Merge cleanup of 3d editor support 2018-11-27 11:45:46 +01:00
Jacob Støren
733324634b #3757, #3723 Split the RicPointTangentManipulator file into the different classes actually contained therein 2018-11-27 11:29:20 +01:00
Bjørn Erik Jensen
e578deb43c #3756 Annotations. Moved files to subdirs 2018-11-27 09:26:30 +01:00
Jacob Støren
fb93ad7ca7 AppFwk: Make PdmUiSelection3dEditorVisualizer generic, ready to be moved to a separate file 2018-11-26 21:50:46 +01:00
Bjørn Erik Jensen
cdaa5e2af6 #3756 Annotation. Refactore features. Add view local text annotations 2018-11-26 15:12:43 +01:00
Jacob Støren
9297c5888c #3724, #3723 Several polyline annotation updates 
Renamed from polyline to polylines.
Split into PolylinesFromFile and UserDefinedPolylines
Add import of polylines from file
 2018-11-26 14:10:20 +01:00
Bjørn Erik Jensen
6286a8729b #3706 Annotations. Simple drilling reach circle 2018-11-26 11:08:38 +01:00
Bjørn Erik Jensen
4dc5c66b03 #3706 Annotations. Working text annotation, no view interaction yet. (and no background transparency) 2018-11-26 09:27:39 +01:00
Bjørn Erik Jensen
35405ebafc #3706 Annotations. First commit. Not tested 2018-11-23 13:33:59 +01:00
Bjørn Erik Jensen
39a838b406 Merge branch 'dev' into dev-deeper 2018-11-23 08:45:28 +01:00
Gaute Lindkvist
56ae4fa5bd Fix Linux Build Problem after FlowDiag 2018-11-23 08:20:05 +01:00
Magne Sjaastad
314c20a04a #3735 Summary plot : Improve stepping for well path name 2018-11-22 15:24:18 +01:00
Bjørn Erik Jensen
15a6bc358b Merge branch 'dev' into dev-deeper 2018-11-22 14:21:00 +01:00
Bjørn Erik Jensen
ceb5fff780 Create Well Path. Add tooltip containing dog leg unit 2018-11-22 14:20:08 +01:00
Gaute Lindkvist
a1b7e694a6 #3727 Give packers a more realistic default length 2018-11-22 14:06:03 +01:00
Gaute Lindkvist
ae8cb9d210 #3741 Make it possible to enable/disable all well path components in plots and 3d view. 
* Add check box to casing design and update of plot
* Add isEnabled() method to component interface which controls plotting.
 2018-11-22 13:39:08 +01:00
Gaute Lindkvist
132408ab6f #3727 Additional packer fixes 2018-11-22 13:39:08 +01:00
Gaute Lindkvist
fcc8ee6e27 #3736 Fix Linking issues related to Contour Maps. 
* They are not allowed to be master views so a few things should be disallowed.
 2018-11-22 13:39:07 +01:00
Gaute Lindkvist
d69153c013 #3489 Fix legend text for flow diagnostics. 2018-11-22 13:39:07 +01:00
Magne Sjaastad
17524f66f8 #3696 Non-Darcy perforation intervals : Set default radius 2018-11-22 09:50:50 +01:00
Magne Sjaastad
a225d1fd1a #3696 Non-Darcy perforation intervals : Remove unit constant from UI 2018-11-22 09:46:40 +01:00
Bjørn Erik Jensen
5e769b337f Merge branch 'dev' into dev-deeper 2018-11-21 14:00:46 +01:00
Bjørn Erik Jensen
b89dcf3eb1 #3690 Missing Summary Data. Fix strange summary vector names in the legend 2018-11-21 12:31:56 +01:00
Gaute Lindkvist
4818a4fd71 #3727 Set packer end when you set packer start and still make it available for edit. 2018-11-21 11:38:56 +01:00
Bjørn Erik Jensen
651084420c #3720 Temp LGR. Hide 'Temporary LGRs' tree node when no temp LGRs exist 2018-11-21 09:58:54 +01:00
Gaute Lindkvist
094ae45dcd Formatted contour map code and renamed some methods. 2018-11-21 09:33:21 +01:00
Gaute Lindkvist
66d5cedb2e #3716 Ensure static results can be shown if there are no dynamic results. 2018-11-20 14:54:30 +01:00
Bjørn Erik Jensen
939dfe664a #3698 Scale bar. Enable check box for showing/hiding scale bar 2018-11-20 12:07:39 +01:00
Bjørn Erik Jensen
e3c619ddfe Merge remote-tracking branch 'origin/dev' into dev-deeper 2018-11-20 11:37:14 +01:00
Gaute Lindkvist
b41217455f #3689 Change order of result aggregation types 2018-11-20 11:32:02 +01:00
Gaute Lindkvist
58c5f066c3 #3700 Fix bugs related to cell positions and grid extent. 2018-11-20 11:31:22 +01:00
Gaute Lindkvist
42d3e65416 #3700 Add visual picking marker and improve map results 
* Fix "off by half a cell" errors and improve smoothness using averaging and interpolation
 2018-11-19 15:24:18 +01:00
Gaute Lindkvist
86f40ed8a9 #3580 Fix Linux build problem related to fault appearance 2018-11-19 08:28:45 +01:00
Bjørn Erik Jensen
d8a466a9ef #3698 Scale bar. Take 1. Only vertical variant implemented so far 2018-11-16 13:52:05 +01:00
Magne Sjaastad
3c3bb153ac #3685 Well Path Creation: Set MDRKB at first target when starting from an existing wellpath 2018-11-16 11:35:13 +01:00
Gaute Lindkvist
e2cc7fb423 #3699 Show global east west position when picking on Contour Maps. 2018-11-15 15:19:19 +01:00
Gaute Lindkvist
a1e094625a #3701 Add axis line option to 2d intersection view as well. 2018-11-15 15:02:07 +01:00
Magne Sjaastad
e100c679d3 Temporary fix : Remove call to missing function 2018-11-15 07:15:03 +01:00
Gaute Lindkvist
12fbd968ad #3580 Improve visualisation of faults in Contour Map 2018-11-14 15:41:25 +01:00
Gaute Lindkvist
5bdba24148 2d Maps: Fix crash when generating new map without a result variable set 2018-11-14 14:39:13 +01:00
Gaute Lindkvist
c99fb71c36 #3687 Fix view updates if creating a brand new contour map, not based on existing view 2018-11-14 13:49:57 +01:00
Gaute Lindkvist
387741d0c1 #3530 Support picking on 2d Maps. 2018-11-14 13:43:55 +01:00
Magne Sjaastad
4117e266ed #3686 Completion Export : Use map based on size_t instead of RigCompletionDataGridCell 
Using RigCompletionDataGridCell as key in a map causes cells with identical local IJK to be treated as same global cell. Use reservoir grid cell index (size_t) as key to be able to handle cells correctly.
 2018-11-14 11:40:23 +01:00
Jacob Støren
bfee1dfa64 #3646 Add icons for MainGrid LGR/Temp LGR's, Export Completions, sub items on/off/toggle 2018-11-13 15:43:36 +01:00
Magne Sjaastad
f644a5ae34 #3679 Temporary LGR : Missing null pointer guarding 2018-11-13 14:51:22 +01:00
Gaute Lindkvist
91c96b9315 2d Maps. Fix minor text bold issue in Overlay Info box 2018-11-13 14:45:21 +01:00
Gaute Lindkvist
052b3e0c7c 2d Maps: Remove volume adjustment code with little effect. 2018-11-13 14:43:52 +01:00
Gaute Lindkvist
a8feee287c #3681 and #3680 Introduce regular sum and fix column result. 2018-11-13 14:43:52 +01:00
Gaute Lindkvist
f3a353039c #3677 2d Maps: Make sure property filters are handled correctly. 2018-11-13 14:40:59 +01:00
Magne Sjaastad
c95fa81a23 Use size_t instead of int 2018-11-12 08:06:16 +01:00
Gaute Lindkvist
667518c849 #3628 2d Maps: Weighting by result parameters 2018-11-09 15:25:45 +01:00
Gaute Lindkvist
c716529542 #3654 2d Maps: hide cell result from overlay info when using column aggregation. 2018-11-09 11:47:19 +01:00
Gaute Lindkvist
669b40df20 #3654 2d Maps: set mean aggregation as default. 
* Top used to be default, but is our least attractive view because it suffers from more edge effects than other views, because the deeper k-levels of for instance Norne is wider than the top level.
* Set it to Oil-column by mistake earlier, which doesn't work well when creating from an existing 3d View because it doesn't match the result parameter.
 2018-11-09 11:47:19 +01:00
Gaute Lindkvist
68d12a325f #3649 Move from createUiGroup to defineUiOrdering/uiOrdering code in name config. 2018-11-09 10:40:05 +01:00
Gaute Lindkvist
72d3a6b46f #3595 Implement auto naming for contour maps 2018-11-09 10:40:05 +01:00
Bjørn Erik Jensen
551bf099d3 #3607 Grid items. Hide LGRs folder if there are no LGRs on file 2018-11-09 09:45:47 +01:00
Bjørn Erik Jensen
8eead5c2f7 #3606 Export LGR/CARFIN. Disable features (keep code) 2018-11-09 09:26:07 +01:00
Gaute Lindkvist
53fad80e89 2d Maps: Renames to make classes and variables more consistent. 
* Everything is now named something related to ContourMap:
  - Rim2dEclipseView -> RimContourMapView
  - Rim2dGridProjection -> RimContourMapProjection
  ....
 2018-11-09 09:11:29 +01:00
Gaute Lindkvist
c334106e9c #3635 Move creation of contour maps out of RimEclipseCase 2018-11-08 16:18:03 +01:00
Gaute Lindkvist
23e3391c64 #3635 Rename m_2dContourMapsCollection -> m_2dContourMapCollection 2018-11-08 15:58:20 +01:00
Gaute Lindkvist
03cfa8f146 #3644 Move hex overlap code to RigCellGeometryTools and clamp in z-direction as well. 
* The latter is not important for 2d Maps because the height of the 2d extrusion is always at least as much as the cells.
* However this makes it so the code can estimate overlap with bounding boxes that do not reach the full height of the hexahedron.
* Also added unit tests.
 2018-11-08 15:53:10 +01:00
Magne Sjaastad
22a7a3da2a 2D contour map : Guard for zero overlap volume 2018-11-08 14:22:41 +01:00
Magne Sjaastad
41e9f0169a Performance : Skip loading results for inactive property filters 2018-11-08 14:22:41 +01:00
Gaute Lindkvist
6ed598e40b #3627 Ensure volume weights for cells in 2d element extrusion doesn't exceed volume of extrusion. 2018-11-08 12:52:29 +01:00
Gaute Lindkvist
ad9f86a517 #3630 2d Maps: schedule update of volumes when creating LGRs 2018-11-08 12:52:28 +01:00
Gaute Lindkvist
4f0e818009 2d Maps: Fix Read Only setting for cell result 2018-11-08 12:52:28 +01:00
Gaute Lindkvist
e07f4ea37f #3638 2d Maps: Update info box when result and aggregation changes and change sampleSpacing to be relative 2018-11-08 12:52:28 +01:00
Gaute Lindkvist
c67469b410 #3627 2d Maps: Nearly true volume of intersection weighing + riOilVolume result 
* Takes the volume summation error from around 30% -> 1.5-2.0% for Norne and TEST10K_FLT_LGT_NNC for sample
spacing approximately the same as grid characteristic size.
* The latter part is for #3630 and adds a special case for calculating 2d Maps SUM of riOilVolume since it needs
to avoid using the actual riOilVolume 3d result but instead use SOIL to avoid multiplying by cell volume twice.
 2018-11-08 11:52:19 +01:00
Gaute Lindkvist
50a0924f84 #3630 Fix volume sum calculation to avoid multiplying by volume twice. 2018-11-08 11:52:19 +01:00
Gaute Lindkvist
ef4b70d6e5 #3630 Implement volume calculation on grid 2018-11-08 11:52:19 +01:00
Gaute Lindkvist
8ebfe074f1 #3642 Make sure cell visibility storage is cleared when LGRs are created. 
* This fixes data corruption causing both #3632 and #3643.
 2018-11-08 11:52:19 +01:00
Bjørn Erik Jensen
cfb45f674a #3604 Export completions. New feature 'Export Completion Data for Temporary LGRs' 2018-11-08 11:24:40 +01:00
Magne Sjaastad
a5d6fa1bba Revert "#3640 Add convenience allEclipseCases()" 
This reverts commit f1d017f1a4.
 2018-11-07 08:46:07 +01:00
Magne Sjaastad
f1d017f1a4 #3640 Add convenience allEclipseCases() 2018-11-07 08:41:04 +01:00
Bjørn Erik Jensen
886487f45d #3631 Well Path Export. Use RKB for modeled well paths 2018-11-06 11:23:35 +01:00
Magne Sjaastad
eaec135019 #3636 Temporary LGR : Add required reload functions 2018-11-06 11:15:36 +01:00
Magne Sjaastad
f36ca9b49d Reenable read/write of modeled well path name 2018-11-06 10:55:06 +01:00
Magne Sjaastad
f2b8f8487c #3636 Temporary LGR : Always rebuild geometry of intersections 2018-11-06 10:55:06 +01:00
Magne Sjaastad
59c1f612fb #3623 Grid Items : Do not try to delete object twice 2018-11-06 10:55:06 +01:00
Magne Sjaastad
5e17eaf98a Whitespace 2018-11-06 10:55:06 +01:00
Magne Sjaastad
00b0d6ef9f Grid Items : Hide checkbox from property editor 2018-11-06 10:55:06 +01:00
Gaute Lindkvist
a842f3d445 #3633 2d Maps: Make contour lines optional 2018-11-05 16:19:16 +01:00