OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #925 from atgeirr/fix-satfuncpropertyinitializers-slgof

Browse Source 
Bugfix: multiple bugs in dealing with SLGOF dealt with.
This commit is contained in:
Bård Skaflestad
2019-08-06 15:29:47 +02:00
committed by GitHub
parent 8633f07018 b9cdb9fb78
commit 9875d5fbd8
1 changed files with 71 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.cpp
View File

@@ -61,7 +61,7 @@ namespace Opm {
bool family1 = !sgofTables.empty() || !swofTables.empty() || !slgofTables.empty();
bool family2 = !swfnTables.empty() || !sgfnTables.empty() || !sof3Tables.empty();
if (!swofTables.empty() && !slgofTables.empty()) {
if (!sgofTables.empty() && !slgofTables.empty()) {
throw std::invalid_argument("Both, the SGOF and SLGOF have been specified but they are mutually exclusive!");
}
@@ -363,25 +363,22 @@ namespace Opm {
auto rbegin = reverse( col.begin() + sgofTable.numRows() );
auto rend = reverse( col.begin() );
const auto critical = std::upper_bound( rbegin, rend, 0.0 );
if( critical == rend ) {
return 0.0;
}
const auto index = std::distance( col.begin(), critical.base() - 1 );
if( critical == rend ) return 0.0;
return 1 - sgofTable.getSgColumn()[ index + 1 ];
return 1.0 - sgofTable.getSgColumn()[ index + 1 ];
}
static inline double critical_oil_gas( const SlgofTable& sgofTable ) {
const auto& col = sgofTable.getKrogColumn();
using reverse = std::reverse_iterator< decltype( col.begin() ) >;
auto rbegin = reverse( col.begin() + sgofTable.numRows() );
auto rend = reverse( col.begin() );
const auto critical = std::upper_bound( rbegin, rend, 0.0 );
const auto index = std::distance( col.begin(), critical.base() - 1 );
if( critical == rend ) return 0.0;
return 1 - sgofTable.getSlColumn()[ index + 1 ];
const auto critical = std::upper_bound( col.begin(), col.end(), 0.0 );
if (critical == col.end()) {
return 0.0;
}
const auto index = std::distance( col.begin(), critical - 1);
return sgofTable.getSlColumn()[ index ];
}
@@ -426,19 +423,29 @@ namespace Opm {
static std::vector< double > findMaxKrg( const TableManager* tm ) {
const auto num_tables = tm->getTabdims().getNumSatTables();
const auto& sgofTables = tm->getSgofTables();
const auto& slgofTables = tm->getSlgofTables();
const auto& sgfnTables = tm->getSgfnTables();
const auto& famI = [&sgofTables]( int i ) {
const auto& famI_sgof = [&sgofTables]( int i ) {
return sgofTables.getTable< SgofTable >( i ).getKrgColumn().back();
};
const auto& famI_slgof = [&slgofTables]( int i ) {
return slgofTables.getTable< SlgofTable >( i ).getKrgColumn().front();
};
const auto& famII = [&sgfnTables]( int i ) {
return sgfnTables.getTable< SgfnTable >( i ).getKrgColumn().back();
};
switch( getSaturationFunctionFamily( tm ) ) {
case SatfuncFamily::I:
return fun::map( famI, fun::iota( num_tables ) );
if( sgofTables.empty() && slgofTables.empty() )
throw std::runtime_error( "Saturation keyword family I requires either sgof or slgof non-empty" );
if( !sgofTables.empty() )
return fun::map( famI_sgof, fun::iota( num_tables ) );
else
return fun::map( famI_slgof, fun::iota( num_tables ) );
case SatfuncFamily::II:
return fun::map( famII, fun::iota( num_tables ) );
default:
@@ -449,19 +456,29 @@ namespace Opm {
static std::vector< double > findKrgr( const TableManager* tm ) {
const auto num_tables = tm->getTabdims().getNumSatTables();
const auto& sgofTables = tm->getSgofTables();
const auto& slgofTables = tm->getSlgofTables();
const auto& sgfnTables = tm->getSgfnTables();
const auto& famI = [&sgofTables]( int i ) {
const auto& famI_sgof = [&sgofTables]( int i ) {
return sgofTables.getTable< SgofTable >( i ).getKrgColumn().front();
};
const auto& famI_slgof = [&slgofTables]( int i ) {
return slgofTables.getTable< SlgofTable >( i ).getKrgColumn().back();
};
const auto& famII = [&sgfnTables]( int i ) {
return sgfnTables.getTable< SgfnTable >( i ).getKrgColumn().back();
};
switch( getSaturationFunctionFamily( tm ) ) {
case SatfuncFamily::I:
return fun::map( famI, fun::iota( num_tables ) );
if( sgofTables.empty() && slgofTables.empty() )
throw std::runtime_error( "Saturation keyword family I requires either sgof or slgof non-empty" );
if( !sgofTables.empty() )
return fun::map( famI_sgof, fun::iota( num_tables ) );
else
return fun::map( famI_slgof, fun::iota( num_tables ) );
case SatfuncFamily::II:
return fun::map( famII, fun::iota( num_tables ) );
default:
@@ -529,9 +546,10 @@ namespace Opm {
static std::vector< double > findKrorg( const TableManager* tm ) {
const auto num_tables = tm->getTabdims().getNumSatTables();
const auto& sgofTables = tm->getSgofTables();
const auto& slgofTables = tm->getSlgofTables();
const auto& sof3Tables = tm->getSof3Tables();
const auto& famI = [&sgofTables]( int i ) {
const auto& famI_sgof = [&sgofTables]( int i ) {
const auto& sgofTable = sgofTables.getTable< SgofTable >( i );
const auto& krgCol = sgofTable.getKrgColumn();
const auto crit = std::upper_bound( krgCol.begin(), krgCol.end(), 0.0 );
@@ -542,6 +560,21 @@ namespace Opm {
return sgofTable.getKrogColumn()[ index - 1 ];
};
const auto& famI_slgof = [&slgofTables]( int i ) {
const auto& slgofTable = slgofTables.getTable< SlgofTable >( i );
const auto& col = slgofTable.getKrgColumn();
using reverse = std::reverse_iterator< decltype( col.begin() ) >;
auto rbegin = reverse( col.begin() + slgofTable.numRows() );
auto rend = reverse( col.begin() );
const auto crit = std::upper_bound( rbegin, rend, 0.0 );
// base() points to the next element in the forward order
const auto index = std::distance( col.begin(), crit.base());
if( crit == rend ) return 0.0;
return slgofTable.getKrogColumn()[ index ];
};
const auto crit_gas = findCriticalGas( tm );
const auto min_water = findMinWaterSaturation( tm );
const auto& famII = [&sof3Tables,&crit_gas,&min_water]( int i ) {
@@ -552,7 +585,12 @@ namespace Opm {
switch( getSaturationFunctionFamily( tm ) ) {
case SatfuncFamily::I:
return fun::map( famI, fun::iota( num_tables ) );
if( sgofTables.empty() && slgofTables.empty() )
throw std::runtime_error( "Saturation keyword family I requires either sgof or slgof non-empty" );
if( !sgofTables.empty() )
return fun::map( famI_sgof, fun::iota( num_tables ) );
else
return fun::map( famI_slgof, fun::iota( num_tables ) );
case SatfuncFamily::II:
return fun::map( famII, fun::iota( num_tables ) );
default:
@@ -572,10 +610,15 @@ namespace Opm {
static std::vector< double > findMaxPcog( const TableManager* tm ) {
const auto num_tables = tm->getTabdims().getNumSatTables();
const auto& sgofTables = tm->getSgofTables();
const auto& slgofTables = tm->getSlgofTables();
const auto& sgfnTables = tm->getSgfnTables();
const auto& famI = [&sgofTables]( int i ) {
return sgofTables.getTable< SgofTable >( i ).getPcogColumn().front();
const auto& famI_sgof = [&sgofTables]( int i ) {
return sgofTables.getTable< SgofTable >( i ).getPcogColumn().back();
};
const auto& famI_slgof = [&slgofTables]( int i ) {
return slgofTables.getTable< SlgofTable >( i ).getPcogColumn().front();
};
const auto& famII = [&sgfnTables]( int i ) {
@@ -584,7 +627,12 @@ namespace Opm {
switch( getSaturationFunctionFamily( tm ) ) {
case SatfuncFamily::I:
return fun::map( famI, fun::iota( num_tables ) );
if( sgofTables.empty() && slgofTables.empty() )
throw std::runtime_error( "Saturation keyword family I requires either sgof or slgof non-empty" );
if( !sgofTables.empty() )
return fun::map( famI_sgof, fun::iota( num_tables ) );
else
return fun::map( famI_slgof, fun::iota( num_tables ) );
case SatfuncFamily::II:
return fun::map( famII, fun::iota( num_tables ) );
default: