OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-08-15 15:45:11 -05:00
Code Issues Packages Projects Releases Wiki Activity
9,444 Commits 54 Branches 82 Tags
9cd695278e68464a2d591c8836f486e5dde79117
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Magne Sjaastad 6c25aff479 Upped to version 2018.05.01-dev.11 2018-10-31 12:35:39 +01:00
Magne Sjaastad 715003f58e #3587 Clear all selections as part of delete of temporary LGRs 2018-10-30 14:02:27 +01:00
Magne Sjaastad d353cfb8ec #3558 Grid items in Project Tree : Use main grid to control fault visibility 2018-10-29 11:23:19 +01:00
Magne Sjaastad a424546e7c Revert "#3558 Grid items in Project Tree : Use main grid to control fault visibility" 
This reverts commit 6d55b5d242.
 2018-10-29 11:23:19 +01:00
Magne Sjaastad 6d55b5d242 #3558 Grid items in Project Tree : Use main grid to control fault visibility 2018-10-29 09:18:00 +01:00
Magne Sjaastad e3d985d220 #3558 Grid items in Project Tree : Remove obsolete field showMainGrid 2018-10-26 16:23:18 +02:00
Magne Sjaastad 5906e68245 #3558 Grid items in Project Tree : Control grid visibility from checked state 2018-10-26 16:08:27 +02:00
Magne Sjaastad 42de5833a9 #3558 Grid items in Project Tree : Set name/index read only, enable checkbox 2018-10-26 15:43:35 +02: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 38f3e7d03d #3558 Grid items in Project Tree : Use childObjects 2018-10-26 15:31:32 +02:00
Magne Sjaastad 4a07398871 Header and white space cleanup 2018-10-26 13:25:36 +02:00
Magne Sjaastad 7813527a33 #3533 Perforation Interval : Whitespace and cleanup 2018-10-26 12:09:29 +02:00
Magne Sjaastad 5f329509c3 #3533 Perforation Interval : Allow init of sliders for two well targets 2018-10-26 12:09:05 +02:00
Magne Sjaastad f6c92a15a6 #3564 System : Recreate QGridLayout for each property editor 
If the layout is reused, the rows grow over time. This causes the Cell Result to not fill all available space.
 2018-10-26 11:39:58 +02:00
Magne Sjaastad 7febeba433 #3563 Temporary LGR : Use infinity() instead of max() 2018-10-25 22:23:58 +02:00
Magne Sjaastad fbaa49b72c #3565 Cell Edge : Move field private and whitespace fixes 2018-10-25 22:15:23 +02:00
Magne Sjaastad fb57cf048d #3565 Cell Edge : Remove explicit delete, handled by destructor of child field 2018-10-25 22:14:37 +02:00
Magne Sjaastad 47f3004cd0 #3554 Temprorary LGR : Set several properties to undefined (infinity) 2018-10-25 21:08:29 +02:00
Magne Sjaastad cc8f42f878 #3554 Temprorary LGR : Early exit if no active cells 2018-10-25 21:08:29 +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
Magne Sjaastad 81ff5f70af CellEdge : Early exit if not enabled 2018-10-25 21:08:29 +02:00
Magne Sjaastad 23d6e8ee2a Merge pull request #3548 from bska/scaling-bugfix 
Update Flow Diagnostics Application Library
 2018-10-25 14:47:12 +02:00
Magne Sjaastad b9465c070f #3549 Temporary LGR : Make sure values are recomputed when required 2018-10-25 14:36:35 +02:00
Magne Sjaastad d35888b5de Remove obsolete include 2018-10-25 14:16:45 +02:00
Magne Sjaastad 74bcc84281 #3549 Temporary LGR : Use activeCellCount when creating a property not found on file 2018-10-25 14:11:52 +02:00
Magne Sjaastad 87622d2e85 #3549 Temporary LGR : Clear selection 2018-10-25 13:38:58 +02:00
Magne Sjaastad 58655c481e #3549 Temporary LGR : Make sure size of depth properties is at least active cell count 2018-10-25 13:12:55 +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
Magne Sjaastad e0202f87af #3549 Temporary LGR : Use activeCellInfo when computing depth properties 2018-10-25 11:50:29 +02:00
Magne Sjaastad 29c89eb135 #3549 Temporary LGR : Do not append temporary result values if no data is read from file 2018-10-25 11:50:29 +02:00
Magne Sjaastad bb674e7504 #3557 HoloLens : Add export folder to preferences 2018-10-25 09:25: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