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
4,989 Commits 27 Branches 61 Tags 309 MiB
f096f78a55
Commit Graph

664 Commits

Author SHA1 Message Date
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
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
Magne Sjaastad
3a1991d37d #1292 Fixed bug reported by CppCheck 2017-03-06 11:52:32 +01:00
Jacob Støren
4312968124 Removed CppCheck Warnings 2017-03-03 17:09:30 +01:00
Jacob Støren
b00ad4ba4a Fixed some CppCheck Performance warnings 2017-03-03 16:23:20 +01:00
Magne Sjaastad
e7b920fab8 Removed unused files 2017-03-03 14:12:03 +01:00
Jacob Støren
8f2affe670 #1120 Well Alloc Plot: Simple TVD calculations 2017-03-01 16:09:28 +01:00
Jacob Støren
984762ab5d #1268 Well Alloc Plots: Fixed missing grouping of small contributions for pseudo depth 2017-03-01 16:09:28 +01:00
Magne Sjaastad
68ff093c61 #1266 If not computed, compute staticWellCellPath when needed 2017-03-01 14:23:01 +01:00
Jacob Støren
e19373ec9d #1265 Made sure all in/out fluxes are added to the flow diag solution. 
Also made sure only producing cells are added to the producer tracers and injecting cells as injector tracers.
 2017-02-28 16:03:43 +01:00
Jacob Støren
528b064569 #1171 Made the branch contribution a bit cleaner by splitting the cells own contribution as one point, and the branch inflow as another at the same depth, creating a step at the upper cell depth. 2017-02-28 11:47:11 +01:00
Jacob Støren
9e73fadada #1171 Correct start and end of each cell contribution for pseudo-length based plot. 2017-02-28 11:47:11 +01:00
Jacob Støren
e1d579f195 #1171 Fixed assert regarding total flow pr. pseudo lenght 2017-02-28 11:47:11 +01:00
Jacob Støren
b336d49fb6 #1171 WIP: Pseudo length active. Needs more verification 2017-02-28 11:47:11 +01:00
Jacob Støren
601a920337 #1171 WIP: Calculated pseudo length-based flow (Both accumulated and not) 2017-02-28 11:47:11 +01:00
Jacob Støren
ccd5294ded More refactoring as preparation to #1171 and #1120 2017-02-28 11:47:11 +01:00
Magne Sjaastad
1af3df6c6c #1255 Removed includes from RimWellLogCurve 2017-02-24 14:14:29 +01:00
Jacob Støren
d69a6e1daa Linux compile fix 2017-02-17 16:04:16 +01:00
Jacob Støren
070d9c893b #1209 Added calculation of none-accumulated flows as preparation for #1171 and #1120. Missing handling of wells with inconsistent flow. 2017-02-17 15:49:14 +01:00
Jacob Støren
492b777040 More refactoring as preparations for #1171, #1120, and #1209 2017-02-17 15:49:14 +01:00
Jacob Støren
b00fe21726 Refactoring as preparations for #1171, #1120, and #1209 2017-02-17 15:49:14 +01:00
Jacob Støren
4fc0839a33 #1211 Disabled tracer allocation for wells with inconsistent flow. 2017-02-15 12:29:58 +01:00
Jacob Støren
ed31dab152 #1172 Calculated a grouped tracer contribution value of the tracers below a certain threshold. 2017-02-15 08:46:55 +01:00
Jacob Støren
df35335744 #1172 Well Alloc plot: Sorted the tracers according to contribution. 2017-02-14 08:10:39 +01:00
Jacob Støren
491e0bcb7c Fixed too much unit conversion... 2017-02-09 15:27:34 +01:00
Jacob Støren
65f36d6a3f #1168, #1171 Added new depth types to RimWellLogPlot, with handling of unit type "none" as well. Made Well Alloc Plots make only "Connection Number" available on its WellLogPlot 2017-02-09 13:31:25 +01:00
Jacob Støren
76bc449d1f #1161 and #1188 Fixed problems with last MSW segments. Two errors: missing last segment ID, and missing drawing the last pipe segment. 2017-02-07 10:53:48 +01:00
Jacob Støren
94a90c8796 Fixed #1188 The connection number calculation was wrong 2017-02-07 10:53:48 +01:00
Jacob Støren
4a3ffb9238 #1166 Added the reservoir part of the well allocation plot 2017-02-03 15:52:37 +01:00
Magne Sjaastad
426d42935f Copy up from pre-proto 2017-02-03 10:23:07 +01:00
Magne Sjaastad
9493a1dfc0 Use hasWellResult instead of firstResultTimeStep 2017-02-02 12:52:32 +01:00
Jacob Støren
8e4e7f098f #1113, #1112 Made stacked curves. Now the accumulated well flow by connection graphs is up to speed. 2017-02-01 19:18:37 +01:00
Jacob Støren
3f091aa884 #1112 Guard against none-connection segments in accumulation calculation 2017-01-31 16:35:49 +01:00
Jacob Støren
d3f1c9d6fa #1112 Calculation of accumulated well flow is now implemented. Tracers are handled, as well as MSW's. 2017-01-31 15:29:22 +01:00
Jacob Støren
90c791a2da #1112 Finally the first iteration of the actual calculation of accumulated flow pr connection. No Flow Diagnostics yet, and we wait for the real flow rates. 2017-01-25 22:49:25 +01:00
Magne Sjaastad
1b517a8e5e Added helper class for measured depth 2017-01-24 13:46:35 +01:00
Jacob Støren
825c505443 #1112, #1106 Added and removed fields to make the allocation plot have the needed data to do its calculation. Refacord the CenterLine calculation interface yet again to make it usable. 2017-01-23 11:10:09 +01:00
Jacob Støren
0d7da9788a #1112 Made conveninece methods to calculate well pipe centerline, and added possibility to do it pr timestep. 2017-01-20 17:20:09 +01:00
Jacob Støren
94f94af325 #1112 Added a flowrate to the well results. Waiting for ERT to include the reading. 2017-01-20 16:12:12 +01:00
Jacob Støren
06b9f13e41 #1112 Well centerline with cell centers improved, and moved to centerline calculator 2017-01-20 15:57:04 +01:00
Jacob Støren
d7782c6ddf #1112 Refactored well centerline calculation a bit 2017-01-20 15:00:19 +01:00
Jacob Støren
51d6d21d77 Constified wellresultcell to cell 2017-01-20 14:56:08 +01:00
Magne Sjaastad
2edc090c89 Restored previous behaviour related to result accessor creation 2017-01-19 10:39:08 +01:00
Magne Sjaastad
9b42f1ca8c Reverted 4ec7c97a77 
Access of RimEclipseCase was done by firstAncestorOf from, and in several cases RimEclipseCase is not parent of RimEclipseCellColors. RimEclipseCase must be explicitly specified.
 2017-01-19 10:37:59 +01:00
