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
|
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
|
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 |
|
Magne Sjaastad
|
8dfe181cc3
|
#2455 Non-Darcy Flow : Add support for user defined D-factor
|
2018-02-16 09:37:55 +01:00 |
|
Magne Sjaastad
|
dda9bd11ea
|
#2455 Non-Darcy Flow : Add fracture width
|
2018-02-16 09:37:55 +01:00 |
|
Magne Sjaastad
|
e1619d3d62
|
#2455 Non-Darcy Flow : Show user defined permeability and rename
|
2018-02-16 09:37:55 +01:00 |
|
Rebecca Cox
|
82343d6680
|
#2489 Geo mech cases: Hide legend when result is not valid
|
2018-02-16 09:11:45 +01:00 |
|
Rebecca Cox
|
1fd6d10b69
|
#2460 Tensor vectors: Put scalar mapper code in separate functions
|
2018-02-15 15:45:40 +01:00 |
|
Rebecca Cox
|
67040d757f
|
#2477 2D intersection view: add legend update
|
2018-02-15 15:10:59 +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 |
|
Rebecca Cox
|
0fece2447a
|
#2470 2D Intersection Views: Hide the item when no intersections are present
|
2018-02-15 14:37:38 +01:00 |
|
Rebecca Cox
|
f909a7ea27
|
#2438 2d Intersection View: Update intersection view on 3dOverlayInfo update
|
2018-02-15 14:31:13 +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
|
1076384ce0
|
#2438 2D Intersection View: 3D Info Box items must follow settings in the main view
|
2018-02-15 13:00:44 +01:00 |
|
Bjørn Erik Jensen
|
de498a71c2
|
#2474 fractures. Added plural form of fracture. Moved below sim wells
|
2018-02-15 12:34:34 +01:00 |
|
Bjørn Erik Jensen
|
3fd5d3a3a7
|
#2393 Reservoir compaction derived result
|
2018-02-15 11:01:55 +01:00 |
|
Bjørn Erik Jensen
|
0e53c4b8bd
|
RuiMainWindow. Null pointer guard
|
2018-02-15 10:59:15 +01:00 |
|
Rebecca Cox
|
22ba541145
|
#2359 Tensor Vectors: Use lines to draw the vectors
|
2018-02-15 10:47:14 +01:00 |
|
Magne Sjaastad
|
8e1a7b2bbb
|
#2455 Non-Darcy Flow : Compute D-factor and show in UI
|
2018-02-14 13:35:35 +01:00 |
|
Magne Sjaastad
|
f9bded9c13
|
#2455 Fracture : Move code to cpp and restructure header
|
2018-02-14 13:34:38 +01:00 |
|
Magne Sjaastad
|
1a78490991
|
Fix warnings related to signed / unsigned compare
|
2018-02-14 13:27:50 +01:00 |
|
Magne Sjaastad
|
03f4b778cc
|
#2471 Fracture : Block selection of fracture if fracture template is selected in Project Tree
|
2018-02-14 13:07:33 +01:00 |
|
Magne Sjaastad
|
646eb8fee4
|
StimPlan Fracture : Make sure geometry is recomputed when required
|
2018-02-14 13:07:16 +01:00 |
|
Magne Sjaastad
|
302edc5677
|
System : Guard null pointer access
|
2018-02-14 13:06:54 +01:00 |
|
Rebecca Cox
|
eedf182620
|
#2413 2D intersection view: Use correct cell result in infoText
|
2018-02-14 10:54:28 +01:00 |
|
Jacob Støren
|
cb38d435cd
|
#2457 Make 2d intersection view length start at well start
|
2018-02-13 16:56:48 +01:00 |
|
Rebecca Cox
|
3b627ce1c4
|
#2413 2D Intersection View: Add geoMech result title to infoText
|
2018-02-13 14:01:37 +01:00 |
|
Rebecca Cox
|
4eb80e83bb
|
#2465 Property panel: Update UI fields from selected result on tree view object changed
|
2018-02-13 13:29:47 +01:00 |
|
Jacob Støren
|
2e8a497989
|
#2461 Align the vertices between shader and fixed function rendering methods.
|
2018-02-13 12:53:50 +01:00 |
|
Jacob Støren
|
ab27efcb7d
|
#2461 Add explicit render code for shader based rendering. Should solve the issue.
|
2018-02-13 12:12:55 +01:00 |
|
Rebecca Cox
|
c8182fbb2f
|
Merge to fix #588
|
2018-02-13 10:50:18 +01:00 |
|
Rebecca Cox
|
b49396b88c
|
#588 GeoMech Color result: Make active result visible in property editor when selecting a object ofType/containing Result definition
|
2018-02-13 10:49:26 +01:00 |
|
Rebecca Cox
|
fa4535a18e
|
#2413 2D Intersection View: Create more space in info text
|
2018-02-13 08:48:15 +01:00 |
|
Magne Sjaastad
|
59958dcc3a
|
Fix picking on fracture geometry when scale factor is different to 1.0
|
2018-02-12 20:08:43 +01:00 |
|
Rebecca Cox
|
5195ea502a
|
#2413 2D Intersection View: Add Text info
|
2018-02-12 15:58:47 +01:00 |
|
Rebecca Cox
|
7222a6ba46
|
Fix colors on tensor glyphs
|
2018-02-12 13:06:56 +01:00 |
|
Jacob Støren
|
c3c2dfc678
|
#2337 Made EdgeAxis overly item more robust. Some cleanup and renaming.
|
2018-02-12 10:07:07 +01:00 |
|
Rebecca Cox
|
fb5055581d
|
Merge to fix #2458
|
2018-02-12 09:41:14 +01:00 |
|
Rebecca Cox
|
b8c9989d0b
|
#2458 Cell Result: Select chosen result type on load
|
2018-02-12 09:40:10 +01:00 |
|
Rebecca Cox
|
063802130c
|
Fix window edge axis crash
|
2018-02-12 09:05:58 +01:00 |
|
Rebecca Cox
|
cf3a1ad43f
|
#2392 3D View Context command: "Color Result"
|
2018-02-12 08:42:12 +01:00 |
|
Jacob Støren
|
c6846f0d57
|
Fix linux compile issues
|
2018-02-09 16:47:24 +01:00 |
|
Jacob Støren
|
d86b6f690e
|
#2337 Place legends aware of the possible edge axis border and enable the border by default in Intersection views
|
2018-02-09 14:10:26 +01:00 |
|
Jacob Støren
|
068adf6aa2
|
#2337 Fix crash when having too few tickmarks. Some rename
|
2018-02-09 14:09:41 +01:00 |
|
Jacob Støren
|
e76f8cfbcc
|
#2337 Add an improved tick mark generator
|
2018-02-09 14:08:55 +01:00 |
|
Jacob Støren
|
911571e267
|
#2337 Window Edge axis overlay item working.
|
2018-02-09 14:08:55 +01:00 |
|
Rebecca Cox
|
c3ea8f3415
|
2344 Tensor vectors: Code cleanup
|
2018-02-09 11:44:42 +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 |
|
Rebecca Cox
|
f747c22fd3
|
#2344 Tensor vectors: Avoid creating vectors of Infinity result values
|
2018-02-09 10:10:09 +01:00 |
|
Magne Sjaastad
|
b068296afd
|
#2455 Non-Darcy Flow: Add fields to fracture template
|
2018-02-09 07:26:51 +01:00 |
|
Rebecca Cox
|
bd0d23520b
|
#2344 Tensor Vectors: Vector visualization code
|
2018-02-08 16:43:18 +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
|
beb122c6d0
|
System : Fix compiler warning
|
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 |
|
Bjørn Erik Jensen
|
6f3a84c2b0
|
Merge branch '2018.01.01-patch' into dev. #2453
|
2018-02-08 11:45:15 +01:00 |
|
Bjørn Erik Jensen
|
2e0069456f
|
#2453 Stim plan. Removed double string splitting loop
|
2018-02-08 11:37:07 +01:00 |
|
Bjørn Erik Jensen
|
7ddfaeb234
|
#2388 fractures. Support for asymmetric stim plan
|
2018-02-08 11:05:55 +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 |
|
Jacob Støren
|
bb53b926bf
|
#2345 Add + and * operators to the tensor class, to make averaging possible.
|
2018-02-07 13:10:36 +01:00 |
|
Jacob Støren
|
bd14c65678
|
#2334 Add visualization of well paths and simulation wells to Intersection Views.
|
2018-02-07 11:44:38 +01:00 |
|
Magne Sjaastad
|
d208f63255
|
Add .clang-format to cmakelist
|
2018-02-07 08:54:53 +01:00 |
|
Jacob Støren
|
59b0a4bd1e
|
Remove obsolete code
|
2018-02-06 14:55:55 +01:00 |
|
Bjørn Erik Jensen
|
69cc77e026
|
#2427 2d intersection view. Display result info and curves
|
2018-02-06 14:40:14 +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
|
519771cb38
|
#2447 Fracture : Rename to fractureColors
|
2018-02-06 12:57:50 +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
|
d420b74326
|
Remove unused function
|
2018-02-06 12:27:55 +01:00 |
|
Magne Sjaastad
|
4fdb7671a8
|
#2431 : Removed obsolete struct
|
2018-02-06 11:09:22 +01:00 |
|
Magne Sjaastad
|
daad891b24
|
System : Show grid name and global cell index in result info
|
2018-02-06 07:27:21 +01:00 |
|
Magne Sjaastad
|
9734774e21
|
#2439 Fracture : Set default permeability to 1e5
|
2018-02-05 20:39:42 +01:00 |
|
Magne Sjaastad
|
67da4af831
|
#2431 : Use const ref and nullptr
|
2018-02-05 20:12:22 +01:00 |
|
Magne Sjaastad
|
b69fc78361
|
#2431 : Remove Rim3dView from function parameters
|
2018-02-05 20:12:22 +01:00 |
|