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

Merge pull request #775 from atgeirr/suppress-warnings

Browse Source 
Suppress warnings
This commit is contained in:
Atgeirr Flø Rasmussen 2015-04-07 09:13:14 +02:00
commit 1d2849691f
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/core/io/eclipse/EclipseWriter.cpp
View File

@ -920,7 +920,7 @@ public:
phase,
type,
'B',
handleUnit_(phase, useFieldUnits))
handleUnit_(useFieldUnits))
{ }
virtual double retrieveValue(const int /* writeStepIdx */,
@ -943,7 +943,7 @@ public:
}
private:
const std::string handleUnit_(BlackoilPhases::PhaseIndex phase, bool useField) {
const std::string handleUnit_(bool useField) {
using namespace Opm::unit;
if (useField) {

2
opm/core/props/pvt/ThermalGasPvtWrapper.hpp
View File

@ -56,7 +56,7 @@ namespace Opm
// viscosity
if (deck->hasKeyword("GASVISCT")) {
gasvisctTables_ = &eclipseState->getGasvisctTables();
assert(gasvisctTables_->size() == numRegions);
assert(int(gasvisctTables_->size()) == numRegions);
gasCompIdx_ = deck->getKeyword("GCOMPIDX")->getRecord(0)->getItem("GAS_COMPONENT_INDEX")->getInt(0) - 1;
gasvisctColumnName_ = "Viscosity"+std::to_string(static_cast<long long>(gasCompIdx_));

4
opm/core/props/pvt/ThermalOilPvtWrapper.hpp
View File

@ -60,8 +60,8 @@ namespace Opm
oilvisctTables_ = &eclipseState->getOilvisctTables();
Opm::DeckKeywordConstPtr viscrefKeyword = deck->getKeyword("VISCREF");
assert(oilvisctTables_->size() == numRegions);
assert(viscrefKeyword->size() == numRegions);
assert(int(oilvisctTables_->size()) == numRegions);
assert(int(viscrefKeyword->size()) == numRegions);
viscrefPress_.resize(numRegions);
viscrefRs_.resize(numRegions);

6
opm/core/props/pvt/ThermalWaterPvtWrapper.hpp
View File

@ -68,8 +68,8 @@ namespace Opm
watvisctTables_ = &eclipseState->getWatvisctTables();
Opm::DeckKeywordConstPtr viscrefKeyword = deck->getKeyword("VISCREF");
assert(watvisctTables_->size() == numRegions);
assert(viscrefKeyword->size() == numRegions);
assert(int(watvisctTables_->size()) == numRegions);
assert(int(viscrefKeyword->size()) == numRegions);
viscrefPress_.resize(numRegions);
for (int regionIdx = 0; regionIdx < numRegions; ++ regionIdx) {
@ -83,7 +83,7 @@ namespace Opm
if (deck->hasKeyword("WATDENT")) {
DeckKeywordConstPtr watdentKeyword = deck->getKeyword("WATDENT");
assert(watdentKeyword->size() == numRegions);
assert(int(watdentKeyword->size()) == numRegions);
watdentRefTemp_.resize(numRegions);
watdentCT1_.resize(numRegions);