OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-11 07:56:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,995 Commits 29 Branches 61 Tags 290 MiB
ffc3515b49
Commit Graph

2085 Commits

Author SHA1 Message Date
Gaute Lindkvist
15576a9ae3 #3779 Preliminary AICD output 2018-12-07 15:48:18 +01:00
Gaute Lindkvist
ddd454077f #3779 Implement accumulator system for ICDs in preparation of using this for AICDs 2018-12-07 15:48:18 +01:00
Bjørn Erik Jensen
a6e9d463f4 #3723 Annotations. Remove commented code. Minor code fixes 2018-12-07 09:52:29 +01:00
Gaute Lindkvist
e677778ddd #3828 Refactor Completion export code by splitting out MSW export into separate files 
* Plus fill in some incomplete functionality regarding MSW export
 2018-12-07 09:46:39 +01:00
Bjørn Erik Jensen
b4482d20b0 #3723 Annotations. User editable polyline, both in in view and in property editor 2018-12-07 09:11:19 +01:00
Gaute Lindkvist
55f980eeb7 Restructure RicMswExportInfo code into multiple files. 2018-12-06 11:32:59 +01:00
Gaute Lindkvist
73be6b6b19 #3779 Split RicMswCompletions into subclasses and move ICD-area and flow coefficient from segment to the icd completion class 2018-12-06 10:55:23 +01:00
Gaute Lindkvist
8fbc1d0953 #3779 Make sure we always have a super valve for segments that overlap with valves. 2018-12-06 10:11:06 +01:00
Gaute Lindkvist
420944e910 #3442 Improve ICD/ICV export to add a small 0.1 length segment for each segment containing valves. 2018-12-05 15:47:16 +01:00
Magne Sjaastad
069d434584 #3827 Fishbone Laterals : Whole well is exported instead of lateral only 2018-12-05 12:47:11 +01:00
Bjørn Erik Jensen
23148c621e #3824 Annotations. 'Create annotation' context menu item on each annotation group 2018-12-05 10:23:15 +01:00
Magne Sjaastad
968da84051 #3816 Annotations : Guard assert with debug ifdef 2018-12-05 07:36:57 +01:00
Magne Sjaastad
af18e30ac6 #3816 Annotations : Assert if resolve of PdmPtrField fails 2018-12-04 14:33:14 +01:00
Magne Sjaastad
0371a1962e Add missing include 2018-12-03 14:50:12 +01:00
Jacob Støren
f3c0345d3a #3757 Improve position of labels when creating them in 3D view 2018-12-03 11:05:12 +01:00
Magne Sjaastad
0ae2dcaccf #3784 Completion Export : Use isCompletionWellPathEqual() 2018-12-03 10:40:15 +01:00
Magne Sjaastad
bbadf3918e #3784 Completion Export : Split on well name instead of well name for export 2018-12-03 10:31:56 +01:00
Magne Sjaastad
52b02a6056 Whitespace 2018-12-03 08:57:28 +01:00
Jacob Støren
a9a5eaf604 #3757 New feature to add a text annotation in the 3D view 2018-11-30 14:30:34 +01:00
Jacob Støren
92a45e959e #3757 Rename RiuSelectionManager to Riu3dSelectionManager 2018-11-30 14:30:34 +01:00
Jacob Støren
c2206abca5 #3757 Wip: Add draggers to text annotation points when text is selected 2018-11-30 14:30:34 +01:00
Gaute Lindkvist
5c66b901c3 #3752 ResInsight code changes to build on both Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
f14d36ca23 #3442 Implement export of ICD/ICV table for performations 2018-11-29 15:26:22 +01:00
Jacob Støren
3cc8ff82d1 #3764 Add annotation related icons 2018-11-28 15:40:28 +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
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
4685d5981d Merge branch 'dev' into dev-deeper 2018-11-28 07:10:56 +01:00
Bjørn Erik Jensen
d138770a2a 3767 Annotations. Feature for deleting annotations 2018-11-27 15:44:00 +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
Jacob Støren
3c32595e25 AppFwk: Moved PdmUi3dObjectEditorHandle and PdmUiSelection3dEditorVisualizer into correct place in PdmUiCore 2018-11-27 10:31:54 +01:00
Jacob Støren
318cd76b64 AppFwk: Split PdmUiObjectEditorHandle into PdmUiWidgetObjectEditorHandle 
making PdmUiObjectEditorHandle  a cleaner interface for PdmUi3dObjectEditorHandle
 2018-11-27 09:31:33 +01:00
