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,563 Commits 59 Branches 85 Tags
b5f0459843cf5c3cbc99ba451a5ee908d01ad58c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Magne Sjaastad c6df9eb7e7 Upped to 2018.11-dev.01 2018-11-29 07:06:56 +01:00
Magne Sjaastad 3b5011d573 Merge remote-tracking branch 'origin/dev' into dev-deeper 2018-11-28 13:56:36 +01:00
Magne Sjaastad 2aa838ee6b Update of keywords 2018-11-28 13:54:46 +01:00
Magne Sjaastad 6d251edf92 Include dev in version info 2018-11-28 12:04:31 +01:00
Magne Sjaastad 4c2d3e0130 Merge pull request #3774 from OPM/master 
Merge pull request #3771 from OPM/dev
 2018-11-28 12:00:18 +01:00
Magne Sjaastad bd44ec8d51 Merge pull request #3771 from OPM/dev 
Merge dev into master for Release 2018.11
 2018-11-28 09:39:16 +01:00
Magne Sjaastad 5f9a80b438 Upped to 2018.11 2018-11-28 09:25:38 +01:00
Magne Sjaastad 5496430de7 Upped version to ResInsight-2018.11.0-RC1 2018-11-27 14:11:55 +01:00
Magne Sjaastad f6572e876d #3704 : Export completions : WELSPECL - one line per well 2018-11-26 12:46:32 +01:00
Magne Sjaastad 243633137a #3753 : Non-Darcy perforations : Use effectiveK and effectiveH 2018-11-26 10:07:35 +01:00
Magne Sjaastad 268fc4f368 #3753 : Non-Darcy perforations : Add calculation of effective height 2018-11-26 10:07:35 +01:00
Magne Sjaastad 4f46a9b3cb #3715 Well connection factor viz : Show fracture well connection factors in cell center 2018-11-23 13:05:34 +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 200e6d229b #3748 Statistics calculators : Improve handling of invalid numbers 2018-11-23 10:13:58 +01:00
Magne Sjaastad f9a6957fae #3748 Statistics calculator : Add helper functions for (in)valid numbers 2018-11-23 10:12:23 +01:00
Magne Sjaastad 5e7ebcd0f6 #3748 Statistics calculators : Add tests for statistics calculators 
Add negative infinity to input data to trigger failing tests
 2018-11-23 09:12:56 +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
Magne Sjaastad 314c20a04a #3735 Summary plot : Improve stepping for well path name 2018-11-22 15:24:18 +01:00
Magne Sjaastad 17524f66f8 #3696 Non-Darcy perforation intervals : Set default radius 2018-11-22 09:50:50 +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
Magne Sjaastad eebab64625 #3713 Fracture header : Compute matrix permeability and create weighted average 2018-11-21 13:44:31 +01:00
Magne Sjaastad bc12dc44eb #3713 Fracture header : Add computation of matrix permeability 2018-11-21 13:43:15 +01:00
Magne Sjaastad 11de63a5ef Fix Linux build 2018-11-21 10:55:57 +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
Magne Sjaastad 212f80f92e #3709 Fracture : Mix of both main grid and LGR cells when computing completion data 2018-11-19 21:31:03 +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 bab90456c7 #3694 Stimplan : Add support for effective width using unit mm 2018-11-19 10:39:15 +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
Magne Sjaastad 9cd695278e #3695 Well path creation : Crash when creating a vertical well 
Caused by two identical reference points next to each other
 2018-11-16 08:43:19 +01:00
Magne Sjaastad e100c679d3 Temporary fix : Remove call to missing function 2018-11-15 07:15:03 +01:00
Magne Sjaastad 4d924e2d17 Merge pull request #3682 from bska/refactor-flux-calc 
Refactor Flux Calculator to Eliminate Warnings and Reduce Clutter
 2018-11-14 15:28:47 +01:00
Magne Sjaastad 9589d0fbb7 System : Remove warning from header file in boost subset 2018-11-14 15:27:48 +01:00
Magne Sjaastad 32eb83712f Upped to version 2018.05.01-dev.12 2018-11-14 14:09:19 +01:00
Magne Sjaastad cbc0e55303 #3686 Completion Export : Fix less than operator for RigCompletionDataGridCell 2018-11-14 12:22:08 +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
Magne Sjaastad 1121abbfac #3686 Completion Export : Add null pointer guard 2018-11-14 11:32:14 +01:00
Magne Sjaastad f644a5ae34 #3679 Temporary LGR : Missing null pointer guarding 2018-11-13 14:51:22 +01:00
Magne Sjaastad 7963a18928 Merge pull request #3671 from bska/dont-crash-on-unexpected 
Don't crash on Unexpected Input
 2018-11-13 10:24:14 +01:00
Magne Sjaastad 3b9cdf5a92 #3588 Intersect : Add support for import of Intersect data 2018-11-13 09:52:28 +01:00
Magne Sjaastad 9b41685035 #3662 AppFwk : Allow interaction in second main window 2018-11-12 09:49:35 +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
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
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
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
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
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
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
Magne Sjaastad 10394f1571 Move black from first to last palette color for well log plot curves 2018-11-06 13:37:01 +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
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
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
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
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
Magne Sjaastad 4831cffc99 Add missing include 2018-11-01 06:46:44 +01:00