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
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