Magne Sjaastad
e0ba009e34 Cleaned up includes 
Removed includes to cvfLibCore and friends. Removed several includes from header files.
 2017-01-17 15:11:02 +01:00
Jacob Støren
96396eed10 #1122 Added a progress bar when calculating flowdiagnostics results 2017-01-12 16:39:12 +01:00
Magne Sjaastad
894b4468b4 #1125 Limit size of string in legend and info, reordered tracer combo 2017-01-12 15:00:23 +01:00
Jacob Støren
53400a1497 #1099 Not necessary with both Gas and Oil phases 2017-01-12 14:39:30 +01:00
Jacob Støren
bd31317000 #1099 Flow results only available when the case has fluxes 2017-01-12 14:16:39 +01:00
Jacob Støren
3d7d3096eb #1123 Fixed missing timestep problem. Using Report Step Number, not timestep index. 2017-01-12 12:07:07 +01:00
Jacob Støren
b584590588 #1115 Fixed crash on norne due to missing handling of closed wells/inoperative wells 2017-01-12 12:07:07 +01:00
Magne Sjaastad
c638def4d6 Fixed missing includes 2017-01-12 08:20:50 +01:00
Magne Sjaastad
b104b1a97c #1056 Simplified TimeHistoryResultAccessor 
#1056 Simplified TimeHistoryResultAccessor
 2017-01-12 07:22:19 +01:00
