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

Removes nearly all warnings experienced with g++-8.3

Browse Source 
Namely:
- unused parameter
- type qualifiers ignored ...
- catchinhg polymorphic type ... by value
This commit is contained in:
Markus Blatt 2019-04-12 13:26:33 +02:00 committed by Arne Morten Kvarving
parent 3ffefd8098
commit 2859980cb4
13 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/msim.cpp
View File

@ -30,7 +30,7 @@
#include <opm/msim/msim.hpp> #include <opm/msim/msim.hpp>
int main(int argc, char** argv) { int main(int /* argc */, char** argv) {
std::string deck_file = argv[1]; std::string deck_file = argv[1];
Opm::Parser parser; Opm::Parser parser;
Opm::ParseContext parse_context; Opm::ParseContext parse_context;

4
msim/src/msim.cpp
View File

@ -51,7 +51,7 @@ void msim::run(Schedule& schedule, EclipseIO& io) {
} }
void msim::post_step(Schedule& schedule, data::Solution& sol, data::Wells& well_data, size_t report_step, EclipseIO& io) const { void msim::post_step(Schedule& schedule, data::Solution& /* sol */, data::Wells& /* well_data */, size_t report_step, EclipseIO& io) const {
const auto& actions = schedule.actions(); const auto& actions = schedule.actions();
if (actions.empty()) if (actions.empty())
return; return;
@ -98,7 +98,7 @@ void msim::run_step(const Schedule& schedule, data::Solution& sol, data::Wells&
void msim::output(size_t report_step, bool substep, double seconds_elapsed, const data::Solution& sol, const data::Wells& well_data, EclipseIO& io) const { void msim::output(size_t report_step, bool /* substep */, double seconds_elapsed, const data::Solution& sol, const data::Wells& well_data, EclipseIO& io) const {
RestartValue value(sol, well_data); RestartValue value(sol, well_data);
io.writeTimeStep(report_step, io.writeTimeStep(report_step,
false, false,

12
src/opm/output/eclipse/AggregateGroupData.cpp
View File

@ -53,9 +53,9 @@ namespace {
return inteHead[19]; return inteHead[19];
} }
const int groupType(const Opm::Schedule& sched, int groupType(const Opm::Schedule& sched,
const Opm::Group& group, const Opm::Group& group,
const std::size_t simStep) std::size_t simStep)
{ {
const std::string& groupName = group.name(); const std::string& groupName = group.name();
if (!sched.hasGroup(groupName)) if (!sched.hasGroup(groupName))
@ -118,7 +118,7 @@ namespace {
return groupIndexMap; return groupIndexMap;
} }
const int currentGroupLevel(const Opm::Schedule& sched, const Opm::Group& group, const size_t simStep) int currentGroupLevel(const Opm::Schedule& sched, const Opm::Group& group, size_t simStep)
{ {
int level = 0; int level = 0;
const std::vector< const Opm::Group* > groups = sched.getGroups(simStep); const std::vector< const Opm::Group* > groups = sched.getGroups(simStep);
@ -462,8 +462,8 @@ namespace {
void void
Opm::RestartIO::Helpers::groupMaps:: Opm::RestartIO::Helpers::groupMaps::
currentGrpTreeNameSeqIndMap(const Opm::Schedule& sched, currentGrpTreeNameSeqIndMap(const Opm::Schedule& sched,
const size_t simStep, size_t simStep,
const std::map<const std::string , size_t>& GnIMap, const std::map<const std::string , size_t>& /* GnIMap */,
const std::map<size_t, const Opm::Group*>& IGMap) const std::map<size_t, const Opm::Group*>& IGMap)
{ {
const auto& grpTreeNSIMap = (sched.getGroupTree(simStep)).nameSeqIndMap(); const auto& grpTreeNSIMap = (sched.getGroupTree(simStep)).nameSeqIndMap();
@ -545,7 +545,7 @@ captureDeclaredGroupData(const Opm::Schedule& sched,
// Define Static Contributions to SGrp Array. // Define Static Contributions to SGrp Array.
groupLoop(curGroups, groupLoop(curGroups,
[this](const Group& group, const std::size_t groupID) -> void [this](const Group& /* group */, std::size_t groupID) -> void
{ {
auto sw = this->sGroup_[groupID]; auto sw = this->sGroup_[groupID];
SGrp::staticContrib(sw); SGrp::staticContrib(sw);

2
src/opm/output/eclipse/AggregateMSWData.cpp
View File

@ -416,7 +416,7 @@ namespace {
void staticContrib(const Opm::Well& well, void staticContrib(const Opm::Well& well,
const std::size_t rptStep, const std::size_t rptStep,
const std::vector<int>& inteHead, const std::vector<int>& inteHead,
const Opm::EclipseGrid& grid, const Opm::EclipseGrid& /* grid */,
ISegArray& iSeg ISegArray& iSeg
) )
{ {

2
src/opm/output/eclipse/AggregateWellData.cpp
View File

@ -265,7 +265,7 @@ namespace {
const std::size_t msWellID, const std::size_t msWellID,
const std::map <const std::string, size_t>& GroupMapNameInd, const std::map <const std::string, size_t>& GroupMapNameInd,
/*const std::vector<std::string>& groupNames,*/ /*const std::vector<std::string>& groupNames,*/
const int maxGroups, const int /* maxGroups */,
const std::size_t sim_step, const std::size_t sim_step,
IWellArray& iWell) IWellArray& iWell)
{ {

4
src/opm/parser/eclipse/EclipseState/Schedule/ArrayDimChecker.cpp
View File

@ -41,7 +41,7 @@ namespace {
const Opm::ParseContext& ctxt, const Opm::ParseContext& ctxt,
Opm::ErrorGuard& guard) Opm::ErrorGuard& guard)
{ {
const auto nWells = sched.numWells(); auto nWells = sched.numWells();
if (nWells > static_cast<decltype(nWells)>(wdims.maxWellsInField())) if (nWells > static_cast<decltype(nWells)>(wdims.maxWellsInField()))
{ {
@ -83,7 +83,7 @@ namespace {
const Opm::ParseContext& ctxt, const Opm::ParseContext& ctxt,
Opm::ErrorGuard& guard) Opm::ErrorGuard& guard)
{ {
const auto nGroups = sched.numGroups(); auto nGroups = sched.numGroups();
// Note: "1 +" to account for FIELD group being in 'sched.numGroups()' // Note: "1 +" to account for FIELD group being in 'sched.numGroups()'
// but excluded from WELLDIMS(3). // but excluded from WELLDIMS(3).

2
src/opm/parser/eclipse/EclipseState/Schedule/RFTConfig.cpp
View File

@ -150,7 +150,7 @@ std::size_t RFTConfig::firstRFTOutput() const {
for (const auto& rft_pair : this->plt_config) { for (const auto& rft_pair : this->plt_config) {
const auto& dynamic_state = rft_pair.second; const auto& dynamic_state = rft_pair.second;
auto pred = [] (const std::pair<PLTConnections::PLTEnum, std::size_t>& elm) { return false; }; auto pred = [] (const std::pair<PLTConnections::PLTEnum, std::size_t>& ) { return false; };
int this_first_rft = dynamic_state.find_if(pred); int this_first_rft = dynamic_state.find_if(pred);
if (this_first_rft >= 0) if (this_first_rft >= 0)
first_rft = std::min(first_rft, static_cast<std::size_t>(this_first_rft)); first_rft = std::min(first_rft, static_cast<std::size_t>(this_first_rft));

2
src/opm/parser/eclipse/EclipseState/Tables/Rock2dTable.cpp
View File

@ -29,7 +29,7 @@ namespace Opm {
{ {
} }
void Rock2dTable::init(const DeckRecord& record, size_t tableIdx) void Rock2dTable::init(const DeckRecord& record, size_t /* tableIdx */)
{ {
m_pressureValues.push_back(record.getItem("PRESSURE").getSIDoubleData()[0]); m_pressureValues.push_back(record.getItem("PRESSURE").getSIDoubleData()[0]);
m_pvmultValues.push_back(record.getItem("PVMULT").getSIDoubleData()); m_pvmultValues.push_back(record.getItem("PVMULT").getSIDoubleData());

2
src/opm/parser/eclipse/EclipseState/Tables/Rock2dtrTable.cpp
View File

@ -29,7 +29,7 @@ namespace Opm {
{ {
} }
void Rock2dtrTable::init(const DeckRecord& record, size_t tableIdx) void Rock2dtrTable::init(const DeckRecord& record, size_t /* tableIdx */)
{ {
m_pressureValues.push_back(record.getItem("PRESSURE").getSIDoubleData()[0]); m_pressureValues.push_back(record.getItem("PRESSURE").getSIDoubleData()[0]);
m_transMultValues.push_back(record.getItem("TRANSMULT").getSIDoubleData()); m_transMultValues.push_back(record.getItem("TRANSMULT").getSIDoubleData());

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

@ -322,7 +322,7 @@ void ParserState::loadFile(const boost::filesystem::path& inputFile) {
boost::filesystem::path inputFileCanonical; boost::filesystem::path inputFileCanonical;
try { try {
inputFileCanonical = boost::filesystem::canonical(inputFile); inputFileCanonical = boost::filesystem::canonical(inputFile);
} catch (boost::filesystem::filesystem_error fs_error) { } catch (const boost::filesystem::filesystem_error& fs_error) {
std::string msg = "Could not open file: " + inputFile.string(); std::string msg = "Could not open file: " + inputFile.string();
parseContext.handleError( ParseContext::PARSE_MISSING_INCLUDE , msg, errors); parseContext.handleError( ParseContext::PARSE_MISSING_INCLUDE , msg, errors);
return; return;

4
tests/msim/test_msim.cpp
View File

@ -44,12 +44,12 @@
using namespace Opm; using namespace Opm;
double prod_opr(const EclipseState& es, const Schedule& sched, const data::Solution& sol, size_t report_step, double seconds_elapsed) { double prod_opr(const EclipseState& es, const Schedule& /* sched */, const data::Solution& /* sol */, size_t /* report_step */, double seconds_elapsed) {
const auto& units = es.getUnits(); const auto& units = es.getUnits();
return -units.to_si(UnitSystem::measure::rate, seconds_elapsed); return -units.to_si(UnitSystem::measure::rate, seconds_elapsed);
} }
void pressure(const EclipseState& es, const Schedule& sched, data::Solution& sol, size_t report_step, double seconds_elapsed) { void pressure(const EclipseState& es, const Schedule& /* sched */, data::Solution& sol, size_t /* report_step */, double seconds_elapsed) {
const auto& grid = es.getInputGrid(); const auto& grid = es.getInputGrid();
const auto& units = es.getUnits(); const auto& units = es.getUnits();
if (!sol.has("PRESSURE")) if (!sol.has("PRESSURE"))

12
tests/msim/test_msim_ACTIONX.cpp
View File

@ -66,25 +66,25 @@ struct test_data {
}; };
double prod_opr(const EclipseState& es, const Schedule& sched, const data::Solution& sol, size_t report_step, double seconds_elapsed) { double prod_opr(const EclipseState& es, const Schedule& /* sched */, const data::Solution& /* sol */, size_t /* report_step */, double /* seconds_elapsed */) {
const auto& units = es.getUnits(); const auto& units = es.getUnits();
double oil_rate = 1.0; double oil_rate = 1.0;
return -units.to_si(UnitSystem::measure::rate, oil_rate); return -units.to_si(UnitSystem::measure::rate, oil_rate);
} }
double prod_opr_low(const EclipseState& es, const Schedule& sched, const data::Solution& sol, size_t report_step, double seconds_elapsed) { double prod_opr_low(const EclipseState& es, const Schedule& /* sched */, const data::Solution& /* sol */, size_t /* report_step */, double /* seconds_elapsed */) {
const auto& units = es.getUnits(); const auto& units = es.getUnits();
double oil_rate = 0.5; double oil_rate = 0.5;
return -units.to_si(UnitSystem::measure::rate, oil_rate); return -units.to_si(UnitSystem::measure::rate, oil_rate);
} }
double prod_wpr_P1(const EclipseState& es, const Schedule& sched, const data::Solution& sol, size_t report_step, double seconds_elapsed) { double prod_wpr_P1(const EclipseState& es, const Schedule& /* sched */, const data::Solution& /* sol */, size_t /* report_step */, double /* seconds_elapsed */) {
const auto& units = es.getUnits(); const auto& units = es.getUnits();
double water_rate = 0.0; double water_rate = 0.0;
return -units.to_si(UnitSystem::measure::rate, water_rate); return -units.to_si(UnitSystem::measure::rate, water_rate);
} }
double prod_wpr_P2(const EclipseState& es, const Schedule& sched, const data::Solution& sol, size_t report_step, double seconds_elapsed) { double prod_wpr_P2(const EclipseState& es, const Schedule& /* sched */, const data::Solution& /* sol */, size_t report_step, double /* seconds_elapsed */) {
const auto& units = es.getUnits(); const auto& units = es.getUnits();
double water_rate = 0.0; double water_rate = 0.0;
if (report_step > 5) if (report_step > 5)
@ -93,13 +93,13 @@ double prod_wpr_P2(const EclipseState& es, const Schedule& sched, const data::S
return -units.to_si(UnitSystem::measure::rate, water_rate); return -units.to_si(UnitSystem::measure::rate, water_rate);
} }
double prod_wpr_P3(const EclipseState& es, const Schedule& sched, const data::Solution& sol, size_t report_step, double seconds_elapsed) { double prod_wpr_P3(const EclipseState& es, const Schedule& /* sched */, const data::Solution& /* sol */, size_t /* report_step */, double /* seconds_elapsed */) {
const auto& units = es.getUnits(); const auto& units = es.getUnits();
double water_rate = 0.0; double water_rate = 0.0;
return -units.to_si(UnitSystem::measure::rate, water_rate); return -units.to_si(UnitSystem::measure::rate, water_rate);
} }
double prod_wpr_P4(const EclipseState& es, const Schedule& sched, const data::Solution& sol, size_t report_step, double seconds_elapsed) { double prod_wpr_P4(const EclipseState& es, const Schedule& /* sched */, const data::Solution& /* sol */, size_t report_step, double /* seconds_elapsed */) {
const auto& units = es.getUnits(); const auto& units = es.getUnits();
double water_rate = 0.0; double water_rate = 0.0;
if (report_step > 10) if (report_step > 10)

2
tests/test_AggregateConnectionData.cpp
View File

@ -71,7 +71,7 @@ struct MockIH
MockIH::MockIH(const int numWells, MockIH::MockIH(const int numWells,
const int nsegWell, const int nsegWell,
const int ncwMax, const int /* ncwMax */,
const int iConnPerConn, const int iConnPerConn,
const int sConnPerConn, const int sConnPerConn,
const int xConnPerConn) const int xConnPerConn)