OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,377 Commits 27 Branches 61 Tags 309 MiB
a812190af3
Commit Graph

1350 Commits

Author SHA1 Message Date
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
Magne Sjaastad
3253c8968e #1691 Move RigResultInfo into separate file 2017-08-11 14:26:15 +02:00
astridkbjorke
abd058da8b #1126 Update after merge - using ALL for PhaseSelection 2017-08-11 11:26:35 +02:00
astridkbjorke
ef1208e2f5 #1126 Adding RigTofAccumulatedPhaseFractionsCalculatorTester with function calling sortTofAndCalculateAccPhaseFraction, so that this function can be set private. 2017-08-11 10:31:13 +02:00
astridkbjorke
ebab0b50a3 #1126 moving finding data and calling sortTofAndCalculateAccPhaseFraction to constructor 2017-08-11 10:31:13 +02:00
astridkbjorke
db6d471e9c #1126 Fixing constructor 2017-08-11 10:31:13 +02:00
astridkbjorke
2ce81e9045 #1126 Updating inserting to map to use insert. Adding access functions for calculated data and constructor for class (not finished) 2017-08-11 10:31:13 +02:00
astridkbjorke
35cc413f4d #1126 Adding handling of multiple cells with same tof. No test yet. 2017-08-11 10:31:13 +02:00
astridkbjorke
4f2d3c7f5b #1126 Fixing missing/wrong filenames in cmake-files, and error in last check-in 2017-08-11 10:31:13 +02:00
astridkbjorke
42245b22af #1126 Adding unit test 2017-08-11 10:31:13 +02:00
astridkbjorke
40addb9a10 #1126 Adding (dummy) unit test. Calling the sortTofAndCalculateAccPhaseFraction function, but no check of values calculated yet 2017-08-11 10:31:13 +02:00
astridkbjorke
a61882d092 #1126 Adding first implementation of calculator for TOF-accumulated phaase fraction. Not yet tested or called from any code. 2017-08-11 10:31:13 +02:00
Bjørnar Grip Fjær
efb79ac753 #1202 Flow: Handle separate phase solutions 2017-08-10 15:08:30 +02:00
Bjørnar Grip Fjær
747721a7f8 #1698 Use opm-flowdiagnostics calculation of fluxes if not present in Eclipse restart file 2017-08-10 10:09:24 +02:00
Bjørnar Grip Fjær
7598d8c196 #1696 Threshold option for aquifer cells 2017-08-09 14:10:39 +02:00
Bjørnar Grip Fjær
7e3e538a43 #1662 Octave interface to push generated NNC values back into ResInsight 2017-08-08 13:13:05 +02:00
Jacob Støren
2d9f48d715 Whitespace and typo 2017-08-08 13:12:18 +02:00
Bjørnar Grip Fjær
79c48338a7 #1741 Add octave interface command to get names of available NNC properties 2017-08-07 15:30:16 +02:00
astridkbjorke
09363b2fec #1737 Making small adjustment to polygon to avoid having well path line going though perforation length polygon vertex, due to problems in clipper for this case. 2017-08-07 13:14:22 +02:00
Magne Sjaastad
c481a275ee Merge branch 'dev' into pre-proto 2017-08-04 10:37:35 +02:00
astridkbjorke
50eb8b7225 #1617 Adding conductivity scaling factor to StimPlan fracture templates, and scaling the conductivity values in file with this value. 2017-08-03 13:40:35 +02:00
astridkbjorke
ef8fc3dbc6 #1716 Fix spelling 2017-08-02 13:29:45 +02:00
astridkbjorke
fcfe0eb4a9 #1716 Fixing error in Peaceman formula 2017-08-02 13:10:08 +02:00
astridkbjorke
313752bb7c #1721 Updating value used if trig calculation of azimuth value for simWell cannot be used due to 0 y component (well oriented East-West) 2017-08-02 11:37:46 +02:00
astridkbjorke
d55c362bf0 #1714 Adding point at fracture position to the vector of wellPathPoints used in calculation of intersection between fracture and wellpath. 2017-08-02 11:37:46 +02:00
Bjørnar Grip Fjær
7179aaeac9 Merge branch 'dev' into pre-proto 2017-08-01 12:44:11 +02:00
Jacob Støren
ec4362b247 #1692 Put SourSimRL Results in a separate result type 
#1693 Started to separate code for SourSim and Eclipse results data.
 2017-07-07 13:31:14 +02:00
