Commit Graph
100 Commits
Author SHA1 Message Date
Jacob Støren 7ddd5ca7d7 Add some reference code to help improve the CAF_ASSERT at a later point in time. 2017-12-08 16:56:42 +01:00
Jacob Støren 160b4c263d #2237 AppFwk Progressinfo: Add better error reporting, and avoid asserts when unneccessary 2017-12-08 16:56:42 +01:00
Jacob Støren 84dcc0980e #2237 Progress bar when calculating flooded PV
Fix errors in progress detected when opening project
2017-12-08 16:56:42 +01:00
Jacob Støren 04e5ccfd7e #2238 Lift limitation of plotting Flooded PV as time history curve 2017-12-07 19:31:28 +01:00
Jacob Støren f0ad02bc37 #2233, #2236 Fix some timestep related issues in RFT/PLT plot
Missing first grid timestep in RFT, and missing previous closest timestep if all available are before observed timesteps.
2017-12-07 16:24:53 +01:00
Jacob Støren cbeb248f6e Fix assert when canceling the Show Contributing Wells 2017-12-07 16:24:53 +01:00
Jacob Støren 03aaa47a60 #2177 Active property filters now considered when evaluation well visibility 2017-12-06 12:07:29 +01:00
Jacob Støren e344fcd47a #2156 Fixed crash when loading project with intersection referencing missing well path file 2017-12-05 14:03:40 +01:00
Jacob Støren 2a3f82875c Upgraded opm-flowdiagnostics-applications to cf8a5d2381776a8887d61f825b40f03b1d1cc4b0 2017-12-05 13:50:26 +01:00
Jacob Støren 63489ba91b Upped to 2017.05.2-dev.13 for D4RM sprint 1 2017-12-04 17:16:36 +01:00
Jacob Støren b092c6e047 Merge branch 'dev' of https://github.com/OPM/ResInsight.git 2017-12-04 16:38:45 +01:00
Jacob Støren 1ec6d77ff9 #2195 Final fix of missing connections in high level grids, if connections in lower levels exist. 2017-12-04 16:37:53 +01:00
Jacob Støren fcd9d0f3e6 #2195 First step in making higher LGR level connections not beeing hidden 2017-12-04 11:42:10 +01:00
Jacob Støren b69e9abce3 Upped to version 2017.05.02-dev.12 at the end of Sprint 8 - Deeper 2017-11-30 00:56:47 +01:00
Jacob Støren 2a41b4fbb8 #1994 Update opm-flowdiagnostics-applications to cd614100f3d5b8fcf1fd783e929630f11251682e 2017-11-30 00:07:35 +01:00
Jacob Støren cf9f886856 #2176 Fix the crash due to an invalid wellhead definition from libecl. Now using first valid connection-cell as proxywellhead in calculations if needed. 2017-11-24 15:46:31 +01:00
Jacob Støren 007fc87283 Switched to none-deprecated enums 2017-11-24 15:46:31 +01:00
Jacob Støren da56696a26 #2072 Allign code for x-axis title on well flow plots. Handle combination of surface and reservoir conditions for PLT plot 2017-11-24 08:14:20 +01:00
Jacob Støren eaefaf4980 #2119, #2072 Handle well flow condition and total flow 2017-11-23 15:11:43 +01:00
Jacob Støren 69a61a2cb8 #2119, #2072 Move private section to the bottom. Add isTotalFlowChannel 2017-11-23 15:11:43 +01:00
Jacob Støren 5efe0f705e #2174 Upgrade opm-flowdiagnostics-applications to 75b333335f6cd055d3130d460c6d87444fb7aed4
to get more of the PVT/RelPerm functionality.
2017-11-22 15:28:38 +01:00
Jacob Støren 41a533b6cd #2173 Push button editor now right aligns and has sensible size in steps 2017-11-22 14:52:23 +01:00
Jacob Støren df8d23efb9 Changed Select Address to Select Vector... 2017-11-22 14:52:23 +01:00
Jacob Støren 819427e091 #2171 Changed ui texts 2017-11-22 14:52:23 +01:00
Jacob Støren 4f653cbf3d Move axis selection into Y-Axis option-group 2017-11-21 10:23:19 +01:00
Jacob Støren 9faf4f8740 Add "New crossplot and summary curve" command to SummaryCurve Collection context menu 2017-11-21 10:22:36 +01:00
Jacob Støren dc22f4615f Remove margin in Text editor to align with everything else 2017-11-21 10:19:45 +01:00
Jacob Støren f032a3eb9f #2136 Sort observed data phases largest first 2017-11-17 20:17:44 +01:00
Jacob Støren 5731acb319 #2136, #2136 Zoom PLT plot when adding curves (respect autoscale)
Fix "New PLT plot" command using simwell name and not wellpath name
Rename of some methods
Use Phase Split as default
2017-11-17 15:35:07 +01:00
Jacob Støren 8c95975054 #2136 PLT plot curve appearance improved. First group gets solid fill. If Observed data is available, it will be first. The other groups are drawn with a gentle transparency on the last curve to "connect" the groups visually. 2017-11-17 15:33:43 +01:00
Jacob Støren 84c63e7df8 Remove unneccessary code 2017-11-17 15:33:42 +01:00
Jacob Støren 503c7bf37c Remove memory leak, Simplified code 2017-11-17 11:09:14 +01:00
Jacob Støren 6951000145 Fishbone Compdat: Use references instead of copy in loops etc. 2017-11-17 11:09:14 +01:00
Jacob Støren 30e3622ad4 #2126, #2139 Removed unused methods 2017-11-16 17:02:39 +01:00
Jacob Støren 1808745ea0 #2126, #2139 Rftplot alignment with PLT plot. Move two new static methods to WellPlotTool 2017-11-16 17:02:39 +01:00
Jacob Støren 6b2231478c #2126, #2139 Rftplot alignment with PLT plot. WIP 2 2017-11-16 17:02:39 +01:00
Jacob Støren 49c2d6df0d #2126, #2139 Rftplot alignment with PLT plot. WIP 2017-11-16 17:02:39 +01:00
Jacob Støren 0007682f03 Use RiaRftPltCurveDefinition in Plt Plot 2017-11-16 17:02:39 +01:00
Jacob Støren 7ff93e9154 Remove obsolete code in RimWellPlotTools, sorted header according to actual use. 2017-11-16 17:02:39 +01:00
Jacob Støren ff7ae94e43 Remove unneccessary guarding against other channels in well log file curve used in rft plot 2017-11-16 17:02:39 +01:00
Jacob Støren f027f7395d #2126, #2139 Several improvements in PLT Plot
Improved timestep and source filtering
Show contribution sources on timestep
Axis unit set from the cases actually used
Warning on inconsistent units
2017-11-15 16:18:36 +01:00
Jacob Støren 259ea5b0e7 #2126, #2139 Simplified PLT sources IO field update. Remove obsolete code 2017-11-15 16:18:36 +01:00
Jacob Støren 42ee25d29e #2126, #2139 Improve timestep filtering in PLT plot 2017-11-15 11:32:25 +01:00
Jacob Støren f1c8c0ebbe AppFwk: Fix crash and memory leak in TreeSelectionEditor system 2017-11-15 11:32:25 +01:00
Jacob Støren 07264140cb Add deleteAllCurves method, and rename removeCurve to takeOutCurve in order to minimize wrong use. 2017-11-15 11:32:25 +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
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
Jacob Støren 9070a97815 #2112 Step two of performance fixing: Avoid unneccessary calls to uiValue from the treeSelectionQMode by caching it temporarily 2017-11-11 02:38:52 +01:00
Jacob Støren 6ee03340a5 #2112 First step in improved performance: When toggling several at once, avoid update for each. 2017-11-10 23:34:22 +01:00
Jacob Støren c5e4773a58 Fix RFT plot after change of well name meaning 2017-11-10 15:44:35 +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
Jacob Støren 5adc6a4d41 Upped to version 2017.05.2-dev.10 after Sprint 6 - Deeper 2017-11-08 23:04:38 +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
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
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
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
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
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
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
Jacob Støren 7e1831bfa0 #2046 Whitespace cleanup 2017-11-03 09:15:09 +01:00
Jacob Støren 2443199bfd #2046 Clean up 2017-11-03 09:15:09 +01:00
Jacob Støren 20b262043e #2046 Prefer K-negative, K-positive faces when expanding the branchlines.
Add previous cell on stem to start of branch, and use the midface point of the shared face between this and the branching cell as start point for the branch
2017-11-03 09:15:09 +01:00
Jacob Støren 0762a2f08f #2046 Ignore neighbours with small area overlap 2017-11-03 09:15:09 +01:00
Jacob Støren daeb7c3bdc #2046 Add line from well head to new branches. Handle branch lines with only one cell 2017-11-03 09:15:09 +01:00
Jacob Støren 956b73c0c9 #2046 First nearly working more advanced branch detection 2017-11-03 09:15:09 +01:00
Jacob Støren f21e27e25b Remove unneccesary code 2017-11-03 09:15:09 +01:00
Jacob Støren 46e8144f3b #2064 Fix wrong timestep range text in Gui. Complete Fix #1986. Make it possible with Visible cells and FlowDiag/Injection flooding 2017-10-27 17:12:48 +02:00
Jacob Støren 9f9fb21cbe #2034 Update opm-flowdiagnostics to 7e2be931d4
Remove monkeypatch
Fixes Exception
2017-10-27 14:39:03 +02:00
Jacob Støren 57a5f7fc66 #2011 libecl: Add INSTALL_ERT to control install targets 2017-10-26 17:16:42 +02:00
Jacob Støren 04404c3b2c #2011 Update libecl to 89f6c44aa0 to fix RFT file reading and missing dyn nnc handling 2017-10-26 17:16:36 +02:00
Jacob Støren e7ced4f59b Set version to 2017.05.2-dev.09 2017-10-25 19:50:15 +02:00
Jacob Støren c4bc81b2cc Fix linux compile error and warning 2017-10-25 19:50:10 +02:00
Jacob Støren 12d0457e90 Whitespace changes 2017-10-25 16:04:41 +02:00
Jacob Støren 2f4bfddb06 Upped to 2017.05.2-dev.08 for end of Deeper Sprint 4 and Flow Diag 4 2017-10-13 16:29:48 +02:00
Jacob Støren 869ad4752f Fix crash creating RFT plot from well with well path but without LAS file 2017-10-13 16:28:12 +02:00
Jacob Støren a8121fb0c4 #1988 Remove assumed wrong test to make the new version of flow diag to actually work 2017-10-11 18:05:53 +02:00
Jacob Støren 4d097a3149 #1988 Update flow diag libraries to handle multiple connections in same well, and have PVT Rel Perm support. 2017-10-11 18:05:53 +02:00
Jacob Støren b87c5fb8c8 Upped to version 2017.05.2-dev-07 at end of Sprint 4 Further Development 2017-10-09 16:03:22 +02:00
Jacob Støren 62b8da837f Remove field accessor method. Adjusted whitespace 2017-10-06 13:34:45 +02:00
Jacob Støren 9bb5dcf011 Make wellLogFile field private in RimWellPath. Some whitespace changes 2017-10-06 13:24:45 +02:00