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

Use name based lookup in function getijk()

Browse Source
This commit is contained in:
Joakim Hove 2020-11-02 14:15:06 +01:00
parent 7d596e4e41
commit f02437cdcb
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp
View File

@ -395,6 +395,14 @@ inline void keywordAquifer( SummaryConfig::keyword_list& list,
} }
} }
inline std::array< int, 3 > getijk( const DeckRecord& record ) {
return {{
record.getItem( "I" ).get< int >( 0 ) - 1,
record.getItem( "J" ).get< int >( 0 ) - 1,
record.getItem( "K" ).get< int >( 0 ) - 1
}};
}
inline void keywordW( SummaryConfig::keyword_list& list, inline void keywordW( SummaryConfig::keyword_list& list,
const std::string& keyword, const std::string& keyword,
KeywordLocation loc, KeywordLocation loc,
@ -577,14 +585,6 @@ inline void keywordF( SummaryConfig::keyword_list& list,
keywordF( list, keyword.name(), keyword.location() ); keywordF( list, keyword.name(), keyword.location() );
} }
inline std::array< int, 3 > getijk( const DeckRecord& record,
int offset = 0 ) {
return {{
record.getItem( offset + 0 ).get< int >( 0 ) - 1,
record.getItem( offset + 1 ).get< int >( 0 ) - 1,
record.getItem( offset + 2 ).get< int >( 0 ) - 1
}};
}
inline std::array< int, 3 > getijk( const Connection& completion ) { inline std::array< int, 3 > getijk( const Connection& completion ) {
return { { completion.getI(), completion.getJ(), completion.getK() }}; return { { completion.getI(), completion.getJ(), completion.getK() }};
@ -711,7 +711,7 @@ inline void keywordMISC( SummaryConfig::keyword_list& list,
auto cijk = getijk( connection ); auto cijk = getijk( connection );
int global_index = 1 + dims.getGlobalIndex(cijk[0], cijk[1], cijk[2]); int global_index = 1 + dims.getGlobalIndex(cijk[0], cijk[1], cijk[2]);
if( ijk_defaulted || ( cijk == getijk(record, 1) ) ) if( ijk_defaulted || ( cijk == getijk(record) ) )
list.push_back( param.number(global_index) ); list.push_back( param.number(global_index) );
} }
} }