Commit Graph

932 Commits

Author SHA1 Message Date
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