Commit Graph

7943 Commits

Author SHA1 Message Date
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
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
47f3004cd0 #3554 Temprorary LGR : Set several properties to undefined (infinity) 2018-10-25 21:08:29 +02:00
Magne Sjaastad
cc8f42f878 #3554 Temprorary LGR : Early exit if no active cells 2018-10-25 21:08:29 +02:00
Magne Sjaastad
829c3cd9aa #3554 Temprorary LGR : Do not add LGR if no active fracture cells 2018-10-25 21:08:29 +02:00
Magne Sjaastad
81ff5f70af CellEdge : Early exit if not enabled 2018-10-25 21:08:29 +02:00
sigurdp
8ca73960f4 #3561 HoloLens: Establish sharing server session and publish visualization data to sharing server 2018-10-25 15:34:48 +02:00
Magne Sjaastad
23d6e8ee2a
Merge pull request #3548 from bska/scaling-bugfix
Update Flow Diagnostics Application Library
2018-10-25 14:47:12 +02:00
Magne Sjaastad
b9465c070f #3549 Temporary LGR : Make sure values are recomputed when required 2018-10-25 14:36:35 +02:00
Magne Sjaastad
d35888b5de Remove obsolete include 2018-10-25 14:16:45 +02:00
Magne Sjaastad
74bcc84281 #3549 Temporary LGR : Use activeCellCount when creating a property not found on file 2018-10-25 14:11:52 +02:00
Bård Skaflestad
dc8931f782 Update Flow Diagnostics Application Library
Fixes incorrect horizontal and vertical end-point scaling of model's
saturation functions.

