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,758 Commits 27 Branches 61 Tags 309 MiB
6b7a9b8da5
Commit Graph

1369 Commits

Author SHA1 Message Date
Jacob Støren
61e9a2a696 First shot on time difference implementation 2019-01-30 16:46:16 +01:00
Jacob Støren
58ac488929 Refactoring : RigResultAccessorFactory simplification 
To make the result address including basetimestep info reach the CellResultsData class.
 2019-01-30 15:25:29 +01:00
Jacob Støren
8a5cbf60fd Refactoring CaseCellResultsData to propagate result address with timelapse info all the way. 2019-01-29 12:44:23 +01:00
Magne Sjaastad
0a22515a3e Rename 2019-01-29 11:57:27 +01:00
Jacob Støren
a3660cd496 Refactoring: Rename modifiable result access to make it easier to track in the code. The existing overloads made things harder to read. 2019-01-29 08:35:42 +01:00
Jacob Støren
fe53380a36 Refactoring: RigCaseCellResultsData: Reorder headerfile 
to group the methods sensibly
 2019-01-28 16:31:57 +01:00
Jacob Støren
dbb2a564a2 Refactoring: RigCaseCellResultsData: Remove the final result index based interface 2019-01-28 16:18:28 +01:00
Jacob Støren
3e3d3871ed Refactoring: Remove scalarResultIndex from RigEclipseResultAddress 
and real external use (outside CaseCellResultsData)
Regression tests OK.
 2019-01-25 16:19:15 +01:00
Jacob Støren
98f2b50180 Refactoring: Remove more direct use of scalarResultIndex related to CellEdge 2019-01-25 16:19:15 +01:00
Jacob Støren
d8eded7d49 Refactoring: Removed result index from NNC data 2019-01-25 16:19:15 +01:00
Jacob Støren
8ee1d1491f Refactoring: EclipseResultAddress can now be used with type and variable in addition to index (which is to be removed) 2019-01-25 16:19:14 +01:00
Jacob Støren
726f5ee596 Remove compiler warnings 2019-01-25 16:19:14 +01:00
Jacob Støren
42afa063d5 Refactoring: Rename to findOrLoadKnownScalarResult 
to make it clear that it does not add a result name to the internal structures.
 2019-01-25 16:19:14 +01:00
Jacob Støren
d0792d80c3 Refactoring : Moved formation names calculation into CaseCellResultsData. 
Made one more method private.
 2019-01-25 16:19:14 +01:00
Jacob Støren
70fc63056f Refactoring: Privatized and renamed findTransmissibilityResults() 
Narrower identification in header of methods needing refactoring attention
 2019-01-25 16:19:14 +01:00
Jacob Støren
5a01fdb88e Refactoring: Replaced result info based lookups with result address. 
Replaced access of resultInfo as vector with single access based on address.
Moved RigEclipseResultAddress to a separate new file.
 2019-01-25 16:19:13 +01:00
Jacob Støren
accc0768a1 Refactoring: Reordered the headerfile to outline the index-based methods needing refactorization 2019-01-25 16:19:13 +01:00
Jacob Støren
e21a0da543 Refactoring: Remove resultIndex in maxTimeStepResult 2019-01-25 16:19:13 +01:00
Jacob Støren
8e16d3ff20 Refactoring: Moved code into CaseCellResultsData. 
Made methods private
 2019-01-25 16:19:13 +01:00
Jacob Støren
ccfee8f34a Starting refactoring of eclipse results addressing 
Preparations for time diff results
 2019-01-25 16:19:13 +01:00
Jacob Støren
b329f3acc7 Fixed memory overwrite (and arbitrary crashes) due to missing critical section. 
The critical section is needed when doing geometry transfer from libecl in paralell.
Caused arbitrary crashes in completely unrelated code when compiled in release on a 32-core machine on windows
 2019-01-25 12:27:43 +01:00
Gaute Lindkvist
26015753a3 Massively improve contour map speed by polygon simplification before clipping 2019-01-18 13:53:03 +01:00
Gaute Lindkvist
b1ad93f4b9 Contour Maps: improve edge look 
* Remove excess tiny triangles around edges
* Remove labels from contour lines that overlap inner contour lines
 2019-01-17 20:18:15 +01:00
