OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-14 01:13:52 -06:00
Code Issues Packages Projects Releases Wiki Activity
7,579 Commits 28 Branches 61 Tags 291 MiB
3a6de3cc56
Commit Graph

6273 Commits

Author SHA1 Message Date
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
Jacob Støren
02f6b95959 #2333 Add flattened intersectino geometry. Some view modifications to move towards a final 2D view experience 2018-01-26 11:19:15 +01:00
Rebecca Cox
47d8508196 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-26 10:29:01 +01:00
Rebecca Cox
007602dbf9 #2326 Well allocation plot: Remove formation options regarding well path 2018-01-26 10:28:24 +01:00
Magne Sjaastad
78068e547d Fix compiler warnings related to converting time_t to double 2018-01-26 08:25:50 +01:00
Magne Sjaastad
889f615d19 #2276 : Source Stepping : Improve region ordering 
Internally, region numbers are stored in a set and then ordered correctly. When converting to strings for UI, the sorting criteria changes, and the order is wrong. If a vector is used to represent the UI strings, the problem is solved.
 2018-01-26 08:16:07 +01:00
Magne Sjaastad
0559084d93 #2325 Summary plot: Apply axis settings on preview plot 2018-01-25 21:16:35 +01:00
Rebecca Cox
4078002770 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-25 18:24:40 +01:00
Rebecca Cox
83ed95a311 #2328 Water flooded PV: Remove warning. Remove injection flooding option if no fluxes are available 2018-01-25 18:24:12 +01:00
Rebecca Cox
b1bf970ff8 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-25 17:04:59 +01:00
Rebecca Cox
5273ace5e6 #2301 Rel.perm Plot: Add tooltip for cell value 2018-01-25 17:04:20 +01:00
Bjørn Erik Jensen
868e1ef075 #2406 delete plot crash. Guard pointer to view 2018-01-25 15:44:28 +01:00
Rebecca Cox
eb03096c1c Change "QMessageBox" to <QMessageBox> 2018-01-25 15:44:28 +01:00
Rebecca Cox
0bd3f4e74c #2328 Give warning when user tries to calculate injection flooding without available fluxes 2018-01-25 15:44:28 +01:00
Bjørn Erik Jensen
3a1c6406ff #2406 delete plot crash. Guard pointer to view 2018-01-25 14:53:51 +01:00
Magne Sjaastad
aa6b657027 #2141 : Fracture : Show conductivity result name from file 2018-01-25 14:24:54 +01:00
Magne Sjaastad
6ff354c7ec Fix signed/insigned compare 2018-01-25 14:17:10 +01:00
Magne Sjaastad
6ce0037733 #2141 : Fracture : Make sure a new StimPlan fracture get valid defaults 2018-01-25 14:17:10 +01:00
Magne Sjaastad
430b193437 #2402 Fracture : Compute conductivity scaling for all conductivity variants 2018-01-25 14:17:10 +01:00
Magne Sjaastad
827468b764 #2402 Code cleanup 2018-01-25 14:17:10 +01:00
Magne Sjaastad
001742cbd3 #2402 Fracture : Add support for multiple conductivities on a template 2018-01-25 14:17:10 +01:00
Bjørn Erik Jensen
95db322f57 #2384 multi case import. Fix path filtering. Display relative file names 2018-01-25 13:57:09 +01:00
Rebecca Cox
64731fb242 Change "QMessageBox" to <QMessageBox> 2018-01-25 12:00:48 +01:00
Rebecca Cox
ab72981681 #2328 Give warning when user tries to calculate injection flooding without available fluxes 2018-01-25 11:59:49 +01:00
Magne Sjaastad
1e4b4dbf62 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-25 11:14:09 +01:00
Rebecca Cox
a6333128e3 #2328 Fix crash when calculating "Water Flooded PV" 2018-01-24 16:32:48 +01:00
Rebecca Cox
d3f1767ff9 #2362 Grdecl: Read input file only once 2018-01-24 15:01:19 +01:00
Rebecca Cox
0ea10a45eb #2362 Grdecl SegFault: Guard for empty vectors 2018-01-24 14:58:21 +01:00
Bjørn Erik Jensen
3d2e5b6088 #2383 Eclipse cases import. New command feature using file hierarchy dialog 2018-01-24 14:39:06 +01:00
Bjørn Erik Jensen
3f96ad7ad9 File hierarchy dialog. Trim extensions 2018-01-24 14:37:52 +01:00
Bjørn Erik Jensen
5e46a378aa #2384 multi case import. New command feature for importing cases into group recursively 2018-01-24 13:18:47 +01:00
Bjørn Erik Jensen
a039bcd0a9 File hierarchy dialog. Stop if no root dir 2018-01-24 13:18:47 +01:00
Rebecca Cox
5d840368b1 #2390 Intersections: Move paste command to the top in the context menus 2018-01-24 13:10:17 +01:00
Bjørn Erik Jensen
d646af8514 #2384 multi case import. Context menu for on/off/toggle files 2018-01-24 12:36:06 +01:00
Rebecca Cox
8b4a1f05bc #2390 Intersections: Add Copy/Paste 2018-01-24 11:44:20 +01:00
Rebecca Cox
140b75df88 #2390 Intersections: Add noUpdate-version of appendIntersection and appendIntersectionBox 2018-01-24 11:30:39 +01:00
Rebecca Cox
97aab5bda5 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-24 10:56:10 +01:00
Rebecca Cox
650fc2147d #2404 Intersection: Update 3d view when creating new Intersection Box 2018-01-24 10:48:23 +01:00
Bjørn Erik Jensen
7c47783e3a #2384 multi case import. Add check box for each file 2018-01-24 10:43:56 +01:00
Rebecca Cox
e68f0e2be8 Merge branch '2018.01.01-patch' into dev 2018-01-24 08:33:47 +01:00
Rebecca Cox
9617481406 #2327 Formation RFT Plot: Read tvdss from well pick files 2018-01-24 08:21:22 +01:00
Bjørn Erik Jensen
e98d969e62 #2358 fracture. Fix linker errors by adding fracture support ifdefs 2018-01-23 20:58:39 +01:00
Jacob Støren
d34b3a7c74 #2331 Add 2d Intersection View collection with automatic views. The create command is adjusted into a "Show" command. 2018-01-23 14:37:52 +01:00
Bjørn Erik Jensen
9cfd2ff3cf #2358 fracture. When clicking on an ellipse fracture, display info in result into panel 2018-01-23 14:30:58 +01:00
Bjørn Erik Jensen
1c668ce3b4 #2358 fracture. Display values in resultInfo panel when clicking on stim plan fracture cell 2018-01-23 14:14:40 +01:00
Magne Sjaastad
7dbd6c1027 #2398 Fracture : Hide "New Fracture" in context menu when no Fracture Template is defined 2018-01-23 07:28:32 +01:00
Magne Sjaastad
bc5139257f #2141 Fracture : Remove Stimplan from UI text 2018-01-22 15:10:49 +01:00
Magne Sjaastad
f0554d85af #2402 Fracture Conductivity : Add result name define 2018-01-22 15:07:59 +01:00
Magne Sjaastad
759d46813d #1544 Fracture Perforation Length : Set color to deep green 2018-01-22 13:00:11 +01:00
Magne Sjaastad
348b492cc1 RiaColorTables : Add and use undefinedCellColor() 2018-01-22 11:55:27 +01:00
Magne Sjaastad
9a420183e1 Remove unused code 2018-01-22 11:09:37 +01:00
Magne Sjaastad
245d10c5c1 Fix compiler warnings related to converting time_t to double 2018-01-19 16:55:16 +01:00
Jacob Støren
5855e412e7 #2375 Fix missing catch of exeptions from pvt/relperm curve generation 2018-01-19 15:21:17 +01:00
Magne Sjaastad
5c1f5326a0 #1544 Fracture : Show perforation length for along well path fractures 2018-01-19 15:08:31 +01:00
Magne Sjaastad
53418179ba #1544 Fracture : Add function used to compute perforation length coords 2018-01-19 15:08:31 +01:00
Magne Sjaastad
c7d61ed7f4 #1544 : Move well path radius to RimWellPath 2018-01-19 15:08:31 +01:00
Magne Sjaastad
8e5bcef7c7 #1544 Removed unused functions and other minor improvements 2018-01-19 15:08:31 +01:00
Magne Sjaastad
ba437c605d #2385 Main Window: More flexible docking restrictions 2018-01-19 15:08:31 +01:00
Magne Sjaastad
ef3d9f1095 #2141 Fracture Legend : If conductivity, use legend to set ellipse fracture color 2018-01-19 15:08:31 +01:00
Magne Sjaastad
0674eaefbf #2141 Fracture Legend : Update model when ellipse conductivity changes 2018-01-19 15:08:31 +01:00
Magne Sjaastad
04a91b92f4 Remove unused function 2018-01-19 15:08:31 +01:00
Magne Sjaastad
2da5f8cf54 #2141 Use accumulators to compute min/max used to configure legend 2018-01-19 15:08:31 +01:00
Magne Sjaastad
b4b1dfa0f9 #2141 Fixed wrong default values for MinMaxAccumulator 2018-01-19 15:08:31 +01:00
Rebecca Cox
fbb6f56bd3 #2382 Elm props: Update Result Info to show relevant Element Result info 2018-01-19 13:36:51 +01:00
Rebecca Cox
7726ed1610 #2366 AppFwk: Use caf::FilePath for odb-file 2018-01-19 12:53:37 +01:00
Rebecca Cox
56188c8f3f #2380 AppFwk: Move fieldsByType to RimProject 2018-01-19 12:52:50 +01:00
Jacob Støren
6adcbd9c56 #2375 Fix missing catch of exceptions from opm-flowdiagnostics libraries 2018-01-19 12:46:53 +01:00
Rebecca Cox
ed930da11d #2380 AppFwk: Take vector<T*>* as argument, not vector<PdmField<T*>>* 2018-01-19 08:02:09 +01:00
Rebecca Cox
b84812616f Merged from patch-branch to dev-branch 2018-01-18 15:43:27 +01:00
Rebecca Cox
79539c1c99 #2378 Fractures: Hide "Fracture Colors" in Project tree when not in use 2018-01-18 15:04:04 +01:00
Bjørn Erik Jensen
28ea6f054c #2377 summary plot. Add missing curve update 2018-01-18 13:50:39 +01:00
Bjørn Erik Jensen
cdfe7f51d3 #2377 summary plot. Add missing curve update 2018-01-18 13:24:21 +01:00
Rebecca Cox
39cf8e8b0d #2378 Fractures: Hide "Fracture Colors" in Project tree when not in use 2018-01-18 11:42:29 +01:00
Rebecca Cox
bbda7f30a2 NULL -> nullptr 2018-01-18 08:11:26 +01:00
Bjørn Erik Jensen
50c3e5f0d2 #2379 import summary cases. Minor refactoring 2018-01-17 13:15:04 +01:00
Bjørn Erik Jensen
8f384c9752 #2379 import summary cases. Dialog improvements, find button, grouping widgets 2018-01-17 13:05:05 +01:00
Bjørn Erik Jensen
b74dca8de8 #2379 import summary cases. Fix path filtering 2018-01-17 13:05:05 +01:00
Magne Sjaastad
3bcfc09baf #2332 2D Intersection View: Show warning if intersection is not vertical 2018-01-17 11:29:06 +01:00
Magne Sjaastad
03de2aba5b #2332 2D Intersection View: Command to create view 2018-01-17 11:05:31 +01:00
Magne Sjaastad
b53603e906 Use range based for 2018-01-17 09:23:45 +01:00
Magne Sjaastad
0ecfdeee6b Reorder functions, remove unused function 2018-01-17 09:23:45 +01:00
Magne Sjaastad
1523ce55f0 #2150 Fracture : Duplicate fracture geometry for along well pipe fractures 2018-01-17 09:23:45 +01:00
Magne Sjaastad
673ae6b1ff #2150 Fracture : Create two parts of fracture geometry 2018-01-17 09:23:45 +01:00
Magne Sjaastad
828557f71f Whitespace and include cleanup 2018-01-17 09:23:45 +01:00
Jacob Støren
d616548cd0 #2331 Shell of 2dIntersectionView shell added. Fixed access to views on a case including the intersection views also. 2018-01-17 08:10:05 +01:00
Rebecca Cox
548c065290 Fix cotire build 2018-01-16 16:24:29 +01:00
Rebecca Cox
4adec8d2bf #2380 AppFwk: Make template function to find all PdmFields of a type 2018-01-16 16:01:42 +01:00
Bjørn Erik Jensen
735165bb2b #2379 import summary cases. Fixed dialog issues 2018-01-16 13:40:38 +01:00
Jacob Støren
d283f2c733 Fix linux compile issue 2018-01-16 11:22:48 +01:00
Rebecca Cox
dcff8c1536 #2372 Elm Props: Scale Modulus by a factor of 1e-9 2018-01-16 10:56:41 +01:00
Rebecca Cox
305e2aee38 #2372 Elm Props: Add unit [GPA] to Modulus 2018-01-16 10:56:41 +01:00
Jacob Støren
c3c2f3b75a Fix missing include 2018-01-16 10:36:41 +01:00
Jacob Støren
0debeafd68 #2331 Move RimGridView to separate files 2018-01-16 09:37:08 +01:00
Jacob Støren
b1cf7f6674 #2331 Cleaned up whitespace. Made crossectionCollection protected 2018-01-16 08:44:37 +01:00
Magne Sjaastad
424c6a46f6 Whitespace and function headers, move implementation to header 2018-01-16 08:04:49 +01:00
Magne Sjaastad
2457f968cf #2374 Fracture : Incomplete results when computing intersected StimPlan cells 2018-01-16 08:04:49 +01:00
Rebecca Cox
96bff27519 #2372 Elm props: Map modulus and ratio ui names 2018-01-15 17:40:39 +01:00
Rebecca Cox
58123f4a49 #2369 Elm props: Only delete results from the closed files 2018-01-15 16:09:52 +01:00
Jacob Støren
b092565a61 #2331 Introduce new intermediate class RimGridView 2018-01-15 14:53:48 +01:00
Jacob Støren
1bbd3ade7b #2331 WIP: Creating new RimGridView base class 2018-01-15 14:53:48 +01:00
Rebecca Cox
4bf8de2787 #2369 Elm props: Clear cell results on deletion 2018-01-15 14:48:05 +01:00
Rebecca Cox
277bd496f1 Add override keyword 2018-01-15 14:48:05 +01:00
Bjørn Erik Jensen
ac59050824 #2358 Ellipse fracture template. Extracted conductivity method 2018-01-15 13:32:47 +01:00
Magne Sjaastad
523c623d39 #2152 Fracture : Rename UI text 2018-01-15 09:41:00 +01:00
Bjørn Erik Jensen
ee50b0492d #2151 fractures. Turn on/off fractures in views by toggling fracture colors 2018-01-15 09:24:19 +01:00
Magne Sjaastad
b2e0f3df31 #2371 Fracture : Update views after change of stimplan xml file name 2018-01-15 09:16:44 +01:00
Magne Sjaastad
85ead20ec9 #2371 Fracture : Guard for null pointer access 2018-01-15 08:58:56 +01:00
Magne Sjaastad
9820cb45e4 #2371 Fracture Template : Avoid crash when StimPlan xml fails to load 2018-01-15 08:58:56 +01:00
Magne Sjaastad
e5aaf73a84 #2152 Fracture : Add StimPlan cell element color 2018-01-15 08:58:56 +01:00
Rebecca Cox
47e154bf53 #2370 Elm props: Update prop filters + intersections on reload 2018-01-15 08:52:00 +01:00
Rebecca Cox
673ad12dee #2370 Elm Props: Reload selected files. Prop filters etc not updated 2018-01-14 09:10:23 +01:00
Rebecca Cox
a8039b8569 #2369 Elm Props: Remove deleted field results from cache 2018-01-13 12:38:08 +01:00
Rebecca Cox
27901f426c #2369 Elm Props: Close selected files 2018-01-12 16:18:54 +01:00
Rebecca Cox
3b46849c79 Fix warning 2018-01-12 16:14:30 +01:00
Magne Sjaastad
5e3bc0e5ee #2152 Fracture : Add color interpolation mode 2018-01-12 14:56:05 +01:00
Magne Sjaastad
ff03820a19 #2152 Minor refactoring 2018-01-12 14:56:05 +01:00
Rebecca Cox
a97dd087d6 #2349 Elm Props: Use caf::FilePath instead of QString 2018-01-12 14:39:49 +01:00
Rebecca Cox
efaaab1dc6 #2360 Elm Props: Make sure either elementIdxToId or elementIdToIdx is larger than elementIdsFromFile 2018-01-12 14:08:11 +01:00
Rebecca Cox
27f7f07ffd Replace auto 2018-01-12 12:43:39 +01:00
Rebecca Cox
b08e382dae #2360 Elm Props: Use correct index to id map 2018-01-12 12:43:39 +01:00
Rebecca Cox
6aa2d99587 #2349 Elm Props: Only add files which are not already added 2018-01-12 12:43:39 +01:00
Magne Sjaastad
fe17d0edd4 Remove unused function 2018-01-12 12:12:03 +01:00
Jacob Støren
0bba60f22f Remove RimView.cpp due to some git strangeness 2018-01-12 12:01:04 +01:00
Jacob Støren
4b26354b30 #2331 Moved redraw scheduling and completion type recalc out of RiaApplication 2018-01-12 12:01:04 +01:00
Jacob Støren
591b72901f #2331 Reordered Rim3dView header to pave way for Rim2dIntersectionView 2018-01-12 12:01:04 +01:00
Jacob Støren
5644684606 #2331 Refactor the viewer-view communication to pave way for 2dIntersection Views 2018-01-12 12:01:04 +01:00
Magne Sjaastad
ded9cc6708 #2322 Check define before using stimPlanColors 2018-01-12 11:56:33 +01:00
Jacob Støren
67bc555d49 #2367 Fix crash in completion type calculation for wellpaths without geometry 2018-01-12 11:36:41 +01:00
Magne Sjaastad
7511e8a243 #2322 New View : Improve default values when creating view 2018-01-12 10:55:00 +01:00
Magne Sjaastad
d25f9d4b67 Use const reference 2018-01-12 10:25:16 +01:00
Magne Sjaastad
9a2eebe8f5 Fracture : Move public fields to protected, and make RimFractureTemplate friend 2018-01-12 10:21:10 +01:00
Magne Sjaastad
337310c497 Fix invalid compare 2018-01-12 10:20:09 +01:00
Magne Sjaastad
402a2607c4 #1905 Perforation Intervals : Make sure well path context menu is displayed when clicking a perforation interval 2018-01-12 08:49:01 +01:00
Magne Sjaastad
f027027618 #1905 Perforation Intervals : Picking the well path pipe does not work at perforations 
Forward all parts intersected to 3d viewer event handler
 2018-01-12 07:56:35 +01:00