Jacob Støren
8edac70013 Adjusted argument alignment 2017-07-04 13:51:14 +02:00
astridkbjorke
28c572b1fd #1540 Adding comment to make it more clear why direction for calculating length in is calculated as it is. 2017-07-04 11:34:21 +02:00
astridkbjorke
032630f6e9 #1634 Calculating smallest positive value and using this value for the min range value when using logarithmic scale 2017-06-30 16:16:27 +02:00
Magne Sjaastad
ec990b5e2c Add static cast from size_t to int 2017-06-29 22:37:00 +02:00
Magne Sjaastad
468d5134cb #1670 Move grid functions from RimCellRangeFilterCollection to RigReservoirGridTools 2017-06-29 22:37:00 +02:00
Bjørnar Grip Fjær
44f0234096 #1661 Octave interface for getting static and dynamic NNC result values from ResInsight 2017-06-29 11:19:07 +02:00
astridkbjorke
2625ce6ea9 #1618 Fixing bug in well path angle calculation + corresponding update to fracture azimuth angle. Calculating difference between well path and fracture angle and displaying warning if less than 10 deg. 2017-06-27 14:12:50 +02:00
Jacob Støren
2ed872e8fc Add comment to make it clear that using mainGrid::cellCornerVertices with reservoir cell index is valid. 2017-06-27 13:21:04 +02:00
Jacob Støren
6610977c9f Linux compile fixes 2017-06-26 11:05:46 +02:00
Jacob Støren
9d1cc2eb19 #1653 Make fracture mesh visualization independent of active view. 
Removed use of timestep index in rimfracture (use template timestep)

Remove display value from fracture cell
 2017-06-26 10:28:23 +02:00
Bjørnar Grip Fjær
de414c4277 #1645 Load dynamic NNC results from restart file 2017-06-26 10:25:08 +02:00
Jacob Støren
febdabc6c6 Minor whitespace adjustments 2017-06-25 10:42:53 +02:00
Jacob Støren
7d7172f811 #1646 Fix disappearing mesh lines by using double transformation calculations 2017-06-23 10:16:39 +02:00
Bjørnar Grip Fjær
faf225d8c3 Merge branch 'master' into hdf-prototype 2017-06-22 10:56:36 +02:00
Jacob Støren
33b037a80b #1440 Merge dev into pre-proto (WellPath viz restructure and constness) 
Had to do quite a bit constness fiddeling to make the merge work
 2017-06-22 10:42:07 +02:00
Bjørnar Grip Fjær
8f06115730 Merge branch 'dev' into pre-proto 2017-06-21 16:38:57 +02:00
astridkbjorke
8d28981664 #1589 Remove option removeLateralsInMainBoreCells, instead implement option for "Exclude main bore" for fishbone export. Also grouping export options. 2017-06-21 15:55:35 +02:00
astridkbjorke
21f0857791 #1589 Replace bools "Calculate Trans" and "Include WPImult" with choice of calc trans or use wpimult and default connection factors 2017-06-21 15:55:35 +02:00
Bjørnar Grip Fjær
4f8f77945c Add method for checking if fracture has non-zero conductivity 2017-06-20 16:40:51 +02:00
Bjørnar Grip Fjær
d63fdf0c80 #1593 Use well path unit type on fractures 2017-06-20 14:46:58 +02:00
astridkbjorke
5a466db9af #1630 Update metadata for completions 2017-06-20 13:49:33 +02:00
astridkbjorke
5bcc226aba #1561 Setting wpimult in RigCompletionData to double, setting celldirection in completionData for implicit trans and wpi mult calculation 2017-06-20 13:49:33 +02:00
astridkbjorke
ade665e5b4 #1561 Setting isMainBore for main bore fishbone completions 2017-06-20 13:49:33 +02:00
Bjørnar Grip Fjær
7c99a2573a Merge branch 'dev' into pre-proto 2017-06-20 13:26:52 +02:00
Bjørnar Grip Fjær
d3f512f783 #1593 Use well path unit system for completions on well path 2017-06-20 10:51:01 +02:00
astridkbjorke
9ccd033c91 #1630 Calculate transmissibility for perforation intervals 2017-06-20 10:18:20 +02:00
astridkbjorke
7af233fba0 #1561 Update calculation of transmissibility for fish bones to only use number of laterals (not main bore) in adjustment of cell volume. 2017-06-20 09:47:16 +02:00
astridkbjorke
a6a1ad0f95 #1561 Replacing old combine function for RigCompletionData with new combineEclipseCellCompletions which can calculate WPImult. Assumes completions to always have calculated transmissibility. 2017-06-20 09:47:16 +02:00
Jacob Støren
a91a4d2285 #1585 corrected calculations of achor cell on fracture 
Move IJK achor cell visualization to SimWellFracture
Remove unused IJK fields and IJK anchor cell from RimFracture, because they are ambigous for well path fractions.
Should be a list, but not implemented yet
 2017-06-16 14:24:16 +02:00
Bjørnar Grip Fjær
2090db62b2 #1602 Consolidate some intersection functionality to common tools class 2017-06-16 09:44:28 +02:00
Bjørnar Grip Fjær
403bf1890c #1607 Record completion type of completion data and combine after all completions are calculated 2017-06-15 09:12:42 +02:00
Jacob Støren
1911092cb7 Merge dev into pre-proto 2017-06-14 23:25:55 +02:00
Jacob Støren
81d44ca69b Linux Compile fix 2017-06-14 15:28:23 +02:00
Jacob Støren
088b486a3e Linux compile fix 2017-06-14 14:34:52 +02:00
Jacob Støren
c0d493f690 #1558 Move Hexintersection methods to a separate file 
To make it easierr to see and use from other code.
 2017-06-14 14:16:20 +02:00
