From c645da66d41786d487eedd9c300ff085f78f8b10 Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Mon, 18 Mar 2024 21:46:04 -0700 Subject: [PATCH] Clang-Tidy 17: modernize-loop-convert --- Src/Amr/AMReX_Amr.cpp | 4 +- Src/Amr/AMReX_AmrLevel.cpp | 20 ++-- Src/AmrCore/AMReX_ErrorList.H | 11 +- Src/Base/AMReX_FileSystem.cpp | 6 +- Src/Base/AMReX_MPMD.H | 2 +- Src/Base/AMReX_Machine.cpp | 4 +- Src/Base/AMReX_NFiles.cpp | 13 ++- Src/Base/AMReX_ParallelDescriptor.H | 4 +- Src/Base/AMReX_PlotFileUtil.cpp | 4 +- Src/Base/AMReX_Utility.cpp | 36 +++---- Src/Base/AMReX_VisMF.H | 4 +- Src/Base/AMReX_VisMF.cpp | 100 ++++++++---------- Src/LinearSolvers/MLMG/AMReX_MLEBTensorOp.cpp | 8 +- Src/LinearSolvers/MLMG/AMReX_MLTensorOp.cpp | 4 +- Src/Particle/AMReX_ParGDB.H | 4 +- Src/Particle/AMReX_ParticleContainerBase.H | 8 +- Src/Particle/AMReX_ParticleContainerI.H | 3 +- Src/Particle/AMReX_ParticleIO.H | 4 +- Src/Particle/AMReX_WriteBinaryParticleData.H | 24 ++--- 19 files changed, 124 insertions(+), 139 deletions(-) diff --git a/Src/Amr/AMReX_Amr.cpp b/Src/Amr/AMReX_Amr.cpp index 1e9c4b137b9..30ca8f8dc00 100644 --- a/Src/Amr/AMReX_Amr.cpp +++ b/Src/Amr/AMReX_Amr.cpp @@ -1830,8 +1830,8 @@ Amr::checkPoint () amrex::FileOpenFailed(FAHeaderFilesName); } - for(int i(0); i < FAHeaderNames.size(); ++i) { - FAHeaderFile << FAHeaderNames[i] << '\n'; + for(const auto & FAHeaderName : FAHeaderNames) { + FAHeaderFile << FAHeaderName << '\n'; } } } diff --git a/Src/Amr/AMReX_AmrLevel.cpp b/Src/Amr/AMReX_AmrLevel.cpp index ee36bad35d1..dff9c88b61c 100644 --- a/Src/Amr/AMReX_AmrLevel.cpp +++ b/Src/Amr/AMReX_AmrLevel.cpp @@ -1445,8 +1445,8 @@ FillPatchIteratorHelper::fill (FArrayBox& fab, // // Copy intersect finefab into next level m_cboxes. // - for (int j = 0, K = static_cast(FinerCrseFabs.size()); j < K; ++j) { - FinerCrseFabs[j]->copy(finefab); + for (const auto & FinerCrseFab : FinerCrseFabs) { + FinerCrseFab->copy(finefab); } } @@ -1462,8 +1462,8 @@ FillPatchIteratorHelper::fill (FArrayBox& fab, // // Copy intersect coarse into destination fab. // - for (int i = 0, N = static_cast(FinestCrseFabs.size()); i < N; ++i) { - fab.copy(*FinestCrseFabs[i],0,dcomp,m_ncomp); + for (const auto & FinestCrseFab : FinestCrseFabs) { + fab.copy(*FinestCrseFab,0,dcomp,m_ncomp); } if (FineGeom.isAnyPeriodic() && !FineDomain.contains(fab.box())) @@ -1472,17 +1472,17 @@ FillPatchIteratorHelper::fill (FArrayBox& fab, FineGeom.periodicShift(FineDomain,fab.box(),pshifts); - for (int i = 0, N = static_cast(FinestCrseFabs.size()); i < N; i++) + for (const auto & FinestCrseFab : FinestCrseFabs) { for (const auto& iv : pshifts) { fab.shift(iv); - Box src_dst = FinestCrseFabs[i]->box() & fab.box(); + Box src_dst = FinestCrseFab->box() & fab.box(); src_dst &= FineDomain; if (src_dst.ok()) { - fab.copy(*FinestCrseFabs[i],src_dst,0,src_dst,dcomp,m_ncomp); + fab.copy(*FinestCrseFab,src_dst,0,src_dst,dcomp,m_ncomp); } fab.shift(-iv); @@ -1846,10 +1846,10 @@ AmrLevel::UpdateDistributionMaps ( DistributionMapping& update_dmap ) if (dmap.size() == mapsize) { dmap = update_dmap; } - for (int i = 0; i < state.size(); ++i) + for (auto & i : state) { - if (state[i].DistributionMap().size() == mapsize) - { state[i].setDistributionMap(update_dmap); } + if (i.DistributionMap().size() == mapsize) + { i.setDistributionMap(update_dmap); } } } diff --git a/Src/AmrCore/AMReX_ErrorList.H b/Src/AmrCore/AMReX_ErrorList.H index ab4395d8ce8..fb39ce6408b 100644 --- a/Src/AmrCore/AMReX_ErrorList.H +++ b/Src/AmrCore/AMReX_ErrorList.H @@ -453,20 +453,16 @@ std::ostream& operator << (std::ostream& os, const ErrorList& elst); AMRErrorTag::TEST test, std::string field, const AMRErrorTagInfo& info = AMRErrorTagInfo()) noexcept - : m_test(test), m_field(std::move(field)), m_info(info) + : m_value(info.m_max_level, value), m_test(test), m_field(std::move(field)), m_info(info), + m_ngrow(SetNGrow()) { - m_value.resize(info.m_max_level); - for (int i = 0; i < m_value.size(); ++i) { - m_value[i] = value; - } - m_ngrow = SetNGrow(); } AMRErrorTag (amrex::Vector value, AMRErrorTag::TEST test, std::string field, const AMRErrorTagInfo& info = AMRErrorTagInfo()) noexcept - : m_test(test), m_field(std::move(field)), m_info(info) + : m_test(test), m_field(std::move(field)), m_info(info), m_ngrow(SetNGrow()) { AMREX_ASSERT(!value.empty()); m_value.resize(info.m_max_level); @@ -478,7 +474,6 @@ std::ostream& operator << (std::ostream& os, const ErrorList& elst); for (auto i = int(value.size()); i < m_value.size(); ++i) { m_value[i] = value[value.size()-1]; } - m_ngrow = SetNGrow(); } AMRErrorTag (AMRErrorTag::UserFunc* userfunc, diff --git a/Src/Base/AMReX_FileSystem.cpp b/Src/Base/AMReX_FileSystem.cpp index c6131399de6..5ba4cb5b585 100644 --- a/Src/Base/AMReX_FileSystem.cpp +++ b/Src/Base/AMReX_FileSystem.cpp @@ -154,10 +154,10 @@ CreateDirectories (std::string const& path, mode_t mode, bool verbose) } if(retVal == false || verbose == true) { - for(int i(0); i < pathError.size(); ++i) { + for(auto & i : pathError) { amrex::AllPrint()<< "amrex::UtilCreateDirectory:: path errno: " - << pathError[i].first << " :: " - << strerror(pathError[i].second) + << i.first << " :: " + << strerror(i.second) << '\n'; } } diff --git a/Src/Base/AMReX_MPMD.H b/Src/Base/AMReX_MPMD.H index bbfc2567178..1c7ad218c1f 100644 --- a/Src/Base/AMReX_MPMD.H +++ b/Src/Base/AMReX_MPMD.H @@ -26,7 +26,7 @@ int MyProgId (); //! Program ID class Copier { public: - Copier (bool); + explicit Copier (bool); Copier (BoxArray const& ba, DistributionMapping const& dm, bool send_ba = false); diff --git a/Src/Base/AMReX_Machine.cpp b/Src/Base/AMReX_Machine.cpp index 0cccead88c0..97de84f30c8 100644 --- a/Src/Base/AMReX_Machine.cpp +++ b/Src/Base/AMReX_Machine.cpp @@ -291,8 +291,8 @@ class Machine } result.reserve(nbh_rank_n); - for (int i = 0; i < local_nbh.size(); ++i) { - for (auto rank : node_ranks.at(local_nbh[i])) { + for (int i : local_nbh) { + for (auto rank : node_ranks.at(i)) { if (result.size() < nbh_rank_n) { result.push_back(rank); } diff --git a/Src/Base/AMReX_NFiles.cpp b/Src/Base/AMReX_NFiles.cpp index 2abd27986f7..3892cabfd07 100644 --- a/Src/Base/AMReX_NFiles.cpp +++ b/Src/Base/AMReX_NFiles.cpp @@ -125,11 +125,11 @@ void NFilesIter::SetSparseFPP(const Vector &ranksToWrite) // ---- do more error checking here // ---- ranks in range, is dynamic on already mySparseFileNumber = -1; - for(int r(0); r < ranksToWrite.size(); ++r) { - if(ranksToWrite[r] < 0 || ranksToWrite[r] >= nProcs) { + for(int r : ranksToWrite) { + if(r < 0 || r >= nProcs) { amrex::Abort("**** Error in NFilesIter::SetSparseFPP: rank out of range."); } - if(ranksToWrite[r] == myProc) { + if(r == myProc) { if(mySparseFileNumber == -1) { mySparseFileNumber = myProc; } else { @@ -281,8 +281,8 @@ bool NFilesIter::ReadyToWrite(bool appendFirst) { BL_PROFILE("NFI::ReadyToWrite:decider"); // ---- the first message received is the coordinator ParallelDescriptor::Recv(&coordinatorProc, 1, MPI_ANY_SOURCE, deciderTag); - for(int i(0); i < setZeroProcs.size(); ++i) { // ---- tell the set zero ranks who is coordinating - ParallelDescriptor::Send(&coordinatorProc, 1, setZeroProcs[i], coordinatorTag); + for(int setZeroProc : setZeroProcs) { // ---- tell the set zero ranks who is coordinating + ParallelDescriptor::Send(&coordinatorProc, 1, setZeroProc, coordinatorTag); } unreadMessages.push_back(std::make_pair(deciderTag, setZeroProcs.size() - 1)); } @@ -552,8 +552,7 @@ Vector NFilesIter::FileNumbersWritten() void NFilesIter::CleanUpMessages() { #ifdef BL_USE_MPI BL_PROFILE("NFI::CleanUpMessages"); - for(int i(0); i < unreadMessages.size(); ++i) { - std::pair & pii = unreadMessages[i]; + for(auto & pii : unreadMessages) { int fromProc, tag(pii.first), nMessages(pii.second); #if 0 amrex::AllPrint() << ParallelDescriptor::MyProc() << ":: cleaning up " << nMessages diff --git a/Src/Base/AMReX_ParallelDescriptor.H b/Src/Base/AMReX_ParallelDescriptor.H index 39c17b520e5..1e201c29d76 100644 --- a/Src/Base/AMReX_ParallelDescriptor.H +++ b/Src/Base/AMReX_ParallelDescriptor.H @@ -996,9 +996,9 @@ ParallelDescriptor::GatherLayoutDataToVector (const LayoutData& sendbuf, Vector recvcount(nprocs, 0); recvbuf.resize(sendbuf.size()); const Vector& old_pmap = sendbuf.DistributionMap().ProcessorMap(); - for (int i=0; i &localStrings, int pfStringsSize(0); std::ostringstream pfStrings; if(ParallelDescriptor::IOProcessor()) { - for(int i(0); i < localStringsCopy.size(); ++i) { - pfStrings << localStringsCopy[i] << '\n'; + for(const auto & i : localStringsCopy) { + pfStrings << i << '\n'; } pfStringsSize = static_cast(pfStrings.str().size()); } @@ -752,28 +752,28 @@ void amrex::SyncStrings(const Vector &localStrings, } } // ---- now check if they match on non ioprocs - for(int n(0); n < ioprocStrings.size(); ++n) { + for(const auto & ioprocString : ioprocStrings) { bool matched(false); - for(int i(0); i < localStringsCopy.size(); ++i) { - if(ioprocStrings[n] == localStringsCopy[i]) { + for(const auto & i : localStringsCopy) { + if(ioprocString == i) { matched = true; } } if( ! matched) { ++nUnmatched; - localStringsCopy.push_back(ioprocStrings[n]); // ---- add to local set + localStringsCopy.push_back(ioprocString); // ---- add to local set } } - for(int n(0); n < localStringsCopy.size(); ++n) { + for(const auto & n : localStringsCopy) { bool matched(false); - for(int i(0); i < ioprocStrings.size(); ++i) { - if(localStringsCopy[n] == ioprocStrings[i]) { + for(const auto & ioprocString : ioprocStrings) { + if(n == ioprocString) { matched = true; } } if( ! matched) { ++nUnmatched; - sendStrings.push_back(localStringsCopy[n]); // ---- send these to the ioproc + sendStrings.push_back(n); // ---- send these to the ioproc } } } @@ -791,8 +791,8 @@ void amrex::SyncStrings(const Vector &localStrings, std::ostringstream ossSendStrings; Vector sendCharArray(1); // cannot be zero for gather call if( ! ParallelDescriptor::IOProcessor()) { - for(int i(0); i < sendStrings.size(); ++i) { - ossSendStrings << sendStrings[i] << '\n'; + for(const auto & sendString : sendStrings) { + ossSendStrings << sendString << '\n'; } sendStringsSize = static_cast(ossSendStrings.str().size()); sendCharArray.resize(sendStringsSize + 1); @@ -806,8 +806,8 @@ void amrex::SyncStrings(const Vector &localStrings, Vector recvStrings(1); Vector offset(nProcs, 0); if(ParallelDescriptor::IOProcessor()) { - for(int i(0); i < nChars.size(); ++i) { - totalChars += nChars[i]; + for(int nChar : nChars) { + totalChars += nChar; } recvStrings.resize(totalChars + 1); @@ -844,8 +844,8 @@ void amrex::SyncStrings(const Vector &localStrings, int syncedStringsSize(0); std::ostringstream syncedStrStr; if(ParallelDescriptor::IOProcessor()) { - for(int i(0); i < syncedStrings.size(); ++i) { - syncedStrStr << syncedStrings[i] << '\n'; + for(const auto & syncedString : syncedStrings) { + syncedStrStr << syncedString << '\n'; } syncedStringsSize = static_cast(syncedStrStr.str().size()); } @@ -878,8 +878,8 @@ void amrex::SyncStrings(const Vector &localStrings, amrex::Vector amrex::SerializeStringArray(const Vector &stringArray) { std::ostringstream stringStream; - for(int i(0); i < stringArray.size(); ++i) { - stringStream << stringArray[i] << '\n'; + for(const auto & i : stringArray) { + stringStream << i << '\n'; } Vector charArray(stringStream.str().size() + 1); diff --git a/Src/Base/AMReX_VisMF.H b/Src/Base/AMReX_VisMF.H index 468523e0039..4e9ac3a387e 100644 --- a/Src/Base/AMReX_VisMF.H +++ b/Src/Base/AMReX_VisMF.H @@ -392,8 +392,8 @@ Write (const FabArray& fa, const std::string& name) const Vector &pmap = fa.DistributionMap().ProcessorMap(); std::set procsWithData; Vector procsWithDataVector; - for(int i = 0; i < pmap.size(); ++i) { - procsWithData.insert(pmap[i]); + for(int i : pmap) { + procsWithData.insert(i); } const int nOutFiles = VisMF::GetNOutFiles(); if (static_cast(procsWithData.size()) < nOutFiles) { diff --git a/Src/Base/AMReX_VisMF.cpp b/Src/Base/AMReX_VisMF.cpp index 87445aba1d3..1321b9bfbb2 100644 --- a/Src/Base/AMReX_VisMF.cpp +++ b/Src/Base/AMReX_VisMF.cpp @@ -51,8 +51,8 @@ namespace } int countForAll = static_cast(totalItems / binCounts.size()); int remainder = static_cast(totalItems % binCounts.size()); - for(int i(0); i < binCounts.size(); ++i) { - binCounts[i] = countForAll; + for(int & binCount : binCounts) { + binCount = countForAll; } for(int i(0); i < remainder; ++i) { ++binCounts[i]; @@ -304,12 +304,12 @@ operator<< (std::ostream &os, if(hd.m_vers == VisMF::Header::NoFabHeaderFAMinMax_v1) { BL_ASSERT(hd.m_famin.size() == hd.m_ncomp); BL_ASSERT(hd.m_famin.size() == hd.m_famax.size()); - for(int i(0); i < hd.m_famin.size(); ++i) { - os << hd.m_famin[i] << ','; + for(double i : hd.m_famin) { + os << i << ','; } os << '\n'; - for(int i(0); i < hd.m_famax.size(); ++i) { - os << hd.m_famax[i] << ','; + for(double i : hd.m_famax) { + os << i << ','; } os << '\n'; } @@ -392,14 +392,14 @@ operator>> (std::istream &is, AMREX_ASSERT(hd.m_ncomp >= 0 && hd.m_ncomp < std::numeric_limits::max()); hd.m_famin.resize(hd.m_ncomp); hd.m_famax.resize(hd.m_ncomp); - for(int i(0); i < hd.m_famin.size(); ++i) { - is >> hd.m_famin[i] >> ch; + for(auto famin : hd.m_famin) { + is >> famin >> ch; if( ch != ',' ) { amrex::Error("Expected a ',' when reading hd.m_famin"); } } - for(int i(0); i < hd.m_famax.size(); ++i) { - is >> hd.m_famax[i] >> ch; + for(auto famax : hd.m_famax) { + is >> famax >> ch; if( ch != ',' ) { amrex::Error("Expected a ',' when reading hd.m_famax"); } @@ -862,14 +862,14 @@ VisMF::Header::CalculateMinMax (const FabArray& mf, m_famax[comp] = -std::numeric_limits::max(); } - for(int ibox(0); ibox < m_min.size(); ++ibox) { - for(int comp(0); comp < m_min[ibox].size(); ++comp) { - m_famin[comp] = std::min(m_famin[comp], m_min[ibox][comp]); + for(auto & ibox : m_min) { + for(int comp(0); comp < ibox.size(); ++comp) { + m_famin[comp] = std::min(m_famin[comp], ibox[comp]); } } - for(int ibox(0); ibox < m_max.size(); ++ibox) { - for(int comp(0); comp < m_max[ibox].size(); ++comp) { - m_famax[comp] = std::max(m_famax[comp], m_max[ibox][comp]); + for(auto & ibox : m_max) { + for(int comp(0); comp < ibox.size(); ++comp) { + m_famax[comp] = std::max(m_famax[comp], ibox[comp]); } } } @@ -978,8 +978,8 @@ VisMF::Write (const FabArray& mf, const Vector &pmap = mf.DistributionMap().ProcessorMap(); std::set procsWithData; Vector procsWithDataVector; - for(int i(0); i < pmap.size(); ++i) { - procsWithData.insert(pmap[i]); + for(int i : pmap) { + procsWithData.insert(i); } if(allowSparseWrites && (static_cast(procsWithData.size()) < nOutFiles)) { useSparseFPP = true; @@ -1300,9 +1300,8 @@ VisMF::FindOffsets (const FabArray &mf, const Vector< Vector > &fileNumbersWriteOrder = nfi.FileNumbersWriteOrder(); - for(int fn(0); fn < fileNumbersWriteOrder.size(); ++fn) { - for(int ri(0); ri < fileNumbersWriteOrder[fn].size(); ++ri) { - int rank(fileNumbersWriteOrder[fn][ri]); + for(const auto & fn : fileNumbersWriteOrder) { + for(int rank : fn) { auto rboIter = rankBoxOrder.find(rank); if(rboIter != rankBoxOrder.end()) { @@ -1310,11 +1309,11 @@ VisMF::FindOffsets (const FabArray &mf, whichFileNumber = fileNumbers[rank]; whichFileName = VisMF::BaseName(NFilesIter::FileName(whichFileNumber, filePrefix)); - for(int i(0); i < index.size(); ++i) { - hdr.m_fod[index[i]].m_name = whichFileName; - hdr.m_fod[index[i]].m_head = currentOffset[whichFileNumber]; - currentOffset[whichFileNumber] += mf.fabbox(index[i]).numPts() * nComps * whichRDBytes - + fabHeaderBytes[index[i]]; + for(int i : index) { + hdr.m_fod[i].m_name = whichFileName; + hdr.m_fod[i].m_head = currentOffset[whichFileNumber]; + currentOffset[whichFileNumber] += mf.fabbox(i).numPts() * nComps * whichRDBytes + + fabHeaderBytes[i]; } } } @@ -1374,12 +1373,8 @@ VisMF::VisMF (std::string fafab_name) AMREX_ASSERT(m_hdr.m_ncomp >= 0 && m_hdr.m_ncomp < std::numeric_limits::max()); m_pa.resize(m_hdr.m_ncomp); - for(int n(0); n < m_pa.size(); ++n) { - m_pa[n].resize(m_hdr.m_ba.size()); - - for(int ii(0), N = static_cast(m_pa[n].size()); ii < N; ++ii) { - m_pa[n][ii] = 0; - } + for(auto & vfabptr : m_pa) { + vfabptr.resize(m_hdr.m_ba.size(), nullptr); } } @@ -1604,8 +1599,8 @@ VisMF::Read (FabArray &mf, NItemsPerBin(static_cast(frc.size()), nBoxesPerRank); int frcIndex(0); - for(int nbpr(0); nbpr < nBoxesPerRank.size(); ++nbpr) { - for(int nb(0); nb < nBoxesPerRank[nbpr]; ++nb) { + for(int nbpr : nBoxesPerRank) { + for(int nb(0); nb < nbpr; ++nb) { baFileOrder.set(indexFileOrder, frc[frcIndex].box); ranksFileOrder[indexFileOrder] = currentRank; @@ -1663,9 +1658,8 @@ VisMF::Read (FabArray &mf, } } - for(int iSet(0); iSet < streamSets.size(); ++iSet) { + for(auto & rfrSet : streamSets) { Vector readRanks; - std::set &rfrSet = streamSets[iSet]; for(setIter = rfrSet.begin(); setIter != rfrSet.end(); ++setIter) { readRanks.push_back(*setIter); } @@ -1680,9 +1674,9 @@ VisMF::Read (FabArray &mf, // ---- confirm the data is contiguous in the stream Long firstOffset(-1); - for(int i(0); i < frc.size(); ++i) { - if(myProc == frc[i].rankToRead) { - firstOffset = frc[i].fileOffset; + for(auto & i : frc) { + if(myProc == i.rankToRead) { + firstOffset = i.fileOffset; break; } } @@ -1691,12 +1685,12 @@ VisMF::Read (FabArray &mf, Long currentOffset(firstOffset), bytesToRead(0); int nFABs(0); - for(int i(0); i < frc.size(); ++i) { - if(myProc == frc[i].rankToRead) { - if(currentOffset != frc[i].fileOffset) { + for(auto & i : frc) { + if(myProc == i.rankToRead) { + if(currentOffset != i.fileOffset) { dataIsContiguous = false; } else { - FArrayBox &fab = whichFA[frc[i].faIndex]; + FArrayBox &fab = whichFA[i.faIndex]; Long fabBytesToRead(fab.box().numPts() * fab.nComp() * hdr.m_writtenRD.numBytes()); currentOffset += fabBytesToRead; bytesToRead += fabBytesToRead; @@ -1721,10 +1715,10 @@ VisMF::Read (FabArray &mf, currentOffset = 0; // ---- this is now relative to allFabData - for(int i(0); i < frc.size(); ++i) { - if(myProc == frc[i].rankToRead) { + for(auto & i : frc) { + if(myProc == i.rankToRead) { char *afPtr = allFabData + currentOffset; - FArrayBox &fab = whichFA[frc[i].faIndex]; + FArrayBox &fab = whichFA[i.faIndex]; Real* fabdata = fab.dataPtr(); #ifdef AMREX_USE_GPU std::unique_ptr hostfab; @@ -1757,12 +1751,12 @@ VisMF::Read (FabArray &mf, delete [] allFabData; } else { // ---- cannot use one read - for(int i(0); i < frc.size(); ++i) { - if(myProc == frc[i].rankToRead) { - if(static_cast(nfi.SeekPos()) != frc[i].fileOffset) { - nfi.Stream().seekp(frc[i].fileOffset, std::ios::beg); + for(auto & i : frc) { + if(myProc == i.rankToRead) { + if(static_cast(nfi.SeekPos()) != i.fileOffset) { + nfi.Stream().seekp(i.fileOffset, std::ios::beg); } - FArrayBox &fab = whichFA[frc[i].faIndex]; + FArrayBox &fab = whichFA[i.faIndex]; Real* fabdata = fab.dataPtr(); #ifdef AMREX_USE_GPU std::unique_ptr hostfab; @@ -1978,9 +1972,9 @@ VisMF::Read (FabArray &mf, #endif if(VisMF::GetUsePersistentIFStreams()) { - for(int idx(0); idx < hdr.m_fod.size(); ++idx) { + for(auto & idx : hdr.m_fod) { std::string FullName(VisMF::DirName(mf_name)); - FullName += hdr.m_fod[idx].m_name; + FullName += idx.m_name; VisMF::DeleteStream(FullName); } } diff --git a/Src/LinearSolvers/MLMG/AMReX_MLEBTensorOp.cpp b/Src/LinearSolvers/MLMG/AMReX_MLEBTensorOp.cpp index c180d951909..3fd1b26cae4 100644 --- a/Src/LinearSolvers/MLMG/AMReX_MLEBTensorOp.cpp +++ b/Src/LinearSolvers/MLMG/AMReX_MLEBTensorOp.cpp @@ -156,9 +156,9 @@ MLEBTensorOp::prepareForSolve () } } else { for (int amrlev = 0; amrlev < NAMRLevels(); ++amrlev) { - for (int mglev = 0; mglev < m_kappa[amrlev].size(); ++mglev) { + for (auto & mglev : m_kappa[amrlev]) { for (int idim = 0; idim < AMREX_SPACEDIM; ++idim) { - m_kappa[amrlev][mglev][idim].setVal(0.0); + mglev[idim].setVal(0.0); } } } @@ -179,8 +179,8 @@ MLEBTensorOp::prepareForSolve () } } else { for (int amrlev = 0; amrlev < NAMRLevels(); ++amrlev) { - for (int mglev = 0; mglev < m_eb_kappa[amrlev].size(); ++mglev) { - m_eb_kappa[amrlev][mglev].setVal(0.0); + for (auto & mglev : m_eb_kappa[amrlev]) { + mglev.setVal(0.0); } } } diff --git a/Src/LinearSolvers/MLMG/AMReX_MLTensorOp.cpp b/Src/LinearSolvers/MLMG/AMReX_MLTensorOp.cpp index c0e8805bd24..a0af307ff9c 100644 --- a/Src/LinearSolvers/MLMG/AMReX_MLTensorOp.cpp +++ b/Src/LinearSolvers/MLMG/AMReX_MLTensorOp.cpp @@ -142,9 +142,9 @@ MLTensorOp::prepareForSolve () } } else { for (int amrlev = 0; amrlev < NAMRLevels(); ++amrlev) { - for (int mglev = 0; mglev < m_kappa[amrlev].size(); ++mglev) { + for (auto & mglev : m_kappa[amrlev]) { for (int idim = 0; idim < AMREX_SPACEDIM; ++idim) { - m_kappa[amrlev][mglev][idim].setVal(0.0); + mglev[idim].setVal(0.0); } } } diff --git a/Src/Particle/AMReX_ParGDB.H b/Src/Particle/AMReX_ParGDB.H index 59f236ad1f5..81c72826ec1 100644 --- a/Src/Particle/AMReX_ParGDB.H +++ b/Src/Particle/AMReX_ParGDB.H @@ -171,9 +171,9 @@ ParGDB::ParGDB (const Vector & geom, m_ba(ba), m_nlevels(static_cast(ba.size())) { - for (int level = 0; level < static_cast(rr.size()); ++level) + for (int level : rr) { - m_rr.push_back(rr[level]*IntVect::TheUnitVector()); + m_rr.push_back(level*IntVect::TheUnitVector()); } } diff --git a/Src/Particle/AMReX_ParticleContainerBase.H b/Src/Particle/AMReX_ParticleContainerBase.H index 9c6b2ea2e30..64adf750f0f 100644 --- a/Src/Particle/AMReX_ParticleContainerBase.H +++ b/Src/Particle/AMReX_ParticleContainerBase.H @@ -57,15 +57,15 @@ public: m_gdb_object (std::make_unique(geom,dmap,ba, [&]() -> Vector { Vector ref_ratio; - for (int i = 0; i < static_cast(rr.size()); ++i) + for (auto const& iv : rr) { #if AMREX_SPACEDIM > 1 - AMREX_ASSERT(rr[i][0] == rr[i][1]); + AMREX_ASSERT(iv[0] == iv[1]); #endif #if AMREX_SPACEDIM > 2 - AMREX_ASSERT(rr[i][0] == rr[i][2]); + AMREX_ASSERT(iv[0] == iv[2]); #endif - ref_ratio.push_back(rr[i][0]); + ref_ratio.push_back(iv[0]); } return ref_ratio; }() )), m_gdb(static_cast(m_gdb_object.get())) diff --git a/Src/Particle/AMReX_ParticleContainerI.H b/Src/Particle/AMReX_ParticleContainerI.H index 1de3edcef1a..8f92fc39004 100644 --- a/Src/Particle/AMReX_ParticleContainerI.H +++ b/Src/Particle/AMReX_ParticleContainerI.H @@ -1836,9 +1836,8 @@ ParticleContainer_impl(grid_tile_ids.size()); ++pit) + for (auto index : grid_tile_ids) { - auto index = grid_tile_ids[pit]; auto& ptile = DefineAndReturnParticleTile(lev, index.first, index.second); auto& soa = ptile.GetStructOfArrays(); auto& soa_tmp = soa_local[lev][index]; diff --git a/Src/Particle/AMReX_ParticleIO.H b/Src/Particle/AMReX_ParticleIO.H index 27ffb44a904..abe1b7d32df 100644 --- a/Src/Particle/AMReX_ParticleIO.H +++ b/Src/Particle/AMReX_ParticleIO.H @@ -869,9 +869,7 @@ ParticleContainer_impl(grids_to_read.size()); ++igrid) { - const int grid = grids_to_read[igrid]; - + for(int grid : grids_to_read) { if (count[grid] <= 0) { continue; } // The file names in the header file are relative. diff --git a/Src/Particle/AMReX_WriteBinaryParticleData.H b/Src/Particle/AMReX_WriteBinaryParticleData.H index 3fc658bcff8..33390d1aee2 100644 --- a/Src/Particle/AMReX_WriteBinaryParticleData.H +++ b/Src/Particle/AMReX_WriteBinaryParticleData.H @@ -182,8 +182,8 @@ packIOData (Vector& idata, Vector& rdata, const PC& pc, int l idata.resize(np*iChunkSize); int num_output_real = 0; - for (int i = 0; i < (int) write_real_comp.size(); ++i) { - if (write_real_comp[i]) { ++num_output_real; } + for (int i : write_real_comp) { + if (i) { ++num_output_real; } } const Long rChunkSize = AMREX_SPACEDIM + num_output_real; @@ -204,9 +204,9 @@ packIOData (Vector& idata, Vector& rdata, const PC& pc, int l const auto write_real_comp_d_ptr = write_real_comp_d.data(); std::size_t poffset = 0; - for (int i = 0; i < tiles.size(); i++) { - const auto& ptile = pc.ParticlesAt(lev, grid, tiles[i]); - const auto& pflags = particle_io_flags[lev].at(std::make_pair(grid, tiles[i])); + for (int tile : tiles) { + const auto& ptile = pc.ParticlesAt(lev, grid, tile); + const auto& pflags = particle_io_flags[lev].at(std::make_pair(grid, tile)); int np_tile = ptile.numParticles(); typename PC::IntVector offsets(np_tile); int num_copies = Scan::ExclusiveSum(np_tile, pflags.begin(), offsets.begin(), Scan::retSum); @@ -291,8 +291,8 @@ packIOData (Vector& idata, Vector& rdata, const PC& pc, int l idata.resize(np*iChunkSize); int num_output_real = 0; - for (int i = 0; i < (int) write_real_comp.size(); ++i) { - if (write_real_comp[i]) { ++num_output_real; } + for (int i : write_real_comp) { + if (i) { ++num_output_real; } } const Long rChunkSize = AMREX_SPACEDIM + num_output_real; @@ -300,9 +300,9 @@ packIOData (Vector& idata, Vector& rdata, const PC& pc, int l int* iptr = idata.dataPtr(); ParticleReal* rptr = rdata.dataPtr(); - for (unsigned i = 0; i < tiles.size(); i++) { - const auto& ptile = pc.ParticlesAt(lev, grid, tiles[i]); - const auto& pflags = particle_io_flags[lev].at(std::make_pair(grid, tiles[i])); + for (int tile : tiles) { + const auto& ptile = pc.ParticlesAt(lev, grid, tile); + const auto& pflags = particle_io_flags[lev].at(std::make_pair(grid, tile)); for (int pindex = 0; pindex < ptile.numParticles(); ++pindex) { if (pflags[pindex]) { const auto& soa = ptile.GetStructOfArrays(); @@ -495,8 +495,8 @@ void WriteBinaryParticleDataSync (PC const& pc, } int num_output_real = 0; - for (int i = 0; i < (int) write_real_comp.size(); ++i) { - if (write_real_comp[i]) { ++num_output_real; } + for (int i : write_real_comp) { + if (i) { ++num_output_real; } } int num_output_int = 0;