Bjørn Erik Jensen
4d98ac04e8
Merged patch to dev. #2429 , #2430
2018-01-31 15:53:02 +01:00
Bjørn Erik Jensen
60afae10ad
#2429 , #2430 . Display perforations correctly
2018-01-31 15:34:50 +01:00
Rebecca Cox
e50f7bf66f
#2428 Fracture: Reorganize Fracture Colors tree item
2018-01-31 15:11:46 +01:00
Magne Sjaastad
d7fa97f052
Fix wrong include path
2018-01-31 13:54:58 +01:00
Magne Sjaastad
33ef2948f4
Merge "Completion Export LGR" into dev
...
#2425 #1758 #2423
2018-01-31 13:38:05 +01:00
Rebecca Cox
61d8a76587
#2390 Fracture: Set minimum 10 m perf length
2018-01-31 12:43:42 +01:00
Rebecca Cox
b2bdd996d2
#2389 Fracture: Set perforation length and depth from file values
2018-01-31 12:25:58 +01:00
Magne Sjaastad
6f0f73a017
#1758 Add direct access to RigMainGrid from RimEclipseCase
2018-01-31 10:20:47 +01:00
Bjørn Erik Jensen
7779ff5ed0
Merge branch '2018.01.01-patch' into dev. #2229
2018-01-31 08:33:51 +01:00
Bjørn Erik Jensen
bc72c86497
#2229 curve creator. Update when adding/deleting observed summary cases
2018-01-30 15:51:48 +01:00
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
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
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
f598e6905c
#2419 Do not make OpmFlowDiagStat if result is fracture (DUAL)
2018-01-29 14:41:07 +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
4a4dab3f1c
#2408 summary plot. Update qwt axis when duplicating curves
2018-01-29 12:46:34 +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
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
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
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
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
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
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
Magne Sjaastad
aa6b657027
#2141 : Fracture : Show conductivity result name from file
2018-01-25 14:24:54 +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
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