Magne Sjaastad
d460d3d77d clang-tidy : Apply modernize-deprecated-headers 2019-01-11 08:14:53 +01:00
Magne Sjaastad
81c3ee5df2 System : Improve code quality using clang-tidy 
Remove redundant virtual and add override
 2019-01-11 08:14:53 +01:00
Magne Sjaastad
6db80f40b9 Update copyright headers 2019-01-09 15:29:24 +01:00
Bård Skaflestad
6839c1cf77 ECLFluxCalc: Remove Unused 'useEPS' Constructor Parameter 
Recent developments have rendered this parameter unused.  Remove
it to make API simpler.  The library now always loads arrays as
if the caller requests end-point scaling behaviour and we defer
effects of actual end-point scaling until client code queries
the flux calculator at run time.
 2018-12-21 13:14:45 +01:00
Magne Sjaastad
e514a77a80 CppCheck : Add missing assignment to isOk 2018-12-21 12:32:25 +01:00
Gaute Lindkvist
a9f70a13b3 Just one ICV per completion, not one per segment. 2018-12-18 17:09:43 +01:00
Gaute Lindkvist
15576a9ae3 Preliminary AICD output 2018-12-07 15:48:18 +01:00
Gaute Lindkvist
f14d36ca23 Implement export of ICD/ICV table for performations 2018-11-29 15:26:22 +01:00
Jacob Støren
0f384cf4f7 Split the line annotation classes into separate files. Cleaned up includes 2018-11-28 12:10:08 +01:00
Magne Sjaastad
268fc4f368 : Non-Darcy perforations : Add calculation of effective height 2018-11-26 10:07:35 +01:00
Gaute Lindkvist
9dc2452ba1 Fix crash in Well Bore Stability plots for synt_small.odb 2018-11-22 13:39:08 +01:00
Magne Sjaastad
13f8ad5ea8 Non-Darcy Perforations : Adjust computation of 'kh' 2018-11-22 09:13:56 +01:00
Magne Sjaastad
eebab64625 Fracture header : Compute matrix permeability and create weighted average 2018-11-21 13:44:31 +01:00
Magne Sjaastad
bc12dc44eb Fracture header : Add computation of matrix permeability 2018-11-21 13:43:15 +01:00
Magne Sjaastad
212f80f92e Fracture : Mix of both main grid and LGR cells when computing completion data 2018-11-19 21:31:03 +01:00
Magne Sjaastad
cbc0e55303 Completion Export : Fix less than operator for RigCompletionDataGridCell 2018-11-14 12:22:08 +01:00
Magne Sjaastad
4117e266ed Completion Export : Use map based on size_t instead of RigCompletionDataGridCell 
Using RigCompletionDataGridCell as key in a map causes cells with identical local IJK to be treated as same global cell. Use reservoir grid cell index (size_t) as key to be able to handle cells correctly.
 2018-11-14 11:40:23 +01:00
Magne Sjaastad
1121abbfac Completion Export : Add null pointer guard 2018-11-14 11:32:14 +01:00
Gaute Lindkvist
73b79daa09 Implement new Pressure Depletion behaviour 
* Removed choice of different scaling
* Always use current pressure delta
* Use the maximum of an epsilon value and the absolute value of the matrix to well pressure drop as the scaling factor
* Remove file name suffixes and update information table in export file.
 2018-11-13 16:48:30 +01:00
Gaute Lindkvist
47edac084f Hide riOilColumn when RESINSIGHT_DEVEL isn't set 2018-11-13 14:53:13 +01:00
Magne Sjaastad
ef17a7c057 Temporary LGR : Set transmissibility to zero for temporary grid cells in non-active cells 2018-11-09 14:12:17 +01:00
Magne Sjaastad
fe3fe5c8f8 LAS file import : Add support for MD as depth channel name 2018-11-09 08:47:14 +01:00
Gaute Lindkvist
03cfa8f146 Move hex overlap code to RigCellGeometryTools and clamp in z-direction as well. 
* The latter is not important for 2d Maps because the height of the 2d extrusion is always at least as much as the cells.
* However this makes it so the code can estimate overlap with bounding boxes that do not reach the full height of the hexahedron.
* Also added unit tests.
 2018-11-08 15:53:10 +01:00
