Magne Sjaastad
c6b12b85e0
Merge fracture unit refactoring into dev #2509
...
Add display of M and F in front of fracture templates
Add convert of StimPlan templates
Add copy/paste of StimPlan templates
Remove obsolete unit conversion code
2018-02-21 10:15:56 +01:00
Magne Sjaastad
81bb4481ed
#2509 Fracture : Rename
2018-02-21 10:10:22 +01:00
Magne Sjaastad
0acab5cd65
#2509 Fracture : Add copy / paste of StimPlan
2018-02-21 09:50:50 +01:00
Magne Sjaastad
0d7e4f460c
#2509 Fracture : Find matching template when adding new fracture
2018-02-21 09:10:40 +01:00
Magne Sjaastad
28ab07b199
#2509 Fracture : Remove obsolete unit conversion
2018-02-21 09:10:08 +01:00
Magne Sjaastad
f67918eba3
#2509 Fracture : Improve UI
2018-02-21 08:36:18 +01:00
Magne Sjaastad
b0be540977
#2509 Fracture : Remove obsolete unit conversion code
2018-02-21 08:18:55 +01:00
Magne Sjaastad
4e737885e4
#2509 Fracture : Move unit conversion of top/bot perforation depth
2018-02-20 15:35:08 +01:00
Magne Sjaastad
35febab8db
#2509 Fracture : Add support for unit conversion of stimplan grid coords
2018-02-20 15:15:06 +01:00
Rebecca Cox
81287ee7cc
#2484 2D Intersection View: 3D Info text: Show only well name, well path name or intersection name
2018-02-20 14:40:47 +01:00
Rebecca Cox
b69b15145f
#2496 Tensor vectors: Use dark magenta for principal 1 and move color code to RiaColorTables
2018-02-20 14:27:10 +01:00
Magne Sjaastad
479247dc4d
Merge fix for multi case statistics into dev
2018-02-20 14:02:51 +01:00
Rebecca Cox
0366361767
#2460 Tensor vectors: Move cvf::ref of scaler mapper out to avoid nullptr exception
2018-02-20 13:56:36 +01:00
Rebecca Cox
2c26ca4243
#2460 Tensor Vectors: Hide tensors on intersection creation
2018-02-20 13:47:47 +01:00
Rebecca Cox
4ca78ca833
#2460 Tensor Vectors: Use result as colormapping on the vectors
2018-02-20 13:47:47 +01:00
Magne Sjaastad
65f93814fe
#2468 Multi grid statistics : Initialize filename before creating data access object
2018-02-20 13:35:31 +01:00
Magne Sjaastad
9b1b94a4ae
#2517 Export COMPDATL : Include diameter for LGR grids
2018-02-20 11:26:39 +01:00
Magne Sjaastad
79a32af209
Octave Plugin : Move definition of qtDataStreamVersion to RiaSocketServerDefines
...
After conversion from NULL -> nullptr the octave plugins failed to compile. By moving the define of qtDataStreamVersion this issue was resolved, and the dependency from oct-files to RiaSocketServer.h was not required anymore (and removed)
2018-02-20 08:26:19 +01:00
Magne Sjaastad
82e706375a
Octave Plugin : Move definition of qtDataStreamVersion to riSettings
...
After conversion from NULL -> nullptr the octave plugins failed to compile. By moving the define of qtDataStreamVersion this issue was resolved, and the dependency from oct-files to RiaSocketServer.h was not required anymore (and removed)
2018-02-20 08:16:13 +01:00
Magne Sjaastad
fb95d896ef
#2509 Fracture : Add copy / paste of ellipse fracture template
2018-02-20 07:20:25 +01:00
Magne Sjaastad
a218addbe5
clang : Fix to be compatible with Clang 3.8
2018-02-19 21:09:44 +01:00
Rebecca Cox
f0d32e6e45
#2511 2D Intersection view: Avoid selecting intersection in tree when selecting a cell
2018-02-19 15:11:35 +01:00
Rebecca Cox
0cb14397ac
#2503 2D intersection View: Add Z-scale as info in the 3d info box
2018-02-19 15:08:54 +01:00
Magne Sjaastad
0ef0f3b5b1
#2509 Fracture : Guard UI selection of fracture template of different unit
2018-02-19 14:32:33 +01:00
Rebecca Cox
7f246a032a
Merge patch into dev with fixes for #2501
2018-02-19 14:16:22 +01:00
Rebecca Cox
119752bf04
#2501 Result Plot: Add "Show Plot Data" to context menu
2018-02-19 14:15:42 +01:00
Magne Sjaastad
de3aa9f975
#2509 Fracture : Add text to indicate unit of fracture template
2018-02-19 13:54:29 +01:00
Rebecca Cox
542c912df2
Merge patch into dev with fixes for #2403
2018-02-19 09:32:37 +01:00
Rebecca Cox
4d39136212
#2403 Extraction curves: Fix curves without vertical connections
2018-02-19 09:29:14 +01:00
Magne Sjaastad
8d30b6e09f
Use size_t instead of int
2018-02-18 19:01:38 +01:00
Magne Sjaastad
1ae30ef11a
(clang-tidy) : modernize-use-nullptr
2018-02-18 18:56:43 +01:00
Magne Sjaastad
69875eec8f
(clang-tidy) : modernize-use-nullptr
2018-02-18 18:22:23 +01:00
Magne Sjaastad
cfb75ecc34
AppFwk (clang-tidy) : modernize-use-nullptr
2018-02-18 18:17:50 +01:00
Magne Sjaastad
3239c66f54
AppFwk (clang-tidy) : modernize-use-nullptr
2018-02-18 18:05:08 +01:00
Magne Sjaastad
5a2072e6ec
clang-tidy : Add minimal config file
2018-02-18 17:55:20 +01:00
Magne Sjaastad
950617af96
AppFwk : Fix assignment of float value
2018-02-18 17:42:28 +01:00
Magne Sjaastad
88ead1f986
Fix signed /unsigned compare
2018-02-16 16:56:39 +01:00
Bjørn Erik Jensen
772ba788ad
#2449 2d intersection view. Show UTM intersection point in result info window
2018-02-16 14:38:28 +01:00
Magne Sjaastad
917cae9e2d
#2455 Non-Darcy Flow : Hide "From Fracture" if no width is available
2018-02-16 14:17:28 +01:00
Magne Sjaastad
cf11eff319
#2456 Non-Darcy Flow : Allow transmissibilities close to zero when computing d-factor
2018-02-16 11:22:13 +01:00
Magne Sjaastad
504e80534b
#2456 Non-Darcy Flow : Export : Use scientific formatting for kh and d-factor
2018-02-16 11:02:50 +01:00
Magne Sjaastad
52621bae6c
#2456 Non-Darcy Flow : Include diameter for fracture completions
2018-02-16 10:51:04 +01:00
Magne Sjaastad
dab73009e7
#2456 Non-Darcy Flow : Return the one and only (unmodified) completion
2018-02-16 10:49:53 +01:00
Magne Sjaastad
b06d33c5e9
#2455 Non-Darcy Flow : Use DoubleValueEditor
2018-02-16 10:14:41 +01:00
Magne Sjaastad
9184ef14ca
AppFwk : Use 'g' instead of 'f' to create text from double values
2018-02-16 10:14:08 +01:00
Magne Sjaastad
ec70639a8f
Remove obsolete code
2018-02-16 09:54:51 +01:00
Magne Sjaastad
db20cf4b5b
#2492 : Non-Darcy Flow : Ignore WPIMULT export setting if non-Darcy Flow is active
2018-02-16 09:37:55 +01:00
Magne Sjaastad
7f5ff7be0f
#2455 Non-Darcy Flow : Use double in fields to avoid many decimals when converting from float to double
2018-02-16 09:37:55 +01:00
Magne Sjaastad
ac96824640
#2455 Non-Darcy Flow : Add fields to fracture template
2018-02-16 09:37:55 +01:00
Magne Sjaastad
6b246f4671
Remove unused function
2018-02-16 09:37:55 +01:00