Jacob Støren
1d405384ee Remove obsolete code: StimPlaneUpscaling and Transmissibilities 2017-06-14 11:25:43 +02:00
astridkbjorke
4577ef973c Removing (never used) arguments with default in RigWellPathIntersectionTools::findCellsIntersectedByPath (and renaming inside function) 2017-06-14 10:33:19 +02:00
Jacob Støren
f87a186648 #1585 Privatize data members in FractureDefinition 2017-06-14 09:28:56 +02:00
Magne Sjaastad
12bbaa898d Added several missing copyright headers 2017-06-14 07:53:28 +02:00
Magne Sjaastad
a8b8e061d7 #1596 Merge dev into pre-proto 2017-06-14 07:25:34 +02:00
Magne Sjaastad
cf859e7c16 #1596 Rename from RimDefines to RiaDefines 2017-06-13 15:41:52 +02:00
Magne Sjaastad
5fa2f6cfbe #1596 Rename to RiaEclipseUnitTools 2017-06-13 15:25:52 +02:00
Jacob Støren
add7516532 #1585 Clean up in the RigStimPlanFractureDefinition 2017-06-13 15:07:16 +02:00
Jacob Støren
e9b9b17739 #1585 Move geometry generation code frm RimStimPlanTemplate to Rig 2017-06-13 15:07:16 +02:00
Jacob Støren
f09374b12a #1585 Rename in StimPlanFractureTemplate. Move obsolete method to upscaling 2017-06-13 15:07:16 +02:00
Jacob Støren
bd03fa4791 #1585 Move more code away from StimPlanTemplate 2017-06-13 15:07:16 +02:00
Jacob Støren
681a3404b4 #1585 Move more code away from StimPlanTemplate 2017-06-13 15:07:16 +02:00
Jacob Støren
e159fa5bca #1585 Move code away from StimPlanTemplate, and prepare to move more 2017-06-13 15:07:16 +02:00
Jacob Støren
a2de4efb66 #1585 Remove RigFracture. No caching of transformed triangles related to each fracture instance 2017-06-12 12:52:39 +02:00
Bjørnar Grip Fjær
6391fad018 #1559 Use common export completions command for well paths and simulation wells 2017-06-12 12:41:14 +02:00
Jacob Støren
95dd87f23c #1585 Moved obsolete RigFracturedEclipseCellExportData to obsoleted code 2017-06-12 09:30:01 +02:00
Jacob Støren
dceae0581e #1585 Major renaming of fracture related methods and members 2017-06-09 17:21:59 +02:00
Magne Sjaastad
96981d1ab4 Fix mix of signed / unsigned compare 2017-06-09 15:55:47 +02:00
Magne Sjaastad
dd912b4f97 Merge branch 'dev' into pre-proto 2017-06-08 14:09:03 +02:00
Bjørnar Grip Fjær
5cad6cd376 Use previously created functionality to get corner vertices from a cell 2017-06-08 13:01:26 +02:00
Bjørnar Grip Fjær
0f188a2200 #1560 Add support for computing fishbones transmissibilities 2017-06-08 13:01:26 +02:00
astridkbjorke
42563ac813 #1571 Using circle instead of square to find relevant part of well path based on perforation length. 2017-06-08 11:37:23 +02:00
Bjørnar Grip Fjær
b82bda5905 #1577 Improve RigWellPathIntersectionTools 2017-06-07 16:04:34 +02:00
astridkbjorke
ac447c0486 #1557 Cleanup includes, improve comments 2017-06-07 11:49:45 +02:00
astridkbjorke
2dc7076593 #1557 Adding equations for peacemans formula, well bore transmissibility for a given direction, and total connection factor based on X, Y and Z trans. 2017-06-07 11:36:44 +02:00
Bjørnar Grip Fjær
f1b4b735ff #1573 Created own unit system class 2017-06-06 14:57:32 +02:00
Jacob Støren
2d85f1f1c5 Merge branch 'dev' into pre-proto 2017-06-05 11:40:13 +02:00
astridkbjorke
1f87681d7e #1542 Always using radial transmissibility calculation if the fracture is transverse to well or azimuth. If alog well: Perforation length for fracture limits the intersection fracture/well. 2017-06-02 15:04:32 +02:00
Bjørnar Grip Fjær
a8ddd20063 Pass constructor parameter as const reference to RigCompletionData 2017-06-02 10:42:57 +02:00
Bjørnar Grip Fjær
a52d70c424 #1548 Remove fishbones laterals based on success rate 2017-06-02 10:16:41 +02:00
Jacob Støren
e7244d0b0b Merge dev into pre-proto. 2017-06-02 08:05:07 +02:00
Jacob Støren
665ee684b3 Fix less operator of Completion Data 2017-06-01 17:20:04 +02:00
Jacob Støren
252defd96a #1493 Include fracture export in the Export Completions Command 2017-06-01 16:34:30 +02:00
astridkbjorke
07cd5f31c4 #1541 Fixing value used for initializing azimuth angle for well path 2017-06-01 14:06:41 +02:00
astridkbjorke
e6fea6130b #1507 Setting up fractureGrid for ellipse fracture template, and adapting transmissibility calculation to be able to handle both ellipse and stimplan fractures. Missing setup of fractureCells for ellipse when loading old project. 2017-06-01 14:06:41 +02:00
Bjørnar Grip Fjær
b20a563517 #1520 Establish new result type 'Completion Type' 2017-06-01 12:36:54 +02:00
Bjørnar Grip Fjær
935299b3df Merge branch 'fishbones' into pre-proto 2017-06-01 12:32:36 +02:00
Bjørnar Grip Fjær
1aedf92efc Merge branch 'dev' into fishbones 2017-06-01 09:02:38 +02:00
astridkbjorke
a1738d8e3a #1487 Renaming functions for calculating transmissibilities. Simplifying names and using fractureCell instead of stimPlanCell in names 2017-05-31 09:16:49 +02:00
astridkbjorke
f82511264b #1507 When using addNeighbourTransmissibility for a cell combination where a trans value already exists, the new value is added to the old instead of replacing it. 2017-05-31 08:11:17 +02:00
astridkbjorke
406bf96f3f #1487 RigFractureGrid inherits from cvf::Object, and RimStimPlanFractureTemplate fractureGrid() is returning a pointer 2017-05-30 14:57:21 +02:00
Bjørnar Grip Fjær
e76d2a8980 #1532 Refactor RigCompletionData::combine to be a static method 2017-05-30 14:12:51 +02:00
Bjørnar Grip Fjær
99da23d4a7 #1531 Display message in logger if perforation interval is outside eclipse grid 2017-05-30 12:10:05 +02:00
astridkbjorke
a8b6543c3c #1487 Renaming RigStimPlanFracTemplateCell to RigFractureCell 2017-05-30 11:52:19 +02:00
astridkbjorke
8cf5f6983f #1487 Renaming. Removing stimPlan from names in RigFractureGrid 2017-05-30 11:35:52 +02:00
astridkbjorke
0458ac38d7 #1487 Small fixes after merge 2017-05-30 10:00:04 +02:00
Jacob Støren
258ec8a728 #1526, #1482 Use kSm3 and BOE as units for Gas in Well Alloc Plots 2017-05-29 22:53:44 +02:00
Bjørnar Grip Fjær
87cfb22efe #1464 Move well segment export to own feature 2017-05-29 15:39:37 +02:00
Bjørnar Grip Fjær
b27d0c3469 Fix missing imports for GCC 2017-05-29 15:02:38 +02:00
Bjørnar Grip Fjær
e30242bf0b #1462 Fix detection of starting cell of lateral 2017-05-29 14:19:18 +02:00
astridkbjorke
68251f4b4e pre-proto - Adding todo-comments and fixing indexing 2017-05-29 14:16:45 +02:00
astridkbjorke
8ca5a5a90a #1487 - pre-proto - Adding class RigFractureGrid, which now holds RigStimPlanFracTemplateCells and functions for accessing these. 2017-05-29 14:16:45 +02:00
astridkbjorke
7420c069c7 #1487 - pre-proto - Moving private functions to private, removing some functions / parameters not in use. 2017-05-29 13:59:05 +02:00
Jacob Støren
f9a29925c5 #1483 Flow Characteristics plot: Set pore volume fraction threshold to 0.1 2017-05-29 13:16:40 +02:00
Bjørnar Grip Fjær
3dbc09b28d #1519 Compdat export for fishbones and perforations 2017-05-29 13:13:25 +02:00
Jacob Støren
4e091641a4 #1483 Update opm-flowdiagnostics and ..-applications 
to b6e59ddcd2fe, and ccaaa4dd1b55 respectively.