Magne Sjaastad
b70d39cc6c System : Postfix with u to indicate unsigned value (avoid warning on linux) 2018-01-11 14:04:25 +01:00
Rebecca Cox
3786adc9b7 #2347 Elm Props: Evaluate result type ELEMENT for WellLogExtractor 2018-01-11 11:35:31 +01:00
Rebecca Cox
e4e160cdd4 #2347 Elm Props: Evaluate result type ELEMENT for Intersections 2018-01-11 11:35:08 +01:00
Rebecca Cox
e0d91f90ae #2360 Elm Props: Correct text in result info 2018-01-11 10:58:52 +01:00
Rebecca Cox
de95ee0a9a #2347 Elm props: Traverse result type ELEMENT in stat calc 2018-01-11 10:58:24 +01:00
Rebecca Cox
cede66c8c0 #2360 Elm Props: Correct UI text in 3d overlay info 2018-01-11 10:19:22 +01:00
Rebecca Cox
81a7fb204d #2360 Elm Props: Correct UI text 2018-01-10 16:32:59 +01:00
Rebecca Cox
5751acf2b9 #2347 Elm props: Evaluate result type ELEMENT in property visibility 2018-01-10 15:23:00 +01:00
Rebecca Cox
2ce7e2c3d2 #2360 Elm props: Use element index in closest result intex calc 2018-01-10 15:20:21 +01:00
Bjørn Erik Jensen
65d85b82f7 #2272 fracture. Disable IO for anchor position 2018-01-10 14:43:01 +01:00
Bjørn Erik Jensen
3f4489c45f #1752 Summary cases import. Minor refactoring 2018-01-10 14:11:57 +01:00
Bjørn Erik Jensen
e743a61d5b #1752. Import multiple summary cases from a directory structure. Take 1 2018-01-10 13:57:20 +01:00
Rebecca Cox
118980d568 #2360 Elm Props: read metadata on project load 2018-01-10 12:55:36 +01:00
Rebecca Cox
2cd006882f #2360 Elm Props: Wire up reading of elm prop data into data structures 2018-01-10 10:43:33 +01:00
Rebecca Cox
0dc0533501 #2350 Elm props: Fix crash when table has only one data column 2018-01-10 10:33:33 +01:00
Rebecca Cox
e22ceb5cc2 add override keyword 2018-01-10 10:33:33 +01:00
Magne Sjaastad
30cbd8018f #2359 Move fields to private, whitespace cleanup 2018-01-10 07:44:53 +01:00
Magne Sjaastad
49eebd0c28 #2359 Fracture : Adjust default parameters for ellipse fracture 2018-01-10 07:44:53 +01:00
Bjørn Erik Jensen
effe1f291a RifElementPropertyTableReader-Test. Fix names 2018-01-09 15:44:54 +01:00
Bjørn Erik Jensen
3e11f9fbd6 RifElementPropertyTableReader unit tests 2018-01-09 15:39:17 +01:00
Bjørn Erik Jensen
f632b36993 Implement support for reading test files from unit tests 2018-01-09 15:13:44 +01:00
Bjørn Erik Jensen
766f4da48b #2350. Renaming, robustify 2018-01-09 11:59:43 +01:00
Bjørn Erik Jensen
55147e5b70 #2350. Implement ElementPropertyTable file reader for single file 2018-01-09 11:34:52 +01:00
Jacob Støren
2dbc907934 Merge renaming of RimView into dev 2018-01-09 10:48:09 +01:00
Jacob Støren
cb6d49a611 #2331 Renamed RimView to Rim3dView 2018-01-09 10:11:28 +01:00
Magne Sjaastad
68b5a0e019 Merge branch '2018.01.01-patch' into dev 2018-01-09 09:58:39 +01:00
Magne Sjaastad
472aa87265 System : Postfix with _OBSOLETE 2018-01-09 09:57:54 +01:00
Rebecca Cox
57ae195372 #2349 Elm Props: Create list of imported files in Geomech Case prop pan 2018-01-09 09:50:13 +01:00
Magne Sjaastad
09d776dd73 #2353 Empty function caseName() shadows base class field with same signature 2018-01-09 09:16:06 +01:00
Rebecca Cox
9513cb61d5 #2348 Elm prop: Add ELEMENT to set of valid resultPosTypes 2018-01-09 08:46:52 +01:00
Rebecca Cox
ab67ddfecb #2348 Elm Props: Import command on case 2018-01-09 08:45:47 +01:00
Rebecca Cox
0dff5fc1a5 Merge branch '2018.01.01-patch' into dev 2018-01-09 07:37:40 +01:00
Rebecca Cox
397168df17 #2347 Elm Props: Create new Result Position entry called Element 2018-01-09 07:37:07 +01:00
Rebecca Cox
cd4b930d77 #2352 Geomech: Geo mech: Fix crash when choosing invalid Result Variable 2018-01-08 16:34:41 +01:00
Rebecca Cox
ab35d30ff5 #2348 Elm Props: "Import Element Property Table" command 2018-01-08 14:48:00 +01:00
Bjørn Erik Jensen
69a18e1a11 #2329. Relocate summary cases 2018-01-08 14:03:27 +01:00
Magne Sjaastad
a26f3b6907 #2340 Snapshot : Space in path is replaced with underscore 2018-01-08 11:46:51 +01:00
Magne Sjaastad
561e20a37e #2329 Add relocate of RimWellLogFile 2018-01-08 10:37:57 +01:00
Magne Sjaastad
a40a3578f2 #2329 Add relocate of well path formation file 2018-01-08 10:35:53 +01:00
Magne Sjaastad
f515d3c2de System : Add field and object keywords for 2018.01 2018-01-05 15:40:09 +01:00
Magne Sjaastad
1df20d1b10 #2313 Improve cmake tooltip text and mark as advanced 2018-01-05 14:21:02 +01:00
Magne Sjaastad
b598bdf86c #2315 Add missing include of cmath 2018-01-05 11:38:58 +01:00
Rebecca Cox
9a41e1c134 #2321 Avoid crash when opening a project file with a PLT/RFT plot and where main plot window was closed before saving 2018-01-05 11:11:27 +01:00
Bjørn Erik Jensen
e0bc2c4046 Fracture colors. Fix default option 2018-01-05 11:09:33 +01:00
sigurdp
434d03b9d7 #2318 Added workaround that guards initialization of relative permeability evaluation library since opening of special EGRID file causes exception in library and crash 2018-01-05 11:00:40 +01:00
Magne Sjaastad
0939cff93a
Merge pull request #2320 from OPM/fabs 
#2315. Replaced abs() by fabs() where relevant
 2018-01-05 10:50:11 +01:00