Gaute Lindkvist
25b45fb8fc Write unit test for cell volume calculation and fix negative volumes for "flipped" cells. 2018-11-08 13:46:57 +01:00
Gaute Lindkvist
ad9f86a517 2d Maps: schedule update of volumes when creating LGRs 2018-11-08 12:52:28 +01:00
Gaute Lindkvist
c67469b410 2d Maps: Nearly true volume of intersection weighing + riOilVolume result 
* Takes the volume summation error from around 30% -> 1.5-2.0% for Norne and TEST10K_FLT_LGT_NNC for sample
spacing approximately the same as grid characteristic size.
* The latter part is for  and adds a special case for calculating 2d Maps SUM of riOilVolume since it needs
to avoid using the actual riOilVolume 3d result but instead use SOIL to avoid multiplying by cell volume twice.
 2018-11-08 11:52:19 +01:00
Gaute Lindkvist
50a0924f84 Fix volume sum calculation to avoid multiplying by volume twice. 2018-11-08 11:52:19 +01:00
Gaute Lindkvist
ef4b70d6e5 Implement volume calculation on grid 2018-11-08 11:52:19 +01:00
Bjørn Erik Jensen
cfb45f674a Export completions. New feature 'Export Completion Data for Temporary LGRs' 2018-11-08 11:24:40 +01:00
Magne Sjaastad
056c22b8af Fracture header : Add computation of permeability 2018-11-05 10:53:35 +01:00
Bjørn Erik Jensen
81608990a0 InFlow model. New class RiaCellDividingTools. Moved method from RigCellGeometryTools 2018-10-31 14:47:03 +01:00
Bjørn Erik Jensen
d2249e4d17 Temp LGR. No recreation of faults after creating temporary LGRs 2018-10-30 11:41:35 +01:00
Bjørn Erik Jensen
a1c8275eed Temp LGR. Error handling, bug fixes 2018-10-29 10:53:29 +01:00
Gaute Lindkvist
7f7fd91f20 Remove Pressure Depletion candidates that are definitely going away. 2018-10-29 10:00:39 +01:00
Magne Sjaastad
7febeba433 Temporary LGR : Use infinity() instead of max() 2018-10-25 22:23:58 +02:00
Magne Sjaastad
47f3004cd0 Temprorary LGR : Set several properties to undefined (infinity) 2018-10-25 21:08:29 +02:00
Magne Sjaastad
cc8f42f878 Temprorary LGR : Early exit if no active cells 2018-10-25 21:08:29 +02:00
Magne Sjaastad
23d6e8ee2a
Merge pull request from bska/scaling-bugfix 
Update Flow Diagnostics Application Library
 2018-10-25 14:47:12 +02:00
Magne Sjaastad
b9465c070f Temporary LGR : Make sure values are recomputed when required 2018-10-25 14:36:35 +02:00
Magne Sjaastad
d35888b5de Remove obsolete include 2018-10-25 14:16:45 +02:00
Magne Sjaastad
74bcc84281 Temporary LGR : Use activeCellCount when creating a property not found on file 2018-10-25 14:11:52 +02:00
Bård Skaflestad
dc8931f782 Update Flow Diagnostics Application Library 
Fixes incorrect horizontal and vertical end-point scaling of model's
saturation functions.

API Change: No longer supports user-selected behaviour for treating
scaled end-points with a sentinel value (-1.0E+20).  That option was
introduced due to incomplete understanding of the semantics of the
sentinel value.  Now that we understand the meaning (use actual,
unscaled end-point value from input table), we no longer need the
option.  Update the calling code in RigFlowDiagSolverInterface.cpp
accordingly.
 2018-10-25 13:40:08 +02:00