In order to include flowCapacityStorageCapacityCurve with max pv fraction threshold
 2017-05-29 13:08:32 +02:00
Bjørnar Grip Fjær
45f5b5a80a Make more const accessors available 2017-05-29 12:56:40 +02:00
Jacob Støren
6cdf13a2bc #1506 Add debug output of total transmissibility info to COMPDAT file 2017-05-27 17:51:34 +02:00
Jacob Støren
e4abc737cd #1514, #1506 Fix several wellpath stimplan intersection bugs. 
First numbers to file achieved, but they are wrong and too few
 2017-05-26 17:37:48 +02:00
Bjørnar Grip Fjær
dbcdd4dde0 Fix GCC build error 2017-05-26 14:52:01 +02:00
Bjørnar Grip Fjær
96760884d1 #1519 Export COMPDAT for all perforation intervals 2017-05-26 12:37:01 +02:00
Bjørnar Grip Fjær
05edb97635 #1519 Create tools for calculating cells intersected by well paths 2017-05-26 11:10:54 +02:00
Jacob Støren
edbad753b8 Proposal for new names in FractureTransEq class 2017-05-23 12:02:37 +02:00
Magne Sjaastad
a45aee0cc2 Merge branch 'fishbones' into pre-proto 2017-05-23 10:28:42 +02:00
Jacob Støren
0b0747a8ec #1506 Fixes linux compile errors and some warnings 2017-05-23 07:35:51 +02:00
Jacob Støren
6cbbed15bf #1514 Add Wellpath StimPlanGrid intersector. Fix errors in polyline polygon intersection. Add tests for Polyline polygon intersection 2017-05-22 18:11:03 +02:00
Jacob Støren
50c182aa26 #1514 Add polyline/polygon intersection method 
To be used for wellpath stimplan intersection
 2017-05-22 15:34:50 +02:00
