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
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
Jacob Støren
5640f91b68
#2412 2D Navigation only for Intersectino Views
2018-01-26 14:33:32 +01:00
Jacob Støren
1de088ccba
#2333 Intersection View: Made default view and near/far clip planes behave
2018-01-26 11:19:17 +01:00
Jacob Støren
d8d2076dea
#2333 New Intersection View: Update vertical warningtext. Avoid selecting view in tree.
2018-01-26 11:19:16 +01:00
Jacob Støren
02f6b95959
#2333 Add flattened intersectino geometry. Some view modifications to move towards a final 2D view experience
2018-01-26 11:19:15 +01:00
Rebecca Cox
47d8508196
Merge remote-tracking branch 'origin/2018.01.01-patch' into dev
2018-01-26 10:29:01 +01:00
Rebecca Cox
007602dbf9
#2326 Well allocation plot: Remove formation options regarding well path
2018-01-26 10:28:24 +01:00
Magne Sjaastad
78068e547d
Fix compiler warnings related to converting time_t to double
2018-01-26 08:25:50 +01:00
Magne Sjaastad
889f615d19
#2276 : Source Stepping : Improve region ordering
...
Internally, region numbers are stored in a set and then ordered correctly. When converting to strings for UI, the sorting criteria changes, and the order is wrong. If a vector is used to represent the UI strings, the problem is solved.
2018-01-26 08:16:07 +01:00
Magne Sjaastad
0559084d93
#2325 Summary plot: Apply axis settings on preview plot
2018-01-25 21:16:35 +01:00
Rebecca Cox
4078002770
Merge remote-tracking branch 'origin/2018.01.01-patch' into dev
2018-01-25 18:24:40 +01:00
Rebecca Cox
83ed95a311
#2328 Water flooded PV: Remove warning. Remove injection flooding option if no fluxes are available
2018-01-25 18:24:12 +01:00
Rebecca Cox
b1bf970ff8
Merge remote-tracking branch 'origin/2018.01.01-patch' into dev
2018-01-25 17:04:59 +01:00
Rebecca Cox
5273ace5e6
#2301 Rel.perm Plot: Add tooltip for cell value
2018-01-25 17:04:20 +01:00
Bjørn Erik Jensen
868e1ef075
#2406 delete plot crash. Guard pointer to view
2018-01-25 15:44:28 +01:00
Rebecca Cox
eb03096c1c
Change "QMessageBox" to <QMessageBox>
2018-01-25 15:44:28 +01:00
Rebecca Cox
0bd3f4e74c
#2328 Give warning when user tries to calculate injection flooding without available fluxes
2018-01-25 15:44:28 +01:00
Bjørn Erik Jensen
3a1c6406ff
#2406 delete plot crash. Guard pointer to view
2018-01-25 14:53:51 +01:00
Magne Sjaastad
aa6b657027
#2141 : Fracture : Show conductivity result name from file
2018-01-25 14:24:54 +01:00
Magne Sjaastad
6ff354c7ec
Fix signed/insigned compare
2018-01-25 14:17:10 +01:00
Magne Sjaastad
6ce0037733
#2141 : Fracture : Make sure a new StimPlan fracture get valid defaults
2018-01-25 14:17:10 +01:00
Magne Sjaastad
430b193437
#2402 Fracture : Compute conductivity scaling for all conductivity variants
2018-01-25 14:17:10 +01:00
Magne Sjaastad
827468b764
#2402 Code cleanup
2018-01-25 14:17:10 +01:00
Magne Sjaastad
001742cbd3
#2402 Fracture : Add support for multiple conductivities on a template
2018-01-25 14:17:10 +01:00
Bjørn Erik Jensen
95db322f57
#2384 multi case import. Fix path filtering. Display relative file names
2018-01-25 13:57:09 +01:00
Rebecca Cox
64731fb242
Change "QMessageBox" to <QMessageBox>
2018-01-25 12:00:48 +01:00
Rebecca Cox
ab72981681
#2328 Give warning when user tries to calculate injection flooding without available fluxes
2018-01-25 11:59:49 +01:00
Magne Sjaastad
1e4b4dbf62
Merge remote-tracking branch 'origin/2018.01.01-patch' into dev
2018-01-25 11:14:09 +01:00
Rebecca Cox
a6333128e3
#2328 Fix crash when calculating "Water Flooded PV"
2018-01-24 16:32:48 +01:00
Rebecca Cox
d3f1767ff9
#2362 Grdecl: Read input file only once
2018-01-24 15:01:19 +01:00
Rebecca Cox
0ea10a45eb
#2362 Grdecl SegFault: Guard for empty vectors
2018-01-24 14:58:21 +01:00
Bjørn Erik Jensen
3d2e5b6088
#2383 Eclipse cases import. New command feature using file hierarchy dialog
2018-01-24 14:39:06 +01:00
Bjørn Erik Jensen
3f96ad7ad9
File hierarchy dialog. Trim extensions
2018-01-24 14:37:52 +01:00
Bjørn Erik Jensen
5e46a378aa
#2384 multi case import. New command feature for importing cases into group recursively
2018-01-24 13:18:47 +01:00
Bjørn Erik Jensen
a039bcd0a9
File hierarchy dialog. Stop if no root dir
2018-01-24 13:18:47 +01:00