OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-21 14:03:18 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,293 Commits 29 Branches 61 Tags 286 MiB
edc4b39acb
Commit Graph

297 Commits

Author SHA1 Message Date
Magne Sjaastad
dfd4539786 #4172 libecl : Guard null pointer access 2019-03-05 21:11:14 +01:00
Magne Sjaastad
b120d0a2c1 #4172 libecl : Return std::string instead of NULL 
libecl crashes when NULL is returned from a function returning std::string
 2019-03-05 21:10:39 +01:00
Bård Skaflestad
3ebb106623 Max 2P Sat-Sum: Don't Dereference Null Pointer 
A simulation run might not activate all three phases.  We therefore
must guard against querying the connate saturations of the missing
phase.

Pointy hat: Bard.Skaflestad@sintef.no
Thanks to: Magne Sjåstad
 2019-02-13 23:35:51 -06:00
Magne Sjaastad
288ee59587 #4066 System : Improve cmake macros for cotire 2019-02-11 07:13:08 +01:00
Magne Sjaastad
2fd54b1d0a #4061 : Harmonize how to find Qt5 2019-02-08 13:22:33 +01:00
Magne Sjaastad
0a2b9241ae #4061 Harmonize how Qt5 is found 2019-02-08 11:28:51 +01:00
Magne Sjaastad
5fd80920c8 Merge remote-tracking branch 'origin/master' into dev 2019-02-04 15:48:36 +01:00
Magne Sjaastad
bd6bbe9da9 #4020 System : Use ri_apply_cotire() 2019-02-01 06:56:11 +01:00
Magne Sjaastad
24628e8ca4 #3937 libecl : Workaround to avoid crash for some summary files 2019-01-31 09:21:10 +01:00
Magne Sjaastad
e0ce64e11c #3937 libecl : Workaround to avoid crash for some summary files 2019-01-31 09:20:19 +01:00
Magne Sjaastad
dfac372a9c #4028 Fix performance issues 2019-01-31 09:13:29 +01:00
Magne Sjaastad
55b215e66b #4028 NNC fix 
9d68e3bc60
 2019-01-31 09:06:16 +01:00
Magne Sjaastad
a4b9b3db12 #3982 System : Remove debug output and add comment 2019-01-21 21:52:58 +01:00
Magne Sjaastad
a03e92c7b3 #3982 System : Avoid recompile of libecl at every commit 
set git info to zero
 2019-01-21 21:46:51 +01:00
Magne Sjaastad
fca21efe05 #3982 System : Avoid recompile of libecl at every commit 2019-01-21 21:37:22 +01:00
Bård Skaflestad
6839c1cf77 ECLFluxCalc: Remove Unused 'useEPS' Constructor Parameter 
Recent developments have rendered this parameter unused.  Remove
it to make API simpler.  The library now always loads arrays as
if the caller requests end-point scaling behaviour and we defer
effects of actual end-point scaling until client code queries
the flux calculator at run time.
 2018-12-21 13:14:45 +01:00
Gaute Lindkvist
17e12a92a0 Update CMake to only look for Qt5 if RESINSIGHT_BUILD_WITH_QT5 is set 2018-12-10 15:10:46 +01:00
Gaute Lindkvist
83c5f63291 #3754 Qt4/Qt5 CMake build configuration for Nightcharts and ExpressionParser 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
cc672eb31b #3752 Upgrade Qwt to 6.1.3 to support Qt5 2018-11-30 09:47:53 +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
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
Bård Skaflestad
78dfbfea6b Flux and massflux: Return Empty Vector for Inactive Phases 
This commit introduces a new (private) predicate function

  ECLFluxCalc::phaseIsActive(const ECLPhaseIndex phase) const

that identifies whether or not 'phase' is active in the current
simulation model/result set.  This enables returning an empty result
vector from flux() and/or masssflux() in the case of the caller
requesting fluxes for inactive phases.  That, in turn, mirrors the
behaviour of ECLGraph::flux() on inactive phases and promotes
uniform phase treatment in calling code irrespective of using stored
or calculated flux values.
 2018-11-13 09:55:56 +01:00
