Commit Graph

1052 Commits

Author SHA1 Message Date
sigurdp
a285ae8f61 PVT Plot: Added guarding to prevent access visolations when querying dynamic properties for PVT plots in cases where initialization of PVT curve collection fails. 2017-12-05 16:16:58 +01:00
sigurdp
e12a931940 Added calculation of PVT related dynamic properties and display of these in the PVT FVF and Viscosity plots as a point marker. Started using flow diagnostics library's output unit conversion for PVT curves to align output units with the case units. #1990 2017-12-05 14:18:46 +01:00
sigurdp
0af37f3613 Changed name of flag and semantics from removeNegativeValues to includePositiveValuesOnly so that only positive values (zero not included) are included. Makes functions more suitable for usage with plots using logarithmic scale. #2193 2017-12-05 10:44:36 +01:00
sigurdp
9e3868d6d8 First attempt at using unit conversion when getting PVT curve data (commented out due to crash) 2017-12-05 10:43:44 +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
Rebecca Cox
8d7a578d6f #2137 Formation Names: Update all plots necessary when changing formation names on case 2017-12-01 10:26:32 +01:00
sigurdp
85832ae0bc PVT Plot: Added warning message if PVT plotting could not be initialized 2017-11-30 11:28:07 +01:00
sigurdp
3b1775ad4d #1994 PVT Plot: Removed water phase from plot, started implementing display of pressure marker, but this is not yet active. 2017-11-28 09:15:11 +01:00
sigurdp
aa1bbbe2d9 #1994 First cut implementing PVT plots 2017-11-28 09:15:11 +01:00
Rebecca Cox
403e137f6d Code cleanup 2017-11-27 15:23:26 +01:00
Rebecca Cox
b8848317f4 #2123 Formation/Well Path: Add access functions 2017-11-27 14:41:15 +01:00
Rebecca Cox
8c57fdf22a #2122 Formation/Well Path: Set formations path and key on RimWellPath 2017-11-27 10:33:41 +01:00
Magne Sjaastad
e231685d4c #2176 Avoid use of pointer to a temporary 2017-11-24 16:10:38 +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
Unknown
7e28039ffd #2122 Formation/Well Path: Add new reader. Same pattern as WellPathFile 2017-11-24 15:18:25 +01:00
sigurdp
65fe3ba902 #2063 Added support for showing RelPerm plot curves without end-point scaling 2017-11-24 08:36:44 +01:00
sigurdp
14c1b5a595 Enabled caclulation and plotting of PCOG and PCOW now that opm-flowdiagnostics-applications have been updated 2017-11-24 08:36:44 +01:00
sigurdp
5f5abdf347 Working on adding SWAT and SGAS markers to RelPerm plot, #2061 2017-11-24 08:36:44 +01:00
Magne Sjaastad
686a47587b #2125 Curve Calculations : Add TimeHistoryCurveMerger 2017-11-21 08:10:28 +01:00
Rebecca Cox
f5290f020b #2146 Num Flooded PV: Add allTimeSteps for all active native cells 2017-11-20 09:46:29 +01:00
Magne Sjaastad
8ee0ddb317 #2125 Curve Calculations : Add tools used to interpolate two curves 2017-11-17 14:29:19 +01:00
Magne Sjaastad
5cbaf3c1eb #2125 Refactor : Return by value instead of incoming parameter 2017-11-17 13:50:25 +01:00
Magne Sjaastad
cd368d8ef2 #2125 Refactor : Introduce typedef for CurveIntervals 2017-11-17 13:50:25 +01:00
Magne Sjaastad
827cee6093 #2125 Curve Calculations : Extract isValidValue 2017-11-17 13:50:25 +01:00
Rebecca Cox
6347c9d716 #2146 Num Flooded PV: Add allVisibleCells for native 2017-11-16 15:28:12 +01:00
Rebecca Cox
204ee2162a #2146 Num Flooded PV: Add allVisibleCells for flowDiag 2017-11-16 14:59:55 +01:00
Rebecca Cox
92a6819b39 Rename frameIndex -> timeStepIndex 2017-11-16 14:52:18 +01:00
Rebecca Cox
7c19b0601b Rename frameIndex -> timeStepIndex 2017-11-16 14:52:18 +01:00
Rebecca Cox
49417bbb3a #2146 Num Flooded PV: Add volume weighted mean for visible cells and current time step 2017-11-16 10:50:55 +01:00
Rebecca Cox
4b2af286e3 #2146 Num Flooded PV: Move getResultIndexableStaticResult 2017-11-16 10:50:55 +01:00
Rebecca Cox
797115d5c1 #2146 Num Flooded PV: Add accessor for flowDiagSolution 2017-11-16 10:50:55 +01:00
Rebecca Cox
969d6342bc include cmath for linux 2017-11-16 10:50:55 +01:00
Rebecca Cox
6c42e74623 #2146 Num Flood PV: Allow artCellInfo to be null if not usingActiveIndex 2017-11-16 10:50:55 +01:00
Rebecca Cox
47429b1c6b #2146 Num Flooded PV: Add weighted mean calulator 2017-11-16 10:50:55 +01:00
Magne Sjaastad
5fe44fe943 #2097 Reservoir Phase Detection : Compute SGAS for non-oil simulations 2017-11-10 10:36:43 +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
Magne Sjaastad
7a10087c01 #2118 Fracture : Improve detection of Stimplan cell intersected by well path 2017-11-09 14:15:05 +01:00
Jacob Støren
014dd9497a #2035 Add color and legend text to the PLT curves 2017-11-08 11:59:38 +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
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
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
0c8067f022 Well center line calc. Fix Linux warnings 2017-11-06 12:11:51 +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
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
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
Rebecca Cox
80ee785e5e Extractor: Fix crash when well path does not intersect any cells 2017-11-01 14:35:53 +01:00
Rebecca Cox
dda063cd68 Add vector of CellIntersectionInfo to WellLogExtractor 2017-10-27 14:28:53 +02:00
Bjørn Erik Jensen
71caab54ec Added first cut extraction and plotting of RelPerm plots. Also added skeleton implementation of extraction and plotting of PVT plots. #1991, #1992, #1992, #2014 2017-10-27 10:20:34 +02:00
Jacob Støren
12d0457e90 Whitespace changes 2017-10-25 16:04:41 +02:00
Rebecca Cox
89cedb350a #2038 RFT Plot: Add formation names 2017-10-25 16:00:46 +02:00
Magne Sjaastad
bb549c6aed #1878 : Ensure derived results are always tested for when creating result accessor objects 2017-10-20 15:48:12 +02:00
Magne Sjaastad
d6b0b8edf2 Remove obsolete includes and reorder 2017-10-20 10:20:58 +02:00
Rebecca Cox
e5cab39a7f #1702 Faults: Remove artificial faults caused by gaps in grid 2017-10-19 12:54:44 +02:00
Rebecca Cox
adf55ec762 #1987 Time Step Filtering: Support dynamic NNC data time step filtering 2017-10-19 09:57:10 +02:00
Unknown
314bb71ea4 #1986 Flooded PV: Add function isFlowDiagOrInjectionFlooding and replace 2017-10-18 12:54:46 +02:00
Rebecca Cox
7da8e3091b #1996: Rename RimEclipseWellCollection -> RimSimWellInViewCollection 2017-10-17 09:52:31 +02:00
Rebecca Cox
44be1bfd6b #1996 Rename RigSingleWellResultsData -> RigSimWellData 2017-10-17 09:52:31 +02:00
Rebecca Cox
d748803159 #1996 Rename RimEclipseWell -> RimSimWellInView 2017-10-17 09:52:31 +02:00
Bjørn Erik Jensen
d9a29a6c9a #1982 RFT plot. Support for TVDMSL when showing well log file curve 2017-10-16 08:38:57 +02:00
Rebecca Cox
c9d8afc803 #1980 PLT Plot: Map data cells and MD in RFTCurves 2017-10-12 13:37:03 +02:00
Rebecca Cox
e3666a21fe #1980 PLT Plot: Add argument for isExtractioncurve in setValuesWithTVD 2017-10-12 12:43:55 +02:00
Rebecca Cox
901d03079a #1980 PLT Plot: Make accessor for intersectedCellsGlobIdx 2017-10-12 12:43:55 +02:00
Bjørn Erik Jensen
66d4a817a0 Fix Linux build error 2017-10-12 11:27:05 +02:00
Bjørn Erik Jensen
389234715c Well branches. Simple well branch cache 2017-10-12 11:05:28 +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
Bjørn Erik Jensen
dcb1c40414 #1976 RFT/PLT Plot. Associate sim well and well path. RFT branch index impl 2017-10-11 13:53:05 +02:00
Jacob Støren
6f82f0f614 Rename and whitespace changes 2017-10-06 12:36:21 +02:00
Magne Sjaastad
f938827523 hasFlowDiagUsableFluxes : Add parenthesis to evaluate logical or before logical and 2017-10-06 10:56:59 +02:00
Bjørn Erik Jensen
2add09ea33 #1842 RFT Plot. Show plot when new RFT plot command is triggered 2017-10-05 16:26:39 +02:00
Magne Sjaastad
aba74bcdfd #1918 Observed Data : Remove RigSummaryCaseData 2017-09-22 15:02:14 +02:00
Magne Sjaastad
edd39b6ff1 #1926 Fishbones Export : Guard input values to std::vector::reserve() 2017-09-22 13:10:12 +02:00
Rebecca Cox
d0d8a7d4be #1816 Observed data: Reader interface will be used throughout the code 2017-09-21 09:00:51 +02:00
Jacob Støren
b03da807ea Merge fixes related to #1901 Perforation COMPDAT export errors 2017-09-20 11:05:59 +02:00
Jacob Støren
50a88dff4a #1901 Fix error in peaceman radius calculation. Used int values 1/2 and 1/4 as exponent, which ends in 0. 2017-09-20 11:02:19 +02:00
Jacob Støren
dc1844f5d5 #1901 Use the more robust WellLogExtraction system for perforation interval intersection calculations. 2017-09-19 17:20:49 +02:00
Jacob Støren
3f099861a0 #1901 RigEclipseData::ownerCase() is made const 2017-09-19 17:12:46 +02:00
Jacob Støren
19354b1a8b #1901 Whitespace changes to improve readability 2017-09-19 15:22:14 +02:00
Rebecca Cox
6d3d89bfe0 #1813 Observed data: Geometry data model object 2017-09-19 14:19:44 +02:00
Jacob Støren
d1c41fa77d #1901 Avoid returning multiple intersections for the same point in the same cell 2017-09-18 16:29:05 +02:00
Jacob Støren
d4315f7ccf #1901 Fix wrong calculation of perforation points along wellpath 2017-09-18 16:24:29 +02:00
Magne Sjaastad
1ec9e72ce2 #1891 StimPlan : Add support for "Conductivity-propped" 2017-09-14 13:48:33 +02:00
Jacob Støren
7f07962187 #1693 Reroute all access to RigCaseCellResultsData away from RimReservoirCellResultsStorage 2017-09-13 11:50:27 +02:00
Jacob Støren
bb098a241b #1693 Rename of result() to resultStorage() as step to remove the access to RigCaseCellResultsData through RimReservoirCellResultsStorage 2017-09-13 11:50:27 +02:00
Jacob Støren
337ad4d356 #1693 Remove and move stuff away from RimReservoirCellResultsStorage
To make its sole responsibility to store/restore generated results to/from cache file
2017-09-11 11:58:42 +02:00
Rebecca Cox
788ac2c8a8 #1727 Reload summary case: A new file reader will be created on reload 2017-09-11 10:45:26 +02:00
Jacob Støren
75f350db10 #1693 Move a lot of code from RimReservoirCellResultsStorage to RigCaseCellResultsData 2017-09-08 14:43:52 +02:00
Magne Sjaastad
fb1b6cc628 CppCheck : Remove unused variables 2017-09-07 22:05:20 +02:00