Magne Sjaastad
25a1823f35
Merge branch 'dev' into cmake-improvements
2018-02-28 08:47:01 +01:00
Magne Sjaastad
89c090ba24
#2536 Build System : Remove obsolete code for cmake older than "2.8.2"
2018-02-28 08:05:00 +01:00
Jacob Støren
267e3ef59d
#2535 Use the MainWindowTools class instead of MainWindow directly (part 4)
2018-02-27 16:46:53 +01:00
Jacob Støren
562dfbe9b8
#2535 Use the MainWindowTools class instead of MainWindow directly (part 3)
2018-02-27 16:46:53 +01:00
Jacob Støren
72013f4ff8
#2535 Use the MainWindowTools class instead of MainWindow directly (part 2)
2018-02-27 16:46:53 +01:00
Jacob Støren
d74807d669
#2535 Use the MainWindowTools class instead of MainWindow directly (part 1)
2018-02-27 16:46:53 +01:00
Magne Sjaastad
f4bae6f796
#2529 Fracture : Remove RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES from CMake files
2018-02-26 21:11:14 +01:00
Magne Sjaastad
72b5f540e5
#2529 Fracture : Remove all #ifdef USE_PROTOTYPE_FEATURE_FRACTURES
2018-02-26 20:54:45 +01:00
Magne Sjaastad
0cee37ce86
Add missing ifdef macro for use of fracture template
2018-02-26 14:42:00 +01:00
Magne Sjaastad
c22f38e30c
#2509 Fracture : Move fracture commands to separate folder
2018-02-21 19:38:20 +01:00
Magne Sjaastad
8ad30d9350
#2509 Fracture : Disconnect fracture template when unit changes
2018-02-21 19:07:03 +01:00
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
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
35febab8db
#2509 Fracture : Add support for unit conversion of stimplan grid coords
2018-02-20 15:15:06 +01:00
Rebecca Cox
2c26ca4243
#2460 Tensor Vectors: Hide tensors on intersection creation
2018-02-20 13:47:47 +01:00
Magne Sjaastad
9b1b94a4ae
#2517 Export COMPDATL : Include diameter for LGR grids
2018-02-20 11:26:39 +01:00
Magne Sjaastad
fb95d896ef
#2509 Fracture : Add copy / paste of ellipse fracture template
2018-02-20 07:20:25 +01:00
Magne Sjaastad
1ae30ef11a
(clang-tidy) : modernize-use-nullptr
2018-02-18 18:56:43 +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
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
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
Magne Sjaastad
cdfe6e3000
#2475 Fractures: Use filename as default name when importing a StimPlan fracture
2018-02-15 15:00:09 +01:00
Bjørn Erik Jensen
022d2ffd2d
#2473 copy intersections. Resolve references and update connected editors
2018-02-15 13:05:42 +01:00
Rebecca Cox
cf3a1ad43f
#2392 3D View Context command: "Color Result"
2018-02-12 08:42:12 +01:00
Magne Sjaastad
123a2830aa
Merge patch into dev : Snapshot : Always use _ in generated file names #2446
2018-02-09 11:34:05 +01:00
Magne Sjaastad
6e16a47b0d
#2446 : Replace - with _ for all generated file names
2018-02-09 11:19:04 +01:00
Magne Sjaastad
778119bf62
#2442 Fracture Template : Move more fields from public to protected
2018-02-08 14:02:02 +01:00
Magne Sjaastad
a1c891cd99
Merge remote-tracking branch 'origin/2018.01.01-patch' into dev
2018-02-08 13:18:36 +01:00
Magne Sjaastad
80eefb3141
#2442 Fracture Template : Move several fields from public to protected
2018-02-08 13:17:31 +01:00
Magne Sjaastad
f053dfa8e3
#2446 : Snapshot : Improve generated file, always use _ in generated filename
2018-02-08 13:17:18 +01:00
Magne Sjaastad
1370cfe3e5
Merge fix for fishbone export into dev #2451
2018-02-08 10:31:51 +01:00
Magne Sjaastad
39949923a6
#2451 Export Completion : Remove obsolete test
2018-02-08 10:25:43 +01:00
Magne Sjaastad
0843c3e464
#2451 Export Completion : Exclude main bore cells correctly
2018-02-08 10:18:01 +01:00
Magne Sjaastad
53a1de91d7
#1968 Export Completions : Improve ordering
2018-02-07 14:07:49 +01:00
Magne Sjaastad
68c21e117b
#1968 Readability : Whitespace changes
2018-02-07 14:07:00 +01:00
Magne Sjaastad
76e6ec3aef
Remove unused function
2018-02-07 14:07:00 +01:00
Magne Sjaastad
dd34b0111a
#1968 Readability : Major whitespace changes
2018-02-07 14:07:00 +01:00
Magne Sjaastad
c695d40266
#2447 Fracture : Set default conductivity result when creating the first fracture
2018-02-06 13:15:36 +01:00
Magne Sjaastad
a283a468c2
#2447 Fracture : Show fracture legend when only ellipse fractures are present
2018-02-06 12:42:13 +01:00
Magne Sjaastad
91e062fd93
#2431 : Add Rim3dView to event interface object
2018-02-05 20:12:22 +01:00
Bjørn Erik Jensen
8c4cad894f
#2391 intersections. New copy to all views command feature
2018-02-05 13:24:17 +01:00
Magne Sjaastad
bf0b4f68e1
Merge message box fixes into dev, #2443
2018-02-02 14:47:05 +01:00
Magne Sjaastad
ba09906163
#2443 Replace QMessageBox with RiaLogging to avoid blocking of batch commands
2018-02-02 09:37:34 +01:00
Magne Sjaastad
dc0c6d1b47
#2443 : Remove obsolete includes of QMessageBox
2018-02-02 09:37:00 +01:00
