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

Add 'empty' Predicate to DeckKeyword Type

Browse Source 
Makes logic statements more explicit and removes a number of
"signed vs. unsigned" comparison operations.
This commit is contained in:
Bård Skaflestad 2021-05-16 00:07:10 +02:00
parent 98b49964f5
commit b216c63921
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/parser/eclipse/Deck/DeckKeyword.hpp
View File

@ -54,6 +54,7 @@ namespace Opm {
size_t size() const;
bool empty() const;
void addRecord(DeckRecord&& record);
const DeckRecord& getRecord(size_t index) const;
DeckRecord& getRecord(size_t index);

3
src/opm/parser/eclipse/Deck/DeckKeyword.cpp
View File

@ -227,6 +227,9 @@ namespace Opm {
return m_recordList.size();
}
bool DeckKeyword::empty() const {
return this->m_recordList.empty();
}
void DeckKeyword::addRecord(DeckRecord&& record) {
this->m_recordList.push_back( std::move( record ) );

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

@ -447,7 +447,7 @@ inline void keywordAquifer( SummaryConfig::keyword_list& list,
.parameterType( parseKeywordType(keyword.name()) )
.isUserDefined( is_udq(keyword.name()) );
if (keyword.size() && keyword.getDataRecord().getDataItem().hasValue(0)) {
if (!keyword.empty() && keyword.getDataRecord().getDataItem().hasValue(0)) {
for( const int id: keyword.getIntData()) {
if (aquiferConfig.hasAquifer(id)) {
list.push_back(param.number(id));
@ -580,7 +580,7 @@ inline void keywordW( SummaryConfig::keyword_list& list,
.parameterType( parseKeywordType(keyword.name()) )
.isUserDefined( is_udq(keyword.name()) );
if (keyword.size() && keyword.getDataRecord().getDataItem().hasValue(0)) {
if (!keyword.empty() && keyword.getDataRecord().getDataItem().hasValue(0)) {
for( const std::string& pattern : keyword.getStringData()) {
auto well_names = schedule.wellNames( pattern, schedule.size() - 1 );
@ -624,7 +624,7 @@ inline void keywordG( SummaryConfig::keyword_list& list,
.parameterType( parseKeywordType(keyword.name()) )
.isUserDefined( is_udq(keyword.name()) );
if( keyword.size() == 0 ||
if( keyword.empty() ||
!keyword.getDataRecord().getDataItem().hasValue( 0 ) ) {
for( const auto& group : schedule.groupNames() ) {
@ -664,7 +664,7 @@ void keyword_node( SummaryConfig::keyword_list& list,
.parameterType( parseKeywordType(keyword.name()) )
.isUserDefined( is_udq(keyword.name()) );
if( keyword.size() == 0 ||
if( keyword.empty() ||
!keyword.getDataRecord().getDataItem().hasValue( 0 ) ) {
for (const auto& node_name : node_names) {
@ -1065,7 +1065,7 @@ inline void keywordMISC( SummaryConfig::keyword_list& list,
const auto last_timestep = schedule.size() - 1;
if (keyword.size() > 0) {
if (! keyword.empty()) {
// Keyword with explicit records.
// Handle as alternatives SOFR and SPR above
keywordSWithRecords(last_timestep, parseContext, errors,

1
tests/parser/DeckValueTests.cpp
View File

@ -100,6 +100,7 @@ BOOST_AUTO_TEST_CASE(DeckKeywordConstructor) {
DeckKeyword deck_kw(addreg, {record}, unit_active, unit_default);
BOOST_CHECK_EQUAL( deck_kw.size(), 1U );
BOOST_CHECK_MESSAGE( !deck_kw.empty(), "Deck keyword must not be empty" );
const DeckRecord& deck_record = deck_kw.getRecord(0);
BOOST_CHECK_EQUAL( deck_record.size(), 4U );