OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-12 16:32:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
9,581 Commits 59 Branches 85 Tags
5c66b901c3536c447d902b4be910e4ab8071bf85
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gaute Lindkvist 5c66b901c3 #3752 ResInsight code changes to build on both Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist ddb546d877 #3754 Upgrade CAF CMake-system to support both Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist cc7269c717 #3752 CAF code changes to build on both Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist 398a59d0a6 Add some more checks to the SILENCE_TR1 warnings for Ceevis unittests/gtest 2018-11-30 09:47:53 +01:00
Gaute Lindkvist a7e76679e1 #3754 Support both Qt4 and Qt5 in Ceevis build. 2018-11-30 09:47:53 +01:00
Gaute Lindkvist 237623ef21 #3752 CVF Code changes to build on Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist 83c5f63291 #3754 Qt4/Qt5 CMake build configuration for Nightcharts and ExpressionParser 2018-11-30 09:47:53 +01:00
Gaute Lindkvist cc672eb31b #3752 Upgrade Qwt to 6.1.3 to support Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist 100aabd332 CVF Code changes to hide std::tr1 warnings so unit tests build. 2018-11-30 09:47:51 +01:00
Gaute Lindkvist 7fd3dac2ef Revert "#3751 Fix keyboard selection in Summary Plot Editor" 
This reverts commit ab0fa2fb19.

* This change should never have been merged back into the repo.
 2018-11-30 09:45:50 +01:00
Gaute Lindkvist f14d36ca23 #3442 Implement export of ICD/ICV table for performations 2018-11-29 15:26:22 +01:00
Gaute Lindkvist f0d3a36374 #3442 Change defaults for ICDs to values suggested in meeting 2018-11-29 15:25:53 +01:00
Gaute Lindkvist 2414865dbe #3442 UI For ICD/ICV parameters 2018-11-29 15:24:39 +01:00
Gaute Lindkvist 5498c2f466 #3766 Hide blank grid children in GeoMech cases 2018-11-27 13:40:19 +01:00
Gaute Lindkvist 70eca210bf #3765 Support Eclipse cases in Memory Management case list 2018-11-27 13:40:08 +01:00
Gaute Lindkvist d743602b81 #2396 Set better fixed y-axis range for logarithmic scaling 2018-11-27 11:29:55 +01:00
Gaute Lindkvist 49b5b60352 #2396 Add support for locking axes in Cell RelPerm plot 
* Also put curves in a grid layout and
shortened logarithmic label to fit better
 2018-11-27 10:53:14 +01:00
Gaute Lindkvist 8b7b110440 Merge branch 'dev' into dev-deeper 2018-11-26 09:21:33 +01:00
Gaute Lindkvist 40f466fb0c #3751 Fix keyboard selection by overriding keyPressEvent and emitting clicked() 2018-11-26 08:01:54 +01:00
Gaute Lindkvist 80d48fd669 Move QString include to cpp file of RiaStatisticsTool 2018-11-26 08:01:44 +01:00
Gaute Lindkvist ab0fa2fb19 #3751 Fix keyboard selection in Summary Plot Editor 2018-11-23 15:36:33 +01:00
Gaute Lindkvist 2cf5357a47 #3738 Active correct item when clicking in Summary Plot Editor 2018-11-23 15:11:23 +01:00
Gaute Lindkvist 56ae4fa5bd Fix Linux Build Problem after FlowDiag 2018-11-23 08:20:05 +01:00
Gaute Lindkvist a1b7e694a6 #3727 Give packers a more realistic default length 2018-11-22 14:06:03 +01:00
Gaute Lindkvist ae8cb9d210 #3741 Make it possible to enable/disable all well path components in plots and 3d view. 
* Add check box to casing design and update of plot
* Add isEnabled() method to component interface which controls plotting.
 2018-11-22 13:39:08 +01:00
Gaute Lindkvist 132408ab6f #3727 Additional packer fixes 2018-11-22 13:39:08 +01:00
Gaute Lindkvist 9dc2452ba1 #3739 Fix crash in Well Bore Stability plots for synt_small.odb 2018-11-22 13:39:08 +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
Gaute Lindkvist d69153c013 #3489 Fix legend text for flow diagnostics. 2018-11-22 13:39:07 +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
Gaute Lindkvist 4818a4fd71 #3727 Set packer end when you set packer start and still make it available for edit. 2018-11-21 11:38:56 +01:00
Gaute Lindkvist 0eea7d38cf #3728 Put time step into comment table for pressure depletion. 2018-11-21 11:38:56 +01:00
Gaute Lindkvist 094ae45dcd Formatted contour map code and renamed some methods. 2018-11-21 09:33:21 +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 66d5cedb2e #3716 Ensure static results can be shown if there are no dynamic results. 2018-11-20 14:54:30 +01:00
Gaute Lindkvist 9145e6011d #3697 Fix zoom issues with ortographic views 2018-11-20 13:49:19 +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 b41217455f #3689 Change order of result aggregation types 2018-11-20 11:32:02 +01:00
Gaute Lindkvist 58c5f066c3 #3700 Fix bugs related to cell positions and grid extent. 2018-11-20 11:31:22 +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
Gaute Lindkvist 86f40ed8a9 #3580 Fix Linux build problem related to fault appearance 2018-11-19 08:28:45 +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 a1e094625a #3701 Add axis line option to 2d intersection view as well. 2018-11-15 15:02:07 +01:00
Gaute Lindkvist b20e801ae1 #3701 Larger margins around axis text 2018-11-15 15:02:07 +01:00
Gaute Lindkvist 12fbd968ad #3580 Improve visualisation of faults in Contour Map 2018-11-14 15:41:25 +01:00
Gaute Lindkvist 5bdba24148 2d Maps: Fix crash when generating new map without a result variable set 2018-11-14 14:39:13 +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
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
Gaute Lindkvist 47edac084f #3676 Hide riOilColumn when RESINSIGHT_DEVEL isn't set 2018-11-13 14:53:13 +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
Gaute Lindkvist ea053eac2d #3670 Implement initial WBHP changes. 2018-11-13 14:40:59 +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
Gaute Lindkvist 97f3cbc18d #3656 Improve display of Y-axis values. 2018-11-12 14:30:18 +01:00
Gaute Lindkvist 667518c849 #3628 2d Maps: Weighting by result parameters 2018-11-09 15:25:45 +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
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
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
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
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
Gaute Lindkvist 937dacd7df Assert on contourLevel range not being empty for cafContourLines 2018-11-05 14:41:12 +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
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
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
Gaute Lindkvist ee388ca4b0 #3591 Improve edges on contour map. 2018-10-31 16:17:09 +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
Gaute Lindkvist 0d3b205dac #3589 Fix regression in column width for table in well path creation. 2018-10-31 09:32:10 +01:00
Gaute Lindkvist 69d079f942 #3505 First go at contour lines 2018-10-30 16:25:33 +01:00