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

Silence various warnings.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2015-09-02 13:08:11 +02:00
parent 5981df7f82
commit 76e6972042
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/parser/eclipse/Deck/tests/DeckTimeStepTests.cpp
View File

@ -33,7 +33,7 @@ using namespace Opm;
BOOST_AUTO_TEST_CASE(testDeckTimeStepInitialize) {
BOOST_CHECK_NO_THROW(DeckTimeStep deckTimeStep());
BOOST_CHECK_NO_THROW(DeckTimeStep deckTimeStep);
}
BOOST_AUTO_TEST_CASE(testDeckTimeStepTSTEP) {

2
opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.hpp
View File

@ -246,7 +246,6 @@ protected:
}
case SaturationFunctionFamily::FamilyII: {
auto tables = m_eclipseState.getTableManager();
const std::vector<SwfnTable>& swfnTables = tables->getSwfnTables();
const std::vector<SgfnTable>& sgfnTables = tables->getSgfnTables();
const std::vector<Sof3Table>& sof3Tables = tables->getSof3Tables();
@ -374,7 +373,6 @@ protected:
break;
}
case SaturationFunctionFamily::FamilyII: {
auto tables = m_eclipseState.getTableManager();
const std::vector<SwfnTable>& swfnTables = tables->getSwfnTables();
const std::vector<SgfnTable>& sgfnTables = tables->getSgfnTables();
const std::vector<Sof3Table>& sof3Tables = tables->getSof3Tables();

10
opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
View File

@ -263,14 +263,14 @@ namespace Opm {
DeckTimeStepConstPtr deckTimeStep = section->getDeckTimeStep(currentStep);
if (deckTimeStep->hasKeyword("COMPORD")) {
DeckKeywordConstPtr keyword = deckTimeStep->getKeyword("COMPORD");
DeckKeywordConstPtr compord = deckTimeStep->getKeyword("COMPORD");
for (size_t recordNr = 0; recordNr < keyword->size(); recordNr++) {
DeckRecordConstPtr record = keyword->getRecord(recordNr);
for (size_t compordRecordNr = 0; compordRecordNr < compord->size(); compordRecordNr++) {
DeckRecordConstPtr compordRecord = compord->getRecord(compordRecordNr);
const std::string& wellNamePattern = record->getItem(0)->getTrimmedString(0);
const std::string& wellNamePattern = compordRecord->getItem(0)->getTrimmedString(0);
if (Well::wellNameInWellNamePattern(wellName, wellNamePattern)) {
const std::string& compordString = record->getItem(1)->getTrimmedString(0);
const std::string& compordString = compordRecord->getItem(1)->getTrimmedString(0);
wellCompletionOrder = WellCompletion::CompletionOrderEnumFromString(compordString);
}
}