Magne Sjaastad
794e703043 System : Disable unused unit test 2018-11-02 11:36:46 +01:00
Bjørn Erik Jensen
5c95b5a605 #3576 Apply patch install-ert.patch after upgrading ecllib 2018-10-30 13:30:44 +01:00
Bjørn Erik Jensen
b51779c568 #3576 Apply patch fix-synthetic-odb-cases.patch after upgrading ecllib 2018-10-30 13:27:01 +01:00
Bjørn Erik Jensen
6924c20ab6 #3576 ecllib upgrade from statoil repo 7f93730c08a4d981a4b738b42146d099977572ce 2018-10-30 13:21:11 +01:00
Bård Skaflestad
405f6426f3 Bring EPS Unit Test Up To Date WRT Changing Behaviour 
A previous commit changed the reverse mapping behaviour in the case
of coincident tabulated scaled displacing saturation and maximum
phase saturation in the two-phase systems.  Bring the corresponding
unit test in line with the changed behaviour (now maps high
saturation values to scaled critical displacing saturation Sr rather
than Smax in this situation).

Pointy Hat: [at]bska
Thanks to: [at]atgeirr
 2018-10-25 13:40:08 +02:00
Bård Skaflestad
d6862265b7 Remark That 3pt EPS Changes Function Shape in [Sr, Smax] 
The three-point vertical scaling option will usually change the
shape of the relative permeability function in the saturation
interval between the scaled critical displacing saturation and the
maximum phase saturation.  In particular, we usually replace a
general, non-linear function with a linear approximation when
applying three-point vertical scaling.

Add a comment to that effect.
 2018-10-25 13:40:08 +02:00
Bård Skaflestad
dc8931f782 Update Flow Diagnostics Application Library 
Fixes incorrect horizontal and vertical end-point scaling of model's
saturation functions.

API Change: No longer supports user-selected behaviour for treating
scaled end-points with a sentinel value (-1.0E+20).  That option was
introduced due to incomplete understanding of the semantics of the
sentinel value.  Now that we understand the meaning (use actual,
unscaled end-point value from input table), we no longer need the
option.  Update the calling code in RigFlowDiagSolverInterface.cpp
accordingly.
 2018-10-25 13:40:08 +02:00
Jacob Støren
5bf5e6c99d #3382 Remove libslvs from the code base, including some cleanup. 2018-10-16 09:20:44 +02:00
Magne Sjaastad
27bbaff56b VS2017 : Hide warnings from gtest 2018-09-10 15:50:15 +02:00
Bjørn Erik Jensen
a4d9212372 #3235 Applied patch install-ert to new ecllib 2018-08-22 14:16:44 +02:00
Bjørn Erik Jensen
f45bc098d1 #3235 Applied patch fix-synthetic-odb-cases to new ecllib 2018-08-22 14:16:44 +02:00
Bjørn Erik Jensen
90a25f67bb #3235 Update ecllib from statoil master repo. Commit 1f051833c8ed819185fd334dfc7e05511ee35d5f 2018-08-22 14:16:43 +02:00
Bjørn Erik Jensen
f6e6cacc36 #3206 ecllib crash. Temporary patch to handle huge ensembles 2018-08-15 09:29:03 +02:00
Bjørn Erik Jensen
1ce7701fa3 #3194 ecllib. Apply patch install-ert after update 2018-08-14 15:08:59 +02:00
Bjørn Erik Jensen
6ebee07c84 #3194 ecllib. Apply patch fix-synthetic-odb-cases after update 2018-08-14 15:08:59 +02:00
Bjørn Erik Jensen
23024b790f Update ecllib from statoil master repo commit a165d636552fa0c0f96219d341f7f2c17c08dc9d 2018-08-13 14:00:26 +02:00
Jacob Støren
22fd7a7692 #2608 Make the constraints in the SolveSpace solver available for editing 2018-08-10 15:57:40 +02:00
Jacob Støren
7156b99b88 #2608 #2609 Add disabled Solvespace S-curve calculation. Use simplified S-curve calculation. Cleaned up Gui to only whats supported. 2018-07-04 17:02:20 +02:00
Bjørn Erik Jensen
08ad8a98db Qwt fix. Fix plotting of interval series having only one sample 2018-07-04 09:15:29 +02:00
Jacob Støren
c5b5980da3 #3049 Add SolveSpaceLib libslvs with an S-Curve test to ResInsight 2018-06-15 14:47:42 +02:00
Bjørn Erik Jensen
6ee84b598c #3042 OPM flowdiag apps update from repo. Commit 24ff768dc509b6c6bbd0121ef46a5932fae92961 2018-06-12 14:36:08 +02:00
Magne Sjaastad
4ca615e74a #2957 Crash with LGR model 
Guard nullptr access in well_state.cpp
 2018-05-31 08:30:04 +02:00