Bjørn Erik Jensen
4cdc109ec3 #2315. Replaced abs() by fabs() where relevant 2018-01-05 09:29:53 +01:00
Rebecca Cox
074a8fc546 #2303 Formations: Remove well pick filter when depth type is PL 2018-01-05 08:36:59 +01:00
Rebecca Cox
cf12e5ae36 #2303 Formations: Update well path only when formation source changes 2018-01-05 08:36:59 +01:00
Rebecca Cox
fc2e638ba2 #2303 Formation: Make formations for RFT and PLT work 2018-01-05 08:36:59 +01:00
Magne Sjaastad
11ed06a5d5 #2314 Fracture : Along well path direction 
Use fabs instead of abs to avoid unintentionally conversion to integer
 2018-01-04 19:31:44 +01:00
Magne Sjaastad
addf200a9e #2310 Fix boolean test in isProjectFileVersionEqualOrOlderThan 2018-01-04 15:24:35 +01:00
Magne Sjaastad
0647add116 #2302 Formations : Always show formations, and display above fracture templates 2018-01-04 15:04:58 +01:00
Magne Sjaastad
96a900fe0f #2310 Add isProjectFileVersionEqualOrOlderThan to RimProject and use from summary plot 2018-01-04 13:12:07 +01:00
Magne Sjaastad
dbc1061a59 #2310 Version compare : Improve interface and add unit test 2018-01-04 12:38:12 +01:00
Rebecca Cox
50776f5819 Fix typo 2018-01-03 15:30:27 +01:00
Bjørn Erik Jensen
7a0b884e5d #2305. Fix initial icon state color for faults 2018-01-03 14:46:15 +01:00
sigurdp
9b38e9f9c2 #1880: Fixed visualization so that completions and well paths are visible through transparent cells 2018-01-03 14:27:17 +01:00
Rebecca Cox
cffca0f3fb #2310 Add a variety of version numbers 2018-01-03 13:54:00 +01:00
Magne Sjaastad
e7c8667b24 #2310 Add helper files and unit test for project file version queries 2018-01-03 13:17:29 +01:00
sigurdp
5af63f7abd #2295 Guard against null pointer when setting fracture template 2018-01-03 11:50:34 +01:00
sigurdp
f940d0a3d5 #1753 Fracture: Reworked visualization of StimPlan fractures to limit surface tesselation to area with actual values instead of relying on transparency. Done to allow picking on items behind the fracture. Refactored and removed obsolete code related to StimPlan fracture visualization. 2018-01-03 11:13:15 +01:00
Rebecca Cox
7d4bb47cc8 #2307 Update licence info 2018-01-03 08:58:57 +01:00
Bjørn Erik Jensen
79bcc2d727 #2296 Summary Plot Title. Fix region number bug 2018-01-03 07:10:23 +01:00
Bjørn Erik Jensen
01faccee1c #2306 Export completions. Fix missing files for sim wells 2018-01-02 15:45:48 +01:00
Bjørn Erik Jensen
9d00648703 #1780 Export Completions. Add progress bar 2018-01-02 15:45:48 +01:00
Jacob Støren
25e1db9e8f #2294 Use simplified result access in TOF acc. saturation plot, and fix gas oil colors in plot 2018-01-02 14:45:42 +01:00
Jacob Støren
3f22c096d8 #2294 Use phase saturation corrected PORV when calculating TOF for a single phase 2018-01-02 14:45:42 +01:00
Jacob Støren
27835aceae #2294 Add a method to access Eclipse results in a convenient manner. 2018-01-02 14:45:42 +01:00
Bjørn Erik Jensen
82d8b7c98a #2295. Guard for null frac template where it is being used 2018-01-02 12:54:10 +01:00
Jacob Støren
c27058f2a4 Adjust Completion Type recalculation timer from 0.5 s to 1.5 s 2018-01-02 12:31:20 +01:00
Bjørn Erik Jensen
fb0880aadb #2298 Fracture. Fix build error 2018-01-02 11:38:59 +01:00
Bjørn Erik Jensen
70a3df3b3c #2298 Fracture. Update fracture colors when changing stim plan legend settings 2018-01-02 11:21:59 +01:00
Magne Sjaastad
695978ed95 Regression Test : Use folder selection editor 2018-01-02 10:21:32 +01:00
Bjørn Erik Jensen
44639ef529 #2291 Fishbones. Always two decimals on single depth value fields 2018-01-02 09:58:38 +01:00
Magne Sjaastad
40a4222db2 Remove obsolete assert 
Discussed with @jacobstoren : Multiple branches are handled by the logic, and the assert is probably obsolete. Consider to set isMultiSegmentWell = true when multiple branches are detected.
 2018-01-02 08:20:03 +01:00
