Commit Graph

9459 Commits

Author SHA1 Message Date
Bjørn Erik Jensen
939dfe664a #3698 Scale bar. Enable check box for showing/hiding scale bar 2018-11-20 12:07:39 +01:00
Bjørn Erik Jensen
e3c619ddfe Merge remote-tracking branch 'origin/dev' into dev-deeper 2018-11-20 11:37:14 +01:00
Gaute Lindkvist
b41217455f #3689 Change order of result aggregation types 2018-11-20 11:32:02 +01:00
Gaute Lindkvist
58c5f066c3 #3700 Fix bugs related to cell positions and grid extent. 2018-11-20 11:31:22 +01:00
Magne Sjaastad
212f80f92e #3709 Fracture : Mix of both main grid and LGR cells when computing completion data 2018-11-19 21:31:03 +01:00
Gaute Lindkvist
42d3e65416 #3700 Add visual picking marker and improve map results
* Fix "off by half a cell" errors and improve smoothness using averaging and interpolation
2018-11-19 15:24:18 +01:00
Magne Sjaastad
71f90b1337 #3692 Export completions : Use 'Mean' and move text to first column header line 2018-11-19 11:37:25 +01:00
Magne Sjaastad
bab90456c7 #3694 Stimplan : Add support for effective width using unit mm 2018-11-19 10:39:15 +01:00
Magne Sjaastad
8c521b1775 #3703 Do not resize dialog 2018-11-19 10:12:54 +01:00
Gaute Lindkvist
86f40ed8a9 #3580 Fix Linux build problem related to fault appearance 2018-11-19 08:28:45 +01:00
Bjørn Erik Jensen
75c923d102 #3698 Scale bar. Support for both horizontal and vertical orientation 2018-11-16 13:52:05 +01:00
Bjørn Erik Jensen
05e04bb588 #3698 Scale bar. Fixed axis length 2018-11-16 13:52:05 +01:00
Bjørn Erik Jensen
d8a466a9ef #3698 Scale bar. Take 1. Only vertical variant implemented so far 2018-11-16 13:52:05 +01:00
Magne Sjaastad
76abf0fe01 Whitespace 2018-11-16 11:38:35 +01:00
Magne Sjaastad
3c3bb153ac #3685 Well Path Creation: Set MDRKB at first target when starting from an existing wellpath 2018-11-16 11:35:13 +01:00
Magne Sjaastad
9cd695278e #3695 Well path creation : Crash when creating a vertical well
Caused by two identical reference points next to each other
2018-11-16 08:43:19 +01:00
Gaute Lindkvist
e2cc7fb423 #3699 Show global east west position when picking on Contour Maps. 2018-11-15 15:19:19 +01:00
Gaute Lindkvist
a1e094625a #3701 Add axis line option to 2d intersection view as well. 2018-11-15 15:02:07 +01:00
Gaute Lindkvist
b20e801ae1 #3701 Larger margins around axis text 2018-11-15 15:02:07 +01:00
Magne Sjaastad
e100c679d3 Temporary fix : Remove call to missing function 2018-11-15 07:15:03 +01:00
Gaute Lindkvist
12fbd968ad #3580 Improve visualisation of faults in Contour Map 2018-11-14 15:41:25 +01:00
Magne Sjaastad
4d924e2d17
Merge pull request #3682 from bska/refactor-flux-calc
Refactor Flux Calculator to Eliminate Warnings and Reduce Clutter
2018-11-14 15:28:47 +01:00
Magne Sjaastad
9589d0fbb7 System : Remove warning from header file in boost subset 2018-11-14 15:27:48 +01:00
Bård Skaflestad
daa6604e3d Flux Calculator: Use 'phaseSaturation' Result Set Query
This simplifies the implementation of the 'phaseProperties' member
function and, in particular, restores the original code symmetry
amongst the individual phase cases.
2018-11-14 14:40:06 +01:00
Bård Skaflestad
c15432d1b2 Saturation Functions: Add Public Query for Phase Saturations
Simplifies retrieving the phase saturation values in the context of
computing phase fluxes at cell interfaces.
2018-11-14 14:40:06 +01:00
Bård Skaflestad
5347c475be Saturation Functions: Create Helpers for Retrieving Sw and Sg
Limits the amount of magic keyword references to the result vectors
SWAT and SGAS.
2018-11-14 14:40:06 +01:00
Bård Skaflestad
f17b38c479 FluxCalc Interface: Rewrap Doxygen Documentation
Mostly to follow common style elsewhere in library.
2018-11-14 14:40:06 +01:00
Bård Skaflestad
5167299797 DeadOilConstCompr: Re-adjust Whitespace and Comments
No functional changes.
2018-11-14 14:40:06 +01:00
Bård Skaflestad
3c3dfb3dc1 Refactor Constant Compr. Index to Separate Helper
Limits the use of magic constants in the middle of the main logic.
2018-11-14 14:40:06 +01:00
Bård Skaflestad
3d5dca4693 Surface Density: Explicitly Recognise Failure Path
Use the "throw if invalid phase" approach.
2018-11-14 14:40:06 +01:00
Gaute Lindkvist
5bdba24148 2d Maps: Fix crash when generating new map without a result variable set 2018-11-14 14:39:13 +01:00
Magne Sjaastad
32eb83712f Upped to version 2018.05.01-dev.12 2018-11-14 14:09:19 +01:00
Gaute Lindkvist
c99fb71c36 #3687 Fix view updates if creating a brand new contour map, not based on existing view 2018-11-14 13:49:57 +01:00
Gaute Lindkvist
387741d0c1 #3530 Support picking on 2d Maps. 2018-11-14 13:43:55 +01:00
Magne Sjaastad
cbc0e55303 #3686 Completion Export : Fix less than operator for RigCompletionDataGridCell 2018-11-14 12:22:08 +01:00
Magne Sjaastad
4117e266ed #3686 Completion Export : Use map based on size_t instead of RigCompletionDataGridCell
Using RigCompletionDataGridCell as key in a map causes cells with identical local IJK to be treated as same global cell. Use reservoir grid cell index (size_t) as key to be able to handle cells correctly.
2018-11-14 11:40:23 +01:00
Magne Sjaastad
1121abbfac #3686 Completion Export : Add null pointer guard 2018-11-14 11:32:14 +01:00
Gaute Lindkvist
73b79daa09 #3670 Implement new Pressure Depletion behaviour
* Removed choice of different scaling
* Always use current pressure delta
* Use the maximum of an epsilon value and the absolute value of the matrix to well pressure drop as the scaling factor
* Remove file name suffixes and update information table in export file.
2018-11-13 16:48:30 +01:00
Jacob Støren
bfee1dfa64 #3646 Add icons for MainGrid LGR/Temp LGR's, Export Completions, sub items on/off/toggle 2018-11-13 15:43:36 +01:00
Gaute Lindkvist
47edac084f #3676 Hide riOilColumn when RESINSIGHT_DEVEL isn't set 2018-11-13 14:53:13 +01:00
Magne Sjaastad
f644a5ae34 #3679 Temporary LGR : Missing null pointer guarding 2018-11-13 14:51:22 +01:00
Gaute Lindkvist
91c96b9315 2d Maps. Fix minor text bold issue in Overlay Info box 2018-11-13 14:45:21 +01:00
Gaute Lindkvist
052b3e0c7c 2d Maps: Remove volume adjustment code with little effect. 2018-11-13 14:43:52 +01:00
Gaute Lindkvist
a8feee287c #3681 and #3680 Introduce regular sum and fix column result. 2018-11-13 14:43:52 +01:00
Gaute Lindkvist
f3a353039c #3677 2d Maps: Make sure property filters are handled correctly. 2018-11-13 14:40:59 +01:00
Gaute Lindkvist
ea053eac2d #3670 Implement initial WBHP changes. 2018-11-13 14:40:59 +01:00
Magne Sjaastad
7963a18928
Merge pull request #3671 from bska/dont-crash-on-unexpected
Don't crash on Unexpected Input
2018-11-13 10:24:14 +01:00
Bård Skaflestad
4be1685604 Vertical Scaling [PCOW]: Use Value at Minimum Saturation
The oil-water capillary pressure is a non-increasing function of
water saturation so we need to ensure that we use the capillary
pressure value at the minimum tabulated water saturation.  Add
special purpose code to enforce this rule.  This adds a certain
amount of computational overhead because we now compute function
values at two saturation points instead of just one for the case of
pure vertical scaling.  Most of the time those extra function values
will just be subsequently discarded.

Note that this is a bit of hack, because it relies on the fact that
the current implementation assigns

  TableEndPoints::disp = TableEndPoints::low

in the case of two-point horizontal scaling.  We may wish to make
that rule more explicit.
2018-11-13 09:55:56 +01:00
Bård Skaflestad
be160a5c63 Vertical Scaling/Sr: Remove A Few Asserts
These were meant for consistency checking, but would occasionally
fail due to round-off error when doing arithmetic on values
converted from 'float' to 'double'.  The actual scaling procedure
does not rely on those relations as long as we ensure that 'fmax' is
the maximum function value, so add a measure of robustness here.

Note that this is at best a work-around for a deeper problem and
that a more refined solution would probably be needed here.
2018-11-13 09:55:56 +01:00
Bård Skaflestad
8603935aad Capillary Pressure: Truly Fall Back to Scaled Connate Saturations
This commit ensures that we use the scaled connate water/gas
saturations (SWL/SGL) in place of the scaled capillary pressure
saturations (SWLPC/SGLPC) when the latter are undefined (set to a
sentinel value; -1.0E+20).  We would previously fall directly back
to the connate saturations from the input table in this case and
this would lead to inconsistent curves for the scaled capillary
pressure functions.
2018-11-13 09:55:56 +01:00