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
|
8a26861c03
|
Version set to 2016.11.flow.8 for finalizing sprint 8
|
2017-02-03 09:31:27 +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 |
|
Magne Sjaastad
|
fad0974b3f
|
#1148 Use tristate for well cell visibility
|
2017-02-02 09:59:26 +01:00 |
|
Jacob Støren
|
b26bd11674
|
#1113 Made tracer colors consistent, and son to be consistent with default well colors
|
2017-02-02 09:56:39 +01:00 |
|
astridkbjorke
|
d7e980887a
|
#1144 - pre-proto - Update perforation length of fracture when value is updated for fracture template
|
2017-02-02 09:20:58 +01:00 |
|
astridkbjorke
|
30304a5f8a
|
#1157 - pre-proto - Updating how the eclipseCase is handled for transmissibility calculation. Should now avoid segfault when calculating transmissibilities for well path fractures.
|
2017-02-02 08:50:54 +01:00 |
|
astridkbjorke
|
3e65bcfa88
|
#1144 - pre-proto - Updating azimuth angles for fractures for connected fractures with this angle when angle is update in template.
|
2017-02-02 08:50:54 +01:00 |
|
astridkbjorke
|
701687b171
|
pre-proto - Fixing bug in max value for slider for azimuth angle for simulation well fractures.
|
2017-02-02 08:50:54 +01:00 |
|
astridkbjorke
|
871146ba68
|
pre-proto - Updating fracture position from location when creating new fracture in project tree (bugfix)
|
2017-02-02 08:50:54 +01:00 |
|
Magne Sjaastad
|
57a1cd0c64
|
Fixed missing regeneration of geometry when deleting all well path fractures
|
2017-02-02 07:48:58 +01:00 |
|
Magne Sjaastad
|
6d95d00863
|
#1159 Fixed inaccurate position of new fracture when clicking in 3D view
|
2017-02-02 07:36:22 +01:00 |
|
Jacob Støren
|
8e4e7f098f
|
#1113, #1112 Made stacked curves. Now the accumulated well flow by connection graphs is up to speed.
|
2017-02-01 19:18:37 +01:00 |
|
Magne Sjaastad
|
49e0709dc6
|
#1158 Fixed position of well path fractures after scale change
|
2017-02-01 14:54:02 +01:00 |
|
Magne Sjaastad
|
d8c2eb0357
|
#1158 Fixed position of simulation well fractures after scale change
|
2017-02-01 13:25:07 +01:00 |
|
Magne Sjaastad
|
a4ce5f532d
|
#1148 Use tristate to indicate visibility of simulation well geometry
|
2017-02-01 09:52:01 +01:00 |
|
Magne Sjaastad
|
8c01c23e5e
|
#1156 Added tristate class and checkbox editor with tristate support
|
2017-02-01 09:52:01 +01:00 |
|
Magne Sjaastad
|
bd732d9564
|
#1148 Always show context menus
|
2017-02-01 09:52:01 +01:00 |
|
Magne Sjaastad
|
ddd72b4866
|
#1148 Added well head scale factor to EclipseWell
|
2017-02-01 09:52:01 +01:00 |
|
Magne Sjaastad
|
929e9ad09b
|
Guard for index out of range
|
2017-02-01 09:52:01 +01:00 |
|
Jacob Støren
|
3f091aa884
|
#1112 Guard against none-connection segments in accumulation calculation
|
2017-01-31 16:35:49 +01:00 |
|
astridkbjorke
|
4c1f7776b9
|
pre-proto - Sorting includes
|
2017-01-31 15:58:13 +01:00 |
|
astridkbjorke
|
3a5247e357
|
#1147 - pre-proto - Adding index number to names for new fractures
|
2017-01-31 15:54:04 +01:00 |
|
Jacob Støren
|
d3f1c9d6fa
|
#1112 Calculation of accumulated well flow is now implemented. Tracers are handled, as well as MSW's.
|
2017-01-31 15:29:22 +01:00 |
|