Bjørn Erik Jensen
e8d586054c ecllib: Temp fix to avoid assert. This fix will be included in the next ecllib release 2018-05-22 14:58:42 +02:00
Bjørn Erik Jensen
ff628fa9dd #2852 OPM flowdiag upgrade. Copy from repos 2018-05-07 14:37:32 +02:00
Bjørn Erik Jensen
7a7a8bed0e Apply two ecllib patches after upgrade 2018-05-04 14:24:53 +02:00
Bjørn Erik Jensen
d2e48ef153 Update ecllib from statoil master repo commit 0188b08081eb1ac4ade89ac224b8128b4c9b0481 2018-05-04 14:24:53 +02:00
Bjørn Erik Jensen
c9a1eeef03 Apply two ecllib patches after upgrade 2018-04-16 08:45:53 +02:00
Bjørn Erik Jensen
cdc613f334 #2699 Update ecllib from statoil master repo commit b31b055af2d6b887f47aec84c65ec497a5d12973 2018-04-16 08:43:56 +02:00
Bjørn Erik Jensen
d0905c518b libecl. Local quick-fix to prevent crash under Windows when restart file is located in different directory 2018-04-10 13:11:58 +02:00
Bjørn Erik Jensen
c71ab4e88d #2317 Apply fix for synthetic ODB files 2018-04-09 11:24:31 +02:00
Bjørn Erik Jensen
75d505c9f6 #2011 libecl: Add INSTALL_ERT to control install targets 2018-04-09 11:22:39 +02:00
Bjørn Erik Jensen
b72091bb94 #2661 Update ecllib from statoil master repo 2018-04-09 08:48:36 +02:00
Bjørn Erik Jensen
a833b5a2d7 libecl. Local quick-fix to prevent summary restart file import under Windows 2018-03-20 14:32:54 +01:00
Magne Sjaastad
233df05f68 #2536 Build System : Remove obsolete includes and update depending includes 2018-02-27 20:00:56 +01:00
Magne Sjaastad
4f20273e55 #2536 Build System : Add target_include_directories to clipper, exprparser, qwt 2018-02-27 18:56:12 +01:00
Magne Sjaastad
72a3b731bc #2536 Build System : Add target_include_directories to boost-Subset 2018-02-27 18:49:24 +01:00
Jacob Støren
09cd140bba #2375 Updated opm-flowdiagnostics-applications to 5bcd6d99259a63f5cd820db541b45c4f07aec808 including fixes for Relperm and PVT curves 2018-01-24 16:37:32 +01:00
Magne Sjaastad
39168a9be8 #2317 Apply fix for synthetic ODB files 2018-01-04 20:38:16 +01:00
Jacob Støren
20164ec003 #2270 Updated opm-flowdiagnostics-applications to 44f7e47ecdc87ba566ab4146629de49039a73b2e to fix crash 2017-12-19 15:07:10 +01:00
sigurdp
64fe9e9a3b Upgraded opm-flowdiagnostics-applications to d76ec747cf22aa4d235f6a6c83c3a814adcf5cb2 2017-12-13 10:06:39 +01:00
sigurdp
09c09a7386 Upgraded opm-flowdiagnostics-applications to a773bcfc963705679ecc28f58048fc38936fbbc6 2017-12-11 11:15:09 +01:00
Jacob Støren
2a3f82875c Upgraded opm-flowdiagnostics-applications to cf8a5d2381776a8887d61f825b40f03b1d1cc4b0 2017-12-05 13:50:26 +01:00
Jacob Støren
2a41b4fbb8 #1994 Update opm-flowdiagnostics-applications to cd614100f3d5b8fcf1fd783e929630f11251682e 2017-11-30 00:07:35 +01:00
Jacob Støren
5efe0f705e #2174 Upgrade opm-flowdiagnostics-applications to 75b333335f6cd055d3130d460c6d87444fb7aed4 
to get more of the PVT/RelPerm functionality.
 2017-11-22 15:28:38 +01:00