Magne Sjaastad
58655c481e Temporary LGR : Make sure size of depth properties is at least active cell count 2018-10-25 13:12:55 +02:00
Magne Sjaastad
e0202f87af Temporary LGR : Use activeCellInfo when computing depth properties 2018-10-25 11:50:29 +02:00
Magne Sjaastad
29c89eb135 Temporary LGR : Do not append temporary result values if no data is read from file 2018-10-25 11:50:29 +02:00
Magne Sjaastad
166d7dcb6c Temporary LGR : Delete cached extractors and redraw curves 2018-10-24 13:17:33 +02:00
Magne Sjaastad
6445ab05fe Temporary LGR : Simplify adding of grid to active cell info 2018-10-24 13:17:33 +02:00
Magne Sjaastad
145323d8b1 Temporary LGR : Compute size dependent data for LGR 2018-10-24 13:17:33 +02:00
Magne Sjaastad
2e248fee2a Temporary LGR : Rebuild cell bounding box search tree 2018-10-24 13:17:33 +02:00
Magne Sjaastad
08776a09b3 Temporary LGR : Move function and whitespace changes 2018-10-23 21:36:20 +02:00
Magne Sjaastad
577a706b57 Temporary LGR : Copy value from main grid cell to temporary cells 2018-10-23 21:29:23 +02:00
Magne Sjaastad
76a48a8f87 Temporary LGR : Add helper methods for grid and cell count 2018-10-23 15:28:04 +02:00
Magne Sjaastad
d2972d144a RigMainGrid : Several refactoring operations 
Move impl to cpp
Remove obsolete includes
Whitespace fix
 2018-10-23 15:12:46 +02:00
Bjørn Erik Jensen
ffa1a85187 LGR Export/Temp LGR. New split type: One LGR per Completion 2018-10-23 11:13:55 +02:00
Magne Sjaastad
59f0112f2e Completion Export : Guard for missing width values 2018-10-19 15:28:13 +02:00
Bjørn Erik Jensen
fd1df547f9 Fix warning 2018-10-19 11:33:31 +02:00
Bjørn Erik Jensen
9d90f54d5f LGR Export. Create temporary LGR. Take 1 2018-10-19 10:44:07 +02:00
Bjørn Erik Jensen
3edfd1dca6 LocalGrid. Move implementation to cpp file 2018-10-19 10:43:17 +02:00
Magne Sjaastad
6346ed012c clang-tidy : Remove redundant 'virtual' and add 'override' 2018-10-18 19:45:57 +02:00
Magne Sjaastad
726658d642 System : Remove unused functions 2018-10-18 15:40:11 +02:00
Magne Sjaastad
766fea603e System : Remove unused functions 2018-10-18 15:14:25 +02:00
Magne Sjaastad
5a1acc124f System : Remove unused functions 2018-10-17 13:52:48 +02:00
Gaute Lindkvist
fd3b68834d Renamed RigTernaryResultAccessor2d.h|cpp to remove the 2d. 2018-10-17 13:26:44 +02:00
Gaute Lindkvist
222ac5137f Implement 2d grid projection prototype with regular grid. 2018-10-16 10:44:25 +02:00
Magne Sjaastad
8464d19696 Non-Darcy Perf intervals : Separate calculation of transmissibility and permeability 2018-10-12 13:00:37 +02:00
Magne Sjaastad
0174ee03e1 Non-Darcy Perf intervals : Simplify calculations 2018-10-11 12:50:57 +02:00
Bjørn Erik Jensen
676d14e65c Mock model. Set LGR name 2018-10-10 11:46:32 +02:00
Magne Sjaastad
9d9771295f System : Replace NULL with nullptr 2018-10-10 10:17:27 +02:00
Bjørn Erik Jensen
c7f6c74869 LGR Export. Support for exporting a single LGR for per well. Warning if completions intersect with existing LGR 2018-10-10 09:04:35 +02:00
Bjørn Erik Jensen
2f027f0de0 Non-Darcy perforations. Calculate d-factor and KH. Export to file 2018-10-02 12:37:05 +02:00
Gaute Lindkvist
dff3a0536d Apply well radius correction to linear fracture to well transmissibility. 2018-10-02 08:46:24 +02:00
Magne Sjaastad
70a7b3ae5c Fracture Completion Report : Use areaOpenForFlow() and remove unused function 2018-09-28 13:42:02 +02:00
Magne Sjaastad
c21655f2b4 Transmissibiliy Equations : Move function to private section 2018-09-28 09:39:10 +02:00
Bjørn Erik Jensen
492904d465 Fix warnings 2018-09-27 10:01:45 +02:00
Bjørn Erik Jensen
ade352a259 Rename method 2018-09-27 09:55:28 +02:00
Bjørn Erik Jensen
d4dde531a8 2d intersection view. Fix misplaced perforation interval 2018-09-27 09:48:08 +02:00
Bjørn Erik Jensen
bd346536c7 Completion type. Exclude cells having a subgrid from well path intersection 2018-09-26 15:35:48 +02:00