Commit Graph

1287 Commits

Author SHA1 Message Date
Magne Sjaastad
08995cf63e #2483 Refactoring : Simplify generation of well branch geometry (2) 2018-03-02 14:07:31 +01:00
Magne Sjaastad
7bd0bdc612 #2483 Refactoring : Simplify generation of well branch geometry (1) 2018-03-02 14:07:23 +01:00
Bjørn Erik Jensen
2ac9aba485 #2494 Add height/width fracture scaling 2018-03-01 14:18:12 +01:00
Magne Sjaastad
25a1823f35 Merge branch 'dev' into cmake-improvements 2018-02-28 08:47:01 +01:00
Magne Sjaastad
89c090ba24 #2536 Build System : Remove obsolete code for cmake older than "2.8.2" 2018-02-28 08:05:00 +01:00
Magne Sjaastad
f4bae6f796 #2529 Fracture : Remove RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES from CMake files 2018-02-26 21:11:14 +01:00
Magne Sjaastad
72b5f540e5 #2529 Fracture : Remove all #ifdef USE_PROTOTYPE_FEATURE_FRACTURES 2018-02-26 20:54:45 +01:00
Magne Sjaastad
7ce6177bc5 System : Add missing braces 2018-02-23 22:39:29 +01:00
Magne Sjaastad
ae064463a9 System : Add missing default statements 2018-02-23 22:39:14 +01:00
Magne Sjaastad
245ea2dac2 System : Use unsigned type as index 2018-02-23 22:38:46 +01:00
Magne Sjaastad
0006c786cf System : Reorder initialization order to match declaration 2018-02-23 22:38:08 +01:00
Magne Sjaastad
c6b12b85e0 Merge fracture unit refactoring into dev #2509
Add display of M and F in front of fracture templates
Add convert of StimPlan templates
Add copy/paste of StimPlan templates
Remove obsolete unit conversion code
2018-02-21 10:15:56 +01:00
Magne Sjaastad
b0be540977 #2509 Fracture : Remove obsolete unit conversion code 2018-02-21 08:18:55 +01:00
Magne Sjaastad
4e737885e4 #2509 Fracture : Move unit conversion of top/bot perforation depth 2018-02-20 15:35:08 +01:00
Magne Sjaastad
35febab8db #2509 Fracture : Add support for unit conversion of stimplan grid coords 2018-02-20 15:15:06 +01:00
Rebecca Cox
542c912df2 Merge patch into dev with fixes for #2403 2018-02-19 09:32:37 +01:00
Rebecca Cox
4d39136212 #2403 Extraction curves: Fix curves without vertical connections 2018-02-19 09:29:14 +01:00
Magne Sjaastad
1ae30ef11a (clang-tidy) : modernize-use-nullptr 2018-02-18 18:56:43 +01:00
Magne Sjaastad
f9bded9c13 #2455 Fracture : Move code to cpp and restructure header 2018-02-14 13:34:38 +01:00
Bjørn Erik Jensen
7ddfaeb234 #2388 fractures. Support for asymmetric stim plan 2018-02-08 11:05:55 +01:00
Magne Sjaastad
a283a468c2 #2447 Fracture : Show fracture legend when only ellipse fractures are present 2018-02-06 12:42:13 +01:00
Bjørn Erik Jensen
c09dd0522b Merge branch '2018.01.01-patch' into dev. #2086 2018-02-05 08:29:24 +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
c8e002d532 #2374 Fracture : Incomplete results when computing intersected StimPlan cells 2018-02-01 12:58:48 +01:00
Magne Sjaastad
33ef2948f4 Merge "Completion Export LGR" into dev
#2425 #1758 #2423
2018-01-31 13:38:05 +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
e989b3afc9 #2423 Export Completions : Move Rig*-files to completion export 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
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
d5c1e1e898 #1758 Moved implementation to source and improved formatting 2018-01-31 10:20:47 +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
Magne Sjaastad
71deeb8954 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-29 10:09:54 +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
78068e547d Fix compiler warnings related to converting time_t to double 2018-01-26 08:25:50 +01:00
Magne Sjaastad
430b193437 #2402 Fracture : Compute conductivity scaling for all conductivity variants 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
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
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
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
2da5f8cf54 #2141 Use accumulators to compute min/max used to configure legend 2018-01-19 15:08:31 +01:00
Jacob Støren
6adcbd9c56 #2375 Fix missing catch of exceptions from opm-flowdiagnostics libraries 2018-01-19 12:46:53 +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
3786adc9b7 #2347 Elm Props: Evaluate result type ELEMENT for WellLogExtractor 2018-01-11 11:35:31 +01:00
Jacob Støren
cb6d49a611 #2331 Renamed RimView to Rim3dView 2018-01-09 10:11:28 +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
Bjørn Erik Jensen
4cdc109ec3 #2315. Replaced abs() by fabs() where relevant 2018-01-05 09:29:53 +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
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
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
Jacob Støren
69ab95dfed Changed name to "Water Flooded PV" 2017-12-21 16:10:21 +01:00
sigurdp
f716dacb24 Pvt Plot: Display Rs/Rv values of curve's sample points in tool tip, #2255 2017-12-13 14:56:10 +01:00
Jacob Støren
7d39d29ca5 Merge fix of #1858 2017-12-12 17:41:45 +01:00
Jacob Støren
b8b5707ebc #1858 Compleded information for start and end of well paths starting and/or ending within cells 2017-12-12 16:34:42 +01:00
Jacob Støren
7e820cd251 #1858 General refactoring as preparations. Renaming Whitespace change. Remove obsolete code. 2017-12-12 16:32:57 +01:00
Jacob Støren
68f5253644 #1858 Move method to WellLogExtractor base class 2017-12-12 15:00:14 +01:00
Jacob Støren
6c3f569499 #1858 Align and remove near struct duplicates of WellPathCellIntersectionInfo 2017-12-12 14:49:10 +01:00
Jacob Støren
b15664cfc5 #1858 Rename WellPathIntersectionInfo classes 2017-12-12 13:53:02 +01:00
Jacob Støren
3a1939d460 #1858 Renaming and whitespace as preparations 2017-12-12 12:47:05 +01:00
sigurdp
01ae19ebbc #2235 RelPerm/PVT Plot: Added unit labels to relevant axes 2017-12-11 16:12:31 +01:00
Rebecca Cox
3e5209d1a7 #2227 Well formations: Remove fluids from Level type 2017-12-11 16:07:15 +01:00
Rebecca Cox
fb876f8fdc #2227 Well formations: Remove fluid annotation duplicates 2017-12-11 15:12:12 +01:00
Rebecca Cox
864b9466d5 #2227 Well formations: Handle "+" in formation name file input 2017-12-11 15:12:12 +01:00
Rebecca Cox
c3cd0a650e #2227 Well formations: update ui. remove level from RigWellPathFormation 2017-12-11 15:12:12 +01:00
Rebecca Cox
406c371682 #2227 Well formation: Make level filter dynamic 2017-12-11 15:12:12 +01:00
Rebecca Cox
fa3d9c4fc2 #2227 Well Formation: Add filter. Filter options not dynamic 2017-12-11 15:12:12 +01:00
sigurdp
07b1bbca4b RelPerm Plot: Try and enable handling of invalid scaled saturation end-points by ignoring these, but currently does not seem to give the expected results. 2017-12-11 13:07:35 +01:00
sigurdp
56febb9e92 #2192 RelPerm Plot: Utilize new functionality in opm-flowdiagnostics-applications to show the pressure in case-units 2017-12-11 13:07:35 +01:00
sigurdp
09c09a7386 Upgraded opm-flowdiagnostics-applications to a773bcfc963705679ecc28f58048fc38936fbbc6 2017-12-11 11:15:09 +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
Magne Sjaastad
cda9d82971 Use int instead of size_t to represent time step 2017-12-08 10:49:32 +01:00
Magne Sjaastad
1841379e64 #2127 Sim Well Branches : Major refactor of sim well branch computation
Remove local branch geometry caches
Add checkbox to control if branch detection should be used
Add RiaSimWllBranchTools and move helper functions from RimProject
2017-12-08 10:24:14 +01:00
Rebecca Cox
a2d2879bab #2227 Well formations: New Rig data stucture with top+base MD and level 2017-12-08 09:27:37 +01:00
Rebecca Cox
48f9769eb7 #2221 Well Path Formation names: Improve user feedback on import 2017-12-07 08:34:12 +01:00
Magne Sjaastad
9d83299da9 Statistics : Skip computation of mobile pore volume, as base data is not available 2017-12-06 08:09:54 +01:00
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
Magne Sjaastad
b82cf1377d CppCheck : Remove unused variables 2017-09-07 21:30:33 +02:00
Magne Sjaastad
ad64340b75 CppCheck : Added copyright header, fixed includes and removed unused variable 2017-09-07 21:28:40 +02:00
Magne Sjaastad
228c8d1f87 CppCheck : Add const reference and remove unused variable 2017-09-07 21:24:06 +02:00
Magne Sjaastad
6338166708 CppCheck : Init all members in constructor 2017-09-07 21:10:11 +02:00
Magne Sjaastad
d8beee3eb1 CppCheck : Remove unused constructor and init all members in constructor 2017-09-07 21:06:45 +02:00
Magne Sjaastad
03df2c2540 CppCheck : Add missing initialization in constructor 2017-09-07 20:59:09 +02:00
Rebecca Cox
600da3731a #1727 Summary Plot: Add Reload option for group and for individual summary cases 2017-09-06 14:09:15 +02:00
Jacob Støren
a63b9611de Improved robustness of Flooded PV calculation with respect to PORV and SWCR resultCellCount 2017-09-06 12:50:22 +02:00
Jacob Støren
f2b26be5d8 #1854 Add forgotten negative signs on negative inflow. Now matches results from octavescript where applicable 2017-09-05 13:34:06 +02:00
Jacob Støren
31bddebc65 #1863 Avoid calculating flooded pv for all timesteps, each timestep.
#1854 Corrected sign for nnc flow into cell
2017-09-05 12:01:59 +02:00
Bjørnar Grip Fjær
a335fd0f21 #1788 Create preliminary user interface to show Flooded PV 2017-08-31 16:23:39 +02:00
astridkbjorke
3a44cbb986 #1787 Removing code for returning cumulative inflow, only used for testing 2017-08-31 15:30:29 +02:00
astridkbjorke
ad14863a36 #1787 Removing mainGrid from constructor, scaling porevolume by (1-swcr), if swcr is available in file 2017-08-31 14:28:35 +02:00
astridkbjorke
f0f189b311 #1787 Correcting which timestep is used for calculation of total flow into cell 2017-08-31 12:45:05 +02:00
astridkbjorke
0ab95bc1f2 #1787 Sorting out issue with indexing - resultindex vs global index 2017-08-31 12:45:05 +02:00
Magne Sjaastad
52d7897160 #1821 SourSimRL : Use type when creating result accessor 2017-08-31 09:54:05 +02:00
astridkbjorke
47790dfad9 #1787 Returning reference to vector 2017-08-30 11:04:50 +02:00
astridkbjorke
d9589c836a #1787 Removing hardcoding of tracername to dummy value. Changing to have vector of QString for tracernames for calculator. 2017-08-30 10:50:55 +02:00
astridkbjorke
97796329e9 #1787 Fixing issues with data not present at all time steps. 2017-08-30 10:10:50 +02:00
astridkbjorke
28d1437bc8 #1787 Using cellResultIndex instead of globalCellIndex to get cell values from flowResults. Also checking that neighbour cell is not an LGR. 2017-08-30 08:59:05 +02:00
astridkbjorke
71cd963945 #1787 Adding functions returning calculated number of flooded pore volumes 2017-08-30 08:59:05 +02:00
astridkbjorke
dc41644452 #1787 Removing code from constructor to separate calculate function 2017-08-30 08:59:05 +02:00
astridkbjorke
ae8729f7f7 #1787 checking which hostGrid a cell belongs to, and use this instead of maingrid to find i,j,k 2017-08-30 08:59:05 +02:00
astridkbjorke
7e52a1b01c #1787 Adding nnc flow rates 2017-08-30 08:59:05 +02:00
astridkbjorke
bfe4875de5 #1787 Renamings + moving code to get flowrates to outside the timestep-loop 2017-08-30 08:59:05 +02:00
astridkbjorke
77f784ce8a #1787 Calculating number-of-cell-PV flooded. Still assuming only maingrid and no NNC 2017-08-30 08:59:05 +02:00
astridkbjorke
8027f3d5c4 #1787 Adding files for calculator of number of flooded pore volumes. Starting calculating by only considering neighbour cells. 2017-08-30 08:59:05 +02:00
Bjørnar Grip Fjær
c736e10ad5 #1836 Add region selection threshold fields 2017-08-29 16:21:19 +02:00
Bjørnar Grip Fjær
d3eaf9c73a #1828 Add check for existence of results when calculating TOF Acc Sat Plot 2017-08-29 10:25:00 +02:00
Magne Sjaastad
538d308922 #1769 Rename to findOrCreateScalarResultIndex 2017-08-25 06:58:47 +02:00
astridkbjorke
e428bf33f9 #1792 Avoiding issue with negative transmissibility from fracture to well due to small discretization by forcing peaceman radius r0 > wellRadius. 2017-08-24 14:01:43 +02:00
astridkbjorke
c7dcf9f4d0 #1792 Giving error message if cells from LGR are found in export. Compdat-values for cells not part of LGR exported. 2017-08-24 14:01:43 +02:00
Bjørnar Grip Fjær
dbee70b222 #1807 Adjust tracer communication in flow characteristics plot to include cells with 0-value 2017-08-24 10:58:52 +02:00
Bjørnar Grip Fjær
5ead49e01e #1807 Add option to use visible cells in view as region selection in flow characteristics plot 2017-08-24 09:28:05 +02:00
Jacob Støren
7f63e8d688 Linux compile fix 2017-08-23 11:02:58 +02:00
astridkbjorke
5134a461d9 #1776 Updating calculation of length of stimplan-eclipse-overlap polygon for sl/pi-term in matrix-to-fracture transmissibility to avoid possible NaN values in export. Length is now calculated in x direction in the fracture coordinate system. 2017-08-23 09:46:00 +02:00
Magne Sjaastad
56a04de2ff Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-22 09:36:05 +02:00
Magne Sjaastad
de6e6858fa #1794 Include Clipper library inside ifdef USE_PROTOTYPE_FEATURE_FRACTURES 2017-08-21 22:05:15 +02:00
Magne Sjaastad
26149f1b5e #1794 Several fixes to make fracture configuration compile 2017-08-21 20:54:48 +02:00
Magne Sjaastad
553b3bf63e #1794 Add flag RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES 2017-08-21 15:24:20 +02:00
Bjørnar Grip Fjær
44fa306ce1 #1805 Make * indicate calculated time step in flow characteristics plot 2017-08-21 11:48:41 +02:00
Bjørnar Grip Fjær
3658811ed2 #1805 Better naming of cell filter options in flow characteristics plot 2017-08-21 11:42:08 +02:00
Magne Sjaastad
51c30448e9 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-21 10:42:11 +02:00
Bjørnar Grip Fjær
65ce0d3788 #1377 Flow Characteristics Plot: Calculate for a defined set of cells 2017-08-17 11:25:13 +02:00
Magne Sjaastad
a961221c2c Merge remote-tracking branch 'origin/hdf-prototype' into dev 2017-08-17 07:30:01 +02:00
Bjørnar Grip Fjær
030ad9cec4 #1126 Add "Accumulated Saturation by Time of Flight"-plot 2017-08-15 16:00:32 +02:00
Magne Sjaastad
c0e3349632 Merge remote-tracking branch 'origin/dev' into hdf-prototype 2017-08-15 15:34:23 +02:00
Magne Sjaastad
16a1caf4c0 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-15 15:26:36 +02:00
Jacob Støren
6912ee0081 #1765 Fix of mapping between well timesteps and result timesteps, handling holes in both well and result timesteps. 2017-08-15 14:51:18 +02:00
Bjørnar Grip Fjær
0314a045e7 Fix issue with flow diagnostics loading with assertion error 2017-08-15 10:12:02 +02:00
Magne Sjaastad
f756d1d2cb #1764 Use helper function to load data and create result accessor 2017-08-14 19:27:44 +02:00
Magne Sjaastad
3cf4bb25dc #1764 If no NTG values are defined on file, use 1.0 as NTG value 2017-08-14 19:03:01 +02:00
Magne Sjaastad
5eb4eafb6e Merge branch 'dev' into hdf-prototype 2017-08-14 10:47:44 +02:00
Magne Sjaastad
3644f4eb76 Do not compare signed with unsigned 2017-08-11 16:17:40 +02:00
Magne Sjaastad
0ba1746755 Merge branch 'dev' into pre-proto 2017-08-11 16:14:00 +02:00
Magne Sjaastad
f096f78a55 Linux : Fix compile issue 2017-08-11 15:18:20 +02:00
Magne Sjaastad
c1fe8a7e6c #1691 Rename to RigEclipseResultInfo 2017-08-11 15:10:08 +02:00
Magne Sjaastad
21fd00389c Fixes after merge 2017-08-11 14:55:01 +02:00
Magne Sjaastad
89684c243f #1755 Use namespace RiaDefines instead of class 2017-08-11 14:28:42 +02:00
Magne Sjaastad
8f3a7a5867 #1691 Map from filtered time step indices to well result indices 2017-08-11 14:27:58 +02:00
Magne Sjaastad
68e52e1838 #1755 Cleaned up includes 2017-08-11 14:27:57 +02:00
Magne Sjaastad
c4aa625d33 #1755 Move porosity model enum to separate file 2017-08-11 14:27:56 +02:00
Magne Sjaastad
88bbea6339 #1755 Remove porosity enum from RifReaderInterface 2017-08-11 14:27:22 +02:00
Magne Sjaastad
ad09441da1 #1691 Add RigTimeStepInfo 2017-08-11 14:26:16 +02:00
Magne Sjaastad
6b90a94458 #1691 Rename to RigResultInfo 2017-08-11 14:26:15 +02:00