Commit Graph

6227 Commits

Author SHA1 Message Date
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
Magne Sjaastad
df231ab50a #2431 : Remove RivWellPathPartMgr from RimWellPath 2018-02-05 20:12:22 +01:00
Magne Sjaastad
cd575ef9c1 #2431 : Use well path part manager in Rim3dView 2018-02-05 20:12:22 +01:00
Magne Sjaastad
91e062fd93 #2431 : Add Rim3dView to event interface object 2018-02-05 20:12:22 +01:00
Magne Sjaastad
5919cb20fb #2431 : Refactor of well part manager 2018-02-05 20:12:22 +01:00
Magne Sjaastad
0679ec4ba5 #2431 : Add part manager for all well paths WIP 2018-02-05 20:12:22 +01:00
Jacob Støren
e8b29f7279 #2334 Add polyline visualization to 2D intersection view as a preparation for showing the main well. 2018-02-05 17:57:20 +01:00
Jacob Støren
7dbffd0075 Add error to messages window if a requested regression test is not found. 2018-02-05 17:56:40 +01:00
Bjørn Erik Jensen
0b0e60135c Merge branch '2018.01.01-patch' into dev. #2434 2018-02-05 14:15:50 +01:00
Bjørn Erik Jensen
0dff40f658 #2434. Ignore NOECHO keyword in grdecl files 2018-02-05 14:13:28 +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
082b82214d #2444 Batch : Fix support for multiple replaceCase in command file 2018-02-05 11:22:31 +01:00
Rebecca Cox
c6f8c957de #2316 Tensor Vectors: Create Object in Project tree 2018-02-05 09:28:16 +01:00
Magne Sjaastad
24cd47abfc Merge fix for failing test into dev 2018-02-05 08:45:20 +01:00
Bjørn Erik Jensen
c09dd0522b Merge branch '2018.01.01-patch' into dev. #2086 2018-02-05 08:29:24 +01:00
Magne Sjaastad
5a7133f6e2 Fix disabled test 2018-02-03 09:15:04 +01:00
Bjørn Erik Jensen
98a94c0525 #2086 Moved RifStringTools -> RiaStringEncodingTools 2018-02-02 15:44:28 +01:00
Bjørn Erik Jensen
d5116d8942 #2086 Fix well GUI name for well paths when extended ascii chars in name 2018-02-02 15:03:41 +01:00
Magne Sjaastad
bf0b4f68e1 Merge message box fixes into dev, #2443 2018-02-02 14:47:05 +01:00
Bjørn Erik Jensen
b0ca4f3199 #2086 Handle extended file name chars on Linux for eclipse cases and summary cases 2018-02-02 14:18:09 +01:00
Rebecca Cox
eef5fe6e55 #2428 Fracture: backwards compatibility of "Show mesh"-toggle 2018-02-02 10:27:58 +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
Magne Sjaastad
f21f6e969f #1905 : Make sure picking on perforation intervals reports well path MD 2018-02-02 08:20:57 +01:00
Jacob Støren
29ac24f3dd #2426 Add working legends to 2D intersection Views. Refactor to make legend update code work from a separate view with separate legend configs. Make sure legend and results are updated as the main view is updated. Adjust legendconfig->setTitle to use QString 2018-02-02 07:48:27 +01:00
Magne Sjaastad
a4eb16883b #2441: Fracture Colors : Make sure conductivity result is set on template for old project files 2018-02-01 15:37:05 +01:00
Magne Sjaastad
c5333d09b2 Merge perforation updates into dev #2422 2018-02-01 13:05:00 +01:00
Magne Sjaastad
c8e002d532 #2374 Fracture : Incomplete results when computing intersected StimPlan cells 2018-02-01 12:58:48 +01:00
Bjørn Erik Jensen
7131006188 #2422 perforations. Update tree view after perforations import 2018-02-01 09:10:31 +01:00
Rebecca Cox
aa18ee9aa4 Fix build 2018-01-31 16:37:43 +01:00
Rebecca Cox
5b083bf974 Remove unused include 2018-01-31 16:06:56 +01:00
Bjørn Erik Jensen
4d98ac04e8 Merged patch to dev. #2429, #2430 2018-01-31 15:53:02 +01:00
Bjørn Erik Jensen
60afae10ad #2429, #2430. Display perforations correctly 2018-01-31 15:34:50 +01:00
Rebecca Cox
e50f7bf66f #2428 Fracture: Reorganize Fracture Colors tree item 2018-01-31 15:11:46 +01:00
Magne Sjaastad
d7fa97f052 Fix wrong include path 2018-01-31 13:54:58 +01:00
Magne Sjaastad
33ef2948f4 Merge "Completion Export LGR" into dev
#2425 #1758 #2423
2018-01-31 13:38:05 +01:00
Rebecca Cox
61d8a76587 #2390 Fracture: Set minimum 10 m perf length 2018-01-31 12:43:42 +01:00
Rebecca Cox
b2bdd996d2 #2389 Fracture: Set perforation length and depth from file values 2018-01-31 12:25:58 +01:00
Magne Sjaastad
d111fde68b #2425 Export Completions : Include cleanup 2018-01-31 10:20:47 +01:00
Magne Sjaastad
8fbd417c4f #2425 Export Completions : Move function 2018-01-31 10:20:47 +01:00
Magne Sjaastad
f8b020e364 #2425 Export Completions : Whitespace 2018-01-31 10:20:47 +01:00
Magne Sjaastad
c04ef6bbbf #2425 Export Completions : Move app logic into separate file 2018-01-31 10:20:47 +01:00
Magne Sjaastad
965deeb67a #2425 Export Completions : Separated feature UI from app logic 2018-01-31 10:20:47 +01:00
Magne Sjaastad
52875a57dc #2423 Export Completions : Cleaned up private functions, moved to cpp and improved whitespace 2018-01-31 10:20:47 +01:00
Magne Sjaastad
20652a0597 #2423 Export Completions : Move folder one level up 2018-01-31 10:20:47 +01:00
Magne Sjaastad
e989b3afc9 #2423 Export Completions : Move Rig*-files to completion export folder 2018-01-31 10:20:47 +01:00
Magne Sjaastad
f0f7c954cc #2423 Export Completions : Move files to separate folder 2018-01-31 10:20:47 +01:00
Magne Sjaastad
e18a08a425 #1758 Use RigMainGrid in interface to CompletionDataGridCell 2018-01-31 10:20:47 +01:00
Magne Sjaastad
6f0f73a017 #1758 Add direct access to RigMainGrid from RimEclipseCase 2018-01-31 10:20:47 +01:00
Magne Sjaastad
54a7320b59 #1758 Export main grid data to one file and LGR data to one file 2018-01-31 10:20:47 +01:00
Magne Sjaastad
38f18dbecb #1758 Add support for export of WPIMULTL 2018-01-31 10:20:47 +01:00
Magne Sjaastad
c7b5e091c6 #1758 Rename to gridName 2018-01-31 10:20:47 +01:00
Magne Sjaastad
5cc6877afa #1758 Use map to sort RigCompletionDataGridCell based on grid 2018-01-31 10:20:47 +01:00
Magne Sjaastad
4516941d2c #1758 Add RigCompletionDataGridCell 2018-01-31 10:20:47 +01:00
Magne Sjaastad
028b5303a7 #1758 Add support for export of COMPDATL for LGR grid 2018-01-31 10:20:47 +01:00
Magne Sjaastad
c0359f1776 #1758 Refactor IJKCellIndex 2018-01-31 10:20:47 +01:00
Magne Sjaastad
85d9d21bb6 #1758 Rename to globalCellIndex 2018-01-31 10:20:47 +01:00
Magne Sjaastad
d5c1e1e898 #1758 Moved implementation to source and improved formatting 2018-01-31 10:20:47 +01:00
Bjørn Erik Jensen
7779ff5ed0 Merge branch '2018.01.01-patch' into dev. #2229 2018-01-31 08:33:51 +01:00
Bjørn Erik Jensen
fa66cf14cd #2229 curve creator. Update when adding/deleting calculated curves as well 2018-01-31 08:32:14 +01:00
Bjørn Erik Jensen
bc72c86497 #2229 curve creator. Update when adding/deleting observed summary cases 2018-01-30 15:51:48 +01:00
Bjørn Erik Jensen
b06c3b443b Merge patch to dev. #2277 2018-01-30 14:25:53 +01:00
Bjørn Erik Jensen
e417e3af76 #2277 external files. Improve robustness when importing 2018-01-30 13:48:57 +01:00
Rebecca Cox
4094fd1861 #2421 RelPerm: Remove invalid points on transparent curve 2018-01-30 13:30:05 +01:00
Jacob Støren
c9d6d60931 #2331 GeoMech fixes for intersection view. Paste view and animation of synthetic cases. 2018-01-29 16:16:11 +01:00
Jacob Støren
287992df91 #2331 Update Intersection View List when copying and deleting views 2018-01-29 16:16:11 +01:00
Jacob Støren
f931b92341 #2412 Disable irrelevant toolbar commands 2018-01-29 16:16:11 +01:00
Jacob Støren
6dead054c4 #2331 Save the 2D Intersection views. Turn off unneccesary fields 2018-01-29 16:16:11 +01:00
Rebecca Cox
a5dd38969f Merge to fix #2417 2018-01-29 16:05:02 +01:00
Rebecca Cox
9f08f1264a #2417 Extraction Curves: Avoid clamping time step to -1 2018-01-29 16:04:21 +01:00
Rebecca Cox
bbcda37813 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-29 14:47:04 +01:00
Rebecca Cox
f598e6905c #2419 Do not make OpmFlowDiagStat if result is fracture (DUAL) 2018-01-29 14:41:07 +01:00
Bjørn Erik Jensen
ebabefcd2c #2368 summary plot. Fix right axis properties update issue 2018-01-29 12:49:32 +01:00
Bjørn Erik Jensen
065aa92d16 #2408 summary plot. Update qwt axis when duplicating curves 2018-01-29 12:49:32 +01:00
Rebecca Cox
20e5c27209 #2261 Well Paths: Change newestAddedWellPath to mostRecentlyUpdatedWellPath 2018-01-29 12:49:32 +01:00
Rebecca Cox
27192e8096 Rename variable 2018-01-29 12:49:32 +01:00
Rebecca Cox
17e38130fc #2319 PLT/Well log plot: Remove auto scale on scroll. Make auto scale from file work 2018-01-29 12:49:32 +01:00
Rebecca Cox
e416d6557a Add option to avoid updating parent plot 2018-01-29 12:49:32 +01:00
Bjørn Erik Jensen
ecfd1ad817 #2368 summary plot. Fix right axis properties update issue 2018-01-29 12:46:34 +01:00
Bjørn Erik Jensen
4a4dab3f1c #2408 summary plot. Update qwt axis when duplicating curves 2018-01-29 12:46:34 +01:00
Rebecca Cox
d67e1a7d13 #2261 Well Paths: Change newestAddedWellPath to mostRecentlyUpdatedWellPath 2018-01-29 11:24:12 +01:00
Rebecca Cox
438ee340e3 Rename variable 2018-01-29 10:47:54 +01:00
Rebecca Cox
b7a316589a #2319 PLT/Well log plot: Remove auto scale on scroll. Make auto scale from file work 2018-01-29 10:17:42 +01:00
Rebecca Cox
0171589c72 Add option to avoid updating parent plot 2018-01-29 10:17:42 +01:00
Magne Sjaastad
71deeb8954 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-29 10:09:54 +01:00
Magne Sjaastad
41506afe06 #2241 : Workaround for report numbers : Convert to upper case befor calling libecl 2018-01-29 10:09:30 +01:00
Magne Sjaastad
ff0599df04 Guard for access of dynamic data with no time steps 2018-01-29 10:04:33 +01:00
Magne Sjaastad
27ee70f90e Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-29 08:48:27 +01:00
Magne Sjaastad
b59734160c Use range based for 2018-01-29 08:47:23 +01:00
Magne Sjaastad
9cc090256d #2241 : Do not skip report numbers with -1 2018-01-29 08:46:28 +01:00
Magne Sjaastad
c8546eb7e7 #2241 : Improve robustness when reading report numbers from libecl 2018-01-29 08:44:30 +01:00
Magne Sjaastad
33901a115e Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-28 21:31:36 +01:00
Magne Sjaastad
aa12ac743a #2418 : Import of text grid model fails when comments is on same line as keyword 2018-01-28 21:29:40 +01:00
Bjørn Erik Jensen
fbe9d2d73d Merge branch '2018.01.01-patch' into dev 2018-01-26 15:56:37 +01:00
Bjørn Erik Jensen
ca3bb02c57 #2356 grid statistics dialog. Display of Mobile Volume Weighted Mean controlled by info box property 2018-01-26 15:53:13 +01:00
Rebecca Cox
235b1a88fb Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-26 15:49:39 +01:00
Rebecca Cox
84725ced9b Make branch detection toggle hidden if show formations is toggled off 2018-01-26 15:49:18 +01:00
Magne Sjaastad
4d5503afb4 #2385 Main Window: More flexible docking restrictions 2018-01-26 15:44:25 +01:00
Jacob Støren
5640f91b68 #2412 2D Navigation only for Intersectino Views 2018-01-26 14:33:32 +01:00
Jacob Støren
1de088ccba #2333 Intersection View: Made default view and near/far clip planes behave 2018-01-26 11:19:17 +01:00
Jacob Støren
d8d2076dea #2333 New Intersection View: Update vertical warningtext. Avoid selecting view in tree. 2018-01-26 11:19:16 +01:00