Magne Sjaastad
bdfd3d4e04 #2234 Completion Export : Do not include unticked perf intervals in project tree 2017-12-22 15:08:13 +01:00
Magne Sjaastad
173ef575fd #2234 Completion Export : Do not include unticked fishbones in project tree 2017-12-22 15:01:41 +01:00
Magne Sjaastad
500b298c26 #2293 Completion Export : Make sure one of the available combo box items are selected 2017-12-22 14:43:00 +01:00
Magne Sjaastad
d9e29b91cb #2234 Fractures : Export only sim well fractures ticked on in project tree 2017-12-22 14:43:00 +01:00
Magne Sjaastad
71c1267ab6 #2234 Fractures : Export only well path fractures ticked on in project tree 2017-12-22 14:43:00 +01:00
Bjørn Erik Jensen
4232ef2ffe #1726 Export completion dialog. Use previous case as default 2017-12-22 13:56:39 +01:00
Magne Sjaastad
4956604a86 #2288 Fracture Viz : Do not show fracture attached to an invisible well path 2017-12-22 13:43:35 +01:00
Bjørn Erik Jensen
0869a8edf5 #2120 Perforations import. Lookup well path by fuzzy method instead of exact name match 2017-12-22 13:39:31 +01:00
Bjørn Erik Jensen
6d236c24de #2284 Completion export. Control inclusion of fracture debug info file from preferences 2017-12-22 13:10:35 +01:00
Bjørn Erik Jensen
aa40894fe1 #2280 RelPerm/PVT plots. Stacking dock windows by default, result plot visible 2017-12-22 11:37:04 +01:00
Bjørn Erik Jensen
fc6df4558f #2279 Fishbones. Guard against too small MD 2017-12-22 11:18:37 +01:00
Bjørn Erik Jensen
02fdddad7f Imported observed data. Hide child tree nodes 2017-12-22 10:32:19 +01:00
Bjørn Erik Jensen
862dc2e982 #2290 Summary plot. Full vector name in plot auto title 2017-12-22 10:16:15 +01:00
Bjørn Erik Jensen
1d3a31d61f #2279 Fishbones. Default spacing is now 12.5. Place fishbone near well path end if no coordinates are specified 2017-12-22 09:53:08 +01:00
Magne Sjaastad
171c065326 #2140 Set fracture color variable when result name is empty or "None" 2017-12-22 09:23:16 +01:00
Magne Sjaastad
5153f5b926 CppCheck : Use const reference 2017-12-22 08:19:49 +01:00
Magne Sjaastad
b768bf8b34 Summary Plot : Set default auto name to true 2017-12-21 21:11:18 +01:00
Magne Sjaastad
388d4196f1 #2283 Cross Plot : Improve curve title and plot title based on x-axis data 2017-12-21 21:03:23 +01:00
Magne Sjaastad
1583923ed1 #2287 Calculate Completion Type : Execute loadAndUpdate only when required 2017-12-21 18:57:30 +01:00
Jacob Støren
69ab95dfed Changed name to "Water Flooded PV" 2017-12-21 16:10:21 +01:00
Magne Sjaastad
5fab8357ee #2289 Source Stepping : Rename to make it clear what summary case is used 2017-12-21 15:25:09 +01:00
Magne Sjaastad
f3975c8986 #2289 Source Stepping : Always return first case from visible curve cases 2017-12-21 15:25:09 +01:00
Magne Sjaastad
75c94cce7e #2283 Cross Plot : Use empty curve name instead of single pipe "|" 2017-12-21 15:25:09 +01:00
Magne Sjaastad
99893397ea Summary Address : Fixed invalid init of member variables 2017-12-21 15:25:09 +01:00
Bjørn Erik Jensen
dbbdcb904b #1632 Context menus. Reorganize, add sub menus 2017-12-21 14:35:38 +01:00
Bjørn Erik Jensen
a0cb42a93b RicWellPathImportPerforationIntervalsFeature. Rename method 2017-12-21 14:34:01 +01:00
Bjørn Erik Jensen
8dc47a84a2 Export Completions Dialog. Do not overwrite export folder setting 2017-12-21 12:39:17 +01:00
Magne Sjaastad
5ecedb7a30 Fixed typo 2017-12-21 09:44:42 +01:00
Magne Sjaastad
52b377e027 #1770 Current View Changes : Restore original visible view and tree state 2017-12-21 09:44:42 +01:00
Bjørn Erik Jensen
6beb217882 #2282 RFT plot. Fix strange behavior 2017-12-21 09:39:26 +01:00
Bjørn Erik Jensen
ea362ad154 #2140 Fracture colors. Add ifdef around fracture defs 2017-12-20 14:24:20 +01:00
Bjørn Erik Jensen
5d69398caa Try fix Linux build error 2017-12-20 13:53:29 +01:00
Bjørn Erik Jensen
12e95c37a6 #2140 Fracture colors. Set default result to Conductivity when selecting template 2017-12-20 13:14:43 +01:00
Bjørn Erik Jensen
a2a2427062 #1903 Export completions. Use project's export completion dialog settings everywhere it's being used 2017-12-20 11:14:13 +01:00
Bjørn Erik Jensen
a05f357597 #1903 Export completions. Save dialog contents 2017-12-20 11:14:13 +01:00
sigurdp
dbd1265f31 #1873: Changed naming scheme when exporting laterals. Make sure fishbone name is exported and be more explicit in the enumeration of the subs and laterals. 
Refactored RimFishbonesMultipleSubs so that it is clear that the fishbone instances only have auto generated names based on their current index.
 2017-12-19 11:06:28 +01:00