Bjørn Erik Jensen
e578deb43c #3756 Annotations. Moved files to subdirs 2018-11-27 09:26:30 +01:00
Jacob Støren
b9b1646576 AppFwk: 3D editor system: Replace pointer to caf::Viewer with generic QWidget, as it is not neccessary to know the viewer explicitly. 2018-11-26 22:37:25 +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
Magne Sjaastad
f6572e876d #3704 : Export completions : WELSPECL - one line per well 2018-11-26 12:46:32 +01:00
Bjørn Erik Jensen
6286a8729b #3706 Annotations. Simple drilling reach circle 2018-11-26 11:08:38 +01:00
Magne Sjaastad
243633137a #3753 : Non-Darcy perforations : Use effectiveK and effectiveH 2018-11-26 10:07:35 +01:00
Gaute Lindkvist
8b7b110440 Merge branch 'dev' into dev-deeper 2018-11-26 09:21:33 +01:00
Bjørn Erik Jensen
35405ebafc #3706 Annotations. First commit. Not tested 2018-11-23 13:33:59 +01:00
Magne Sjaastad
74dc73adf8 #3750 Completion export header : Extract report items per well 2018-11-23 11:44:57 +01:00
Magne Sjaastad
8d9080d695 #3750 Completion export header : Report only referenced fracture templates 2018-11-23 11:32:50 +01:00
Magne Sjaastad
89098705cb Whitespace 2018-11-22 16:02:44 +01:00
Magne Sjaastad
5603fcf21d #3688 Summary Plot : Update of source stepping toolbar fails sometimes 2018-11-22 16:01:27 +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
Magne Sjaastad
a225d1fd1a #3696 Non-Darcy perforation intervals : Remove unit constant from UI 2018-11-22 09:46:40 +01:00
Magne Sjaastad
13f8ad5ea8 #3712 Non-Darcy Perforations : Adjust computation of 'kh' 2018-11-22 09:13:56 +01:00
Gaute Lindkvist
428f2b9851 #3728 Move WBHP source into header of table rather than as a column 2018-11-21 14:07:14 +01:00
Magne Sjaastad
eebab64625 #3713 Fracture header : Compute matrix permeability and create weighted average 2018-11-21 13:44:31 +01:00
Gaute Lindkvist
0eea7d38cf #3728 Put time step into comment table for pressure depletion. 2018-11-21 11:38:56 +01:00
Magne Sjaastad
8a3907e531 #3725 exportSnapshots : Add optional prefix 2018-11-21 10:30:36 +01:00
Magne Sjaastad
1871e558e5 Temporary LGR : Use icon in feature 2018-11-21 08:36:03 +01:00
Gaute Lindkvist
046a2acc67 #3620 Hide the "New Valve" feature if RESINSIGHT_DEVEL is not 1. 2018-11-20 15:38:43 +01:00
Gaute Lindkvist
9763f420a8 #3718 Update 3d View when deleting casing design 2018-11-20 15:32:09 +01:00
Gaute Lindkvist
d51f66179a #3711 Report only pressure depletion tables when we do scaling. 2018-11-20 13:47:59 +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
Magne Sjaastad
71f90b1337 #3692 Export completions : Use 'Mean' and move text to first column header line 2018-11-19 11:37:25 +01:00
Magne Sjaastad
8c521b1775 #3703 Do not resize dialog 2018-11-19 10:12:54 +01:00
Magne Sjaastad
76abf0fe01 Whitespace 2018-11-16 11:38:35 +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
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
Gaute Lindkvist
73b79daa09 #3670 Implement new Pressure Depletion behaviour 
* Removed choice of different scaling
* Always use current pressure delta
* Use the maximum of an epsilon value and the absolute value of the matrix to well pressure drop as the scaling factor
* Remove file name suffixes and update information table in export file.
 2018-11-13 16:48:30 +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
Gaute Lindkvist
ea053eac2d #3670 Implement initial WBHP changes. 2018-11-13 14:40:59 +01:00
Bjørn Erik Jensen
1215235255 #3650 Temp LGR. Fix some issues for split types cell and well 2018-11-13 08:33:09 +01:00
Bjørn Erik Jensen
bb642b2a46 #3650 Temp LGR. New algorithm for creating LGRs for completions 2018-11-13 08:33:08 +01:00
Bjørn Erik Jensen
b1e9841964 #3650 Temp LGR. Process all affected wells in the same operation 2018-11-13 08:33:08 +01:00
Gaute Lindkvist
12e8c3b9b2 #3669 Write Pressure Depletion scaling parameters as comment table in fracture export. 2018-11-12 14:38:32 +01:00
Gaute Lindkvist
e5b8dc49c1 #3663 Pressure Depletion: fix initial time step 2018-11-12 14:30:18 +01:00
Gaute Lindkvist
37f1cde219 #3664 Pressure Depletion: report correct units for initial WBHP. 2018-11-12 14:30:18 +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
04c993105b Add missing include 2018-11-09 14:20:36 +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
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
Magne Sjaastad
0a9f00248b #3603 Export completions. Move export CARFIN into RicWellPathExportCompletionDataFeatureImpl 2018-11-09 09:40:36 +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
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
ad9f86a517 #3630 2d Maps: schedule update of volumes when creating LGRs 2018-11-08 12:52:28 +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
06db391689 Temporary LGR : Clear all selections before reloading case 2018-11-07 14:29:34 +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
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
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
Bjørn Erik Jensen
f5329eeac6 #3602 Temp LGR. Add forgotten ampersand 2018-11-06 10:39:45 +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
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
64227c5a3b #3464 Well Path Export. Simplified 2018-11-01 10:30:42 +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
81608990a0 #3470 InFlow model. New class RiaCellDividingTools. Moved method from RigCellGeometryTools 2018-10-31 14:47:03 +01:00
Jacob Støren
a1705c5e39 #3487 Use icons for the different MSW valves 2018-10-31 09:48:36 +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
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
37d5156b0d LGR export. Renaming 2018-10-30 13:13:58 +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
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
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
b5dc2c7f94 #3558 Grid items in Project Tree : Use function instead of variable 2018-10-26 15:38:09 +02:00
Magne Sjaastad
4a07398871 Header and white space cleanup 2018-10-26 13:25:36 +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
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
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
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
Gaute Lindkvist
8ad1748597 #3550 Allow linking of selected views 2018-10-24 15:29:28 +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
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
8c344a0c6e #3531 Temporary LGR : Free all memory to trigger reload from file 2018-10-23 21:23:38 +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
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