Bjørn Erik Jensen
3edfd1dca6
LocalGrid. Move implementation to cpp file
2018-10-19 10:43:17 +02:00
Magne Sjaastad
6346ed012c
clang-tidy : Remove redundant 'virtual' and add 'override'
2018-10-18 19:45:57 +02:00
Magne Sjaastad
726658d642
#3512 System : Remove unused functions
2018-10-18 15:40:11 +02:00
Magne Sjaastad
766fea603e
#3512 System : Remove unused functions
2018-10-18 15:14:25 +02:00
Magne Sjaastad
5a1acc124f
#3512 System : Remove unused functions
2018-10-17 13:52:48 +02:00
Gaute Lindkvist
fd3b68834d
Renamed RigTernaryResultAccessor2d.h|cpp to remove the 2d.
2018-10-17 13:26:44 +02:00
Gaute Lindkvist
222ac5137f
#3498 Implement 2d grid projection prototype with regular grid.
2018-10-16 10:44:25 +02:00
Magne Sjaastad
8464d19696
#3412 Non-Darcy Perf intervals : Separate calculation of transmissibility and permeability
2018-10-12 13:00:37 +02:00
Magne Sjaastad
0174ee03e1
#3412 Non-Darcy Perf intervals : Simplify calculations
2018-10-11 12:50:57 +02:00
Bjørn Erik Jensen
676d14e65c
Mock model. Set LGR name
2018-10-10 11:46:32 +02:00
Magne Sjaastad
9d9771295f
System : Replace NULL with nullptr
2018-10-10 10:17:27 +02:00
Bjørn Erik Jensen
c7f6c74869
#3473 LGR Export. Support for exporting a single LGR for per well. Warning if completions intersect with existing LGR
2018-10-10 09:04:35 +02:00
Bjørn Erik Jensen
2f027f0de0
#3412 Non-Darcy perforations. Calculate d-factor and KH. Export to file
2018-10-02 12:37:05 +02:00
Gaute Lindkvist
dff3a0536d
#3429 Apply well radius correction to linear fracture to well transmissibility.
2018-10-02 08:46:24 +02:00
Magne Sjaastad
70a7b3ae5c
Fracture Completion Report : Use areaOpenForFlow() and remove unused function
2018-09-28 13:42:02 +02:00
Magne Sjaastad
c21655f2b4
Transmissibiliy Equations : Move function to private section
2018-09-28 09:39:10 +02:00
Bjørn Erik Jensen
492904d465
Fix warnings
2018-09-27 10:01:45 +02:00
Bjørn Erik Jensen
ade352a259
Rename method
2018-09-27 09:55:28 +02:00
Bjørn Erik Jensen
d4dde531a8
#3328 2d intersection view. Fix misplaced perforation interval
2018-09-27 09:48:08 +02:00
Bjørn Erik Jensen
bd346536c7
#3243 Completion type. Exclude cells having a subgrid from well path intersection
2018-09-26 15:35:48 +02:00
Gaute Lindkvist
301e05caa0
#3409 Add time dependent mat to frac dP option
2018-09-25 10:15:11 +02:00
Magne Sjaastad
f61b82dd35
System : System : Introduce compiler warning 4456 with fixes
2018-09-25 07:37:40 +02:00
Magne Sjaastad
4009d4d63b
System : Introduce compiler warning C4457 with fixes
2018-09-24 21:20:35 +02:00
Gaute Lindkvist
62f36faa12
#3394 Differential Depletion: Flux as a scaling factor for transmissibility.
2018-09-21 12:51:37 +02:00
Gaute Lindkvist
38d3b666e6
#3383 Make transmissibility condenser behave well with zero internal degrees of freedom.
2018-09-21 12:50:28 +02:00
Magne Sjaastad
7adf7e1e31
Fix some warnings
2018-09-20 16:24:11 +02:00
Magne Sjaastad
a7f14a0cb5
Whitespace
2018-09-18 08:15:23 +02:00
Gaute Lindkvist
c1ec5e088b
Fixup after review
2018-09-17 10:51:45 +02:00
Gaute Lindkvist
934c4fffd8
#3193 First implementation of pressure differential depletion scaling.
2018-09-17 10:51:45 +02:00
Gaute Lindkvist
9953c56c35
Make mean calculators more consistent and add an harmonic mean calculator.
2018-09-17 10:51:45 +02:00
Magne Sjaastad
b604d26e90
#3340 Fix some warnings
2018-09-11 21:56:15 +02:00
Magne Sjaastad
251dc050d0
#3032 Completion Export Fracture Header : Exclude truncated cells
2018-09-11 14:28:31 +02:00
Magne Sjaastad
d5b10546b8
#3032 Completion Export Fracture Header : Refactoring
...
Rename to reservoirCellIndicesOpenForFlow
Include inactive cells in area calculation
Consider containment/truncation for header related calculations
Moved calculations from stim plan fracture to stim plan calculator
2018-09-11 13:35:35 +02:00
Jacob Støren
01673f31cb
Remove uninitialized variable used compiler warning
2018-09-11 08:36:00 +02:00
Magne Sjaastad
bbebbf108f
#3340 Remove unused variables
2018-09-10 10:27:54 +02:00
Gaute Lindkvist
c1884bb67e
#3340 Well Bore Stability (and warning level): Check for valid segment stress before calculating stability curves.
...
* This removes a compile time warning about unused validSegmentStress variable.
2018-09-10 10:26:12 +02:00
Gaute Lindkvist
2932545ed8
#3333 Rename POISSON_RATIO to RATIO for element property tables.
2018-09-07 10:51:50 +02:00
Gaute Lindkvist
8eda5bcbb9
#3313 Implement weighted average of WBS data.
2018-09-07 10:49:00 +02:00
Gaute Lindkvist
51434dd304
#3316 , #3317 Change order of preference for Pore Pressure and set valid regions for SFG and FG.
2018-09-07 10:49:00 +02:00
Gaute Lindkvist
847c6127b0
#3308 Fix formation names in well log tracks.
2018-09-05 15:19:22 +02:00
Magne Sjaastad
58f8b3bfbb
Rename
2018-09-05 12:43:25 +02:00
Gaute Lindkvist
5a2ecf25c2
Rename measuredDepth and TVD methods in well log extractor code
2018-09-04 12:02:23 +02:00
Gaute Lindkvist
4c84bbb8a3
#3014 and #3022 Well Bore Stability: LAS and element table input and cleaned up extraction code.
2018-09-04 12:01:07 +02:00
Gaute Lindkvist
b4e2a58327
Well Bore Stability: Fix a couple of weaknesses in SFG and FG solver.
...
* Make sure absolute value is used for range
* Make sure we check for wrong convergence as well as no convergence for secant method.
2018-09-04 09:33:48 +02:00
Gaute Lindkvist
4fd9cdfda3
#3300 Fix crash when loading formation indices as part of a project file.
...
* Rename structGrid() to getOrCreateStructGrid() to make it obvious that it allocates internally.
2018-09-04 09:33:48 +02:00
Bjørn Erik Jensen
6b2359cb39
#3091 Completion export. Add WELSPECS/WELSPECL to exported file
2018-08-29 13:36:33 +02:00
Magne Sjaastad
9e3a100bcc
#3253 OpenMP : Give name to all critical sections
2018-08-27 13:04:29 +02:00
Gaute Lindkvist
0ccbd4e153
#3263 Well Bore Stability: Use a constant tangent for FG and SFG within a cell.
2018-08-27 11:33:01 +02:00
Magne Sjaastad
1fc6aca10b
#3269 Compdat Export Performance : Use const access
2018-08-24 15:50:27 +02:00
Magne Sjaastad
5f52dae545
#3269 Compdat Export Performance : Load all data before loop
2018-08-24 15:50:27 +02:00
Bjørn Erik Jensen
7369ce56ba
#3114 compdat export. Improve performance
2018-08-20 11:47:41 +02:00
Gaute Lindkvist
16560a7d81
#3183 Export Fractures as Multi Segment Wells.
2018-08-16 10:22:07 +02:00
Magne Sjaastad
2ddc3d77df
#3089 Non-Darcy longitudinal : Add support for longitudinal fractures
...
- move non-darcy data from template to fracture, as this data is now depending of fracutre
- compute weighted average of stimplan width and conductivity based on fracture perforation length
- use referringPtrFields() to find fractures using this fracture template
2018-08-15 09:53:52 +02:00
Magne Sjaastad
4c75e2514d
#3089 Move text parsing for unit conversion
2018-08-15 09:53:52 +02:00
Magne Sjaastad
45f0f6b485
Whitespace and rename
2018-08-15 09:53:52 +02:00
Gaute Lindkvist
2987e6128d
#3198 Support LGR when exporting fishbone completions for multi segment wells.
...
* Also refactor RicMultiSegmentWellExportInfo to remove public member variables.
2018-08-13 15:10:03 +02:00
Magne Sjaastad
252950e625
#3197 Refactoring : Add const keyword
2018-08-10 15:34:27 +02:00
Magne Sjaastad
d612362d4b
#3197 Refactoring : Add const keyword and use const ref
2018-08-10 14:12:14 +02:00
Magne Sjaastad
ce085a03ca
#3038 Fracture Completion Summary : Remove obsolete helper feature
2018-08-09 11:44:54 +02:00
Magne Sjaastad
f3d27e0af8
#3038 Fracture Completion Summary : Add fracture summary to compdat export
2018-08-09 11:33:48 +02:00
Magne Sjaastad
de5cced38f
#3038 Fracture Completion Summary : Add fracture grid calculator
2018-08-09 11:15:47 +02:00
Gaute Lindkvist
c869ce4430
#3186 Fix crash when selecting element nodal (and some other types) for some GeoMech well log curves.
2018-08-08 08:10:56 +02:00
Magne Sjaastad
8425ea96ad
#3185 Remove FixedArray
2018-08-07 10:37:52 +02:00
Magne Sjaastad
aeae19c748
#3185 Use std::array instead of FixedArray
2018-08-07 10:07:42 +02:00
Magne Sjaastad
e5c8c07d1f
Performance : Move object allocation outside loop
2018-08-07 09:24:05 +02:00
Magne Sjaastad
9617128464
Use override keyword
2018-08-07 07:58:58 +02:00
Magne Sjaastad
59d6e89fe0
#3038 Minor refactoring
...
Use empty()
Use const ref
2018-08-07 07:24:39 +02:00
Magne Sjaastad
793b56f6f4
#3038 Fix double check of same error state
2018-08-07 07:20:42 +02:00
Magne Sjaastad
0e14499561
#3038 Fix typo
2018-08-06 09:36:42 +02:00
Magne Sjaastad
fe07b60392
CppCheck : Several fixes
...
Add missing initializers
Guard potential null pointer access
2018-08-02 19:22:03 +02:00
Magne Sjaastad
91552c155a
#3090 Add findReservoirCellIndexFromPoint
2018-08-02 13:51:38 +02:00
Magne Sjaastad
5aa46fe855
#3177 COMPDAT Export : Add logging and return if required data is missing
2018-07-30 10:30:13 +02:00
Magne Sjaastad
b32a3f229f
Whitespace changes
2018-07-30 10:21:42 +02:00
Gaute Lindkvist
be63eb5aef
#3160 Use cell centre depth for well bore stability curves
2018-07-16 08:57:28 +02:00
Bjørn Erik Jensen
cc87da2ae0
#3106 Ensemble calculations. Hash only ensemble parameters common to all cases. Move cases validation
2018-07-04 14:36:14 +02:00
Gaute Lindkvist
3dec239c99
#3132 Increase legend sample line lengths and scale by curve thickness
...
* Otherwise we can't distinguish between curves in the legend.
2018-07-04 11:10:32 +02:00
Gaute Lindkvist
0bbe0db394
#3137 Make sure azimuth angles are clockwise and 0 to 360.
2018-07-04 11:10:32 +02:00
Jacob Støren
dc95b217c5
#2609 Update the visualization when the well path geometry definition changes
2018-07-02 16:31:55 +02:00
Gaute Lindkvist
0a0cb584b5
Move hard coded parameter names to RiaDefines
2018-07-02 10:29:32 +02:00
Gaute Lindkvist
76f0126e59
Move rkbDiff calculation code to RigWellPath so it can be shared instead of copied.
2018-07-02 10:29:30 +02:00
Magne Sjaastad
386726a92f
Transmissibility Calc : Early exit if no transmissibilities
2018-06-28 13:52:22 +02:00
Bjørn Erik Jensen
898df5b68a
#3096 Implemented ensemble calulations
2018-06-25 15:15:30 +02:00
Gaute Lindkvist
fab83846e6
#3095 Add PP, OBG and SH to well path derived extraction curves.
2018-06-25 08:37:26 +02:00
Gaute Lindkvist
6cd5ae9e22
#3093 Implement Azimuth and inclination well path derived extraction curves.
...
* Needed improvement of tangent calculation. Take the tangent from the well path, not the two intersection points.
2018-06-25 08:37:26 +02:00
Gaute Lindkvist
9fe1c7de6c
Remove some debug hardcoded code paths for Well Path Derived Well log extraction curves
2018-06-25 08:37:26 +02:00
Magne Sjaastad
5114e05156
#3035 Fault Truncation: Add polygon subtraction
2018-06-22 17:14:28 +02:00
Gaute Lindkvist
5fc795a24a
#3061 Implement Memory Cleanup for eclipse data.
2018-06-20 11:46:19 +02:00
Gaute Lindkvist
e3e4e79340
Improve encapsulation of RigEclipseResultInfo
...
* To make it more suitable for looking up results.
2018-06-20 11:46:19 +02:00
Gaute Lindkvist
51631fda6e
#3027 Disable averaging of Fracture Gradient and Shear Failure Gradient
2018-06-20 11:46:19 +02:00
Bjørn Erik Jensen
508f33903f
Delete files that should have been deleted in an earlier commit
2018-06-20 10:16:15 +02:00
Bjørn Erik Jensen
eebd8bef2d
Move RigCurveDataTools and RigTimeHistoryCurveMerger to Application/Tools plus rename
2018-06-08 15:10:45 +02:00
Bjørn Erik Jensen
69accdc4c6
#2659 Ensemble statistics. First version
2018-06-07 10:04:16 +02:00
Gaute Lindkvist
5b0a185549
Fix Linux build by removing use of Invoke and including some headers
2018-06-06 13:22:35 +02:00
Gaute Lindkvist
4ddacad385
#2680 . First reasonable Fracture Gradient and Shear Failure Gradient estimation.
...
Caveats:
* Hard coded poissonRatio = 0.25
* Hard coded UCS to 100 bar (fairly close to average value for shale in literature).
2018-06-06 12:03:08 +02:00
Magne Sjaastad
3505b9d31a
Debug Tools : Add globalCellIndicesToOneBasedIJKText used as input to cell based range filter
2018-05-31 15:29:55 +02:00
Bjørn Erik Jensen
0b4156da02
#2660 Ensemble curves. Curve filtering
2018-05-31 10:24:16 +02:00
Bjørn Erik Jensen
2bd1bd777c
Case realization parameters. Fix logical bug
2018-05-31 10:24:15 +02:00
Bjørn Erik Jensen
56d0112b07
Case realization parameters. Return empty object and method name change
2018-05-31 10:24:15 +02:00
Bjørn Erik Jensen
d043545747
Case realization parameters. Replaced HUGE_VAL by numeric_limits
2018-05-31 10:24:15 +02:00
Magne Sjaastad
54f5ab66b4
#2969 Add const to currentActiveCellInfo
2018-05-31 08:30:04 +02:00
Gaute Lindkvist
ee7bd79fcb
#2980 Renaming of lastNormal vectors.
2018-05-30 15:37:18 +02:00
Gaute Lindkvist
cf64f5f70d
#2980 Include interpolated previous normal for determining direction of current normal
2018-05-30 15:37:17 +02:00
Gaute Lindkvist
70bcd25c86
#2945 Flip normals if the average well path normals doesn't match the requested direction.
2018-05-30 15:37:17 +02:00
Magne Sjaastad
6a41ad14c3
Fix typo
2018-05-29 10:51:54 +02:00
Magne Sjaastad
be14877525
#2970 Faults : Code cleanup
2018-05-25 11:31:21 +02:00
Gaute Lindkvist
14a5fd4009
#2959 Fix crash when loading ODB file without overburden.
2018-05-25 09:36:46 +02:00
Gaute Lindkvist
956d221c48
#2878 Use correct keyword for solvent data (SSOL not SSOLVENT)
2018-05-14 10:41:23 +02:00
Gaute Lindkvist
3360973e87
Use SSOLVENT in calculating SOIL if present
2018-05-11 15:45:31 +02:00
Magne Sjaastad
4f4a12b636
#2868 Completion Type : Rename
2018-05-09 11:48:37 +02:00
Magne Sjaastad
9bb8f36052
#2868 Completion Type : Compute completion type based on virtual connection factors
2018-05-09 11:48:37 +02:00
Magne Sjaastad
9e6e2e8735
#2868 Completion Type : Use const pointer
2018-05-09 11:48:37 +02:00
Gaute Lindkvist
47ed8dac74
Fix crash due to wrong closest index comparison in RigSimulationWellCoordsAndMD
2018-05-09 10:44:29 +02:00
Gaute Lindkvist
f24fb4aaec
Fix crash due to global/local grid index mixup when creating fractures on SimWellPaths.
...
* Introduces a convenience method on the main grid
* Also converts some callers to use the convenience method.
2018-05-09 10:44:29 +02:00
Bjørn Erik Jensen
e4aa7d681d
#2852 OPM. Updated flow diag solver interface after OPM upgrade
2018-05-07 14:43:24 +02:00
Gaute Lindkvist
a165172723
#2847 Add a fall back dominant direction (0, -1, 0) if the path does not extrude in z-direction.
...
* This direction means Left will cause it to go -x and Right +x so that the directions are correct with respect to "Left" and "Right" when you look "North".
2018-05-03 13:39:39 +02:00
Bjørn Erik Jensen
92fd4183a9
#2797 Ensemble curves. Support for text ensemble parameters. Unit test
2018-05-03 09:55:13 +02:00
Magne Sjaastad
9ac3d806e2
#2663 Rename
2018-04-23 23:06:21 +02:00
Magne Sjaastad
d5bdd1f7a1
#2765 Completions : Use max available diameter when combining multiple completions in same cell
2018-04-19 14:55:14 +02:00
Magne Sjaastad
305fdfcfc8
Remove unused variables and functions
2018-04-19 07:19:29 +02:00
Gaute Lindkvist
01a1f660e7
3D Well Log Curves ( #2746 ): Handle set scale.
...
* Transform to display coordinates *before* calculating normals and generating curves.
2018-04-18 11:33:04 +02:00
Magne Sjaastad
f3a235b9df
#2748 Completion Type Calculations : Remove unused code
2018-04-17 14:42:15 +02:00
Magne Sjaastad
ba3074ff08
#2748 Completion Type Calculations : Use findIntersectedGlobalCellIndices
2018-04-17 14:42:15 +02:00
Magne Sjaastad
c0704a65f3
#2744 Well Log Extractor : Replace use of cornerIndices with cellCornerVertices
2018-04-17 10:14:57 +02:00
Magne Sjaastad
34cbd79410
#2744 Well Log Extractor : Support detection of small well path inside one cell
2018-04-17 09:41:08 +02:00
Magne Sjaastad
43e5fb00f4
Testing : Fix invalid index in small mock model
2018-04-17 07:55:52 +02:00
Gaute Lindkvist
fd63ae7531
3D Well path plots: clean up some indentation and remove an unnecessary epsilon
2018-04-13 15:33:37 +02:00
Gaute Lindkvist
b48adbbaa9
3D Well log curves: Use the new generalized interpolation for normals
...
* Don't have to perform the normal generation again for grid points.
2018-04-13 14:56:19 +02:00
Gaute Lindkvist
1bb1b3004e
Generalize the interpolation in RigWellPath
...
* Make it possible to interpolate any vector along the well path,
not just the well path points. This way it can be used for normals.
* The interpolation line needs to be a weighted sum of vectors from
the two closest points rather than the previous point + a segment,
which only works for points.
* If used for normals, the end result *has to be normalized*
2018-04-13 14:56:18 +02:00
Gaute Lindkvist
6e0b7e2305
Improve 3D Well path plots
...
* Always generate in up-direction and rotate to left/right/down
* Generate a "dominant direction" by interrogating the whole curve, not
just the first and last item.
* Improve maths:
- Generate a projection plane spanned by UP and the dominant direction.
- Project the tangent onto this projection plane.
- Generate normal as the cross product between the projected tangent and
the normal to the projection plane.
- Rotate the normal into left/right/down if required.
2018-04-13 14:55:44 +02:00
Jacob Støren
fee549de35
Adjust an argument order in RigWellPathGeometryTools
2018-04-09 13:23:09 +02:00
Bjørn Erik Jensen
8491fd7f6c
#2610 Fix a few Linux build errors
2018-04-06 13:56:26 +02:00
Bjørn Erik Jensen
ba5480fa81
#2655 , #2610 Add legend config to curve set. No connected to curves yet...
2018-04-06 11:58:06 +02:00
Bjørn Erik Jensen
f7f09c0719
#2610 Import case realization parameters and store those in summary case
2018-04-06 11:58:05 +02:00
Magne Sjaastad
c0054cff91
#2553 Well CF Visualization: Add recompute of virtual conn factors
2018-04-05 14:25:47 +02:00
Magne Sjaastad
c7fbc99c9d
#2553 Move RigWellResultPoint into separate file
2018-04-05 14:25:47 +02:00
Jacob Støren
97c2ebd955
#2436 Intersection Fault lines are now separated and have a separate color
2018-04-05 07:41:29 +02:00
Rebecca Cox
18bde3cd89
#2636 3D Well log curve: Create well path geometry tools.
2018-03-22 14:35:54 +01:00
Jacob Støren
39106fdf99
#2605 Place perforation intervals correct horizontally in 2D Intersection View
2018-03-21 14:21:27 +01:00
Jacob Støren
25ff51c82b
#2630 Fix wrong picked MD on clipped well paths
2018-03-21 13:56:24 +01:00
Magne Sjaastad
8db8575d1e
#2625 Completion Type Legend : Only show categories present in the model
2018-03-21 07:43:59 +01:00
Jacob Støren
c22bafbf29
#2605 Show perforations along well path in 2D intersections view
2018-03-20 17:28:27 +01:00
Jacob Støren
a9daea0938
#2481 , #2605 , #2486 Use a flattened version of the normal wellpath visualization in 2D intersection view
2018-03-20 15:44:45 +01:00
Unknown
e1aa4bb164
#2591 3D well log curves: Draw normals on fixed interval
2018-03-20 11:29:59 +01:00
Magne Sjaastad
d3361d22dd
#2546 Well CF Visualization : Fix computation of transmissibilty
2018-03-14 09:47:17 +01:00
Magne Sjaastad
108ef5eecc
#2544 Well CF Viz : Add basiz viz with spheres, add legend to view
2018-03-14 09:35:48 +01:00
Rebecca Cox
cf4830e0ad
#2592 3D well log curves: Visualize results
2018-03-13 09:25:29 +01:00
Magne Sjaastad
716bb3184b
System : Replace tab with four spaces
2018-03-12 11:12:39 +01:00
Magne Sjaastad
8e8c168405
#2546 Well Connection Factors : Several changes related to data access
...
Moved rig classes from command feature into ReservoirDataModel\Completions\
2018-03-12 11:07:46 +01:00
Magne Sjaastad
64845d796c
Fracture : Move code to cpp
2018-03-09 09:00:44 +01:00
Bjørn Erik Jensen
6942a99406
#2569 Fracture containment. Fix fracture border polygon calculation
2018-03-08 11:06:17 +01:00
Magne Sjaastad
454e0b31be
#2559 Fracture Template : Fix unit conversion for width and conductivity
2018-03-05 09:43:06 +01:00
Magne Sjaastad
bb0f026644
Whitespace
2018-03-02 14:09:46 +01:00
Magne Sjaastad
08995cf63e
#2483 Refactoring : Simplify generation of well branch geometry (2)
2018-03-02 14:07:31 +01:00
Magne Sjaastad
7bd0bdc612
#2483 Refactoring : Simplify generation of well branch geometry (1)
2018-03-02 14:07:23 +01:00
Bjørn Erik Jensen
2ac9aba485
#2494 Add height/width fracture scaling
2018-03-01 14:18:12 +01:00
Magne Sjaastad
25a1823f35
Merge branch 'dev' into cmake-improvements
2018-02-28 08:47:01 +01:00
Magne Sjaastad
89c090ba24
#2536 Build System : Remove obsolete code for cmake older than "2.8.2"
2018-02-28 08:05:00 +01:00
Magne Sjaastad
f4bae6f796
#2529 Fracture : Remove RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES from CMake files
2018-02-26 21:11:14 +01:00
Magne Sjaastad
72b5f540e5
#2529 Fracture : Remove all #ifdef USE_PROTOTYPE_FEATURE_FRACTURES
2018-02-26 20:54:45 +01:00
Magne Sjaastad
7ce6177bc5
System : Add missing braces
2018-02-23 22:39:29 +01:00
Magne Sjaastad
ae064463a9
System : Add missing default statements
2018-02-23 22:39:14 +01:00
Magne Sjaastad
245ea2dac2
System : Use unsigned type as index
2018-02-23 22:38:46 +01:00
Magne Sjaastad
0006c786cf
System : Reorder initialization order to match declaration
2018-02-23 22:38:08 +01:00
Magne Sjaastad
c6b12b85e0
Merge fracture unit refactoring into dev #2509
...
Add display of M and F in front of fracture templates
Add convert of StimPlan templates
Add copy/paste of StimPlan templates
Remove obsolete unit conversion code
2018-02-21 10:15:56 +01:00
Magne Sjaastad
b0be540977
#2509 Fracture : Remove obsolete unit conversion code
2018-02-21 08:18:55 +01:00
Magne Sjaastad
4e737885e4
#2509 Fracture : Move unit conversion of top/bot perforation depth
2018-02-20 15:35:08 +01:00
Magne Sjaastad
35febab8db
#2509 Fracture : Add support for unit conversion of stimplan grid coords
2018-02-20 15:15:06 +01:00
Rebecca Cox
542c912df2
Merge patch into dev with fixes for #2403
2018-02-19 09:32:37 +01:00
Rebecca Cox
4d39136212
#2403 Extraction curves: Fix curves without vertical connections
2018-02-19 09:29:14 +01:00
Magne Sjaastad
1ae30ef11a
(clang-tidy) : modernize-use-nullptr
2018-02-18 18:56:43 +01:00
Magne Sjaastad
f9bded9c13
#2455 Fracture : Move code to cpp and restructure header
2018-02-14 13:34:38 +01:00
Bjørn Erik Jensen
7ddfaeb234
#2388 fractures. Support for asymmetric stim plan
2018-02-08 11:05:55 +01:00
Magne Sjaastad
a283a468c2
#2447 Fracture : Show fracture legend when only ellipse fractures are present
2018-02-06 12:42:13 +01:00
Bjørn Erik Jensen
c09dd0522b
Merge branch '2018.01.01-patch' into dev. #2086
2018-02-05 08:29:24 +01:00
Bjørn Erik Jensen
98a94c0525
#2086 Moved RifStringTools -> RiaStringEncodingTools
2018-02-02 15:44:28 +01:00
Bjørn Erik Jensen
d5116d8942
#2086 Fix well GUI name for well paths when extended ascii chars in name
2018-02-02 15:03:41 +01:00
Magne Sjaastad
c8e002d532
#2374 Fracture : Incomplete results when computing intersected StimPlan cells
2018-02-01 12:58:48 +01:00
Magne Sjaastad
33ef2948f4
Merge "Completion Export LGR" into dev
...
#2425 #1758 #2423
2018-01-31 13:38:05 +01:00
Rebecca Cox
b2bdd996d2
#2389 Fracture: Set perforation length and depth from file values
2018-01-31 12:25:58 +01:00
Magne Sjaastad
e989b3afc9
#2423 Export Completions : Move Rig*-files to completion export folder
2018-01-31 10:20:47 +01:00
Magne Sjaastad
e18a08a425
#1758 Use RigMainGrid in interface to CompletionDataGridCell
2018-01-31 10:20:47 +01:00
Magne Sjaastad
4516941d2c
#1758 Add RigCompletionDataGridCell
2018-01-31 10:20:47 +01:00
Magne Sjaastad
028b5303a7
#1758 Add support for export of COMPDATL for LGR grid
2018-01-31 10:20:47 +01:00
Magne Sjaastad
c0359f1776
#1758 Refactor IJKCellIndex
2018-01-31 10:20:47 +01:00
Magne Sjaastad
d5c1e1e898
#1758 Moved implementation to source and improved formatting
2018-01-31 10:20:47 +01:00
Rebecca Cox
bbcda37813
Merge remote-tracking branch 'origin/2018.01.01-patch' into dev
2018-01-29 14:47:04 +01:00
Rebecca Cox
f598e6905c
#2419 Do not make OpmFlowDiagStat if result is fracture (DUAL)
2018-01-29 14:41:07 +01:00
Magne Sjaastad
71deeb8954
Merge remote-tracking branch 'origin/2018.01.01-patch' into dev
2018-01-29 10:09:54 +01:00
Magne Sjaastad
ff0599df04
Guard for access of dynamic data with no time steps
2018-01-29 10:04:33 +01:00
Magne Sjaastad
78068e547d
Fix compiler warnings related to converting time_t to double
2018-01-26 08:25:50 +01:00
Magne Sjaastad
430b193437
#2402 Fracture : Compute conductivity scaling for all conductivity variants
2018-01-25 14:17:10 +01:00
Magne Sjaastad
001742cbd3
#2402 Fracture : Add support for multiple conductivities on a template
2018-01-25 14:17:10 +01:00
Magne Sjaastad
1e4b4dbf62
Merge remote-tracking branch 'origin/2018.01.01-patch' into dev
2018-01-25 11:14:09 +01:00
Rebecca Cox
a6333128e3
#2328 Fix crash when calculating "Water Flooded PV"
2018-01-24 16:32:48 +01:00
Rebecca Cox
e68f0e2be8
Merge branch '2018.01.01-patch' into dev
2018-01-24 08:33:47 +01:00
Rebecca Cox
9617481406
#2327 Formation RFT Plot: Read tvdss from well pick files
2018-01-24 08:21:22 +01:00
Magne Sjaastad
245d10c5c1
Fix compiler warnings related to converting time_t to double
2018-01-19 16:55:16 +01:00
Jacob Støren
5855e412e7
#2375 Fix missing catch of exeptions from pvt/relperm curve generation
2018-01-19 15:21:17 +01:00
Magne Sjaastad
2da5f8cf54
#2141 Use accumulators to compute min/max used to configure legend
2018-01-19 15:08:31 +01:00
Jacob Støren
6adcbd9c56
#2375 Fix missing catch of exceptions from opm-flowdiagnostics libraries
2018-01-19 12:46:53 +01:00
Magne Sjaastad
424c6a46f6
Whitespace and function headers, move implementation to header
2018-01-16 08:04:49 +01:00
Magne Sjaastad
2457f968cf
#2374 Fracture : Incomplete results when computing intersected StimPlan cells
2018-01-16 08:04:49 +01:00
Rebecca Cox
3786adc9b7
#2347 Elm Props: Evaluate result type ELEMENT for WellLogExtractor
2018-01-11 11:35:31 +01:00
Jacob Støren
cb6d49a611
#2331 Renamed RimView to Rim3dView
2018-01-09 10:11:28 +01:00
sigurdp
434d03b9d7
#2318 Added workaround that guards initialization of relative permeability evaluation library since opening of special EGRID file causes exception in library and crash
2018-01-05 11:00:40 +01:00
Bjørn Erik Jensen
4cdc109ec3
#2315 . Replaced abs() by fabs() where relevant
2018-01-05 09:29:53 +01:00
Magne Sjaastad
11ed06a5d5
#2314 Fracture : Along well path direction
...
Use fabs instead of abs to avoid unintentionally conversion to integer
2018-01-04 19:31:44 +01:00
Jacob Støren
25e1db9e8f
#2294 Use simplified result access in TOF acc. saturation plot, and fix gas oil colors in plot
2018-01-02 14:45:42 +01:00
Jacob Støren
3f22c096d8
#2294 Use phase saturation corrected PORV when calculating TOF for a single phase
2018-01-02 14:45:42 +01:00
Jacob Støren
27835aceae
#2294 Add a method to access Eclipse results in a convenient manner.
2018-01-02 14:45:42 +01:00
Bjørn Erik Jensen
82d8b7c98a
#2295 . Guard for null frac template where it is being used
2018-01-02 12:54:10 +01:00
Magne Sjaastad
40a4222db2
Remove obsolete assert
...
Discussed with @jacobstoren : Multiple branches are handled by the logic, and the assert is probably obsolete. Consider to set isMultiSegmentWell = true when multiple branches are detected.
2018-01-02 08:20:03 +01:00
Jacob Støren
69ab95dfed
Changed name to "Water Flooded PV"
2017-12-21 16:10:21 +01:00
sigurdp
f716dacb24
Pvt Plot: Display Rs/Rv values of curve's sample points in tool tip, #2255
2017-12-13 14:56:10 +01:00
Jacob Støren
7d39d29ca5
Merge fix of #1858
2017-12-12 17:41:45 +01:00
Jacob Støren
b8b5707ebc
#1858 Compleded information for start and end of well paths starting and/or ending within cells
2017-12-12 16:34:42 +01:00
Jacob Støren
7e820cd251
#1858 General refactoring as preparations. Renaming Whitespace change. Remove obsolete code.
2017-12-12 16:32:57 +01:00
Jacob Støren
68f5253644
#1858 Move method to WellLogExtractor base class
2017-12-12 15:00:14 +01:00
Jacob Støren
6c3f569499
#1858 Align and remove near struct duplicates of WellPathCellIntersectionInfo
2017-12-12 14:49:10 +01:00
Jacob Støren
b15664cfc5
#1858 Rename WellPathIntersectionInfo classes
2017-12-12 13:53:02 +01:00
Jacob Støren
3a1939d460
#1858 Renaming and whitespace as preparations
2017-12-12 12:47:05 +01:00
sigurdp
01ae19ebbc
#2235 RelPerm/PVT Plot: Added unit labels to relevant axes
2017-12-11 16:12:31 +01:00
Rebecca Cox
3e5209d1a7
#2227 Well formations: Remove fluids from Level type
2017-12-11 16:07:15 +01:00
Rebecca Cox
fb876f8fdc
#2227 Well formations: Remove fluid annotation duplicates
2017-12-11 15:12:12 +01:00
Rebecca Cox
864b9466d5
#2227 Well formations: Handle "+" in formation name file input
2017-12-11 15:12:12 +01:00
Rebecca Cox
c3cd0a650e
#2227 Well formations: update ui. remove level from RigWellPathFormation
2017-12-11 15:12:12 +01:00
Rebecca Cox
406c371682
#2227 Well formation: Make level filter dynamic
2017-12-11 15:12:12 +01:00
Rebecca Cox
fa3d9c4fc2
#2227 Well Formation: Add filter. Filter options not dynamic
2017-12-11 15:12:12 +01:00
sigurdp
07b1bbca4b
RelPerm Plot: Try and enable handling of invalid scaled saturation end-points by ignoring these, but currently does not seem to give the expected results.
2017-12-11 13:07:35 +01:00
sigurdp
56febb9e92
#2192 RelPerm Plot: Utilize new functionality in opm-flowdiagnostics-applications to show the pressure in case-units
2017-12-11 13:07:35 +01:00
sigurdp
09c09a7386
Upgraded opm-flowdiagnostics-applications to a773bcfc963705679ecc28f58048fc38936fbbc6
2017-12-11 11:15:09 +01:00
Jacob Støren
84dcc0980e
#2237 Progress bar when calculating flooded PV
...
Fix errors in progress detected when opening project
2017-12-08 16:56:42 +01:00
Magne Sjaastad
cda9d82971
Use int instead of size_t to represent time step
2017-12-08 10:49:32 +01:00
Magne Sjaastad
1841379e64
#2127 Sim Well Branches : Major refactor of sim well branch computation
...
Remove local branch geometry caches
Add checkbox to control if branch detection should be used
Add RiaSimWllBranchTools and move helper functions from RimProject
2017-12-08 10:24:14 +01:00
Rebecca Cox
a2d2879bab
#2227 Well formations: New Rig data stucture with top+base MD and level
2017-12-08 09:27:37 +01:00
Rebecca Cox
48f9769eb7
#2221 Well Path Formation names: Improve user feedback on import
2017-12-07 08:34:12 +01:00
Magne Sjaastad
9d83299da9
Statistics : Skip computation of mobile pore volume, as base data is not available
2017-12-06 08:09:54 +01:00
sigurdp
a285ae8f61
PVT Plot: Added guarding to prevent access visolations when querying dynamic properties for PVT plots in cases where initialization of PVT curve collection fails.
2017-12-05 16:16:58 +01:00
sigurdp
e12a931940
Added calculation of PVT related dynamic properties and display of these in the PVT FVF and Viscosity plots as a point marker. Started using flow diagnostics library's output unit conversion for PVT curves to align output units with the case units. #1990
2017-12-05 14:18:46 +01:00
sigurdp
0af37f3613
Changed name of flag and semantics from removeNegativeValues to includePositiveValuesOnly so that only positive values (zero not included) are included. Makes functions more suitable for usage with plots using logarithmic scale. #2193
2017-12-05 10:44:36 +01:00
sigurdp
9e3868d6d8
First attempt at using unit conversion when getting PVT curve data (commented out due to crash)
2017-12-05 10:43:44 +01:00
Jacob Støren
b092c6e047
Merge branch 'dev' of https://github.com/OPM/ResInsight.git
2017-12-04 16:38:45 +01:00
Jacob Støren
1ec6d77ff9
#2195 Final fix of missing connections in high level grids, if connections in lower levels exist.
2017-12-04 16:37:53 +01:00
Jacob Støren
fcd9d0f3e6
#2195 First step in making higher LGR level connections not beeing hidden
2017-12-04 11:42:10 +01:00
Rebecca Cox
8d7a578d6f
#2137 Formation Names: Update all plots necessary when changing formation names on case
2017-12-01 10:26:32 +01:00
sigurdp
85832ae0bc
PVT Plot: Added warning message if PVT plotting could not be initialized
2017-11-30 11:28:07 +01:00
sigurdp
3b1775ad4d
#1994 PVT Plot: Removed water phase from plot, started implementing display of pressure marker, but this is not yet active.
2017-11-28 09:15:11 +01:00
sigurdp
aa1bbbe2d9
#1994 First cut implementing PVT plots
2017-11-28 09:15:11 +01:00
Rebecca Cox
403e137f6d
Code cleanup
2017-11-27 15:23:26 +01:00
Rebecca Cox
b8848317f4
#2123 Formation/Well Path: Add access functions
2017-11-27 14:41:15 +01:00
Rebecca Cox
8c57fdf22a
#2122 Formation/Well Path: Set formations path and key on RimWellPath
2017-11-27 10:33:41 +01:00
Magne Sjaastad
e231685d4c
#2176 Avoid use of pointer to a temporary
2017-11-24 16:10:38 +01:00
Jacob Støren
cf9f886856
#2176 Fix the crash due to an invalid wellhead definition from libecl. Now using first valid connection-cell as proxywellhead in calculations if needed.
2017-11-24 15:46:31 +01:00
Unknown
7e28039ffd
#2122 Formation/Well Path: Add new reader. Same pattern as WellPathFile
2017-11-24 15:18:25 +01:00
sigurdp
65fe3ba902
#2063 Added support for showing RelPerm plot curves without end-point scaling
2017-11-24 08:36:44 +01:00
sigurdp
14c1b5a595
Enabled caclulation and plotting of PCOG and PCOW now that opm-flowdiagnostics-applications have been updated
2017-11-24 08:36:44 +01:00
sigurdp
5f5abdf347
Working on adding SWAT and SGAS markers to RelPerm plot, #2061
2017-11-24 08:36:44 +01:00
Magne Sjaastad
686a47587b
#2125 Curve Calculations : Add TimeHistoryCurveMerger
2017-11-21 08:10:28 +01:00
Rebecca Cox
f5290f020b
#2146 Num Flooded PV: Add allTimeSteps for all active native cells
2017-11-20 09:46:29 +01:00
Magne Sjaastad
8ee0ddb317
#2125 Curve Calculations : Add tools used to interpolate two curves
2017-11-17 14:29:19 +01:00
Magne Sjaastad
5cbaf3c1eb
#2125 Refactor : Return by value instead of incoming parameter
2017-11-17 13:50:25 +01:00
Magne Sjaastad
cd368d8ef2
#2125 Refactor : Introduce typedef for CurveIntervals
2017-11-17 13:50:25 +01:00
Magne Sjaastad
827cee6093
#2125 Curve Calculations : Extract isValidValue
2017-11-17 13:50:25 +01:00
Rebecca Cox
6347c9d716
#2146 Num Flooded PV: Add allVisibleCells for native
2017-11-16 15:28:12 +01:00
Rebecca Cox
204ee2162a
#2146 Num Flooded PV: Add allVisibleCells for flowDiag
2017-11-16 14:59:55 +01:00
Rebecca Cox
92a6819b39
Rename frameIndex -> timeStepIndex
2017-11-16 14:52:18 +01:00
Rebecca Cox
7c19b0601b
Rename frameIndex -> timeStepIndex
2017-11-16 14:52:18 +01:00
Rebecca Cox
49417bbb3a
#2146 Num Flooded PV: Add volume weighted mean for visible cells and current time step
2017-11-16 10:50:55 +01:00
Rebecca Cox
4b2af286e3
#2146 Num Flooded PV: Move getResultIndexableStaticResult
2017-11-16 10:50:55 +01:00
Rebecca Cox
797115d5c1
#2146 Num Flooded PV: Add accessor for flowDiagSolution
2017-11-16 10:50:55 +01:00
Rebecca Cox
969d6342bc
include cmath for linux
2017-11-16 10:50:55 +01:00
Rebecca Cox
6c42e74623
#2146 Num Flood PV: Allow artCellInfo to be null if not usingActiveIndex
2017-11-16 10:50:55 +01:00
Rebecca Cox
47429b1c6b
#2146 Num Flooded PV: Add weighted mean calulator
2017-11-16 10:50:55 +01:00
Magne Sjaastad
5fe44fe943
#2097 Reservoir Phase Detection : Compute SGAS for non-oil simulations
2017-11-10 10:36:43 +01:00
Jacob Støren
1fba5e13c4
#2119 Support total reservoir flow from Grid wells in PLT plot
2017-11-09 15:20:15 +01:00
Magne Sjaastad
7a10087c01
#2118 Fracture : Improve detection of Stimplan cell intersected by well path
2017-11-09 14:15:05 +01:00
Jacob Støren
014dd9497a
#2035 Add color and legend text to the PLT curves
2017-11-08 11:59:38 +01:00
Rebecca Cox
c49db44909
#1490 Simulation well: Remove well head if it does not have perforations
2017-11-08 11:22:51 +01:00
Jacob Støren
994313fcc9
#2035 Fix some bugs in the PLT plot use of wellFlowAccumulator, and in the new constructor of the wellFlowAccumulator. Renamed to m_pipeBranchesWellResultPoints (instead of misleading "CellIds")
2017-11-07 18:35:56 +01:00
Jacob Støren
7f3ec2ad84
#2035 Add accumulated PLT plot curves from *.RFT file. (Not yet available due to missing calculate value options)
2017-11-06 22:24:57 +01:00
Jacob Støren
b708bb0ac3
#2035 Add MD to the intesection struct available from the WellLogExtractors
2017-11-06 22:24:57 +01:00
Jacob Støren
1089060539
#2035 Remove the unused Pseudo Length calculator
2017-11-06 22:24:57 +01:00
Jacob Støren
94c6bc763d
#2035 Commit unused Pseudo length calculation files, for reference.
2017-11-06 22:24:57 +01:00
Bjørn Erik Jensen
0c8067f022
Well center line calc. Fix Linux warnings
2017-11-06 12:11:51 +01:00
Jacob Støren
bf8e4ed4ed
#2035 Add constructor for singel branch data with MD to well flow accumulator
2017-11-03 17:13:37 +01:00
Bjørn Erik Jensen
abcbe963eb
#2074 LAS import. Fix LAS file read error on Linux
2017-11-03 11:34:03 +01:00
Jacob Støren
374c6e7b34
#2046 Disable the new advanced branch detection, as it is not always better. Needs some more work.
2017-11-03 09:15:09 +01:00
Jacob Støren
5fcc0432e8
#2046 Partial experimental fix for one-cell-branches
2017-11-03 09:15:09 +01:00
Jacob Støren
7e1831bfa0
#2046 Whitespace cleanup
2017-11-03 09:15:09 +01:00
Jacob Støren
2443199bfd
#2046 Clean up
2017-11-03 09:15:09 +01:00
Jacob Støren
20b262043e
#2046 Prefer K-negative, K-positive faces when expanding the branchlines.
...
Add previous cell on stem to start of branch, and use the midface point of the shared face between this and the branching cell as start point for the branch
2017-11-03 09:15:09 +01:00
Jacob Støren
0762a2f08f
#2046 Ignore neighbours with small area overlap
2017-11-03 09:15:09 +01:00
Jacob Støren
daeb7c3bdc
#2046 Add line from well head to new branches. Handle branch lines with only one cell
2017-11-03 09:15:09 +01:00
Jacob Støren
956b73c0c9
#2046 First nearly working more advanced branch detection
2017-11-03 09:15:09 +01:00
Jacob Støren
f21e27e25b
Remove unneccesary code
2017-11-03 09:15:09 +01:00
Rebecca Cox
80ee785e5e
Extractor: Fix crash when well path does not intersect any cells
2017-11-01 14:35:53 +01:00
Rebecca Cox
dda063cd68
Add vector of CellIntersectionInfo to WellLogExtractor
2017-10-27 14:28:53 +02:00
Bjørn Erik Jensen
71caab54ec
Added first cut extraction and plotting of RelPerm plots. Also added skeleton implementation of extraction and plotting of PVT plots. #1991 , #1992 , #1992 , #2014
2017-10-27 10:20:34 +02:00
Jacob Støren
12d0457e90
Whitespace changes
2017-10-25 16:04:41 +02:00
Rebecca Cox
89cedb350a
#2038 RFT Plot: Add formation names
2017-10-25 16:00:46 +02:00