Bjørn Erik Jensen
5c4a250c44 #1870, #1871 Fishbones. Switch PdmField type from size_t to int due to non existing size_t pdm editor 2017-12-19 10:54:39 +01:00
sigurdp
f74dc80838 #1870 For fishbones, clamp values so that start MD and end MD always consitutes a valid range where start MD <= end MD 2017-12-19 09:34:23 +01:00
Magne Sjaastad
e8200c41ac #2271 Cross Plot : Disable export of plot data 2017-12-18 14:50:08 +01:00
Magne Sjaastad
57a691f8da Remove "ResInsight:" prefix 2017-12-18 14:30:19 +01:00
Magne Sjaastad
679e4c859f #2228 : Curve Creator : Use one group for curve types other han excplicitly handeled 2017-12-18 14:28:20 +01:00
Rebecca Cox
8ed0393863 Remove grid index from cell reference text if grid is main grid 2017-12-18 11:27:59 +01:00
Magne Sjaastad
bc12695af1 #2275 : Source Stepping : Trigger update of required UI when case changes 2017-12-18 09:53:32 +01:00
Magne Sjaastad
cd340f7713 #2273 Well Accocation Plot : Add flag to control branch detection 2017-12-18 09:34:28 +01:00
Magne Sjaastad
ecdc4b10ba System : VS2017 add definition _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING 
https://github.com/google/googletest/issues/1036
 2017-12-18 08:38:46 +01:00