Commit Graph

4127 Commits

Author SHA1 Message Date
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
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