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,530 Commits 27 Branches 61 Tags 309 MiB
0fa5a5b000
Commit Graph

8015 Commits

Author SHA1 Message Date
Gaute Lindkvist
37f1cde219 #3664 Pressure Depletion: report correct units for initial WBHP. 2018-11-12 14:30:18 +01:00
Gaute Lindkvist
97f3cbc18d #3656 Improve display of Y-axis values. 2018-11-12 14:30:18 +01:00
Magne Sjaastad
c95fa81a23 Use size_t instead of int 2018-11-12 08:06:16 +01:00
Magne Sjaastad
cfbbcacc23 #3634 Regression Test : Use flag to control OpenMP when building geometry 2018-11-12 07:33:08 +01:00
Magne Sjaastad
ca07e710c6 #3655 Fracture header : Adjust number of numbers and improve header 2018-11-11 17:18:59 +01:00
Magne Sjaastad
c5fc0d34e4 Whitespace 2018-11-11 14:07:42 +01:00
Magne Sjaastad
a103e22e0a Export visible cells : Clear scheduled views before exporting visible cells 2018-11-11 14:07:28 +01:00
Magne Sjaastad
2f19ea35cb Reset LGR id before creating LGRs 2018-11-11 13:49:40 +01:00
Magne Sjaastad
ae94785634 #3659 Regression Test : Make sure exported snapshots have same size 2018-11-11 12:58:51 +01:00
Magne Sjaastad
99f182e74d #3659 Regression Test : Use range based for 2018-11-11 12:57:51 +01:00
Magne Sjaastad
937e1f16d4 #3659 Regression Test : Extract functions 2018-11-11 11:52:53 +01:00
Gaute Lindkvist
667518c849 #3628 2d Maps: Weighting by result parameters 2018-11-09 15:25:45 +01:00
Magne Sjaastad
04c993105b Add missing include 2018-11-09 14:20:36 +01:00
Magne Sjaastad
ef17a7c057 #3657 Temporary LGR : Set transmissibility to zero for temporary grid cells in non-active cells 2018-11-09 14:12:17 +01:00
Gaute Lindkvist
71701cd79b #3651 Make sure contour map is zoomed property after creation. 
* Always zoom all. It is doubtful the user wants to see the exact zoomed in spot from the 3d View if creating a map from the view.
 2018-11-09 11:47:19 +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
Bjørn Erik Jensen
c122a14bb2 #3645 Temp LGR. Fix LGR name clash 2018-11-09 11:00:07 +01:00
Magne Sjaastad
41a82ecdf3 #3653 Fracture Header : Wrong value for fcd 2018-11-09 10:51:27 +01:00
Magne Sjaastad
e0cc602fab #3652 Fracture Header : Set LPerf N/A for Transverse and Az 2018-11-09 10:51:27 +01:00
Magne Sjaastad
f17ef52836 #3652 Fracture Header : Use N/A 2018-11-09 10:51:27 +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
Magne Sjaastad
0a9f00248b #3603 Export completions. Move export CARFIN into RicWellPathExportCompletionDataFeatureImpl 2018-11-09 09:40:36 +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
Bjørn Erik Jensen
9b8584c707 #3603 Export completions. Also export CARFIN if temporary LGRs exist 2018-11-09 08:51:44 +01:00
Magne Sjaastad
fe3fe5c8f8 #3641 LAS file import : Add support for MD as depth channel name 2018-11-09 08:47:14 +01:00
Magne Sjaastad
fb18e9b170 Temporary LGR : Hide context menu items, remove invalid assert 2018-11-09 08:13:39 +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
25b45fb8fc #3644 Write unit test for cell volume calculation and fix negative volumes for "flipped" cells. 2018-11-08 13:46:57 +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
30f5a76ee4 Silence C4505 warning for Visual Studio 2017 CL 19.13 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
Bjørn Erik Jensen
963c403869 ClangFormat 2018-11-07 15:51:26 +01:00
Bjørn Erik Jensen
e8bf189116 #3640 File commands. New class RicfApplicationTools containing reusable functionality 2018-11-07 15:42:55 +01:00
Magne Sjaastad
06db391689 Temporary LGR : Clear all selections before reloading case 2018-11-07 14:29:34 +01:00
Magne Sjaastad
54434d8f7d #3513 System : Add test code for RicfObjectCapability::writeFields 2018-11-07 10:38:08 +01:00
Bjørn Erik Jensen
95aaa35383 #3608 Temp LGR. Use short name in export due to Eclipse limitations 2018-11-07 09:48:56 +01:00
Magne Sjaastad
f7375a63ce Use zero as default time step 2018-11-07 09:01:25 +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
9b42c9fde6 #3605 Temp LGR. Delete existing temp LGRs when creating new 2018-11-07 07:46:33 +01:00
Bjørn Erik Jensen
7d9c858f13 #3566 Temp LGR. Command file command createLgrForCompletions 2018-11-07 07:00:33 +01:00
Magne Sjaastad
10394f1571 Move black from first to last palette color for well log plot curves 2018-11-06 13:37:01 +01:00
Bjørn Erik Jensen
e72f8a8ced #3611 Temp LGR. Fix build error 2018-11-06 13:33:47 +01:00
Bjørn Erik Jensen
0acddea407 #3611 Temp LGR. Fix LGR splitting by completions issue 2018-11-06 11:29:00 +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
fcd9c78dcf Temporary LGR : Remove invalid test for eclipse view 2018-11-06 11:07:00 +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
Bjørn Erik Jensen
f5329eeac6 #3602 Temp LGR. Add forgotten ampersand 2018-11-06 10:39:45 +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
f30c87491c #3629 System : Add helper function to disable write and set field hidden 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
8f275757dc System : Display graphics card details in about dialog 2018-11-05 12:26:10 +01:00
Magne Sjaastad
ff12b617bb #3625 Fracture header : Report permeability instead of conductivity 2018-11-05 10:53:35 +01:00
Magne Sjaastad
063c0533b3 #3625 Fracture header : Use RigTransmissibilityEquations 2018-11-05 10:53:35 +01:00
Magne Sjaastad
056c22b8af #3625 Fracture header : Add computation of permeability 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
f71c4c75f5 2d Maps: Remove unnecessary prototype code 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
6bec1615e1 HoloLens : Improve icons 2018-11-02 13:02:32 +01:00
Magne Sjaastad
5e15e1d8e6 #3613 Fishbones : Crash when user defined locations is empty 2018-11-02 12:30:35 +01:00
Magne Sjaastad
2cb4a5cf6e #3601 HoloLens : Do not try to create session if the create session dialog is closed 2018-11-02 11:36:46 +01:00
Magne Sjaastad
bd00ea7e84 #3610 Well Path Import : Use last imported grid file as fallback path 2018-11-02 11:36:46 +01:00
Bjørn Erik Jensen
fa81d0411c #3470 Inflow model. New algorithm for calculating averageflow distance 2018-11-02 09:10:05 +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
64227c5a3b #3464 Well Path Export. Simplified 2018-11-01 10:30:42 +01:00
Bjørn Erik Jensen
46bf5119c3 #3462 Well Plan Header. Use MDRKB and renaming 2018-11-01 10:25:41 +01:00
Bjørn Erik Jensen
f90fed9aa1 #3464 Well Path Export. Use formmatter to export data. Several formatting issues 2018-11-01 10:08:19 +01:00
Bjørn Erik Jensen
2bd70b705e #3464 Well Path Export. Add support for setting custom comment prefix in formatter 2018-11-01 10:08:19 +01:00
Bjørn Erik Jensen
e634e28944 Try to fix build error on Linux 2018-11-01 09:35:47 +01:00
Bjørn Erik Jensen
af4d8ee817 Fix warnings 2018-11-01 09:32:26 +01:00
Magne Sjaastad
4831cffc99 Add missing include 2018-11-01 06:46:44 +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
Bjørn Erik Jensen
81608990a0 #3470 InFlow model. New class RiaCellDividingTools. Moved method from RigCellGeometryTools 2018-10-31 14:47:03 +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
e9de865c1f Rebase conrec code off the Paul D. Bourke C-code and fix copyright. 
* Rebased to the C-code by Bourke himself to avoid the sneaky little requirement
added by Nicholas Yue that only allows redistribution with explicit permission.
 2018-10-31 11:31:02 +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