astridkbjorke
cf2cc5b2b5 #1487 - pre-proto - starting to use trans condenser in export function. Adding transmissibilities to condenser and getting output trans from eclipse cells to well. Not yet summarizing values from multiple fractures or printing COMPDAT values. 2017-05-22 12:46:57 +02:00
astridkbjorke
d12e7747bc #1487 - pre-proto- Removing area factor in calculation for radial tranmissibility to well, and re-ordering functions in RifFractureExport 2017-05-19 15:16:40 +02:00
Jacob Støren
3271f9b32f #1487 Remove obsolete RigStimPlanFractureCell class 2017-05-19 14:57:37 +02:00
Jacob Støren
c1f3dff613 #1487 Remove obsolete methods 2017-05-19 14:12:53 +02:00
Jacob Støren
e779c73e15 #1487 Linux compile fixes 2017-05-19 11:49:24 +02:00
Jacob Støren
7e847361d1 #1487 Move darchy constant into RigEclipseCaseData, where it belongs 2017-05-19 11:41:49 +02:00
astridkbjorke
d1b3d619d3 #1487 - pre-proto - Moving RigStimPlanUpscallingCalc to separate file 2017-05-19 11:31:57 +02:00
astridkbjorke
01364cf6c3 #1487 - pre-proto - Removing obsolete functions 2017-05-19 11:20:57 +02:00
astridkbjorke
061ceb06b2 #1487 - pre-proto - move functions related to upscaling from StimPlan to Eclipse grid to a separate class, and making planCellIntersectionPolygons function static 2017-05-19 11:02:11 +02:00
Jacob Støren
7763a74752 #1487 Use new trans Equation class Step 1. 2017-05-19 10:19:18 +02:00
Jacob Støren
03c7df7b3b #1487 Collect all fracture transmissibility equations into one class 2017-05-19 10:16:30 +02:00
astridkbjorke
c7354e8548 #1487 - pre-proto - Making functions for calculating relevant transmissibilities static, and using cell sizes, conductivities etc as inputs instead of entire RigStimPlanCell 2017-05-18 15:14:45 +02:00
Jacob Støren
ceb260e5da #1487 Remove wrongful use of RiaApplication and active view in fracture cell intersection calculation 2017-05-16 17:52:57 +02:00
Jacob Støren
d298963d94 #1487 Remove vector<FractureData> from RigFracture 2017-05-16 17:26:40 +02:00
Jacob Støren
f057f83d4f #1487 RigFractureTransCalc: Remove some obsolete code. Made private things private 2017-05-16 17:05:43 +02:00
Jacob Støren
84a1940d6a #1487 Remove dependency on RiaApplication and active view in RigEclipseToStimPlanCellTransCalc. Make m_case const. Some cleaning 2017-05-16 16:40:37 +02:00
Jacob Støren
cac9a9ed03 #1487 Move the EclToStPlCellTransCalc to a new file 2017-05-16 16:18:56 +02:00
Jacob Støren
ab121fe80a Prefix calculator with Rig 2017-05-16 16:04:32 +02:00
astridkbjorke
4cb77642f3 #1487- pre-proto - Using EclipseToStimPlanCellTransmissibilityCalculator instead of RigFractureTransCalc for calculating Matrix-to-fracture transmissibilities for stimPlan cells. 2017-05-16 15:37:30 +02:00
astridkbjorke
de2d78828b 1487 - pre-proto - removing const from m_case in EclipseToStimPlanCellTransmissibilityCalculator nad updating function for calculating transmissibilities in fracture to have relevat values as input instead of RigStimPlanFracTemplateCell 2017-05-16 13:55:24 +02:00
astridkbjorke
a1a7441c2d #1487 - pre-proto - Adding class EclipseToStimPlanCellTransmissibilityCalculator 2017-05-16 13:55:24 +02:00
Jacob Støren
2d87ae7566 #1487 Tightens constness of eclipse result access. 2017-05-16 13:54:32 +02:00
Magne Sjaastad
43e50bd8d2 Updated copyright headers 2017-05-16 12:49:36 +02:00
Jacob Støren
fc14531420 #1487 Add a "WELL" index space, to be used for well connections 2017-05-16 11:06:49 +02:00
astridkbjorke
9c4b0776d3 #1487 - pre-proto - Starting refactoring to prepare for Transmissibility condenser 2017-05-16 10:55:31 +02:00
astridkbjorke
6952a373c8 pre-proto - Update cmakelist with new filename 2017-05-16 08:40:50 +02:00
Bjørnar Grip Fjær
d0833adb4c #1462 Add functionality to check if a given coordinate is within a cell 2017-05-15 16:04:53 +02:00
astridkbjorke
deb64c862c pre-proto - Renaming contributingEclipseCell to globalIndeciesToContributingEclipseCells 2017-05-15 14:25:04 +02:00
astridkbjorke
e31023041e pre-proto - Renaming RigStimPlanData to RigStimPlanResultFrames 2017-05-15 14:20:18 +02:00
astridkbjorke
c6b329ea00 pre-proto - Rename RigStimPlanCell to RigStimPlanFracTemplateCell 2017-05-15 14:20:18 +02:00
astridkbjorke
45321d0821 pre-proto - Rename RigFractureStimPlanCellData to RigStimPlanFractureCell 2017-05-15 14:20:18 +02:00
Jacob Støren
df9e434c74 Use double "s" in Transmissibilities, create cpp file for transmissibility condenser 2017-05-15 14:13:59 +02:00
Magne Sjaastad
25e6aec94a Merge branch 'dev' into fishbones 2017-05-15 13:37:09 +02:00
Jacob Støren
2a50df5edb #1481 Add tests for transmisibility condensation. 
The algorithm is now verified
 2017-05-15 13:27:02 +02:00
