Commit Graph

5412 Commits

Author SHA1 Message Date
Bjørn Erik Jensen
dc11cbd4c5 WellPathCollection. Fix crash 2017-11-14 11:37:22 +01:00
Magne Sjaastad
018549d15a #2143 Import of NNC : Move import of dynamic NNC data to RifEclipseOutputFileTools 2017-11-14 10:43:14 +01:00
Magne Sjaastad
1c0d8c0dd0 #2143 Guard agains access of null pointer when reading NNC 2017-11-14 10:35:18 +01:00
Bjørn Erik Jensen
e729ae02da #2111 LAS import. Standard default flow to 'Standard' 2017-11-14 09:43:05 +01:00
Magne Sjaastad
9adb9ba4b1 #2088 Curve Calculator : Ask user to calculate curves when expression has changed 2017-11-14 08:41:44 +01:00
Magne Sjaastad
2e6c37c266 #2088 Curve Calculator : Use Close button instead of Ok and Cancel 2017-11-14 07:30:49 +01:00
Magne Sjaastad
2c8658c5c2 #2088 Curve Calculator : Insert layout once to avoid debug output warning 2017-11-14 07:28:02 +01:00
Magne Sjaastad
cfaf27d4bf #2105 Curve Calculator : Do not show calculator dialog modal 2017-11-13 21:45:02 +01:00
Rebecca Cox
560dd4025a #2124 Curve calculator: Change default variable names to match expressions in context menu 2017-11-13 15:56:49 +01:00
Rebecca Cox
7aada0a1dc #2124 Curve calc: Remove useless functions and rearrange context menu 2017-11-13 15:37:07 +01:00
Rebecca Cox
8f0a7ced36 #1929 Curve Filter: Remove context menu option from summary curve 2017-11-13 15:37:07 +01:00
Jacob Støren
c670878b33 #2139, #2126 Add available times convenience access in RftReader, Rename enum in RifEclipseRftAddress 2017-11-13 15:23:38 +01:00
Jacob Støren
8bea278d20 #2139, #2126 Add convenience access in RifDataSourceForRftPlt 2017-11-13 15:23:38 +01:00
Jacob Støren
a172f0ccfe #2133 Rft cases only returned if they actually contain the well.
Simplified gridCasesForWell code as well.
2017-11-13 15:23:38 +01:00
Jacob Støren
10e1f0f8ab Rename RimRftAddress to RimDataSourceForRftPlt 2017-11-13 15:23:38 +01:00
Jacob Støren
c02538b8bd Rename of RifWellRftAddress to RifDataSourceForRftPlt 2017-11-13 15:23:38 +01:00
Jacob Støren
9853c15ec6 Code adjustments 2017-11-13 15:23:38 +01:00
Magne Sjaastad
612dfd7c9f #2106 Well log plot : Increase delay before of legend widget is updated 2017-11-13 12:56:23 +01:00
Rebecca Cox
4f4635181d #2107 RFT PLT Plot: Hide all children 2017-11-13 10:21:24 +01:00
Rebecca Cox
da7c817023 #2129 Rft/Plt plot: Show formations on default, and not always 2017-11-13 08:56:22 +01:00
Rebecca Cox
a4484579e2 Select last imported wellPath on import, not last wellPath in collection 2017-11-13 07:55:22 +01:00
Rebecca Cox
3e40331c5b #2129 Rft/Plt plot: Show formations on default 2017-11-13 07:55:22 +01:00
Rebecca Cox
7e6b45c626 Avoid crash if simWellName is "None" 2017-11-13 07:55:22 +01:00
Rebecca Cox
45ef3a1f00 #2087 Summary: Reload summary case eclipse case reload 2017-11-13 07:55:22 +01:00
Rebecca Cox
75c506e257 #2109 Remove automatic color on well labels on background change 2017-11-13 07:55:22 +01:00
Jacob Støren
cc4041b09b #2135 Rewrote obfuscated less operator and sort OBSERVED PLT sources first 2017-11-12 23:53:59 +01:00
Jacob Støren
5efd60c227 #2135 Fix broken drawing order of WellFlowRateCurves. Add group awareness to the drawing order. Higher groupids are drawn on top. 2017-11-12 23:51:08 +01:00
Jacob Støren
efa48c2cf5 #2114 Remove code causing timesteps to be unchecked 2017-11-12 23:46:12 +01:00
Jacob Støren
49c6fd9ac4 #2134 Rewrite the wellLogFilesContainingFlow to fix observed data always available bug 2017-11-12 16:18:48 +01:00
Jacob Støren
fadc9d12ff #2130 Avoid resetting zoom when last curve is removed 2017-11-12 15:46:32 +01:00
Jacob Støren
645421fa60 #2130 RFT And PLT plot: Show formation names also when no timesteps are visible. Do not overwrite the users case setting unless none are chosen. 2017-11-12 14:45:06 +01:00
Jacob Støren
fcf5093fb9 #2130 Zoom all when adding or removing curves.
WellLogTrack will not zoomAll but respect the visible-window setting to avoid overwriting the set zoom on project reload.
2017-11-12 13:45:01 +01:00
Jacob Støren
7f038e98ab #2130 Rewrite the wellLogFilesContainingPressure to fix observed data ways available bug 2017-11-12 12:38:12 +01:00
Jacob Støren
324d6d72e3 #2112 Avoid updating legend for each curve. Generalize and roll out the solution found for summary curves 2017-11-11 23:15:13 +01:00
Magne Sjaastad
59c51d7e5e Remove test accessing local file path 2017-11-10 16:14:39 +01:00
Jacob Støren
c5e4773a58 Fix RFT plot after change of well name meaning 2017-11-10 15:44:35 +01:00
Magne Sjaastad
5fe44fe943 #2097 Reservoir Phase Detection : Compute SGAS for non-oil simulations 2017-11-10 10:36:43 +01:00
Magne Sjaastad
5db08c7b76 #2097 Reservoir Phase Detection : Find available phases from result files 2017-11-10 09:43:51 +01:00
Bjørn Erik Jensen
f8a2250f3c RFT plot. Fix invisible grid curves bug 2017-11-09 15:50:32 +01:00
Bjørn Erik Jensen
290458b77a PLT plot. Fix crash when stacking curves containing NULL sample values 2017-11-09 15:34:31 +01:00
Bjørn Erik Jensen
4ad6198d42 PLT plot. Update plot after synced curves from ui selection change 2017-11-09 15:34:31 +01:00
Jacob Støren
1fba5e13c4 #2119 Support total reservoir flow from Grid wells in PLT plot 2017-11-09 15:20:15 +01:00
Jacob Støren
dfa0ade9fe #2116 Convert the PLT plot gas rate from RFT file to oil equivalents 2017-11-09 15:20:15 +01:00
Magne Sjaastad
161690d9c8 Fix signed/unsigned compare 2017-11-09 14:25:42 +01:00
Magne Sjaastad
c9fd4604db System : Make sure MessagePanel is visible for log messages of type warning and error 2017-11-09 14:15:05 +01:00
Magne Sjaastad
7a10087c01 #2118 Fracture : Improve detection of Stimplan cell intersected by well path 2017-11-09 14:15:05 +01:00
Bjørn Erik Jensen
d277a08d29 #2100 PLT plot. Remove branch index field 2017-11-09 13:36:14 +01:00
Bjørn Erik Jensen
f131f1274a #2101 PLT plot. Support for regex matching when comparing flow channels 2017-11-09 13:11:44 +01:00
Bjørn Erik Jensen
d3d5a89979 #2100 PLT plot. Refactoring. Use RimWellPlotTools methods 2017-11-09 11:18:57 +01:00
Bjørn Erik Jensen
89e5c04aef #2100 RFT plot. Add RftPltCurveDefinition. Use that in RFT plot 2017-11-09 10:04:17 +01:00
Bjørn Erik Jensen
a46c5af1f8 RFT plot. Refactoring. Move several static methods to RimWellPlotTools class 2017-11-09 10:04:17 +01:00
Bjørn Erik Jensen
cf069aaf5c RFT plot. Fix list of wells (display well path name when possible) 2017-11-09 10:04:17 +01:00
Jacob Støren
5a075493f2 Add assert when formation names branch index is wrong in WellLogTrack 2017-11-08 23:02:44 +01:00
Bjørn Erik Jensen
444ad2ff90 PLT plot. Fix observed-data-even-if-no-selected-well issue 2017-11-08 17:01:18 +01:00
Bjørn Erik Jensen
95a5085ba0 #2099 #2101 (partly) PLT plot. Well path/well name matching issues. Display only wells with well path 2017-11-08 16:37:19 +01:00
Rebecca Cox
1321b0d754 In RimWellLogPlot: Keep custom zoom factors on load and update 2017-11-08 16:11:53 +01:00
Rebecca Cox
52c1f27ad2 #1972 Toggle grid collection off when creating an intersection 2017-11-08 15:19:35 +01:00
Rebecca Cox
b8ec896464 Change grid icon in tree view 2017-11-08 15:19:35 +01:00
Rebecca Cox
a42786bba0 #1972 Toggle grid collection on property filter creation 2017-11-08 15:19:35 +01:00
Rebecca Cox
c3ebcd7bc5 #1972 Toggle grid collection on range filter creation 2017-11-08 15:19:35 +01:00
Jacob Støren
aa45dd5fcd #2035 Fix crash when bottom of well path ends after last well cell
Add symbols to curves
2017-11-08 11:59:38 +01:00
Jacob Støren
014dd9497a #2035 Add color and legend text to the PLT curves 2017-11-08 11:59:38 +01:00
Magne Sjaastad
9ce06a9084 #2098 Add optional display of tooltip in preferences 2017-11-08 11:29:41 +01:00
Rebecca Cox
c49db44909 #1490 Simulation well: Remove well head if it does not have perforations 2017-11-08 11:22:51 +01:00
Rebecca Cox
ea4a92ab27 Rename wellPathsPartManager -> wellPathCollection 2017-11-08 09:07:44 +01:00
Rebecca Cox
de8b953360 #2094 Move annotation functions from updateGridBoxData to new function 2017-11-08 09:07:44 +01:00
Rebecca Cox
93a83cd756 #2094 Update well name color in 3d view (not sim well) 2017-11-08 09:07:44 +01:00
Magne Sjaastad
c19bc103c2 Observed Data : Use reserve instead of wrong use of resize 2017-11-08 08:58:57 +01:00
Bjørn Erik Jensen
bfa1a1cb67 #2051 Curve calc. Edit calculation command 2017-11-08 08:47:17 +01:00
Magne Sjaastad
ea87c84d8c Observed Data : Improve performance when accessing curve values 2017-11-08 07:44:06 +01:00
Magne Sjaastad
0502b95d86 #2091 Cross Plot : Improve interface of RiuLineSegmentQwtPlotCurve
Remove duplicate code
2017-11-08 07:38:25 +01:00
Magne Sjaastad
baa9a47b92 #2089 Cross Plot : Add New and Edit cross plot features 2017-11-07 21:26:44 +01:00
Magne Sjaastad
7104064937 #2089 Cross Plot : Add cross plot collection 2017-11-07 20:40:45 +01:00
Jacob Støren
994313fcc9 #2035 Fix some bugs in the PLT plot use of wellFlowAccumulator, and in the new constructor of the wellFlowAccumulator. Renamed to m_pipeBranchesWellResultPoints (instead of misleading "CellIds") 2017-11-07 18:35:56 +01:00
Rebecca Cox
765f752c96 Add include (for linux) 2017-11-07 15:19:54 +01:00
Rebecca Cox
f3b7f0abd6 #1392 Improve Dark 3D-View background support 2017-11-07 15:08:32 +01:00
Jacob Støren
a920f16def #2035 Add Simulation well and *.RFT file curves to PLT plot. Work In progress. Does not quite work. 2017-11-07 14:41:20 +01:00
Jacob Støren
93d449bc6e Switched QString compare to == 2017-11-07 14:41:20 +01:00
Magne Sjaastad
e9a938ce78 #2003 Observed Data : Compare first time step when merging 2017-11-07 12:33:22 +01:00
Magne Sjaastad
b022492bc1 #2003 Observed Data : Improve detection of scientific number 2017-11-07 11:16:33 +01:00
Magne Sjaastad
c8e5fb7513 #2003 Observed data : Replace tabs with spaces 2017-11-07 11:16:33 +01:00
Magne Sjaastad
82721cb6fa #2003 Observed Data : Improve error display 2017-11-07 11:16:33 +01:00
Magne Sjaastad
179c15ef5c #2003 Observed Data : Adjust minimum required headers based on presence of units and scaling 2017-11-07 11:16:33 +01:00
Magne Sjaastad
d45ca19af4 #2003 Observed Data : Use epoch as start date when no date is present 2017-11-07 11:16:33 +01:00
Magne Sjaastad
222bf38d58 #2066 Observed Data : Detect scaling 2017-11-07 11:16:33 +01:00
Magne Sjaastad
45d3fe5eaa Skip empty tokens 2017-11-07 11:16:33 +01:00
Magne Sjaastad
5ab56bb2fb #2066 Observed Data : Improve detection of required header lines 2017-11-07 11:16:33 +01:00
Magne Sjaastad
6444b9f32e #2066 Observed Data : Split string by delimiter 2017-11-07 11:16:33 +01:00
Magne Sjaastad
9d06ef857e #2003 Observed Data : Use time with highest available resolution 2017-11-07 11:16:33 +01:00
Magne Sjaastad
97d67f2d49 #2003 Observed Data : Refactor creation of time steps 2017-11-07 11:16:33 +01:00
Magne Sjaastad
d7f70f5c9f Remove duplicate function 2017-11-07 11:16:33 +01:00
Magne Sjaastad
6b18493599 #2003 Observed Data : Collect detection of string types 2017-11-07 11:16:33 +01:00
Rebecca Cox
8a8234fd66 Rename function 2017-11-07 10:38:05 +01:00
Rebecca Cox
630dbd0ffc Tab -> spaces 2017-11-07 10:02:43 +01:00
Rebecca Cox
a4d658423d #2039 Update editor on toggling "Show formation" 2017-11-07 10:00:10 +01:00
Rebecca Cox
4120aecdc2 RFT Plot: Make extractor on correct path type 2017-11-07 10:00:10 +01:00
Rebecca Cox
726adcacf3 PLT Plot: Move settings and hide track and plot 2017-11-07 10:00:10 +01:00
Rebecca Cox
99f6d21e68 #2039 PLT Plot: Move formation logic from track to plot 2017-11-07 10:00:10 +01:00
Rebecca Cox
e0b0fb1c13 #2077 Well Allocation Plot: Move formation logic from track to plot 2017-11-07 10:00:10 +01:00
Rebecca Cox
bac2d2b4b2 #2037 RFT Plot: Set formation case from plot 2017-11-07 10:00:10 +01:00
Rebecca Cox
1e943e1607 #2038 RFT Plot: move formation logic from track to rft plot 2017-11-07 10:00:10 +01:00
Rebecca Cox
2fc796ac27 Update pdm-field names to include "formation" 2017-11-07 10:00:10 +01:00
Rebecca Cox
3919b3012b Remove "uiConfigName" from uiOrdering-functions 2017-11-07 10:00:10 +01:00
Rebecca Cox
de093fda4c Formation names: Change color of annotations 2017-11-07 10:00:10 +01:00
Rebecca Cox
61067cbc24 Remove ternary operator (for Linux build) 2017-11-07 10:00:10 +01:00
Rebecca Cox
ecc1df5424 Fix crash when RFT plot does not exist 2017-11-07 10:00:10 +01:00
Rebecca Cox
5feee83706 #2077 Well Allocation Plot: Formation names for pseudo length 2017-11-07 10:00:10 +01:00
Rebecca Cox
bf00807aee #2077 Well Allocation Plot: Set default formation name values 2017-11-07 10:00:10 +01:00
Rebecca Cox
ae372a4a79 #2039 #2035 RFT/PLT Plot: Set default values for formation names 2017-11-07 10:00:10 +01:00
Rebecca Cox
7e707f131c #2039 PLT Plot: Add branch index getter 2017-11-07 10:00:10 +01:00
Jacob Støren
7f3ec2ad84 #2035 Add accumulated PLT plot curves from *.RFT file. (Not yet available due to missing calculate value options) 2017-11-06 22:24:57 +01:00
Jacob Støren
b708bb0ac3 #2035 Add MD to the intesection struct available from the WellLogExtractors 2017-11-06 22:24:57 +01:00
Jacob Støren
1089060539 #2035 Remove the unused Pseudo Length calculator 2017-11-06 22:24:57 +01:00
Jacob Støren
94c6bc763d #2035 Commit unused Pseudo length calculation files, for reference. 2017-11-06 22:24:57 +01:00
Bjørn Erik Jensen
95d9e1b722 RFT plot. Add None to wells drop down if no wells are loaded 2017-11-06 14:22:21 +01:00
Bjørn Erik Jensen
32e9a06ec3 PLT plot. Add None to wells drop down if no wells are loaded 2017-11-06 14:20:43 +01:00
Bjørn Erik Jensen
1a5db83046 RFT plot. Made some methods static 2017-11-06 14:14:55 +01:00
Bjørn Erik Jensen
936568b22b Curve calc. Reorganized context menus 2017-11-06 13:52:54 +01:00
Bjørn Erik Jensen
0f8b7ce907 #2048 Curve calc. Add command icon 2017-11-06 13:50:15 +01:00
Bjørn Erik Jensen
ca4562d853 #2052 Curve calc. Add user defined unit field 2017-11-06 13:26:32 +01:00
Bjørn Erik Jensen
71bb26a292 Column based user data parser. Fix Linux warning 2017-11-06 12:37:23 +01:00
Bjørn Erik Jensen
0c8067f022 Well center line calc. Fix Linux warnings 2017-11-06 12:11:51 +01:00
Bjørn Erik Jensen
faf703dfeb #2053 Curve calc. Fix Linux build errors 2017-11-06 12:08:13 +01:00
Bjørn Erik Jensen
c6f3638dad #2053 Curve calc. Resove ptr field and fix a bug 2017-11-06 11:35:54 +01:00
Bjørn Erik Jensen
d5a3b319b8 #2053 Curve calc. Add 'Create copy' context menu 2017-11-06 11:35:54 +01:00
Magne Sjaastad
f53acbdce2 #2003 Observed Data : Handle STEPTYPE with potentially missing text for first row 2017-11-06 10:53:46 +01:00
Magne Sjaastad
296bacf7f6 #2003 Observed Data : Merge tables if DATE is present and size is equal 2017-11-03 17:44:48 +01:00
Magne Sjaastad
7d3a547ad6 #2003 Observed Data : If YEARX is present, use this as basis for the time step 2017-11-03 17:42:16 +01:00
Magne Sjaastad
f50760bb35 #2003 Observed Data : Add basic support for fixed width in parser 2017-11-03 17:42:16 +01:00
Magne Sjaastad
50b2717ed2 #2003 Move conversion from string to double into RiaStdStringTools 2017-11-03 17:42:16 +01:00
Magne Sjaastad
713998fb38 #2003 Move conversion from string to integer into RiaStdStringTools 2017-11-03 17:42:16 +01:00
Magne Sjaastad
265c0ebb70 #2003 Observed Data : Add file parsing of fixed column width 2017-11-03 17:42:16 +01:00
Magne Sjaastad
f844c6fdb9 Fix invalid assert 2017-11-03 17:42:16 +01:00
Magne Sjaastad
3fa48d175f #2003 Observed Data : Add RiaStdStringTools 2017-11-03 17:42:16 +01:00
Jacob Støren
bf8e4ed4ed #2035 Add constructor for singel branch data with MD to well flow accumulator 2017-11-03 17:13:37 +01:00
Rebecca Cox
c5fd04f3f6 Avoid showing extraction curve name if no fields are set 2017-11-03 15:31:52 +01:00
Rebecca Cox
c638d63dfe #2038 RFT Plot: Do not set form. case when toggliging show Formation off 2017-11-03 15:15:03 +01:00
Rebecca Cox
c8b05fe9ce #2038 RFT Plot: Set default values for formation names 2017-11-03 14:53:00 +01:00
Rebecca Cox
fc4ceeda95 Add branch index accessor 2017-11-03 14:52:15 +01:00
Rebecca Cox
46aa029717 Hide branch field when untoggling "show formations" 2017-11-03 14:14:07 +01:00
Rebecca Cox
312004446b #2002 RFT Plot: Update rftPlot editor on change of track/plot-settings 2017-11-03 13:47:51 +01:00
Rebecca Cox
771c9d62ed #2002 RFT Plot: Move settings and hide track and plot 2017-11-03 13:23:06 +01:00
Rebecca Cox
cac5fa42a5 Fix crash on plot deletion 2017-11-03 13:23:06 +01:00
Rebecca Cox
95f7f40b15 #2002 RFT Plot: Add visible x range and new logic for formations 2017-11-03 13:23:06 +01:00
Rebecca Cox
40b7f99de3 #2002 RFT Plot: Add formation name properties 2017-11-03 13:23:06 +01:00
Rebecca Cox
4da066c2d4 #2002 RFT Plot: Add setters for members used in formation names function 2017-11-03 13:23:06 +01:00
Bjørn Erik Jensen
189a1478eb #2041 Curve calc. Parse expression automatically after creating new calculation 2017-11-03 11:51:51 +01:00
Bjørn Erik Jensen
abcbe963eb #2074 LAS import. Fix LAS file read error on Linux 2017-11-03 11:34:03 +01:00
Jacob Støren
374c6e7b34 #2046 Disable the new advanced branch detection, as it is not always better. Needs some more work. 2017-11-03 09:15:09 +01:00
Jacob Støren
5fcc0432e8 #2046 Partial experimental fix for one-cell-branches 2017-11-03 09:15:09 +01:00