OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4915 from OPM/flow-diag-improve-robustness

Browse Source 
Improve robustness when importing PVT data
This commit is contained in:
Magne Sjaastad 2019-10-23 14:20:15 +02:00 committed by GitHub
commit 13bb85ccd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLPvtGas.cpp vendored
View File

@ -608,6 +608,11 @@ fromECLOutput(const ECLInitFileData& init)
raw.numCols = 5; // [ x, 1/B, 1/(B*mu), d(1/B)/dx, d(1/(B*mu))/dx ] raw.numCols = 5; // [ x, 1/B, 1/(B*mu), d(1/B)/dx, d(1/(B*mu))/dx ]
raw.numTables = tabdims[ TABDIMS_NTPVTG_ITEM ]; // # PV{D,T}G tables raw.numTables = tabdims[ TABDIMS_NTPVTG_ITEM ]; // # PV{D,T}G tables
if (raw.numTables == 0)
{
return GPtr{};
}
const auto& lh = init.keywordData<bool>(LOGIHEAD_KW); const auto& lh = init.keywordData<bool>(LOGIHEAD_KW);
if (lh[ LOGIHEAD_RV_INDEX ]) { if (lh[ LOGIHEAD_RV_INDEX ]) {

5
ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLPvtOil.cpp vendored
View File

@ -809,6 +809,11 @@ fromECLOutput(const ECLInitFileData& init)
raw.numCols = 5; // [ Po, 1/B, 1/(B*mu), d(1/B)/dPo, d(1/(B*mu))/dPo ] raw.numCols = 5; // [ Po, 1/B, 1/(B*mu), d(1/B)/dPo, d(1/(B*mu))/dPo ]
raw.numTables = tabdims[ TABDIMS_NTPVTO_ITEM ]; // # PVTO tables raw.numTables = tabdims[ TABDIMS_NTPVTO_ITEM ]; // # PVTO tables
if (raw.numTables == 0)
{
return OPtr{};
}
if (lh[ LOGIHEAD_RS_INDEX ]) { if (lh[ LOGIHEAD_RS_INDEX ]) {
// Dissolved gas flag set => Live Oil. // Dissolved gas flag set => Live Oil.
// //

5
ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLPvtWater.cpp vendored
View File

@ -352,6 +352,11 @@ fromECLOutput(const ECLInitFileData& init)
raw.numCols = 5; // [ Pw, 1/B, Cw, 1/(B*mu), Cw - Cv ] raw.numCols = 5; // [ Pw, 1/B, Cw, 1/(B*mu), Cw - Cv ]
raw.numTables = tabdims[ TABDIMS_NTPVTW_ITEM ]; // # PVTW tables raw.numTables = tabdims[ TABDIMS_NTPVTW_ITEM ]; // # PVTW tables
if (raw.numTables == 0)
{
return WPtr{};
}
// Extract Full Table // Extract Full Table
{ {
const auto nTabElem = const auto nTabElem =