Magne Sjaastad
4ec7c97a77 #1056 Removed obsolete code 2017-01-11 21:41:22 +01:00
Magne Sjaastad
8970d93a4d #1068 Renamed to RigEclipseCaseData 2017-01-10 09:51:39 +01:00
Magne Sjaastad
36c008a12c #1068 Removed obsolute include 2017-01-10 09:20:03 +01:00
Magne Sjaastad
50b9fe0ece #1068 Removed obsolete include of RigCaseData 2017-01-10 09:20:03 +01:00
Magne Sjaastad
f70806e056 #1068 Avoid include of RigCell.h and RigSingleWellResultsData in RigCaseData.h 2017-01-10 09:20:03 +01:00
Magne Sjaastad
93032a23eb #1068 Avoid include of RigActiveCellInfo.h in RigCaseData.h 2017-01-10 09:20:03 +01:00
Magne Sjaastad
ccd4cb24c9 #1068 Avoid include of RigMainGrid.h in RigCaseData.h 2017-01-10 09:20:03 +01:00
Jacob Støren
396069ae28 Fixed Linux comiler warnings 2017-01-10 08:48:58 +01:00
Jacob Støren
c65c9b1c58 #1058 Convert time of flight to days 2017-01-06 15:12:13 +01:00
Jacob Støren
c19fc232c8 #1049 Reuse Opm::ECLGraph and Opm::Flowdiagnostics::Toolbox for each timestep. 2017-01-06 14:41:00 +01:00
Jacob Støren
03cf09d90a System: Created a general basename cleanup function, and applied that when creating filenames from userdescription etc. Related to #1054 preparations 2017-01-04 10:45:04 +01:00
Jacob Støren
6d498cce98 #1052 Improved the result variable text a bit for Flow Diag Results 2017-01-03 14:59:48 +01:00
Jacob Støren
5f6468898b #1052 3D info box: Added Flow Diag results statistics etc. 2017-01-03 13:15:27 +01:00
Jacob Støren
22143969c1 #1048 Added derived result: Tracer with max fraction 2017-01-03 09:27:25 +01:00
Jacob Støren
7c24522478 #1048 Added derived result: Injector Producer communication 2017-01-02 14:46:12 +01:00
Jacob Støren
a9b1cb4849 #1048 Added derived result: Sum of tracer fractions 2017-01-02 13:34:51 +01:00
Jacob Støren
60cb1d4ce0 #1048 Added weighted average TOF calculation 2016-12-21 17:14:51 +01:00
Jacob Støren
bd30649a3c Fixed linux compile issues 2016-12-20 15:33:39 +01:00
Jacob Støren
003271ff54 #1035 Connected the Flow Diag solver, and added the statistics needed for legend. Now many things work . 2016-12-20 11:41:05 +01:00
Jacob Støren
3c55a86650 #1035 Adjusted the statistics calculators a bit. 2016-12-20 11:39:10 +01:00
Jacob Støren
8f145da725 #1035 Implemented Flow Diag access and caching system down to solver 2016-12-17 10:46:57 +01:00
Jacob Støren
342855df56 #1035 Work in progress: Added the skeleton for management FlowDiagnostics data 2016-12-16 14:17:56 +01:00
Jacob Støren
ec5ad417f3 #1035 Renamed overloaded methods in result accessor to make it easier to see where the flow interception must come. 2016-12-14 14:51:53 +01:00
Jacob Støren
2288e49c20 #890 Export faults feature created 2016-11-25 15:57:51 +01:00
Magne Sjaastad
4ed6076750 #993 Fixed use of wrong index for unnamed inactive fault 2016-11-18 14:40:42 +01:00
Jacob Støren
ca7bd5b2b0 #950 Some guarding and data update on changing the active formation names reference in case. More to do. 2016-11-02 17:05:11 +01:00
Jacob Støren
055158aeea Comment change 2016-11-01 09:28:29 +01:00
Magne Sjaastad
38921b593d #906 No export of TVDRKB if diff field is empty 2016-10-26 07:32:19 +02:00
Magne Sjaastad
bd69519795 #906 Las Export : Added datum elevation to geometry object 2016-10-26 07:32:18 +02:00
Jacob Støren
593fe93244 #930, #925, #914 
* Formation names format changed to allow no space around k-layer numbers. Also added possibility to use one number as k-layer count for the name. Based on  previous names last layer
* Deleted geomech cache of formation name result when updating the formation names
* Added TNH TNQV THQV to plane transformed stresses.
 2016-10-21 14:31:31 +02:00
