OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-08-18 00:55:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
9,329 Commits 56 Branches 82 Tags
174998335fa28fad27870a6f07421c9a7966869e
Commit Graph
9329 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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 2143673aa7 #3583 Property Editor : Set unused grid cells to stretch 0 2018-11-02 14:58:08 +01:00
Magne Sjaastad a3aeb424b3 Revert "#3564 System : Recreate QGridLayout for each property editor" 
This reverts commit f6c92a15a6.
 2018-11-02 14:04:29 +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 1a1661b12d System : Add compiler flag c++14 to avoid using too new language features 2018-11-02 11:36:46 +01:00
Magne Sjaastad 794e703043 System : Disable unused unit test 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
Magne Sjaastad 78505bb44d System : Fix name collision of macro expansion 
The macro CAF_PDM_UI_FIELD_EDITOR_SOURCE_INIT expands to a variable name colliding with an identical variable name in a different file. Cotire put the two files into same file, and this causes compilation issues.

Fixed by removing some empty lines in one file, to make sure the two statements are defined at different lines.
 2018-11-01 19:56:55 +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
Magne Sjaastad 6c25aff479 Upped to version 2018.05.01-dev.11 2018-10-31 12:35:39 +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