Magne Sjaastad
|
36b4238f13
|
Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
|
2017-02-23 08:44:53 +01:00 |
|
Magne Sjaastad
|
dc886b7e9c
|
Well path delete command supports multi selection
|
2017-02-23 08:42:27 +01:00 |
|
Magne Sjaastad
|
47f207998a
|
#1240 Adjustments to icons and command texts
|
2017-02-23 08:21:45 +01:00 |
|
Magne Sjaastad
|
c8cc667fa1
|
#1240 Use fracture icon for StimPlan colors
|
2017-02-23 07:07:57 +01:00 |
|
Magne Sjaastad
|
139590760f
|
#1240 Added checbox to StimPlan Colors
|
2017-02-22 15:32:19 +01:00 |
|
Magne Sjaastad
|
5ba0a37f34
|
Added missing include
|
2017-02-22 15:08:26 +01:00 |
|
Magne Sjaastad
|
6e5404d943
|
Use *.xml as file filter when opening a StimPlan file
|
2017-02-22 14:46:28 +01:00 |
|
Magne Sjaastad
|
65d71f7106
|
#1250 Show fractures directly as child objects of wells / well path
|
2017-02-22 14:40:13 +01:00 |
|
Magne Sjaastad
|
73690e6d66
|
#1239 Do not show fracture when fracture is unchecked
|
2017-02-22 13:29:20 +01:00 |
|
Magne Sjaastad
|
ac48b31e24
|
#1239 Add checkbox to control visibility of fractures
|
2017-02-22 13:24:07 +01:00 |
|
Magne Sjaastad
|
e67b9e4f59
|
Set visibility to protected to allow for inclusion in derived classes
|
2017-02-22 13:22:32 +01:00 |
|
Magne Sjaastad
|
cc5f5eddd0
|
Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
|
2017-02-22 13:12:23 +01:00 |
|
Magne Sjaastad
|
8eb8a6fd3b
|
#1248 Add namedObject and checkableNamedObject
|
2017-02-22 13:09:31 +01:00 |
|
Magne Sjaastad
|
421dda1042
|
#1245 Property Editor : Use size hint displaying preferences
|
2017-02-22 11:58:56 +01:00 |
|
astridkbjorke
|
407f3734c3
|
#1244 - pre-proto - Improving text for fractures / fracture templates
|
2017-02-22 11:52:06 +01:00 |
|
Magne Sjaastad
|
c180e06172
|
Removed duplicate feature
|
2017-02-22 09:43:15 +01:00 |
|
Magne Sjaastad
|
1753449772
|
Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
ApplicationCode/UserInterface/RiuViewerCommands.cpp
|
2017-02-22 09:42:51 +01:00 |
|
astridkbjorke
|
1a3d695763
|
#1087 - pre-proto - Setting default unit system for fracture templates when reading in a new case.
|
2017-02-22 09:31:10 +01:00 |
|
Magne Sjaastad
|
03932f59c3
|
#1183 Property Filter: Context command : Apply As Cell Result - GeoMech
|
2017-02-21 15:37:56 +01:00 |
|
Magne Sjaastad
|
738e44ed46
|
#1183 Property Filter: Context command : Apply As Cell Result - Eclipse
|
2017-02-21 15:25:36 +01:00 |
|
Magne Sjaastad
|
c76078bd6b
|
Select and expand stored well alloc plot
|
2017-02-21 12:52:33 +01:00 |
|
Magne Sjaastad
|
eb1d8fac1d
|
#1227 Added delete to context menu for stored well alloc plots
|
2017-02-21 12:51:55 +01:00 |
|
Magne Sjaastad
|
0b0055b635
|
#1174 Added icon
|
2017-02-21 10:31:39 +01:00 |
|
Magne Sjaastad
|
7f21582610
|
Use fontMetrics of widget instead of empty QPainter to get valid values
|
2017-02-21 10:31:16 +01:00 |
|
Magne Sjaastad
|
b2ec4e055f
|
#1174 Added Show contributing wells from 3D view
|
2017-02-21 09:49:27 +01:00 |
|
Magne Sjaastad
|
91a962ab21
|
#1174 Rename
|
2017-02-21 09:13:33 +01:00 |
|
Magne Sjaastad
|
401918910a
|
#1231 Moved category handling to new class RimPropertyFilter
|
2017-02-21 08:57:40 +01:00 |
|
astridkbjorke
|
c8460e874f
|
pre-proto - Setting azimuth correctly when changing fracture template
|
2017-02-20 15:39:48 +01:00 |
|
astridkbjorke
|
be49cb2766
|
#1138 - pre-proto - Updating stimPlan legends after reading in xml file
|
2017-02-20 15:39:15 +01:00 |
|
astridkbjorke
|
9f156f9e5f
|
pre-proto - Setting azimuth angle correctly when new fractures are created.
|
2017-02-20 14:44:03 +01:00 |
|
Magne Sjaastad
|
75f2a6cb9f
|
#1236 Property Editor : Scroll bar for reduced screen area
|
2017-02-20 14:32:12 +01:00 |
|
astridkbjorke
|
c84f4efbb1
|
#1138 - pre-proto - Adding field in RimStimPlanColors for transparency
|
2017-02-20 13:24:22 +01:00 |
|
astridkbjorke
|
0a801635dd
|
#1138 - pre-proto - Adding stimPlan color palette (for plotting fracture data)
|
2017-02-20 12:30:26 +01:00 |
|
Magne Sjaastad
|
ad3270e513
|
#1230 Use part priority system
|
2017-02-20 11:10:03 +01:00 |
|
Magne Sjaastad
|
bdbb110ca4
|
Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
ApplicationCode/ModelVisualization/CMakeLists_files.cmake
ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp
|
2017-02-20 11:07:46 +01:00 |
|
Magne Sjaastad
|
b510979151
|
#1230 Use transparent on low values
|
2017-02-20 11:03:18 +01:00 |
|
Magne Sjaastad
|
6c5410f41a
|
#1230 Removed obsolete legend structures
|
2017-02-20 10:05:11 +01:00 |
|
Magne Sjaastad
|
a29f325125
|
Guard time step index
|
2017-02-20 10:04:21 +01:00 |
|
Magne Sjaastad
|
b7aebbb392
|
#1230 Created StimPlan colors and show lenged in 3D view
|
2017-02-20 09:31:24 +01:00 |
|
astridkbjorke
|
d2142c5724
|
#1234 - pre-proto - Adding commands for converting units for all ellipse fracture templates (metric <--> field)
|
2017-02-20 09:13:44 +01:00 |
|
Magne Sjaastad
|
4df861fc9c
|
#1228 Removed bundling of Qt lib files on Linux
A while ago, ResInsight was build using non-system Qt on Linux, and required copy of Qt libs. This is obsolete behaviour and removed.
|
2017-02-19 17:00:46 +01:00 |
|
Magne Sjaastad
|
fb93fbbcc8
|
#1233 Improve system for setting part priorities
|
2017-02-18 12:38:15 +01:00 |
|
Magne Sjaastad
|
52615de9a3
|
#1194 Add some space between end of pipe and wel head arrow
|
2017-02-18 12:38:15 +01:00 |
|
Jacob Støren
|
d69a6e1daa
|
Linux compile fix
|
2017-02-17 16:04:16 +01:00 |
|
Jacob Støren
|
070d9c893b
|
#1209 Added calculation of none-accumulated flows as preparation for #1171 and #1120. Missing handling of wells with inconsistent flow.
|
2017-02-17 15:49:14 +01:00 |
|
Jacob Støren
|
492b777040
|
More refactoring as preparations for #1171, #1120, and #1209
|
2017-02-17 15:49:14 +01:00 |
|
Jacob Støren
|
b7b31f6c03
|
Well Alloc plots: Differentiated gray colors for "Total", "Reservoir" and "Others"
|
2017-02-17 15:49:14 +01:00 |
|
Jacob Støren
|
b00fe21726
|
Refactoring as preparations for #1171, #1120, and #1209
|
2017-02-17 15:49:14 +01:00 |
|
astridkbjorke
|
359f8f9726
|
#1138 - pre-proto - Code cleanup and adding slider for well depth in stimplan file
|
2017-02-17 15:10:04 +01:00 |
|
astridkbjorke
|
1b99c25297
|
#1138 - pre-proto - Added possibility to visualize all properties in input XML stimPlan file
|
2017-02-17 14:14:49 +01:00 |
|
astridkbjorke
|
e971c5276d
|
#1139 - pre-proto - Reading in all parameters available in StimPlan file.
|
2017-02-17 14:14:48 +01:00 |
|
Magne Sjaastad
|
a10b96ba3e
|
Merged branch dev into pre-proto
|
2017-02-17 11:38:32 +01:00 |
|
Magne Sjaastad
|
a4a3a22cdf
|
Added missing include
|
2017-02-17 11:03:20 +01:00 |
|
astridkbjorke
|
1fbc11acc9
|
#1139 - pre-proto - Starting reading in units from XML file
|
2017-02-17 10:11:33 +01:00 |
|
astridkbjorke
|
ab7b86111e
|
pre-proto - Added handling of case where fracture templates have been deleted.
|
2017-02-17 10:11:32 +01:00 |
|
astridkbjorke
|
fa638243ab
|
#1087 - pre-proto - Moving enum for unit system to RimDefines, and establishing default unit system for fracture template collection (used when creating new templates).
|
2017-02-17 10:11:32 +01:00 |
|
astridkbjorke
|
86bd033fa8
|
#1087 - pre-proto - Adding enum for units-system, and adding conversion functions between feet/inch and meter
|
2017-02-17 10:10:21 +01:00 |
|
Magne Sjaastad
|
81c92d2781
|
#1230 Added infrastructure for loadAndUpdate of StimPlan data
|
2017-02-17 09:29:46 +01:00 |
|
Magne Sjaastad
|
aef913739c
|
#1230 Added StimPlan legend configuration object
|
2017-02-17 09:28:46 +01:00 |
|
astridkbjorke
|
65498e5aec
|
#1138 - pre-proto - Fixing symmetry issue
|
2017-02-16 13:05:55 +01:00 |
|
Jacob Støren
|
41fada4d1f
|
#1212 Added a subtle gradient in the flow plots
|
2017-02-16 11:40:02 +01:00 |
|
Jacob Støren
|
590f9995c8
|
1212 Turned off shadow, changed to radial edge gradient to make the colors more easy to read.
|
2017-02-16 11:39:02 +01:00 |
|
Magne Sjaastad
|
3b4fec6196
|
Fixed #1229 Handle reading of invalid summary file
|
2017-02-16 11:09:21 +01:00 |
|
Magne Sjaastad
|
f9d8ab8bad
|
Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
ApplicationCode/Resources/ResInsight.qrc
|
2017-02-16 10:18:39 +01:00 |
|
astridkbjorke
|
8a603c7f73
|
#1138 - pre-proto - Using legend config for controlling colors of stimPlan fracture
|
2017-02-16 09:15:23 +01:00 |
|
Magne Sjaastad
|
f323aa05e4
|
#1194 Well Head : Larger size for pipe part
|
2017-02-16 07:30:18 +01:00 |
|
Magne Sjaastad
|
18f77e16b5
|
#1194 Increased size of arrow head for well head
|
2017-02-16 07:15:01 +01:00 |
|
Jacob Støren
|
afb628d8bc
|
#1207 Added icons for the different aspects of Flow Diag plots. Also adjusted some of the other icons to have a better and more consistent look
|
2017-02-15 18:29:01 +01:00 |
|
Magne Sjaastad
|
a29fe1f7c1
|
Fixed #1223, now pipe can also be rendered without lighting
|
2017-02-15 15:55:24 +01:00 |
|
astridkbjorke
|
3ae816a9aa
|
#1138 - pre-proto - Re-reading data from files when opening stored project. Re-generating geometry when updating values for time-step / parameter to show from stimPlan-file.
|
2017-02-15 15:49:53 +01:00 |
|
Magne Sjaastad
|
037c7c1f73
|
#1174 Use well ordering when creating category legend colors max tracer
|
2017-02-15 15:21:13 +01:00 |
|
astridkbjorke
|
bcd3009066
|
#1138 - pre-proto - Showing data from stimPlan-file on fracture
|
2017-02-15 15:14:16 +01:00 |
|
Magne Sjaastad
|
9a7f187765
|
#1222 Interpolate category colors and assign well color based on sorted order
|
2017-02-15 13:26:59 +01:00 |
|
Jacob Støren
|
4fc0839a33
|
#1211 Disabled tracer allocation for wells with inconsistent flow.
|
2017-02-15 12:29:58 +01:00 |
|
Jacob Støren
|
ad5e18afa6
|
#1226 Show the complete text in the summary plot tooltip text
|
2017-02-15 12:29:58 +01:00 |
|
astridkbjorke
|
1cf6d073fe
|
#1138 - pre-proto - Adding fields for fractures for stimPlan parameter to plot and time step.
|
2017-02-15 12:21:36 +01:00 |
|
Magne Sjaastad
|
c815cfa835
|
#1138 Added result legends
|
2017-02-15 11:29:44 +01:00 |
|
Magne Sjaastad
|
b6b544f13f
|
#1174 Rename to loadDataAndUpdate
|
2017-02-15 10:40:32 +01:00 |
|
Magne Sjaastad
|
f5db37fcf7
|
Use int as category value type
|
2017-02-15 10:38:42 +01:00 |
|
astridkbjorke
|
ff59429ad8
|
#1139 - pre-proto - Adjustments in reading of XML file to handle files with multiple time-steps and several parameters.
|
2017-02-15 10:32:34 +01:00 |
|
Magne Sjaastad
|
e8c5a43e1a
|
#1174 Update legend after result definition has changed
|
2017-02-15 10:26:52 +01:00 |
|
Magne Sjaastad
|
1efbf07711
|
#1174 Avoid load of data in initAfterRead
|
2017-02-15 10:26:16 +01:00 |
|
Jacob Støren
|
ed31dab152
|
#1172 Calculated a grouped tracer contribution value of the tracers below a certain threshold.
|
2017-02-15 08:46:55 +01:00 |
|
Magne Sjaastad
|
43faf00cfa
|
#1194 Use slightly larger pipe radius for open wells
|
2017-02-15 08:14:29 +01:00 |
|
Magne Sjaastad
|
758ac9ef8c
|
#1214 Generalized export of snapshot images for all plot window types
|
2017-02-14 15:03:54 +01:00 |
|
Magne Sjaastad
|
fa0e0d32ef
|
#1214 Use last imported grid file location as fallback path
|
2017-02-14 14:59:08 +01:00 |
|
astridkbjorke
|
3fac46b1a9
|
#1087 - pre-proto - Checking units of case and fractures in export, if mismatch is detected export is aborted.
|
2017-02-14 11:03:38 +01:00 |
|
Magne Sjaastad
|
41836a4930
|
#1138 Added test code for texture scalar mapping
|
2017-02-14 10:29:25 +01:00 |
|
Magne Sjaastad
|
4ff12a4999
|
#1208 Removed duplicate text generation for one grid cell
|
2017-02-14 09:52:02 +01:00 |
|
astridkbjorke
|
3023ddcd78
|
#1087 - pre-proto - Adding units to fracture template and adding command feature for converting length values in ellipseFractureDefinition.
|
2017-02-14 09:49:14 +01:00 |
|
Magne Sjaastad
|
e43f531a0f
|
#1208 Use category text instead of category index
|
2017-02-14 09:47:19 +01:00 |
|
Jacob Støren
|
61e82c37b5
|
#1210 Using defult flow diag results if available when creating Well Alloc Plots
|
2017-02-14 08:30:52 +01:00 |
|
Jacob Støren
|
a25bfd4513
|
#1213 Well allocation plot is now only created when requested.
Also made the fields in FlowPlotCollection private.
|
2017-02-14 08:10:39 +01:00 |
|
Jacob Støren
|
df35335744
|
#1172 Well Alloc plot: Sorted the tracers according to contribution.
|
2017-02-14 08:10:39 +01:00 |
|
Magne Sjaastad
|
92f4abe7c2
|
#1214 Implemented snapshot of well allocation plot
|
2017-02-13 15:47:24 +01:00 |
|
Magne Sjaastad
|
093e02287a
|
Fixed missing include
|
2017-02-13 15:33:42 +01:00 |
|
Magne Sjaastad
|
73053b0bb7
|
#1174 Create TOF property filter with selected tracer
|
2017-02-13 15:00:49 +01:00 |
|
Magne Sjaastad
|
07dc89bceb
|
Cleaned up includes
|
2017-02-13 14:29:02 +01:00 |
|
astridkbjorke
|
3dc836e491
|
#1138 - pre-proto - Setting up nodeCoords and triangleIndices in same loop.
|
2017-02-13 13:46:49 +01:00 |
|
Magne Sjaastad
|
45f3240932
|
#1174 Added context menu to WellAllocationPlot and added feature
|
2017-02-13 13:29:31 +01:00 |
|
Magne Sjaastad
|
9aa98a3895
|
#1078 Assign default colors when a new well is created
|
2017-02-13 13:26:05 +01:00 |
|
Magne Sjaastad
|
62f73260fc
|
#1174 Guard for null pointer access of wellAllocationPlotWidget
|
2017-02-13 13:04:37 +01:00 |
|
Jacob Støren
|
22b3d9fca5
|
#1169 Added unti labels for the three different sets (metric, field, lab)
|
2017-02-13 10:54:21 +01:00 |
|
Jacob Støren
|
edab09823d
|
Whitespace
|
2017-02-13 10:29:58 +01:00 |
|
Jacob Støren
|
321b9e2d62
|
#1173 Made the legend a separate hide/show entity, and changed the overall layout of the well allocation plot
|
2017-02-13 08:44:29 +01:00 |
|
Jacob Støren
|
30ea467f0e
|
Whitespace
|
2017-02-13 08:44:29 +01:00 |
|
Jacob Støren
|
2e806e0cb7
|
#1173 Hide legend in the Well Log part of the Well Alloc Plot by default
|
2017-02-13 08:44:29 +01:00 |
|
Jacob Støren
|
3e7413831a
|
#1173 Added the possibility to hide the legend in a Well Alloc plots ((including WellLog plot )
Also changed the background color to white.
|
2017-02-13 08:44:29 +01:00 |
|
Magne Sjaastad
|
d1743be8e7
|
#1178 Update well allocation plots when well color changes
|
2017-02-10 19:12:21 +01:00 |
|
Magne Sjaastad
|
b3e845ed5e
|
#1178 Use well colors for Max Fraction Tracer
|
2017-02-10 18:53:14 +01:00 |
|
astridkbjorke
|
f6caa938ec
|
#1138 - pre-proto - Visualizing full grid of StimPlan simulation with single colour.
|
2017-02-10 15:29:15 +01:00 |
|
astridkbjorke
|
7f6d9eee1c
|
pre-proto - Adding template<> to appEnum to build on linux
|
2017-02-10 13:43:22 +01:00 |
|
astridkbjorke
|
6c9ee7f059
|
#1198 - pre-proto - Adding enum to control finite / infinite conductivity. Calculation for finite conductivity not yet implemented, so transmissibilitiy calculation will as of now always assume infinite cond.
|
2017-02-10 13:31:23 +01:00 |
|
astridkbjorke
|
fc96b33baa
|
#1197 - pre-proto - Fixes in COMPDAT export
|
2017-02-10 13:31:23 +01:00 |
|
Magne Sjaastad
|
9fa772a7bc
|
Fixed #1177 Well Alloc plots: Store command does not add an actual window
|
2017-02-10 12:31:35 +01:00 |
|
Magne Sjaastad
|
2ee25c6cf5
|
Use triangleIndices instead of polygonIndices
|
2017-02-10 11:32:18 +01:00 |
|
astridkbjorke
|
41a103714e
|
#1196 - pre-proto - Rename to PseudoLenght Location
|
2017-02-10 10:49:36 +01:00 |
|
astridkbjorke
|
0d027a8fdf
|
#1199 - Hiding azimuth angle when fracture orientation is selected along or transverse to well path, and setting ui-order for stimPlanFractureTemplate.
|
2017-02-10 10:33:07 +01:00 |
|
astridkbjorke
|
517c53a069
|
(#1139) - pre-proto - Reading in stimplan XMLfile. Not tested for multiple properties / timesteps. (Also some code clean-up)
|
2017-02-10 10:03:46 +01:00 |
|
astridkbjorke
|
22ee6250bd
|
(#1137) - pre-proto - Adding delete/new command for stimplan fracture templates. Removing RimStimPlanFractureDefinition, functionality moved into RimStimPlanFractureTemplate. Renaming RimFractureDefinitionCollection to RimFractureTemplateCollection.
|
2017-02-10 09:54:37 +01:00 |
|
astridkbjorke
|
d52cfc0f0b
|
(#1136, #1137) - pre-proto - Adding base class RimFractureTemplte, and classes for stimPlan fractureTemplate and data structures. Also adding features for creating new stimPlan Fracture templates.
|
2017-02-10 09:52:18 +01:00 |
|
Magne Sjaastad
|
652df8854d
|
#1180 Use RiaColorTables for several features (well log, summary, flow rates)
|
2017-02-10 08:39:25 +01:00 |
|
Magne Sjaastad
|
3d5781a601
|
#1180 Moved color tables from RimLegendConfig to RiaColorTables
|
2017-02-10 08:37:48 +01:00 |
|
Magne Sjaastad
|
8fffc53629
|
#1180 Use RiaColorTables and deleted RivColorTableArray
|
2017-02-10 08:36:32 +01:00 |
|
Magne Sjaastad
|
722492b5c1
|
#1180 Use RiaColorTables for selection colors in 3D view
|
2017-02-10 08:27:20 +01:00 |
|
Magne Sjaastad
|
3c3e0d96ff
|
#1180 Added color table framework files and color tables
|
2017-02-10 08:22:26 +01:00 |
|
Jacob Støren
|
fb85416b73
|
Fixed #1200
|
2017-02-09 15:32:14 +01:00 |
|
Jacob Støren
|
491e0bcb7c
|
Fixed too much unit conversion...
|
2017-02-09 15:27:34 +01:00 |
|
Jacob Støren
|
65f36d6a3f
|
#1168, #1171 Added new depth types to RimWellLogPlot, with handling of unit type "none" as well. Made Well Alloc Plots make only "Connection Number" available on its WellLogPlot
|
2017-02-09 13:31:25 +01:00 |
|
Jacob Støren
|
dea5c8fc8c
|
#1205 Added a none option to Well Alloc Plot Flow Solution menu
|
2017-02-09 13:31:25 +01:00 |
|
Magne Sjaastad
|
5df94a1e18
|
#1181 Do not automatically update track names when adding new tracks
|
2017-02-09 08:35:33 +01:00 |
|
Magne Sjaastad
|
6e901cdb12
|
#1190 Do not show delete features for well allocation plot objects
|
2017-02-09 08:34:28 +01:00 |
|
Magne Sjaastad
|
7cdc550f32
|
Fixed #1130 Make sure visibility of fractures follows pipe/sphere visibility
|
2017-02-09 06:59:34 +01:00 |
|
Magne Sjaastad
|
9753e8b242
|
#1194 Use larger geometry for open wells for spheres and well head
|
2017-02-08 14:26:28 +01:00 |
|
Magne Sjaastad
|
c197f22013
|
#1189 Improved text in UI and reorganized color buttons
|
2017-02-08 14:00:06 +01:00 |
|
Magne Sjaastad
|
a5de98ab32
|
Use upper case for first character in words
|
2017-02-08 13:59:20 +01:00 |
|
Magne Sjaastad
|
9c5f3732b4
|
#1189 Use gray for closed sphere connections
|
2017-02-08 13:45:37 +01:00 |
|
Magne Sjaastad
|
b1beacb46a
|
#1189 Fixed well cells visibilities when no range filters are active
|
2017-02-08 13:34:31 +01:00 |
|
Jacob Støren
|
a736d41eb7
|
#1169 Added text on the x-axis
|
2017-02-08 13:23:52 +01:00 |
|
Magne Sjaastad
|
d5ec760ddd
|
#1189 Fixed well pipe/sphere visibilities when no range filters are active
|
2017-02-08 08:07:27 +01:00 |
|
Magne Sjaastad
|
f11d2a0d31
|
#1189 Fixed well pipe/sphere visibilities when no range filters are active
|
2017-02-08 08:04:08 +01:00 |
|
Magne Sjaastad
|
c215bbcbbc
|
Fixed missing include after merge
|
2017-02-08 07:35:48 +01:00 |
|
Magne Sjaastad
|
93954fece0
|
Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
ApplicationCode/Commands/RicDeleteItemFeature.cpp
|
2017-02-08 07:35:20 +01:00 |
|
astridkbjorke
|
c8f682b205
|
#1140 - pre-proto - Update calculation of dx, dy, dz if not read from file
|
2017-02-07 19:12:44 +01:00 |
|
Magne Sjaastad
|
255643257f
|
Fixed #1191 Info box: crash when using static cell result with dynamic filter and current time step
|
2017-02-07 19:07:30 +01:00 |
|
Magne Sjaastad
|
011fd30d08
|
#1189 Use text "Hide Wells Not Intersecting Filtered Cells"
|
2017-02-07 18:16:19 +01:00 |
|
Magne Sjaastad
|
4bfb85c62e
|
#1189 Harmonized static and dynamic evaluation of cell visibilities
|
2017-02-07 15:36:19 +01:00 |
|
Magne Sjaastad
|
2404cf1582
|
#1189 Visibility of well cells now follow visible range filtered cells
|
2017-02-07 15:33:04 +01:00 |
|
Magne Sjaastad
|
0061067aa7
|
#1189 Do not consider well cells when controlling pipe/sphere visibilities
|
2017-02-07 15:33:04 +01:00 |
|
Jacob Støren
|
ec7e892395
|
Fixed #1175 schedule geometry regeneration when creating a property filter.
|
2017-02-07 15:11:47 +01:00 |
|
Jacob Støren
|
bf0dd5d303
|
#1170 Read volume rate from Ert
|
2017-02-07 13:47:00 +01:00 |
|
Jacob Støren
|
76bc449d1f
|
#1161 and #1188 Fixed problems with last MSW segments. Two errors: missing last segment ID, and missing drawing the last pipe segment.
|
2017-02-07 10:53:48 +01:00 |
|
Jacob Støren
|
94a90c8796
|
Fixed #1188 The connection number calculation was wrong
|
2017-02-07 10:53:48 +01:00 |
|
Magne Sjaastad
|
7652009fe7
|
#1190 Disabled drrop of items into well allocation objects
|
2017-02-07 09:39:40 +01:00 |
|
Magne Sjaastad
|
4313409c57
|
#1190 Make sure well log features are disabled for well allocation objects
|
2017-02-07 09:34:11 +01:00 |
|
Magne Sjaastad
|
b8e838614c
|
#1190 Avoid delete action of RimWellFlowRateCurve
|
2017-02-07 09:28:43 +01:00 |
|
astridkbjorke
|
a79e6118c7
|
#1140 - pre-proto - Update calculation of dx, dy, dz if not read from file
|
2017-02-06 15:23:51 +01:00 |
|
Magne Sjaastad
|
e4830b629c
|
#1176 Read out state directly from well using RigSingleWellResultsData
|
2017-02-06 14:00:05 +01:00 |
|
astridkbjorke
|
642d468b94
|
#1143 - pre-proto - Reordering fields / graying out not relevant fields.
|
2017-02-06 13:51:13 +01:00 |
|
Magne Sjaastad
|
8bc1a3ee3d
|
#1190 Improved copy command feature
|
2017-02-06 13:33:56 +01:00 |
|
astridkbjorke
|
e6958c3e65
|
pre-proto - Organize includes
|
2017-02-06 13:22:18 +01:00 |
|
astridkbjorke
|
093b998fcd
|
#1167 - pre-proto - Calculating azimuth angle for well path and using this angle in setting azimuth angle for fracture.
|
2017-02-06 13:12:56 +01:00 |
|
astridkbjorke
|
10bb3a834d
|
pre-proto - Rename
|
2017-02-06 11:45:50 +01:00 |
|
astridkbjorke
|
53e7d99652
|
#1167, #1143 Calculating angle for simulation well, and setting angle based on this for "along well" and "transverse well" orientation of frac template. Azimuth field for fracture read-only if orientation not "azimuth" for frac template.
|
2017-02-06 11:44:24 +01:00 |
|
Magne Sjaastad
|
c28ed7f206
|
Default state is to show all wells
|
2017-02-06 11:09:02 +01:00 |
|
Magne Sjaastad
|
f186d77136
|
When entering "Show well cells" state, do not hide wells not intersecting visible cells
|
2017-02-06 11:07:35 +01:00 |
|
Magne Sjaastad
|
06ace5d3b0
|
Closes #1176 Well Alloc Plot: Show well Injector/Producer status
|
2017-02-06 10:58:09 +01:00 |
|
Jacob Støren
|
1f184837f1
|
#1182 Added a dummy point on first branch to better show the resulting alloaction
|
2017-02-03 16:35:45 +01:00 |
|
Jacob Støren
|
4a3ffb9238
|
#1166 Added the reservoir part of the well allocation plot
|
2017-02-03 15:52:37 +01:00 |
|
astridkbjorke
|
073c7a6ecc
|
#1186 - pre-proto - Bugfix in reading of NTG.
|
2017-02-03 14:56:30 +01:00 |
|
astridkbjorke
|
5c6fc9dbcb
|
pre-proto - Fixing bug in fracture transmissibility calculation, handling of skinfactor for fracture
|
2017-02-03 14:12:40 +01:00 |
|
astridkbjorke
|
5630df5c1c
|
pre-proto - Deleting line segments shorter than tolerance used when connecting line segments to polygons.
|
2017-02-03 14:12:40 +01:00 |
|
Magne Sjaastad
|
7738b7f74b
|
Fixed merge issue
|
2017-02-03 10:52:22 +01:00 |
|
Magne Sjaastad
|
6dc0a7ff59
|
Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
ResInsightVersion.cmake
|
2017-02-03 10:51:46 +01:00 |
|
Magne Sjaastad
|
426d42935f
|
Copy up from pre-proto
|
2017-02-03 10:23:07 +01:00 |
|
Magne Sjaastad
|
0633e6ca39
|
Fixed mix of signed and unsigned value compare
|
2017-02-03 10:14:02 +01:00 |
|
Magne Sjaastad
|
e2e689e591
|
Fixed compile issue on Linux
|
2017-02-03 10:13:08 +01:00 |
|
Jacob Støren
|
01864aee09
|
Well Alloc Plot: Added case and timestep to title, Adjusted font.
|
2017-02-03 08:51:43 +01:00 |
|
Jacob Støren
|
c613c389f3
|
#1118 When no tracer data is available, show the total well flow instead.
|
2017-02-02 16:08:37 +01:00 |
|
Jacob Støren
|
6aea418084
|
Total Well Log Allocation Pie Chart: Guarded not yet created widget
|
2017-02-02 16:06:50 +01:00 |
|
Jacob Støren
|
45dc7a1c08
|
#1165 Reduced size and spacing.
|
2017-02-02 16:03:39 +01:00 |
|
Magne Sjaastad
|
40dbf78aa9
|
#1165 Added title to well allocation plot
|
2017-02-02 14:17:36 +01:00 |
|
Magne Sjaastad
|
f3a4242826
|
#1162 More guarding for no data available
|
2017-02-02 14:16:03 +01:00 |
|
Magne Sjaastad
|
94eb76436a
|
Fixes #1162 Well Acc plot: Handle missing well data for timesteps (crash)
|
2017-02-02 13:01:57 +01:00 |
|
Magne Sjaastad
|
f1200af1af
|
Repaint widget in addition to clearing of slices
|
2017-02-02 13:01:21 +01:00 |
|
Magne Sjaastad
|
9493a1dfc0
|
Use hasWellResult instead of firstResultTimeStep
|
2017-02-02 12:52:32 +01:00 |
|
Magne Sjaastad
|
8ee7229f60
|
#1163 Well Acc plot: Timestep and case changes in GUI is not handled
|
2017-02-02 12:37:58 +01:00 |
|
Magne Sjaastad
|
e8ee077501
|
#1164 Added feature "Add Stored Well Allocation Plot"
|
2017-02-02 12:32:01 +01:00 |
|
Magne Sjaastad
|
da903575b6
|
#1164 Removed dummy objects
|
2017-02-02 12:31:40 +01:00 |
|
Magne Sjaastad
|
a91bf5144f
|
Removed double namespace prefix
|
2017-02-02 12:10:14 +01:00 |
|
Magne Sjaastad
|
e48c9c0e10
|
Add one and only one flow diag solution if flux is available
|
2017-02-02 12:06:08 +01:00 |
|
astridkbjorke
|
64684f6bec
|
#1145 - pre-proto - Export of fracture data for selected wells (either SimWells or WellPaths)
|
2017-02-02 11:38:55 +01:00 |
|
Jacob Støren
|
eee43ccf0f
|
#1108, #1110, #1116 Pie chart Well Allocation Factors now working.
|
2017-02-02 11:30:59 +01:00 |
|
Magne Sjaastad
|
7abdc38d92
|
#1148 Fixed issue causing well cells to always be enabled
|
2017-02-02 11:27:55 +01:00 |
|
Magne Sjaastad
|
7c86482af3
|
#1107 Added calculateValueOptions for case and flow diag solution
|
2017-02-02 11:11:03 +01:00 |
|
Magne Sjaastad
|
d24bf527bf
|
Assign default colors to wells when importing case from file
|
2017-02-02 10:35:15 +01:00 |
|
Magne Sjaastad
|
b90b2fbc04
|
Use ordering of RigSingleWellResultsData when assigning well colors
|
2017-02-02 10:34:32 +01:00 |
|
astridkbjorke
|
1243ae6cd1
|
#1149 - pre-proto - rotating fracture geometry 90 deg (0 azimuth means fracture oriented North-South)
|
2017-02-02 10:02:27 +01:00 |
|
Magne Sjaastad
|
c4d9c1d780
|
#1148 Made tristate of well cell fence
|
2017-02-02 09:59:26 +01:00 |
|
Magne Sjaastad
|
53bccf3d0f
|
#1148 Improved obsolete field behaviour for well head, label and well cells
|
2017-02-02 09:59:26 +01:00 |
|