Bjørn Erik Jensen
683ac7ea1e #3463 Well Path Export. Use project folder as default export folder 2018-10-31 08:20:58 +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
Magne Sjaastad
715003f58e #3587 Clear all selections as part of delete of temporary LGRs 2018-10-30 14:02:27 +01:00
Bjørn Erik Jensen
9cddc02066 #3576 Fix after ecllib upgrade 2018-10-30 13:48:24 +01:00
Bjørn Erik Jensen
37d5156b0d LGR export. Renaming 2018-10-30 13:13:58 +01:00
Gaute Lindkvist
eb46fad1ec #3501 Support property filters for 2d Maps 2018-10-30 11:44:00 +01:00
Bjørn Erik Jensen
d2249e4d17 #3581 Temp LGR. No recreation of faults after creating temporary LGRs 2018-10-30 11:41:35 +01:00
Bjørn Erik Jensen
ad3a3f46ee #3578 LGR export. Not exporting LGRs for wells that already have intersecting LGRs 2018-10-30 11:05:27 +01:00
Bjørn Erik Jensen
080b8506cd #3568 Temp LGR. Move splitType to separate header file 2018-10-29 13:38:26 +01:00
Bjørn Erik Jensen
202033b684 #3571 Temp LGR. Fix LGR naming 2018-10-29 13:19:06 +01:00
Gaute Lindkvist
2a97359df2 #3543 Fix Linux build problem 2018-10-29 12:42:48 +01:00
Gaute Lindkvist
7b1704502d #3543 Pressure Depletion: limit text strings for well production start. 2018-10-29 11:44:32 +01:00
Bjørn Erik Jensen
eb7303e743 #3553 Temp LGR. Fix error in LGR intersection check 2018-10-29 11:25:57 +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
Bjørn Erik Jensen
8c0409cfb9 #3553 Temp LGR. Changed completion types ordering in dialog 2018-10-29 10:57:35 +01:00
Bjørn Erik Jensen
a1c8275eed #3553 Temp LGR. Error handling, bug fixes 2018-10-29 10:53:29 +01:00
Bjørn Erik Jensen
04c07154b0 #3553 Temp LGR. Handle overlapping completions. LGR for each completions are sorted by completion type 2018-10-29 10:53:29 +01:00
Gaute Lindkvist
1b155ae71f #3543 Pressure Depletion Indicate the production start of the different wells for the time steps. 2018-10-29 10:00:39 +01:00
Gaute Lindkvist
643dd5596b #3556 Remove gray borders on 2d maps. 2018-10-29 10:00:39 +01:00
Gaute Lindkvist
7f7fd91f20 #3546 Remove Pressure Depletion candidates that are definitely going away. 2018-10-29 10:00:39 +01:00
Gaute Lindkvist
6628b9d734 #3569 Fix bug with Pressure Dep method 4 (fracture well dP over max initial draw down) 2018-10-29 10:00:39 +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
4a07398871 Header and white space cleanup 2018-10-26 13:25:36 +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
7febeba433 #3563 Temporary LGR : Use infinity() instead of max() 2018-10-25 22:23:58 +02:00