Jacob Støren
df269931c9 #1481 Add subset of Eigen, and method to condense transmisibilities 
Not yet fully tested.
 2017-05-12 14:41:38 +02:00
Magne Sjaastad
54c6e1c600 #1372 Update solver interface due to API changes in flow diagnostics 2017-05-12 12:22:50 +02:00
Magne Sjaastad
84b922ba82 #1476 Include isFile() when checking if a file exists 2017-05-11 09:23:13 +02:00
Magne Sjaastad
338e51bced Fishbones : Fix invalid start direction for lateral 2017-05-09 10:14:02 +02:00
Jacob Støren
141ce6b54b #1381 Well Flow Plots show phase split (Oil Gas Water) 
Flow rates are explained in the plots as Surface/reservoir flow rates. Unit for field is [stb]/day for all fluids
 2017-05-08 16:02:42 +02:00
Magne Sjaastad
cac2aefefd #1450 Use Y-AXIS as default lateral direction for near-vertical wells 2017-05-08 15:08:57 +02:00
Magne Sjaastad
42e2294eca Merge remote-tracking branch 'origin/dev' into fishbones 2017-05-08 11:07:33 +02:00
Magne Sjaastad
b0c5ceeab6 #1442 Moved geometry functions to RigFishbonesGeometry 2017-05-08 08:00:55 +02:00
Magne Sjaastad
414733899e Fishbones : Add model and visualization 2017-05-05 12:23:29 +02:00
Jacob Støren
0664592ec8 Move a method 2017-05-05 11:55:18 +02:00
Jacob Støren
67e652713f Moved debug output regarding Well Log Extraction Curves to the Log Message window. 
Also removed some debug output.
 2017-04-27 14:14:51 +02:00
Bjørnar Grip Fjær
cf18f5324f #165 Keep original days since simulation start 2017-04-26 09:41:04 +02:00
astridkbjorke
a5e3e864fb pre-proto - Cleanups in code. Renamings and adding functions global index in array of RigStimPlanCell for simplified interaction with these 2017-04-25 16:08:44 +02:00
astridkbjorke
ed03d1fb8e #1417 - pre-proto - Adding function for calculating perforation length in center cell - need to be extended for cases where perforation interval goes outside the center stimPlan cell. 2017-04-21 09:41:52 +02:00
astridkbjorke
8351c6f9d0 #1415 - pre-proto - Adding function for identifying the StimPlanCell though which the well pass, and use this cell in calculation of radial transmissibility to well. Some error in pointers not yet sorted out... 2017-04-21 09:41:52 +02:00
astridkbjorke
26ae9911b7 #1417 - pre-proto - Calculate transmissibility for linear flow from fracture to well (for longitudinal fractures), for a given stimPlanCell and given perforation lengths in this cell. 2017-04-21 09:41:52 +02:00
astridkbjorke
87ff498609 #1415 - pre-proto - Adding function for calculating transmissibility from fracture to well, radial flow 2017-04-21 09:41:52 +02:00
Jacob Støren
2745d857d0 #1381 Wip: Well Alloc Plots split by phase without flow diagnostics 
This is implemented, but turned off as Ert did not seem to deliver correct phase flow rates. Can be enabled as soon as Ert is improved and updated.
 2017-04-20 16:22:33 +02:00