Magne Sjaastad
7c69ae434e #760 Input Property rename does not update dependent fields 2016-10-21 13:57:15 +02:00
Jacob Støren
d82eb6a774 #914 Added method to create rotation mx from two inplane vectors 2016-10-20 10:50:29 +02:00
Magne Sjaastad
71f1966c1c #906 Las Export: Fixed issue with TVDRKB export and improved UI 2016-10-14 13:30:04 +02:00
Magne Sjaastad
ae1eea4ac6 #779 Added support for filtering of zero and negative values in setSamplesFromDateAndValues 2016-10-12 13:49:57 +02:00
Jacob Støren
c2eff1b733 Linux compile fixes 2016-09-28 15:07:19 +02:00
Magne Sjaastad
88e40aa2d9 #886 LAS Export: Set the STEP if the data is resampled 2016-09-23 10:20:05 +02:00
Magne Sjaastad
8514664d06 #880 LAS: Export of TVDRKB 2016-09-23 10:07:15 +02:00
Magne Sjaastad
531aaaa445 AppFwk : Fixed typo of firstAncestorOrThisOfType 2016-09-21 13:59:41 +02:00
Magne Sjaastad
1bcfc41542 #883 Las Export: Inconsistency in NULL value 2016-09-21 13:41:33 +02:00
Magne Sjaastad
ae6397c5c6 #821 Fixed missing include on Linux 2016-09-19 11:22:45 +02:00
Magne Sjaastad
7de4f8f175 #821 Added export dialog with resampling support 2016-09-19 11:17:36 +02:00
Magne Sjaastad
cb6d9d714b #821 Added RigLasFileExporter. Export one LAS file for same case, well and date. 2016-09-16 12:47:27 +02:00
Jacob Støren
5e9308f7b3 #821 Implemented a method to do resampling of the well log data. Untested. 2016-09-14 16:33:07 +02:00
Jacob Støren
ba0a3b53f5 #820 Use TVDMSL as channel name for TVD 2016-09-13 11:19:27 +02:00
Jacob Støren
2ea167337f #820 Export of TVD along with MD to LAS file 
Now the tvd data is always put into the RigWellLogCurveData
Existing tvd data is written to LAS file.
 2016-09-12 16:43:31 +02:00
