diff --git a/opm/parser/eclipse/EclipseState/Tables/TableManager.hpp b/opm/parser/eclipse/EclipseState/Tables/TableManager.hpp index aca4d2f4d..c22bf4ff6 100644 --- a/opm/parser/eclipse/EclipseState/Tables/TableManager.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/TableManager.hpp @@ -253,10 +253,9 @@ namespace Opm { const auto& keyword = deck.getKeyword("PVTWSALT"); size_t numEntries = keyword.size(); size_t regionIdx = 0; - for (unsigned lineIdx = 0; lineIdx < numEntries; ++lineIdx) { + for (unsigned lineIdx = 0; lineIdx < numEntries; lineIdx += 2) { pvtwtables[regionIdx].init(keyword.getRecord(lineIdx), keyword.getRecord(lineIdx+1)); ++regionIdx; - ++lineIdx; } assert(regionIdx == numTables); } diff --git a/src/opm/parser/eclipse/Deck/DeckItem.cpp b/src/opm/parser/eclipse/Deck/DeckItem.cpp index 7a4df6ece..d34953b25 100644 --- a/src/opm/parser/eclipse/Deck/DeckItem.cpp +++ b/src/opm/parser/eclipse/Deck/DeckItem.cpp @@ -525,7 +525,6 @@ const std::vector& DeckItem::defaultDimensions() const { template int DeckItem::get< int >( size_t ) const; template double DeckItem::get< double >( size_t ) const; template std::string DeckItem::get< std::string >( size_t ) const; -template UDAValue DeckItem::get< UDAValue >( size_t ) const; template void DeckItem::push_backDummyDefault(); template void DeckItem::push_backDummyDefault(); diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp index dcc648bb9..4817396e7 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp @@ -2952,8 +2952,7 @@ void Schedule::handleGRUPTREE( const DeckKeyword& keyword, size_t currentStep, c state2.data().begin(), comparePtr); }; - auto&& compareMap = [comparePtr, - compareDynState](const auto& map1, const auto& map2) { + auto&& compareMap = [compareDynState](const auto& map1, const auto& map2) { if (map1.size() != map2.size()) return false; auto it2 = map2.begin(); diff --git a/src/opm/parser/eclipse/Parser/Parser.cpp b/src/opm/parser/eclipse/Parser/Parser.cpp index e8c14e14f..81bfda63b 100644 --- a/src/opm/parser/eclipse/Parser/Parser.cpp +++ b/src/opm/parser/eclipse/Parser/Parser.cpp @@ -742,7 +742,6 @@ std::unique_ptr tryParseKeyword( ParserState& parserState, const Par } } else { const auto& parserKeyword = parser.getParserKeywordFromDeckName(rawKeyword->getKeywordName()); - const auto& parserRecord = parserKeyword.getRecord( rawKeyword->size() ); if (rawKeyword->getSizeType() == Raw::CODE) { auto end_pos = line.find(parserKeyword.codeEnd()); diff --git a/tests/test_ArrayDimChecker.cpp b/tests/test_ArrayDimChecker.cpp index 54e5ded0d..437efd6a6 100644 --- a/tests/test_ArrayDimChecker.cpp +++ b/tests/test_ArrayDimChecker.cpp @@ -341,8 +341,8 @@ struct CaseObjects CaseObjects(const CaseObjects& rhs) = default; CaseObjects(CaseObjects&& rhs) = default; - CaseObjects& operator=(const CaseObjects& rhs) = default; - CaseObjects& operator=(CaseObjects&& rhs) = default; + CaseObjects& operator=(const CaseObjects& rhs) = delete; + CaseObjects& operator=(CaseObjects&& rhs) = delete; Opm::ErrorGuard guard; Opm::EclipseState es;