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

Merge pull request #1406 from atgeirr/silence-warnings

Browse Source 
Silence some warnings.
This commit is contained in:
Joakim Hove 2020-01-13 11:42:09 +01:00 committed by GitHub
commit 8bda586eee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/parser/eclipse/EclipseState/Tables/TableManager.hpp
View File

@ -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);
}

1
src/opm/parser/eclipse/Deck/DeckItem.cpp
View File

@ -525,7 +525,6 @@ const std::vector<Dimension>& 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<int>();
template void DeckItem::push_backDummyDefault<double>();

3
src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
View File

@ -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();

1
src/opm/parser/eclipse/Parser/Parser.cpp
View File

@ -742,7 +742,6 @@ std::unique_ptr<RawKeyword> 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());

4
tests/test_ArrayDimChecker.cpp
View File

@ -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;