Commit Graph
7394 Commits
Author SHA1 Message Date
Bjørn Erik Jensen b06c3b443b Merge patch to dev. #2277 2018-01-30 14:25:53 +01:00
Bjørn Erik Jensen e417e3af76 #2277 external files. Improve robustness when importing 2018-01-30 13:48:57 +01:00
Rebecca Cox 4094fd1861 #2421 RelPerm: Remove invalid points on transparent curve 2018-01-30 13:30:05 +01:00
Jacob Støren c9d6d60931 #2331 GeoMech fixes for intersection view. Paste view and animation of synthetic cases. 2018-01-29 16:16:11 +01:00
Jacob Støren 287992df91 #2331 Update Intersection View List when copying and deleting views 2018-01-29 16:16:11 +01:00
Jacob Støren f931b92341 #2412 Disable irrelevant toolbar commands 2018-01-29 16:16:11 +01:00
Jacob Støren 6dead054c4 #2331 Save the 2D Intersection views. Turn off unneccesary fields 2018-01-29 16:16:11 +01:00
Rebecca Cox a5dd38969f Merge to fix #2417 2018-01-29 16:05:02 +01:00
Rebecca Cox 9f08f1264a #2417 Extraction Curves: Avoid clamping time step to -1 2018-01-29 16:04:21 +01:00
Rebecca Cox bbcda37813 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-29 14:47:04 +01:00
Rebecca Cox 5338a6c2ec Merge branch 'dev' of https://github.com/OPM/ResInsight into dev 2018-01-29 14:46:31 +01:00
Rebecca Cox f598e6905c #2419 Do not make OpmFlowDiagStat if result is fracture (DUAL) 2018-01-29 14:41:07 +01:00
Bjørn Erik Jensen 817500980e Merge branch '2018.01.01-patch' into dev 2018-01-29 14:35:35 +01:00
Bjørn Erik Jensen ebabefcd2c #2368 summary plot. Fix right axis properties update issue 2018-01-29 12:49:32 +01:00
Bjørn Erik Jensen 065aa92d16 #2408 summary plot. Update qwt axis when duplicating curves 2018-01-29 12:49:32 +01:00
Rebecca Cox 20e5c27209 #2261 Well Paths: Change newestAddedWellPath to mostRecentlyUpdatedWellPath 2018-01-29 12:49:32 +01:00
Rebecca Cox 27192e8096 Rename variable 2018-01-29 12:49:32 +01:00
Rebecca Cox 17e38130fc #2319 PLT/Well log plot: Remove auto scale on scroll. Make auto scale from file work 2018-01-29 12:49:32 +01:00
Rebecca Cox e416d6557a Add option to avoid updating parent plot 2018-01-29 12:49:32 +01:00
Bjørn Erik Jensen ecfd1ad817 #2368 summary plot. Fix right axis properties update issue 2018-01-29 12:46:34 +01:00
Bjørn Erik Jensen 4a4dab3f1c #2408 summary plot. Update qwt axis when duplicating curves 2018-01-29 12:46:34 +01:00
Rebecca Cox 885c03b9a4 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-29 11:24:56 +01:00
Rebecca Cox d67e1a7d13 #2261 Well Paths: Change newestAddedWellPath to mostRecentlyUpdatedWellPath 2018-01-29 11:24:12 +01:00
Rebecca Cox 438ee340e3 Rename variable 2018-01-29 10:47:54 +01:00
Rebecca Cox a1f969fc11 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-29 10:21:35 +01:00
Rebecca Cox b7a316589a #2319 PLT/Well log plot: Remove auto scale on scroll. Make auto scale from file work 2018-01-29 10:17:42 +01:00
Rebecca Cox 0171589c72 Add option to avoid updating parent plot 2018-01-29 10:17:42 +01:00
Magne Sjaastad 71deeb8954 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-29 10:09:54 +01:00
Magne Sjaastad 41506afe06 #2241 : Workaround for report numbers : Convert to upper case befor calling libecl 2018-01-29 10:09:30 +01:00
Magne Sjaastad ff0599df04 Guard for access of dynamic data with no time steps 2018-01-29 10:04:33 +01:00
Magne Sjaastad 27ee70f90e Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-29 08:48:27 +01:00
Magne Sjaastad b59734160c Use range based for 2018-01-29 08:47:23 +01:00
Magne Sjaastad 9cc090256d #2241 : Do not skip report numbers with -1 2018-01-29 08:46:28 +01:00
Magne Sjaastad c8546eb7e7 #2241 : Improve robustness when reading report numbers from libecl 2018-01-29 08:44:30 +01:00
Magne Sjaastad 33901a115e Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-28 21:31:36 +01:00
Magne Sjaastad aa12ac743a #2418 : Import of text grid model fails when comments is on same line as keyword 2018-01-28 21:29:40 +01:00
Bjørn Erik Jensen fbe9d2d73d Merge branch '2018.01.01-patch' into dev 2018-01-26 15:56:37 +01:00
Bjørn Erik Jensen ca3bb02c57 #2356 grid statistics dialog. Display of Mobile Volume Weighted Mean controlled by info box property 2018-01-26 15:53:13 +01:00
Rebecca Cox 235b1a88fb Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-26 15:49:39 +01:00
Rebecca Cox 84725ced9b Make branch detection toggle hidden if show formations is toggled off 2018-01-26 15:49:18 +01:00
Magne Sjaastad 4d5503afb4 #2385 Main Window: More flexible docking restrictions 2018-01-26 15:44:25 +01:00
Magne Sjaastad f3807c41ad Merge branch '2018.01.01-patch' into dev 2018-01-26 15:10:05 +01:00
Magne Sjaastad 22c49ebe37 #2414 AppFwk : Cleaned up includes 2018-01-26 15:08:40 +01:00
Magne Sjaastad 7c7a54f5aa #2414 AppFwk : Do not overwrite field double value with UI text representation 2018-01-26 15:08:40 +01:00
Magne Sjaastad 1419865b89 #2411 AppFwk : Increase precision when writing real numbers to XML 2018-01-26 15:08:40 +01:00
Magne Sjaastad fe6f64e093 #2414 AppFwk : Cleaned up includes 2018-01-26 14:50:15 +01:00
Jacob Støren 5640f91b68 #2412 2D Navigation only for Intersectino Views 2018-01-26 14:33:32 +01:00
Jacob Støren b1bbbc2aeb Ignore the Resinsight generated index files 2018-01-26 14:31:05 +01:00
Magne Sjaastad 4b00c6e144 #2414 AppFwk : Do not overwrite field double value with UI text representation 2018-01-26 14:30:06 +01:00
Magne Sjaastad 906484bd46 #2411 AppFwk : Increase precision when writing real numbers to XML 2018-01-26 13:46:15 +01:00