Jacob Støren
9f9fb21cbe #2034 Update opm-flowdiagnostics to 7e2be931d4 
Remove monkeypatch
Fixes Exception
 2017-10-27 14:39:03 +02:00
Jacob Støren
57a5f7fc66 #2011 libecl: Add INSTALL_ERT to control install targets 2017-10-26 17:16:42 +02:00
Jacob Støren
04404c3b2c #2011 Update libecl to 89f6c44aa0 to fix RFT file reading and missing dyn nnc handling 2017-10-26 17:16:36 +02:00
Magne Sjaastad
f61c83a659 #2031 Curve Calculator : Sort variable names by the order they first appear 2017-10-23 13:31:57 +02:00
Magne Sjaastad
d903226db6 Fix typo in comment 2017-10-23 13:07:49 +02:00
Magne Sjaastad
7c0c45b7b9 Curve Calculator : Do not report detected variables as lowercase 2017-10-19 11:23:30 +02:00
Magne Sjaastad
39dc4c0c06 #2015 Update opm-flowdiagnostics-applications to 64d079b736cd70c7139d5e79fb0080233f47db4b 2017-10-17 08:33:07 +02:00
Magne Sjaastad
a3cd62d315 #1977 Expression Parser : Add error text if expression compiling fails 2017-10-13 12:22:40 +02:00
Magne Sjaastad
445048c24b #1985 Curve Calculator : Simplify interface to expression parser 2017-10-12 10:52:30 +02:00
Magne Sjaastad
c976091336 #1985 Expression Parser: Add exprtk to ThirdParty 2017-10-12 10:52:30 +02:00
Jacob Støren
a8121fb0c4 #1988 Remove assumed wrong test to make the new version of flow diag to actually work 2017-10-11 18:05:53 +02:00
Jacob Støren
4d097a3149 #1988 Update flow diag libraries to handle multiple connections in same well, and have PVT Rel Perm support. 2017-10-11 18:05:53 +02:00
sigurdp
00985b00c3 Testing commit 2017-10-11 13:38:46 +02:00
Bjørn Erik Jensen
19e5e61cb7 LasWell. Parse DATE token from LAS well information section 2017-10-05 16:26:39 +02:00
Jacob Støren
13c011edeb libecl: Add INSTALL_ERT to control install targets 2017-10-02 17:19:36 +02:00
Jacob Støren
c8b329ddc3 Update libecl to 2e36798b43. For better memory usage reading wells 2017-10-02 17:11:36 +02:00
Magne Sjaastad
19be1c09a4 #1748 libecl : Add INSTALL_ERT to control install targets 2017-08-29 11:03:45 +02:00
Magne Sjaastad
7e316edf17 #1768 Update libecl to b17c5ffbf2f82594b01037d39ca9440252a10536 2017-08-29 11:03:45 +02:00
Bjørnar Grip Fjær
b66e957e28 #1800 Ensure auto-scaling of QWT plots with date scale will not miss points in the upper end of the plot 2017-08-22 11:48:37 +02:00
Bjørnar Grip Fjær
46919b463d #1800 Ensure auto-scaling of QWT plots with date scale and week resolution will not miss points in the upper end of the plot 2017-08-22 11:48:37 +02:00
Magne Sjaastad
51c30448e9 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-21 10:42:11 +02:00
Magne Sjaastad
f7a333092d System : Hide warnings from boost and NRLib 2017-08-18 10:01:54 +02:00
Magne Sjaastad
afaf6e0d87 Nightcharts : Add return statement to silence warning 2017-08-18 10:01:54 +02:00
Magne Sjaastad
55f23b0902 MSVC : Disable warnings for opm-flowdiag 2017-08-17 14:06:57 +02:00