Magne Sjaastad
2f5acc38ac Added debug output of grid name and size, added comments 2016-09-09 11:47:00 +02:00
Magne Sjaastad
45f56b9fab #829 Use HUGE_VAL for k-layers not covered by formation definitions 2016-09-07 13:31:49 +02:00
Magne Sjaastad
f1c214c1d7 (#829) Use std::vector instead of std::set for categories. Added categoryNames to RimLegendConfig 2016-09-07 11:12:31 +02:00
Magne Sjaastad
3ddec2c65a Allow grids with varying number of active cells to be part of same grid group 2016-09-06 15:11:39 +02:00
Magne Sjaastad
9281156d4d Fixed missing clear of statistics data cache 2016-09-06 15:11:39 +02:00
Jacob Støren
c903e87dfd #811, #812 WIP, Formation names coloring of cells. First shot. Works but needs refinment. 2016-09-06 10:27:30 +02:00
Jacob Støren
5260a3f870 #478 Allowed static results (INIT-file) to not have values for LGRs 2016-08-22 17:00:57 +02:00
Jacob Støren
b305202a35 #478 Made access function const in ActiveCellInfo 2016-08-22 16:59:22 +02:00
Jacob Støren
cf93a67b5e #273 Undefined grid faults between cells where one or both are inactive is now sorted into a seaparate predefined fault section. 2016-08-22 13:24:46 +02:00
Jacob Støren
37099929d6 #273 Added some comments 2016-08-22 10:48:40 +02:00
Magne Sjaastad
e031f89dcc Merged from maintenance branch 2016-08-05 12:13:13 +02:00
Magne Sjaastad
261ccd33e5 (#282) Added basic data structures to compute and cache unique integer values 2016-08-05 10:26:21 +02:00
Magne Sjaastad
24abb27674 #748 Added cell property sum to Info box statistics 2016-08-04 14:15:59 +02:00
Magne Sjaastad
4bfef4ead0 Merged in changes from maintenance branch 2016-08-04 11:12:53 +02:00
Magne Sjaastad
c3328003d0 #254 Avoid creation of cell face geometry if a fault is present at the face 2016-08-01 21:51:05 +02:00
Magne Sjaastad
97232fedd4 #752 Result Info reports "Grid cell" value to be Inf 2016-07-15 09:57:00 +02:00
Magne Sjaastad
cecd942989 Several Linux fixes 2016-06-02 09:57:25 +02:00
Magne Sjaastad
024b730803 Fixed typo 2016-06-02 09:38:22 +02:00
Jacob Støren
40388b308b #739 Added summary case classes. Use those from the summary curves. Made save/restore work again for the summary plots. File format for Summary stuff are changed. 2016-05-31 13:48:22 +02:00
Jacob Støren
d4ec42e9a2 (#712) Made a possible well cell connection in the wellhead control the connection color of the well pipe. 2016-01-10 21:33:50 +01:00
Jacob Støren
7737a713c5 Removed invalid cells from bbox search tree. 
Improving performance on startup and avoid possible stack exhaust error.
 2015-12-15 13:50:59 +01:00
Jacob Støren
cd4c9e6ee0 (#709) Invalid cells destroyed the intersection calculation for well log 
Omit the invalid cells from the calculation.
 2015-12-15 13:41:32 +01:00
Jacob Støren
4d6deef8ab (#708) Fixed simulation well geometry and color mapping. 
Had been sligtly off since 1.5.0.
 2015-12-14 11:25:55 +01:00
Jacob Støren
2a98f5b116 (#707) Renamed to make the use of resultWellIndex more clear 2015-12-11 17:45:09 +01:00
Magne Sjaastad
c0d08dd37f Fixed up regression introduced in 28a0e1107c 
Loading of result is supposed to happen only for
RimWellLogExtractionCurve
 2015-12-11 10:10:36 +01:00
Jacob Støren
856054666d Fixed error introduced in 28a0e1107c 2015-12-10 10:40:15 +01:00
Magne Sjaastad
4713014d26 (#700) Build bounding box search tree when grid is loaded 2015-12-09 15:36:37 +01:00
Magne Sjaastad
a31973e655 Made posNegClosestToZero a static function 2015-12-09 11:33:09 +01:00
Magne Sjaastad
28a0e1107c Improved result accessor factory 
Moved clamping of time step to zero for static results into factory
 2015-12-09 11:33:08 +01:00
Magne Sjaastad
b4e7e27f76 Fixed issued reported by CppDepends 2015-12-07 12:53:36 +01:00
Magne Sjaastad
6d60088a5b Added projection of point on line 2015-12-04 15:15:53 +01:00
Jacob Støren
1977578d90 Fixed error in Fem to Eclipse rangefilter mapping. 
The Fem elment was rotated again and again, bsed on previous rotation.
Need to use the original rotation each time.
 2015-12-03 16:23:41 +01:00
Magne Sjaastad
e03b6495e8 (#687) Moved ReservoirDataModelUnitTests into ApplicationCode/UnitTests 2015-12-03 10:57:10 +01:00
Magne Sjaastad
a215e080cc (#538) Display correct unit in curve name 2015-12-02 15:07:28 +01:00
Magne Sjaastad
de14b93f6b (#538) Support both meter and feet in LAS export 2015-12-02 15:07:28 +01:00
Magne Sjaastad
d18e8f7bd3 (#538) Added depth unit and conversion between meter and feet 2015-12-02 15:07:27 +01:00
Magne Sjaastad
fe261560bd (#538) Added DepthUnitType enum containing meter and feet 2015-12-02 15:07:27 +01:00
Jacob Støren
7b9f2b41ed CppCheck fixes, Errors Warnings and performance 2015-11-27 16:37:26 +01:00
Jacob Støren
9f0c9d13b9 Whitespace 2015-11-27 13:51:36 +01:00