Commit Graph

1003 Commits

Author SHA1 Message Date
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
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
Magne Sjaastad
f7521ad12f Merged branch pre-proto into pre-proto 2017-03-02 11:48:35 +01:00
Magne Sjaastad
ac9f405c96 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ResInsightVersion.cmake
2017-03-02 11:46:25 +01:00
astridkbjorke
6019ff4586 #1275 - pre-proto - Setting default values for stimplan fracture template polygon based on content in file 2017-03-02 11:43:42 +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
astridkbjorke
fde41f5116 #1234 - pre-proto - Adding time-step and property type for fracture polygon calculation 2017-02-28 10:02:40 +01:00
Magne Sjaastad
10f14aee8e Merge remote-tracking branch 'refs/remotes/origin/dev' 2017-02-27 07:13:06 +01:00
Magne Sjaastad
1af3df6c6c #1255 Removed includes from RimWellLogCurve 2017-02-24 14:14:29 +01:00
Magne Sjaastad
bdbb110ca4 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ModelVisualization/CMakeLists_files.cmake
	ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp
2017-02-20 11:07:46 +01:00
Magne Sjaastad
a29f325125 Guard time step index 2017-02-20 10:04:21 +01:00
Magne Sjaastad
b7aebbb392 #1230 Created StimPlan colors and show lenged in 3D view 2017-02-20 09:31:24 +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
astridkbjorke
359f8f9726 #1138 - pre-proto - Code cleanup and adding slider for well depth in stimplan file 2017-02-17 15:10:04 +01:00
astridkbjorke
e971c5276d #1139 - pre-proto - Reading in all parameters available in StimPlan file. 2017-02-17 14:14:48 +01:00
astridkbjorke
1fbc11acc9 #1139 - pre-proto - Starting reading in units from XML file 2017-02-17 10:11:33 +01:00
Magne Sjaastad
81c92d2781 #1230 Added infrastructure for loadAndUpdate of StimPlan data 2017-02-17 09:29:46 +01:00
Magne Sjaastad
f9d8ab8bad Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ApplicationCode/Resources/ResInsight.qrc
2017-02-16 10:18:39 +01:00
Jacob Støren
4fc0839a33 #1211 Disabled tracer allocation for wells with inconsistent flow. 2017-02-15 12:29:58 +01:00
astridkbjorke
ff59429ad8 #1139 - pre-proto - Adjustments in reading of XML file to handle files with multiple time-steps and several parameters. 2017-02-15 10:32:34 +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
Magne Sjaastad
2ee25c6cf5 Use triangleIndices instead of polygonIndices 2017-02-10 11:32:18 +01:00
astridkbjorke
517c53a069 (#1139) - pre-proto - Reading in stimplan XMLfile. Not tested for multiple properties / timesteps. (Also some code clean-up) 2017-02-10 10:03:46 +01:00
astridkbjorke
22ee6250bd (#1137) - pre-proto - Adding delete/new command for stimplan fracture templates. Removing RimStimPlanFractureDefinition, functionality moved into RimStimPlanFractureTemplate. Renaming RimFractureDefinitionCollection to RimFractureTemplateCollection. 2017-02-10 09:54:37 +01:00
astridkbjorke
d52cfc0f0b (#1136, #1137) - pre-proto - Adding base class RimFractureTemplte, and classes for stimPlan fractureTemplate and data structures. Also adding features for creating new stimPlan Fracture templates. 2017-02-10 09:52:18 +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
Magne Sjaastad
93954fece0 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/Commands/RicDeleteItemFeature.cpp
2017-02-08 07:35:20 +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
astridkbjorke
093b998fcd #1167 - pre-proto - Calculating azimuth angle for well path and using this angle in setting azimuth angle for fracture. 2017-02-06 13:12:56 +01:00
astridkbjorke
10bb3a834d pre-proto - Rename 2017-02-06 11:45:50 +01:00
astridkbjorke
53e7d99652 #1167, #1143 Calculating angle for simulation well, and setting angle based on this for "along well" and "transverse well" orientation of frac template. Azimuth field for fracture read-only if orientation not "azimuth" for frac template. 2017-02-06 11:44:24 +01:00
Jacob Støren
4a3ffb9238 #1166 Added the reservoir part of the well allocation plot 2017-02-03 15:52:37 +01:00
astridkbjorke
5630df5c1c pre-proto - Deleting line segments shorter than tolerance used when connecting line segments to polygons. 2017-02-03 14:12:40 +01:00
Magne Sjaastad
6dc0a7ff59 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ResInsightVersion.cmake
2017-02-03 10:51:46 +01:00
Magne Sjaastad
426d42935f Copy up from pre-proto 2017-02-03 10:23:07 +01:00
Magne Sjaastad
0633e6ca39 Fixed mix of signed and unsigned value compare 2017-02-03 10:14:02 +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
astridkbjorke
7d2ebd68bf #1092 - pre-proto - Reading in Dx, Dy, Dz and permeabilities before calculation of transmissibilities. 2017-01-31 12:26:30 +01:00
astridkbjorke
07f5ea45d2 #1141 - pre-proto - Adding intermediate values from transmissibility calculation to the top of the COMPDAT export file. 2017-01-31 09:56:48 +01:00
Magne Sjaastad
b13ca8bb1c #1135 Compute accumulated length along sim well and added slider 2017-01-30 14:28:41 +01:00
astridkbjorke
395c80e35f #1041 - pre-proto - Reading permeability and cell sized from grid for use in transmissibility calculation. 2017-01-30 10:45:18 +01:00
astridkbjorke
035107b48b #1091, #1092 - pre-proto - Simplifying calulation of projected areas and updating export functionality to include intermediate results of transmissibility calculation 2017-01-27 12:12:08 +01:00
astridkbjorke
fccd7d9314 pre-proto - Fixing include 2017-01-27 12:12:08 +01:00
astridkbjorke
9c9592ccce #1091 - pre-proto - Adding function for calculating fracture length. 2017-01-27 12:12:08 +01:00
Magne Sjaastad
aedf184d14 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
2017-01-26 14:30:13 +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
e845ae1ed8 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/CMakeLists.txt
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
2017-01-24 15:23:02 +01:00
astridkbjorke
66e2bcd6d8 pre-proto - Fixing include error (and starting method to calculate fracture lenght) 2017-01-24 14:25:18 +01:00
Magne Sjaastad
1b517a8e5e Added helper class for measured depth 2017-01-24 13:46:35 +01:00
astridkbjorke
08da3e926a #1091 - pre-proto - Expanding the findCellAverageZdirection function to find local X, Y and Z for a cell. 2017-01-24 12:15:26 +01:00
astridkbjorke
030b405d7f #1091 - pre-proto - Adding function for finding an "average" z direction, as the vector normal to the vectors between face centers in i and j. 2017-01-24 11:03:07 +01:00
astridkbjorke
02f4b94ca1 #1091 - pre-proto - Moving functions planeHexCellIntersection and createPolygonFromLineSegments from RimFracture to RigCellGeometryTools 2017-01-24 09:16:51 +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
da371c099b Merged branch dev into pre-proto 2017-01-19 10:45:22 +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
36bcdab426 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/UserInterface/RiuViewerCommands.cpp
2017-01-18 12:19:07 +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
astridkbjorke
89bf71b664 #1041 - pre-proto - Adding new functions transformMatrix (for calculating transform Matrix for fracture) and getPotentiallyFracturedCells (finding all cells in bounding box for fracture geometry) in RimFracture. Relevant code is updated to use these functions. 2017-01-12 12:19:52 +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
astridkbjorke
63e975f6ff pre-proto - Rename (and adding todo-s for further work) 2017-01-12 10:24:01 +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
astridkbjorke
dc1e29c419 #1041 - pre-proto - started on function to calculate transmissibility. Not yet complete. 2017-01-11 14:32:42 +01:00
Magne Sjaastad
9cd17ec508 Merge dev into pre-proto
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseView.cpp
	ApplicationCode/ProjectDataModel/RimEclipseView.h
2017-01-10 10:09:44 +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
astridkbjorke
3f052976f5 #1040 - pre-proto - Converting facture coordinates to display coordinates for visualization. Fractures not yet shown at correct possition. 2017-01-06 15:55:53 +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
astridkbjorke
7e0417b310 pre-proto - Updated handling of negative measured depth values in function for interpolating point along well path 2017-01-04 14:09:40 +01:00
astridkbjorke
996aebc7ac pre-proto - For WellPathFractures, position along well path is updated when setting a new value for measured depth 2017-01-04 13:29:25 +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
Magne Sjaastad
d1bf189154 #1040 Established basis for fracture visualization 2017-01-04 08:10:02 +01:00
Magne Sjaastad
f8ef9bddc7 #1069 Added ellipsis tesselator 2017-01-04 07:39:08 +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
Magne Sjaastad
dc970edf7e Merged in changes from dev 2017-01-03 11:32:00 +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
Magne Sjaastad
db3f7d6650 #1069 : pre-proto - Added empty files related to RigFracture 2017-01-02 14:13:34 +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