OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2850 from atgeirr/silence-warnings

Browse Source 
Silence warnings from range-for.
This commit is contained in:
Atgeirr Flø Rasmussen 2020-10-13 08:19:48 +02:00 committed by GitHub
commit 43d5d2c532
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/simulators/linalg/ParallelOverlappingILU0.hpp
View File

@ -380,7 +380,7 @@ namespace Opm
} }
} }
// create the row // create the row
for(const auto entry: rowPattern) for (const auto& entry : rowPattern)
{ {
iluRow.insert(entry.first); iluRow.insert(entry.first);
} }

6
opm/simulators/timestepping/ConvergenceReport.hpp
View File

@ -109,12 +109,12 @@ namespace Opm
status_ = static_cast<Status>(status_ | WellFailed); status_ = static_cast<Status>(status_ | WellFailed);
well_failures_.push_back(wf); well_failures_.push_back(wf);
} }
void setGroupConverged(const bool groupConverged) void setGroupConverged(const bool groupConverged)
{ {
groupConverged_ = groupConverged; groupConverged_ = groupConverged;
} }
ConvergenceReport& operator+=(const ConvergenceReport& other) ConvergenceReport& operator+=(const ConvergenceReport& other)
{ {
status_ = static_cast<Status>(status_ | other.status_); status_ = static_cast<Status>(status_ | other.status_);
@ -159,7 +159,7 @@ namespace Opm
return s1 < s2 ? s2 : s1; return s1 < s2 ? s2 : s1;
}; };
auto s = Severity::None; auto s = Severity::None;
for (const auto f : res_failures_) { for (const auto& f : res_failures_) {
s = smax(s, f.severity()); s = smax(s, f.severity());
} }
for (const auto& f : well_failures_) { for (const auto& f : well_failures_) {

2
opm/simulators/timestepping/gatherConvergenceReport.cpp
View File

@ -68,7 +68,7 @@ namespace
const auto rf = local_report.reservoirFailures(); const auto rf = local_report.reservoirFailures();
int num_rf = rf.size(); int num_rf = rf.size();
MPI_Pack(&num_rf, 1, MPI_INT, buf.data(), buf.size(), &offset, MPI_COMM_WORLD); MPI_Pack(&num_rf, 1, MPI_INT, buf.data(), buf.size(), &offset, MPI_COMM_WORLD);
for (const auto f : rf) { for (const auto& f : rf) {
packReservoirFailure(f, buf, offset); packReservoirFailure(f, buf, offset);
} }
// Well failures. // Well failures.

2
opm/simulators/utils/ParallelRestart.cpp
View File

@ -392,7 +392,7 @@ void pack(const std::vector<bool,A>& data, std::vector<char>& buffer, int& posit
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
pack(data.size(), buffer, position, comm); pack(data.size(), buffer, position, comm);
for (const auto& entry : data) { for (const auto entry : data) { // Not a reference: vector<bool> range
bool b = entry; bool b = entry;
pack(b, buffer, position, comm); pack(b, buffer, position, comm);
} }

4
opm/simulators/utils/gatherDeferredLogger.cpp
View File

@ -38,7 +38,7 @@ namespace
int messagesize = local_messages.size(); int messagesize = local_messages.size();
MPI_Pack(&messagesize, 1, MPI_UNSIGNED, buf.data(), buf.size(), &offset, MPI_COMM_WORLD); MPI_Pack(&messagesize, 1, MPI_UNSIGNED, buf.data(), buf.size(), &offset, MPI_COMM_WORLD);
for (const auto lm : local_messages) { for (const auto& lm : local_messages) {
MPI_Pack(static_cast<void*>(const_cast<std::int64_t*>(&lm.flag)), 1, MPI_INT64_T, buf.data(), buf.size(), &offset, MPI_COMM_WORLD); MPI_Pack(static_cast<void*>(const_cast<std::int64_t*>(&lm.flag)), 1, MPI_INT64_T, buf.data(), buf.size(), &offset, MPI_COMM_WORLD);
int tagsize = lm.tag.size(); int tagsize = lm.tag.size();
MPI_Pack(&tagsize, 1, MPI_UNSIGNED, buf.data(), buf.size(), &offset, MPI_COMM_WORLD); MPI_Pack(&tagsize, 1, MPI_UNSIGNED, buf.data(), buf.size(), &offset, MPI_COMM_WORLD);
@ -122,7 +122,7 @@ namespace Opm
// store 2 unsigned ints per message for length of tag and length of text // store 2 unsigned ints per message for length of tag and length of text
message_size += num_messages*2*unsigned_int_mpi_pack_size; message_size += num_messages*2*unsigned_int_mpi_pack_size;
for (const auto lm : local_deferredlogger.messages_) { for (const auto& lm : local_deferredlogger.messages_) {
int string_mpi_pack_size; int string_mpi_pack_size;
MPI_Pack_size(lm.tag.size(), MPI_CHAR, MPI_COMM_WORLD, &string_mpi_pack_size); MPI_Pack_size(lm.tag.size(), MPI_CHAR, MPI_COMM_WORLD, &string_mpi_pack_size);
message_size += string_mpi_pack_size; message_size += string_mpi_pack_size;