Magne Sjaastad
c35e79c3b5 Merge branch 'dev' into pre-proto 2017-04-20 13:40:56 +02:00
Magne Sjaastad
d364e045aa Merge branch 'dev' into hdf-prototype 2017-04-20 13:05:04 +02:00
astridkbjorke
94d10f547d #1403 - pre-proto - Adding stimPlan cells transmissibility in fracture to export. 2017-04-18 13:34:32 +02:00
astridkbjorke
2595bf08fe #1403 - pre-proto - Calculating transmissibility in fracture for StimPlanCells 2017-04-18 10:45:31 +02:00
astridkbjorke
abca5ed85b #1400 - pre-proto - Moving contributingEclipseCells and transmissibilities from RigStimPlanceCell to RigFractureStimPlanCellData, since the values will be different depending on placement of fracture. 2017-04-06 11:47:50 +02:00
astridkbjorke
b73e2bb63b pre-proto - Refactoring. Vector of RigStimPlanCells is now being owned by RimStimPlanFractureTemplate 2017-04-06 09:34:38 +02:00
astridkbjorke
faf36665f4 #1400 - pre-proto - Adding function for calculating transmissibilitiy from matrix for each stimPlan-cell (based on contribution from intersecting eclipse cells). 2017-04-05 14:40:54 +02:00
Jacob Støren
6c7dfdca7b #1395 Renamed TopologyItem to GeometrySelectionItem including Keywords with friends. 
Changed keyword to GridTimeHistoryCurve (previously missing Grid)
 2017-04-04 16:10:00 +02:00
astridkbjorke
153bc57dfb pre-proto - Some cleanup and adding function for getting access to one RigFractureData 2017-04-03 15:17:35 +02:00
Magne Sjaastad
8255a3aaa3 Merge branch 'dev' into pre-proto 2017-04-03 07:34:56 +02:00
astridkbjorke
c33b1d1b68 #1364 - pre-proto - Bugfixes for A-H upscaling for flow across layers. 2017-03-31 13:59:30 +02:00
Bjørnar Grip Fjær
feeb16fe70 Fix statistics not being calculated for properties with values for only active cells 2017-03-31 11:56:14 +02:00
Magne Sjaastad
62d345cf1e #1387 Added support for delete of existing sour sim data 2017-03-31 11:37:10 +02:00
Bjørnar Grip Fjær
6c04daf333 #1386 Fixed crash when pasting eclipse case into grid case group 2017-03-31 11:10:22 +02:00
astridkbjorke
4f645758b3 #1364 - pre-proto - Fixing bugs in calculation of upscaled cond values 2017-03-31 10:25:24 +02:00
Bjørnar Grip Fjær
c7f008ca2f Fix missing include on Linux 2017-03-30 14:56:12 +02:00
Bjørnar Grip Fjær
63205b4753 #1354 Only use active cells in statistics for active cells 2017-03-30 11:47:38 +02:00
Bjørnar Grip Fjær
d32461f0ee #1355 Fixed crash when calculating statistics for visible cells without data for all time steps 2017-03-30 11:12:27 +02:00
astridkbjorke
6d791ca3e0 Pre-proto - Fixing compile issues after rename 2017-03-29 11:31:26 +02:00
Bjørnar Grip Fjær
ceec6cb9ec #1353 Compute valid statistics for parameters with results for all cells 2017-03-29 11:22:12 +02:00
astridkbjorke
054f35c5ac Pre-proto - Renaming RimStimPlanCell -> RigStimPlanCell 2017-03-29 10:18:14 +02:00
astridkbjorke
ac78ab4df2 #1339 - pre-proto - Update flow calculation to call new function for upscaling of conductvitiy 2017-03-29 10:11:50 +02:00
astridkbjorke
e9d4acb51a #1364 - pre-proto - Cleanup code related to upscaling of conductivity values for flow across layers 2017-03-29 09:43:36 +02:00
astridkbjorke
2bfb68e17f #1364 - pre-proto - Adding function for calculating AH average for flow across layers 2017-03-29 09:13:07 +02:00
astridkbjorke
926ced4dc5 #1364 - pre-proto - Calculate H-A upscaled cond value for flow across layers 2017-03-28 13:49:03 +02:00
Magne Sjaastad
a6ce3c9ef4 Fixed missing includes on Linux 2017-03-28 09:47:06 +02:00
Jacob Støren
1fefc6124f #1321 Wip: First shot on bringing the flow characteristics curves up into the open. 2017-03-27 18:13:38 +02:00
astridkbjorke
c789b968f6 #1339 - pre-proto - Starting to compute the transmissibility for half a cell. Not yet completed. 2017-03-27 10:16:01 +02:00
astridkbjorke
9d98a1d661 pre-proto - More refactoring. Moving planeCellIntersectionPolygons to RigFractureTransCalc, adding fracture, unit and case as members. 2017-03-27 10:16:01 +02:00
astridkbjorke
56e84a43eb pre-proto - Refactoring: Moiving functions related to transmissibility calculations from RimFracture to new class RigFractureTransCalc 2017-03-27 10:16:01 +02:00
astridkbjorke
d15d1a03a1 #1320 - pre-proto - Moving calculation of upscaled parameter from StimPlan for each cell to a separate method, for use in flow calculation. 2017-03-27 10:16:00 +02:00
astridkbjorke
0f86097870 #1320 - pre-proto - Performing harmonic mean upscaling for stimPlan values 2017-03-27 10:16:00 +02:00
astridkbjorke
28a794cc40 #1320 - pre-proto - Performing artithmetric upscaling of stimPlan values. 2017-03-27 10:16:00 +02:00
astridkbjorke
ffeb50b06a #1320 - pre-proto - Prototyping calculation of upscaled parameter values from stimPlan. Bug in calculation so output values are wrong. 2017-03-27 10:06:42 +02:00
Magne Sjaastad
40ecdc5a7b #1322 Use HUGE_VAL if no results are available 2017-03-24 08:21:24 +01:00
Magne Sjaastad
d3eec3445f #1357 Added access function to return time step vector with most time steps 2017-03-24 06:53:27 +01:00
Jacob Støren
fd23ec242e Fixed crash when creating well alloc plot 2017-03-23 12:32:02 +01:00
Jacob Støren
c39462d19a #1345 Fixed. Injector TOF results ended up with a double unit conversion, because tracers with no cells were wrongfully added to the flow diag solver solution. 2017-03-22 14:04:13 +01:00
Jacob Støren
003da9f640 #1332 Fixed wrong mapping of tracername to index based result value. Resulted in wrong colors for "tracer with max fraction" results, and wrong property filtering. 2017-03-21 15:58:35 +01:00
Magne Sjaastad
17e6b6d826 #1322 Use RimEclipseResultDefinition instead of RimEclipseCellColors 2017-03-19 07:59:43 +01:00
Jacob Støren
c77741f3ab Exclude Well Communication lines that have exact 0 flux. 
In waiting for a GUI-adjustable tolerance.
+ some rename
 2017-03-17 09:46:49 +01:00