API Change: No longer supports user-selected behaviour for treating
scaled end-points with a sentinel value (-1.0E+20).  That option was
introduced due to incomplete understanding of the semantics of the
sentinel value.  Now that we understand the meaning (use actual,
unscaled end-point value from input table), we no longer need the
option.  Update the calling code in RigFlowDiagSolverInterface.cpp
accordingly.
2018-10-25 13:40:08 +02:00
Magne Sjaastad
87622d2e85 #3549 Temporary LGR : Clear selection 2018-10-25 13:38:58 +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
Magne Sjaastad
58655c481e #3549 Temporary LGR : Make sure size of depth properties is at least active cell count 2018-10-25 13:12:55 +02:00
Magne Sjaastad
6f6f45df26 #3549 Temporary LGR : Reload data in view 2018-10-25 12:12:40 +02:00
Magne Sjaastad
a9457b85c8 #3549 Temporary LGR : Reload grid after creating LGRs 2018-10-25 12:05:28 +02:00
Magne Sjaastad
e0202f87af #3549 Temporary LGR : Use activeCellInfo when computing depth properties 2018-10-25 11:50:29 +02:00
Magne Sjaastad
29c89eb135 #3549 Temporary LGR : Do not append temporary result values if no data is read from file 2018-10-25 11:50:29 +02:00
Bjørn Erik Jensen
c5ccd30a14 Temp LGR. Disable IO for temporary LGRs collection 2018-10-25 11:22:18 +02:00
Magne Sjaastad
bb674e7504 #3557 HoloLens : Add export folder to preferences 2018-10-25 09:25:53 +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
45531865ba Whitespace 2018-10-24 13:17:33 +02:00
Magne Sjaastad
71d9f742d9 #3549 Temporary LGR : Recompute completion factors 2018-10-24 13:17:33 +02:00
Magne Sjaastad
166d7dcb6c #3549 Temporary LGR : Delete cached extractors and redraw curves 2018-10-24 13:17:33 +02:00
Magne Sjaastad
6445ab05fe #3531 Temporary LGR : Simplify adding of grid to active cell info 2018-10-24 13:17:33 +02:00
Magne Sjaastad
e33bfc895f #3531 Temporary LGR : Reorganize clearing of cache data 2018-10-24 13:17:33 +02:00
Magne Sjaastad
145323d8b1 #3531 Temporary LGR : Compute size dependent data for LGR 2018-10-24 13:17:33 +02:00
Magne Sjaastad
2e248fee2a #3531 Temporary LGR : Rebuild cell bounding box search tree 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
Magne Sjaastad
08776a09b3 #3531 Temporary LGR : Move function and whitespace changes 2018-10-23 21:36:20 +02:00
Magne Sjaastad
577a706b57 #3531 Temporary LGR : Copy value from main grid cell to temporary cells 2018-10-23 21:29:23 +02:00
Magne Sjaastad
8c344a0c6e #3531 Temporary LGR : Free all memory to trigger reload from file 2018-10-23 21:23:38 +02:00
Magne Sjaastad
76a48a8f87 #3531 Temporary LGR : Add helper methods for grid and cell count 2018-10-23 15:28:04 +02:00
Magne Sjaastad
d2972d144a #3531 RigMainGrid : Several refactoring operations
Move impl to cpp
Remove obsolete includes
Whitespace fix
2018-10-23 15:12:46 +02:00
Magne Sjaastad
158222217a #3531 Clear all selected objects as part of reload case 2018-10-23 14:53:20 +02:00
Bjørn Erik Jensen
82ad3ee675 #3515 LGR Export/Temp LGR. Fix build error 2018-10-23 11:34:15 +02:00
Bjørn Erik Jensen
ffa1a85187 #3515 LGR Export/Temp LGR. New split type: One LGR per Completion 2018-10-23 11:13:55 +02:00
Magne Sjaastad
cdda4d74df #3541 HoloLens : Create dummy file backed feature 2018-10-22 12:36:14 +02:00
Magne Sjaastad
3f7d85e2e1 #3541 HoloLens : Use RicHoloLensSession to control state of toolbar buttons 2018-10-22 12:36:14 +02:00
Magne Sjaastad
24a075499e #3541 HoloLens: Create session object 2018-10-22 12:36:14 +02:00
Magne Sjaastad
75174a47e8 Whitespace 2018-10-22 12:36:14 +02:00
Gaute Lindkvist
1d0fc606d3 Fix ubuntu build problem due to fabs() use without header 2018-10-22 10:38:39 +02:00
Bjørn Erik Jensen
f495c38406 #3532 LGR export. Do not lookup PORO result during temp LGR creation/export 2018-10-22 10:24:38 +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
Bjørn Erik Jensen
fc4620985f #3493 LGR Export. Command file command exportLgrForCompletions 2018-10-22 09:31:41 +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
Magne Sjaastad
59f0112f2e #3534 Completion Export : Guard for missing width values 2018-10-19 15:28:13 +02:00
Gaute Lindkvist
5cddab62ac #3529 Scale length of 3D well path components by well path radius 2018-10-19 15:01:04 +02:00
Gaute Lindkvist
229d098e3d #3525 Remove valves from well path attributes 2018-10-19 15:01:04 +02:00
Gaute Lindkvist
814fc334cc #3535 2d Maps: Improve performance of grid projection 2018-10-19 15:00:45 +02:00
Bjørn Erik Jensen
0a141c322a #3494 LGR export. Fix layout of I J K fields 2018-10-19 13:07:47 +02:00
Bjørn Erik Jensen
e06de21e88 #3494 LGR export. Set correct dialog title 2018-10-19 12:40:52 +02:00
Bjørn Erik Jensen
d239b3e6b3 #3514 LGR Export. Do not export PORO keyword 2018-10-19 12:31:30 +02:00
Bjørn Erik Jensen
abc25b833f #3485 Temp LGR. Ensure unique LGR names 2018-10-19 11:33:57 +02:00
Bjørn Erik Jensen
fd1df547f9 Fix warning 2018-10-19 11:33:31 +02:00
Bjørn Erik Jensen
1c7fd7fb96 #3485 Temp LGR. Removed commented code 2018-10-19 11:21:40 +02:00
Bjørn Erik Jensen
9d90f54d5f #3474 LGR Export. Create temporary LGR. Take 1 2018-10-19 10:44:07 +02:00
Bjørn Erik Jensen
3edfd1dca6 LocalGrid. Move implementation to cpp file 2018-10-19 10:43:17 +02:00
Magne Sjaastad
822645e264 #3524 HoloLens : Add toolbar and icons for operations 2018-10-19 10:09:45 +02:00
Magne Sjaastad
1727ab959a #3524 HoloLens : Add icons 2018-10-19 10:09:45 +02:00
Magne Sjaastad
a87eca531c #3523 Holo Lens : Add features for communication with web server 2018-10-19 10:09:45 +02:00
Gaute Lindkvist
e3b7cc0558 #3521 Make different size casings take up different columns. 2018-10-18 20:15:31 +02:00
Gaute Lindkvist
8e5e58037c #3522 Move grid projection plane below the grid. 2018-10-18 20:15:10 +02:00
Magne Sjaastad
6346ed012c clang-tidy : Remove redundant 'virtual' and add 'override' 2018-10-18 19:45:57 +02:00
Magne Sjaastad
c8285602b1 #3512 Move text file describing functions deleted 2018-10-18 16:59:10 +02:00