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
