Commit Graph
100 Commits
Author SHA1 Message Date
Magne Sjaastad 1311d4eb4d Upped to 2018.11-dev.02 2018-12-12 15:50:07 +01:00
Magne Sjaastad d90c5f07bd Use size_t instead of int 2018-12-12 15:05:36 +01:00
Magne Sjaastad a85b958a0f #3796 Summary Plot Stepping toolbar : Update on plot editor close 2018-12-12 11:21:21 +01:00
Magne Sjaastad e58941a423 Remove duplicate line 2018-12-12 10:45:11 +01:00
Magne Sjaastad eaa0592a9d Add missing initialization 2018-12-11 15:09:19 +01:00
Magne Sjaastad 020146bead Cotire : Move macro definition to avoid duplicate symbols 2018-12-10 09:31:10 +01:00
Magne Sjaastad 069d434584 #3827 Fishbone Laterals : Whole well is exported instead of lateral only 2018-12-05 12:47:11 +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 aa19715c40 #3822 AppFwk : Improve resolve of PtrField, unit test 2018-12-04 14:10:54 +01:00
Magne Sjaastad 90550fe561 #3822 AppFwk : Improve resolve of PtrField 2018-12-04 14:10:18 +01:00
Magne Sjaastad 687aadcfde #3816 Annotations : PdmPtr not resolved correctly 2018-12-04 12:30:47 +01:00
Magne Sjaastad 920467e1f3 Fix signed/unsigned compare 2018-12-04 11:49:29 +01:00
Magne Sjaastad 1c9da3d33f #3820 System : Delete RiuViewer directly instead of deleteLater() 2018-12-04 11:43:58 +01:00
Magne Sjaastad 6bcdd4e6c4 Remove unused code 2018-12-03 20:25:24 +01:00
Magne Sjaastad 4026f21a00 Cotire : Fix duplicate global variables 2018-12-03 15:22:09 +01:00
Magne Sjaastad 0371a1962e Add missing include 2018-12-03 14:50:12 +01:00
Magne Sjaastad 68bc466830 #3792 Use font 10 and 14 2018-12-03 14:19:49 +01:00
Magne Sjaastad 4d25cd0c71 #3792 Add font size 10 and 14 2018-12-03 14:19:49 +01:00
Magne Sjaastad a860adb1fb Fix compare of wrong enum type 2018-12-03 14:03:34 +01:00
Magne Sjaastad 8d0926dd53 Fix Linux build issue 2018-12-03 13:55:48 +01:00
Magne Sjaastad df5179207f Revert unintended entries 2018-12-03 13:53:16 +01:00
Magne Sjaastad 1dc65855ae Merge remote-tracking branch 'origin/dev-deeper' into dev 2018-12-03 13:34:22 +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
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