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,553 Commits 27 Branches 61 Tags 309 MiB
07f8221676
Commit Graph

4174 Commits

Author SHA1 Message Date
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
Gaute Lindkvist
c8ebb0a4d1 #3626 2d Maps: Adjust min/max limits for all time steps and TOP result. 2018-11-05 16:19:16 +01:00
Magne Sjaastad
5970d217a8 #3629 System : Use disableWriteAndSetFieldHidden() 2018-11-05 14:42:39 +01:00
Magne Sjaastad
174998335f #3629 System : Use disableIO() instead of disableRead and disableWrite 2018-11-05 14:42:39 +01:00
Magne Sjaastad
b74a7b9683 #3558 Grid items in Project Tree : Mark show main grid as obsolete, and propagate setting to RimGridCollection 2018-11-05 14:42:39 +01:00
Gaute Lindkvist
1422403b71 #3596 Add new aggregation for Oil / Water / HC columns and improve speed and reliability. 
* Avoid calculating results many times for each change.
* Avoid drawing spurious contour lines when results are undefined.
* Add aggregation type to legend header (#3594).
 2018-11-05 14:31:23 +01:00
Magne Sjaastad
063c0533b3 #3625 Fracture header : Use RigTransmissibilityEquations 2018-11-05 10:53:35 +01:00
Gaute Lindkvist
ccea48bc25 #3624 Guard use of m_viewer in Rim2dEclipseView 2018-11-05 09:56:03 +01:00
Gaute Lindkvist
8545fe5d7f #3502 2d Maps bounding volume averaging: use local 2d extrusion height rather than global bounding height 2018-11-05 08:46:50 +01:00
Gaute Lindkvist
aa2d8a7399 #3502 Improve weighing by using bounding box overlap between 2d extrusion and cell. 2018-11-02 16:25:23 +01:00
Gaute Lindkvist
dd48bd078c 2d Maps: Make sure LGRs are covered by range filter in contour maps. 2018-11-02 16:25:22 +01:00
Magne Sjaastad
0ac2b35fe2 2D contour map : Guard null pointer access 2018-11-02 15:49:13 +01:00
Magne Sjaastad
83d4f42e91 #3623 Grid Items : Sync all grid collections from main grid 2018-11-02 15:42:41 +01:00
Magne Sjaastad
cc7d7d8b65 #3621 Export snapshots : Use hugeval if no result is selected 2018-11-02 13:15:03 +01:00
Magne Sjaastad
5e15e1d8e6 #3613 Fishbones : Crash when user defined locations is empty 2018-11-02 12:30:35 +01:00
Magne Sjaastad
cd61b525a7 System : Do not use generic lambda 2018-11-01 20:01:04 +01:00
Gaute Lindkvist
9730048319 #3597 2d Maps: Implement Top, Sum, Harmonic and Geometric mean aggregation 2018-11-01 16:02:41 +01:00
Gaute Lindkvist
0291dd2237 #3600 Fix crash with 2d Maps and LGRs. 2018-11-01 13:22:31 +01:00
Bjørn Erik Jensen
8d2813ab39 #3460 Well Path Creation. Rename DL columns 2018-11-01 10:46:37 +01:00
Bjørn Erik Jensen
46bf5119c3 #3462 Well Plan Header. Use MDRKB and renaming 2018-11-01 10:25:41 +01:00
Gaute Lindkvist
ee388ca4b0 #3591 Improve edges on contour map. 2018-10-31 16:17:09 +01:00
Bjørn Erik Jensen
f87f1430dc #3461 Well Path Creation. Add field MDRKB at First Target 2018-10-31 14:55:27 +01:00
Gaute Lindkvist
32fb09ca3c #3590 Fix changing ov property filter of linked maps. Stop being able to modify a slave. 2018-10-31 13:04:58 +01:00
Gaute Lindkvist
78d81d2630 #3573 Draw axis lines across the whole view for 2d Contour Maps. 2018-10-31 12:13:04 +01:00
Gaute Lindkvist
fc9686faae #3586 Several minor improvements to 2d maps 
* disable z-scale
* hide some cell and grid appearance groups
* disable grid lines on faults
 2018-10-31 11:03:10 +01:00
Gaute Lindkvist
68eef3f9d8 #3586 Remove separate legend for 2d Grid Projection 2018-10-31 10:36:58 +01:00
Gaute Lindkvist
7975d0a1e4 #3579 Fix crash when selecting none as cell result. 2018-10-31 10:36:13 +01:00
Jacob Støren
0b1bc21d0d Use "Save" icon for export. Changed a misleading Fishbones icon with the correct completions icon 2018-10-31 09:48:37 +01:00
Jacob Støren
6374708520 Set default background color of contour maps to off-white 2018-10-31 09:48:36 +01:00
Jacob Støren
a1705c5e39 #3487 Use icons for the different MSW valves 2018-10-31 09:48:36 +01:00
Gaute Lindkvist
0d3b205dac #3589 Fix regression in column width for table in well path creation. 2018-10-31 09:32:10 +01:00
Jacob Støren
68d34d7000 #3577, #3537, #3487 New icons created, and some put into place. 2018-10-30 17:26:30 +01:00
Gaute Lindkvist
69d079f942 #3505 First go at contour lines 2018-10-30 16:25:33 +01:00
Bjørn Erik Jensen
1227eff8bf #3585 Range Filter. Hide Single Cell Filtering if development features are disabled 2018-10-30 14:24:23 +01:00
Gaute Lindkvist
eb46fad1ec #3501 Support property filters for 2d Maps 2018-10-30 11:44:00 +01:00
Magne Sjaastad
d353cfb8ec #3558 Grid items in Project Tree : Use main grid to control fault visibility 2018-10-29 11:23:19 +01:00
Magne Sjaastad
a424546e7c Revert "#3558 Grid items in Project Tree : Use main grid to control fault visibility" 
This reverts commit 6d55b5d242.
 2018-10-29 11:23:19 +01:00
Magne Sjaastad
6d55b5d242 #3558 Grid items in Project Tree : Use main grid to control fault visibility 2018-10-29 09:18:00 +01:00
Magne Sjaastad
e3d985d220 #3558 Grid items in Project Tree : Remove obsolete field showMainGrid 2018-10-26 16:23:18 +02:00
Magne Sjaastad
5906e68245 #3558 Grid items in Project Tree : Control grid visibility from checked state 2018-10-26 16:08:27 +02:00
Magne Sjaastad
42de5833a9 #3558 Grid items in Project Tree : Set name/index read only, enable checkbox 2018-10-26 15:43:35 +02:00
Magne Sjaastad
b5dc2c7f94 #3558 Grid items in Project Tree : Use function instead of variable 2018-10-26 15:38:09 +02:00
Magne Sjaastad
38f3e7d03d #3558 Grid items in Project Tree : Use childObjects 2018-10-26 15:31:32 +02:00
Magne Sjaastad
7813527a33 #3533 Perforation Interval : Whitespace and cleanup 2018-10-26 12:09:29 +02:00
Magne Sjaastad
5f329509c3 #3533 Perforation Interval : Allow init of sliders for two well targets 2018-10-26 12:09:05 +02:00
Magne Sjaastad
fbaa49b72c #3565 Cell Edge : Move field private and whitespace fixes 2018-10-25 22:15:23 +02:00
Magne Sjaastad
fb57cf048d #3565 Cell Edge : Remove explicit delete, handled by destructor of child field 2018-10-25 22:14:37 +02:00
Magne Sjaastad
81ff5f70af CellEdge : Early exit if not enabled 2018-10-25 21:08:29 +02:00
Bjørn Erik Jensen
a3cf7ff2ac #3518 LGR export/temp LGR. Checkbox for completion types. Dialog adjustments 2018-10-25 13:18:11 +02:00
Bjørn Erik Jensen
c5ccd30a14 Temp LGR. Disable IO for temporary LGRs collection 2018-10-25 11:22:18 +02:00
Gaute Lindkvist
8ad1748597 #3550 Allow linking of selected views 2018-10-24 15:29:28 +02:00
Gaute Lindkvist
b316e1ee83 #3552 and #453 Tile windows by master/managed view + position if they have different positions 2018-10-24 15:21:54 +02:00
Gaute Lindkvist
f80472ffa6 #3540 Create seperate 2d view with parallel, look down and linked views 2018-10-24 15:21:53 +02:00
Magne Sjaastad
166d7dcb6c #3549 Temporary LGR : Delete cached extractors and redraw curves 2018-10-24 13:17:33 +02:00
Bjørn Erik Jensen
608dae30a0 #3517 Temp LGR. Add nodes below Grids node. Command for deleting temp LGRs 2018-10-24 13:01:30 +02:00
Gaute Lindkvist
1d0fc606d3 Fix ubuntu build problem due to fabs() use without header 2018-10-22 10:38:39 +02:00
Gaute Lindkvist
b316aff35a #3528 Allow deleting of the whole casing design table. 2018-10-22 09:35:35 +02:00
Gaute Lindkvist
9abbdb2fd8 #3528 Make Casing Design a child object under well path. 2018-10-22 09:35:35 +02:00
Gaute Lindkvist
2194821609 #3527 Implement multiple ICD/AICDs for perforation intervals. 2018-10-22 09:35:35 +02:00
Gaute Lindkvist
43552fde88 #3527 Split out the valve locations from RimFishbonesMultipleSubs.h 2018-10-22 09:35:35 +02:00
Magne Sjaastad
4632fd7dff Whitespace 2018-10-19 15:43:29 +02:00
Magne Sjaastad
fa2d96ebcf #3534 Completion Export : Hide option when width values are missing 2018-10-19 15:28:13 +02:00