Commit Graph

273 Commits

Author SHA1 Message Date
Gaute Lindkvist
7bbe505d39 #4762 Fix ecl_grid_reset_actnum in the libecl-team suggested way 2019-10-24 14:13:19 +02:00
Gaute Lindkvist
1255c877d7 Revert "#4762 Fix reset_actnum libecl crash on load"
We will check in a different fix on recommendation by libecl team

This reverts commit 047136e8b8.
2019-10-24 14:13:19 +02:00
Magne Sjaastad
5930478a90 #4914 Flow Diag : Improve robustness when reading PVT data
https://github.com/OPM/opm-flowdiagnostics-applications/pull/98
2019-10-23 13:24:47 +02:00
Gaute Lindkvist
047136e8b8 #4762 Fix reset_actnum libecl crash on load 2019-09-25 17:49:58 +02:00
Magne Sjaastad
528d4523bd System : Disable warnings 2019-09-16 21:23:11 +02:00
Magne Sjaastad
29184f4475 System : Disable warnings 2019-09-16 13:33:05 +02:00
Magne Sjaastad
ecf5a67074 System : Upgrade to Qwt 6.1.4
Avoid use of deprecated Qt functions like QString::null
2019-09-13 10:07:49 +02:00
Bård Skaflestad
99ce43ccdb Support Creating ECLGraph from "ecl_grid_type*"
This commit introduces a new static function

  ECLGraph::load(const ecl_grid_type*, const ECLInitFileData&)

This is in order to simplify constructing the backing graph from
ResInsight's .EGRID input--especially to have consistent view of
a model's active cells irrespective of which simulator created
the result set.
2019-06-17 19:31:48 +02:00
Magne Sjaastad
936fab3e32 libecl : Improve comment 2019-06-03 09:11:03 +02:00
Magne Sjaastad
dcf33d9289 #4453 Dual Porosity : Use ACTNUM value 3 when creating values from PORV 2019-05-31 14:53:36 +02:00
Gaute Lindkvist
6691dca4ca #4448 Clean up ResInsight Qt5-checks 2019-05-28 15:58:49 +02:00
Magne Sjaastad
1d574fd8c7 #4266 : opm-flowdiagnostics-applications : Update to f57942a8cdf57422fabf3a4423d02a3e46e0be4e 2019-05-09 10:09:06 +02:00
Magne Sjaastad
819744a03b #4266 : opm-flowdiagnostics : Update to 8bb60d6111063f2b7557502ecaa329a2d5c13b41 2019-05-09 10:06:27 +02:00
Magne Sjaastad
2af89b57de #4266 : libecl : Applied patch for geomech 2019-05-09 09:27:36 +02:00
Magne Sjaastad
e8c214a7e9 #4266 : libecl : Applied patch to avoid recompile at each commit 2019-05-09 09:26:31 +02:00
Magne Sjaastad
6f78404f92 #4266 : libecl : Applied patch related to install 2019-05-09 09:25:31 +02:00
Magne Sjaastad
a31d8cbea6 #4266 : libecl : Fix several crash issues 2019-05-09 08:41:06 +02:00
Magne Sjaastad
96a7f02abe #4266 : flow diagnostics: Update related to API changes 2019-05-09 08:41:02 +02:00
Magne Sjaastad
04091ad77d #4266 Update libecl
Use commit 0e1e780fd6f18ce93119061e36a4fca9711bc020

Excluded multibuild folder, as this caused git issues
2019-05-09 08:40:32 +02:00
Bård Skaflestad
4ad130ae47 PVT Interpolants: Give More Meaningful Diagnostic if Missing
This commit refines the error message emitted if a particular
phase does not have a PVT interpolant--e.g., if the INIT file
does not provide PVT data.  Previously we would generate a
message akin to

    Region Index 0 Outside Valid Range (0 .. (size_t)-1)

which is not very helpful to users in diagnosing the issue.  The
new message does at least indicate that there is no interpolant
for the accompanying phase and also emits the (1-based) region
index for context.
2019-04-16 15:27:31 +02:00
Bård Skaflestad
8d27e0cd01 Don't Calculate Scaled Curves if EPS Data Unavailable
This commit captures the result set's availability of EPS data
in a new data member,

    bool ECLSaturationFunc::Impl::haveEPSData_

We need this piece of information to identify whether a null
'eps_' data member corresponds to missing EPS data or failure to
form the backing EPS data object.  In the first case, it is fine
to output the unscaled curves while throwing an exception in the
latter case is more appropriate.

This restores ResInsight's ability to show unscaled saturation
function curves if the backing EPS data is not output to the
result set's INIT file.
2019-04-10 17:53:50 +02:00
Magne Sjaastad
aa72b384f1 #4289 libecl : Apply external ACTNUM instead of combining with file ACTNUM 2019-04-05 11:20:57 +02:00
Magne Sjaastad
738fc8e283 #4268 libecl : Apply patch for handling of null pointer in util_access 2019-04-02 11:20:43 +02:00
Gaute Lindkvist
29e2305c05 #4259 Apply libecl patch for exporting MAPAXES 2019-04-02 08:20:10 +02:00
Magne Sjaastad
684526ef33 #4268 libecl : Guard null pointer access on Windows 2019-04-01 14:43:04 +02:00
Magne Sjaastad
e1d842d3a4 #4211 libecl : Fix for access of data out of bounds 2019-03-22 08:32:23 +01:00
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