Jacob Støren
54c1bcba93 #1326 Fixed with scale of Well Connection Lines 2017-03-16 16:51:28 +01:00
Jacob Støren
b41a0fb178 #1313 Fixed crossflow related accumulation of well fluxes for separate connections when the accumulated wellflux is inconsistent. 2017-03-16 10:38:09 +01:00
Jacob Støren
e6953a6f8b #1313 Improved handling of branch contributions in wells with accumulated crossflow in branches 2017-03-16 10:38:09 +01:00
Magne Sjaastad
3d67946976 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-03-15 10:10:43 +01:00
Magne Sjaastad
647b4348eb Renamed to eclipseCaseData 2017-03-15 09:10:16 +01:00
Jacob Støren
1a42af5b37 #1114 First working well communication lines operative 2017-03-14 19:21:55 +01:00
Jacob Støren
ef32c8bdc5 #1314 use of abs() is unsafe on linux. Ends up with integer abs() fossibly due to a different default <math.h> include behaviour. Changed to fabs 2017-03-14 19:11:45 +01:00
Jacob Støren
3df05493d4 #1114 Wip: Added calculation of well pair fluxes 2017-03-13 11:03:34 +01:00
Jacob Støren
38b4e3b729 #1291 The accumulated flow from branches with segment count <= 3 is now shown as direct inflow on the "master" branch. In pseudo length mode they are plotted as pure lines at the "top" of the cell/segement of the stem, to separate such contributions from real cell connections on the stem 2017-03-10 14:51:07 +01:00
Jacob Støren
028f9458e9 #1203 Well Alloc Plots for wells with inconsistent flow does now include accumulated allocation factors. The direct well flow rates is also shown with allocation, but the inconsistent flow connections are assigned to the Reservoir tracer. 2017-03-10 11:51:11 +01:00
Jacob Støren
2f17096cde #1304 Avoid crash, and send a message to user if the flow diag solver throws 2017-03-10 11:51:11 +01:00
Jacob Støren
8b3029c3a3 Some refactor before #1203 2017-03-10 11:51:11 +01:00
Jacob Støren
5d0df1c86f #1304 Absolute simplest fix to make things run. Remove tracer on connection cells iif well flow for cell has inconsistent direction with the with the sum of well fluxes in the same cell. 2017-03-10 11:51:11 +01:00
Jacob Støren
c9dc41d374 #1298 Included wells with "closed" state consistently 2017-03-07 12:27:49 +01:00
Jacob Støren
0428dbffa3 #1279 Added <wellname>-Xf as tracer on connections with opposite flow thant the well type indicates. 2017-03-06 16:34:30 +01:00
Magne Sjaastad
0bccc883ff #1292 Fixed CppCheck Issues in ReservoirDataModel 2017-03-06 11:58:07 +01:00