Clang-Tidy: modernize-use-integer-sign-comparison

.clang-tidy

@@ -40,7 +40,6 @@ Checks: >
        -modernize-return-braced-init-list,
        -modernize-use-constraints,
        -modernize-use-designated-initializers,
-       -modernize-use-integer-sign-comparison,
        -modernize-use-ranges,
        -modernize-use-starts-ends-with,
        -modernize-use-std-numbers,
@@ -82,5 +81,4 @@ HeaderFileExtensions: ['', "H", 'h', 'hh', 'hpp', 'hxx']
 # -modernize-use-designated-initializers
 # -modernize-use-std-numbers
 # -modernize-use-ranges
-# -modernize-use-integer-sign-comparison
 # -modernize-use-starts-ends-with

Src/Amr/AMReX_AmrLevel.cpp

@@ -16,6 +16,7 @@
 #endif
 
 #include <sstream>
+#include <iterator>
 #include <memory>
 #include <limits>
 
@@ -108,7 +109,7 @@ AmrLevel::AmrLevel (Amr&            papa,
     }
 
     // Note that this creates a distribution map associated with grids.
-    for (int i = 0; i < state.size(); i++)
+    for (int i = 0; i < std::ssize(state); i++)
     {
         MultiFab::RegionTag statedata_tag("StateData_Level_" + std::to_string(lev));
         MultiFab::RegionTag statedata_index_tag("StateData_" + std::to_string(i) + "_Level_" + std::to_string(lev));
@@ -143,7 +144,7 @@ AmrLevel::writePlotFile (const std::string& dir,
     // second component of pair is component # within the state_type
     //
     std::vector<std::pair<int,int> > plot_var_map;
-    for (int typ = 0; typ < desc_lst.size(); typ++)
+    for (int typ = 0; typ < std::ssize(desc_lst); typ++)
     {
         for (int comp = 0; comp < desc_lst[typ].nComp();comp++)
         {
@@ -197,7 +198,7 @@ AmrLevel::writePlotFile (const std::string& dir,
         //
         // Names of variables
         //
-        for (i =0; i < static_cast<int>(plot_var_map.size()); i++)
+        for (i =0; i < std::ssize(plot_var_map); i++)
         {
             int typ = plot_var_map[i].first;
             int comp = plot_var_map[i].second;
@@ -286,7 +287,7 @@ AmrLevel::writePlotFile (const std::string& dir,
         os << level << ' ' << grids.size() << ' ' << cur_time << '\n';
         os << parent->levelSteps(level) << '\n';
 
-        for (i = 0; i < grids.size(); ++i)
+        for (i = 0; i < std::ssize(grids); ++i)
         {
             RealBox gridloc = RealBox(grids[i],geom.CellSize(),geom.ProbLo());
             for (n = 0; n < AMREX_SPACEDIM; n++) {
@@ -326,7 +327,7 @@ AmrLevel::writePlotFile (const std::string& dir,
     //
     // Cull data from state variables -- use no ghost cells.
     //
-    for (i = 0; i < static_cast<int>(plot_var_map.size()); i++)
+    for (i = 0; i < std::ssize(plot_var_map); i++)
     {
         int typ  = plot_var_map[i].first;
         int comp = plot_var_map[i].second;
@@ -477,7 +478,7 @@ AmrLevel::setTimeLevel (Real time,
                         Real dt_old,
                         Real dt_new)
 {
-    for (int k = 0; k < desc_lst.size(); k++)
+    for (int k = 0; k < std::ssize(desc_lst); k++)
     {
         state[k].setTimeLevel(time,dt_old,dt_new);
     }
@@ -486,7 +487,7 @@ AmrLevel::setTimeLevel (Real time,
 bool
 AmrLevel::isStateVariable (const std::string& name, int& state_indx, int& n)
 {
-    for (state_indx = 0; state_indx < desc_lst.size(); state_indx++)
+    for (state_indx = 0; state_indx < std::ssize(desc_lst); state_indx++)
     {
         const StateDescriptor& desc = desc_lst[state_indx];
 
@@ -577,7 +578,7 @@ AmrLevel::~AmrLevel ()
 void
 AmrLevel::allocOldData ()
 {
-    for (int i = 0; i < desc_lst.size(); i++)
+    for (int i = 0; i < std::ssize(desc_lst); i++)
     {
         state[i].allocOldData();
     }
@@ -586,7 +587,7 @@ AmrLevel::allocOldData ()
 void
 AmrLevel::removeOldData ()
 {
-    for (int i = 0; i < desc_lst.size(); i++)
+    for (int i = 0; i < std::ssize(desc_lst); i++)
     {
         state[i].removeOldData();
     }
@@ -595,7 +596,7 @@ AmrLevel::removeOldData ()
 void
 AmrLevel::reset ()
 {
-    for (int i = 0; i < desc_lst.size(); i++)
+    for (int i = 0; i < std::ssize(desc_lst); i++)
     {
         state[i].reset();
     }
@@ -1013,7 +1014,7 @@ FillPatchIterator::Initialize (int  boxGrow,
     const IndexType& boxType = m_leveldata->boxArray().ixType();
     const int level = m_amrlevel->level;
 
-    for (int i = 0, DComp = 0; i < static_cast<int>(m_range.size()); i++)
+    for (int i = 0, DComp = 0; i < std::ssize(m_range); i++)
     {
         const int SComp = m_range[i].first;
         const int NComp = m_range[i].second;

Src/Base/AMReX.cpp

@@ -59,6 +59,8 @@
 #include <AMReX_MemProfiler.H>
 #endif
 
+#include <iterator>
+
 #ifdef AMREX_USE_OMP
 #include <AMReX_OpenMP.H>
 #include <omp.h>
@@ -979,7 +981,7 @@ amrex::command_argument_count ()
 std::string
 amrex::get_command_argument (int number)
 {
-    if (number < static_cast<int>(command_arguments.size())) {
+    if (number < std::ssize(command_arguments)) {
         return command_arguments[number];
     } else {
         return std::string();

Src/Base/AMReX_CArena.cpp

@@ -37,7 +37,7 @@ void*
 CArena::alloc_protected (std::size_t nbytes)
 {
     bool freeunused_called = false;
-    if (static_cast<Long>(m_used+nbytes) >= arena_info.release_threshold) {
+    if (std::cmp_greater_equal(m_used+nbytes, arena_info.release_threshold)) {
         freeUnused_protected();
         freeunused_called = true;
     }

Src/Base/AMReX_DistributionMapping.cpp

@@ -22,6 +22,8 @@
 #include <string>
 #include <cstring>
 #include <iomanip>
+#include <iterator>
+#include <utility>
 
 namespace {
     int flag_verbose_mapper;
@@ -177,7 +179,7 @@ void
 DistributionMapping::Sort (std::vector<LIpair>& vec,
                            bool                 reverse)
 {
-    if (vec.size() > 1)
+    if (std::ssize(vec) > 1)
     {
         if (reverse) {
             std::stable_sort(vec.begin(), vec.end(), LIpairGT());
@@ -422,7 +424,7 @@ DistributionMapping::RoundRobinDoIt (int                  nboxes,
 
     if (LIpairV)
     {
-        BL_ASSERT(static_cast<int>(LIpairV->size()) == nboxes);
+        BL_ASSERT(std::ssize(*LIpairV) == nboxes);
 
         for (int i = 0; i < nboxes; ++i)
         {
@@ -766,7 +768,7 @@ DistributionMapping::KnapSackDoIt (const std::vector<Long>& wgts,
         }
     }
 
-    BL_ASSERT(static_cast<int>(vec.size()) == nteams);
+    BL_ASSERT(std::ssize(vec) == nteams);
 
     std::vector<LIpair> LIpairV;
 
@@ -864,7 +866,7 @@ DistributionMapping::KnapSackProcessorMap (const std::vector<Long>& wgts,
     m_ref->clear();
     m_ref->m_pmap.resize(wgts.size());
 
-    if (static_cast<int>(wgts.size()) <= nprocs || nprocs < 2)
+    if (std::ssize(wgts) <= nprocs || nprocs < 2)
     {
         RoundRobinProcessorMap(static_cast<int>(wgts.size()),nprocs, sort);
 
@@ -894,7 +896,7 @@ DistributionMapping::KnapSackProcessorMap (const DistributionMapping& olddm,
 
     ComputeDistributionMappingEfficiency(olddm, wgts, &old_efficiency);
 
-    if (static_cast<int>(wgts.size()) <= nprocs || nprocs < 2)
+    if (std::ssize(wgts) <= nprocs || nprocs < 2)
     {
         RoundRobinProcessorMap(static_cast<int>(wgts.size()),nprocs, false);
         new_efficiency = Real(1);
@@ -927,7 +929,7 @@ DistributionMapping::KnapSackProcessorMap (const DistributionMapping& olddm,
                     w += wi;
                 }
             }
-            if (i < static_cast<int>(kb.size())) {
+            if (i < std::ssize(kb)) {
                 lb.insert(lb.end(), kb.begin()+i, kb.end());
                 kb.erase (          kb.begin()+i, kb.end());
             }
@@ -990,7 +992,7 @@ DistributionMapping::KnapSackProcessorMap (const DistributionMapping& olddm,
             AMREX_ASSERT(max_weight > Real(0));
             new_efficiency = avg_weight / max_weight;
 
-            if (new_efficiency < max_efficiency && wblv.size() > 1) {
+            if (new_efficiency < max_efficiency && std::ssize(wblv) > 1) {
                 BL_PROFILE("knapsack()swap");
 
                 std::sort(wblv.begin(), wblv.end());
@@ -1207,7 +1209,7 @@ Distribute (const std::vector<SFCToken>&     tokens,
         }
     }
 
-    BL_ASSERT(static_cast<int>(v.size()) == nprocs);
+    BL_ASSERT(std::ssize(v) == nprocs);
 
     int  K        = 0;
     Real totalvol = 0;
@@ -1502,7 +1504,7 @@ DistributionMapping::SFCProcessorMap (const BoxArray&          boxes,
                                       bool                     sort)
 {
     BL_ASSERT( ! boxes.empty());
-    BL_ASSERT(boxes.size() == static_cast<int>(wgts.size()));
+    BL_ASSERT(boxes.size() == std::ssize(wgts));
 
     m_ref->clear();
     m_ref->m_pmap.resize(wgts.size());
@@ -1525,7 +1527,7 @@ DistributionMapping::SFCProcessorMap (const BoxArray&          boxes,
                                       bool                     sort)
 {
     BL_ASSERT( ! boxes.empty());
-    BL_ASSERT(boxes.size() == static_cast<int>(wgts.size()));
+    BL_ASSERT(boxes.size() == std::ssize(wgts));
 
     m_ref->clear();
     m_ref->m_pmap.resize(wgts.size());
@@ -1948,7 +1950,7 @@ operator<< (std::ostream&              os,
 {
     os << "(DistributionMapping" << '\n';
 
-    for (int i = 0; i < pmap.ProcessorMap().size(); ++i)
+    for (int i = 0; i < std::ssize(pmap.ProcessorMap()); ++i)
     {
         os << "m_pmap[" << i << "] = " << pmap.ProcessorMap()[i] << '\n';
     }
@@ -2018,7 +2020,7 @@ DistributionMapping MakeSimilarDM (const BoxArray& ba, const BoxArray& src_ba,
                               "input BoxArrays must have the same centering.");
 
     Vector<int> pmap(ba.size());
-    for (int i = 0; i < static_cast<int>(ba.size()); ++i) {
+    for (int i = 0; i < std::ssize(ba); ++i) {
         Box box = ba[i];
         box.grow(ng);
         bool first_only = false;

Src/Base/AMReX_FabArray.H

@@ -43,6 +43,7 @@
 
 #include <algorithm>
 #include <cstring>
+#include <iterator>
 #include <limits>
 #include <map>
 #include <memory>
@@ -1755,7 +1756,7 @@ bool
 FabArray<FAB>::defined (int K) const noexcept
 {
     int li = localindex(K);
-    if (li >= 0 && li < static_cast<int>(m_fabs_v.size()) && m_fabs_v[li] != 0) {
+    if (li >= 0 && li < std::ssize(m_fabs_v) && m_fabs_v[li] != 0) {
         return true;
     }
     else {
@@ -1768,7 +1769,7 @@ bool
 FabArray<FAB>::defined (const MFIter& mfi) const noexcept
 {
     int li = mfi.LocalIndex();
-    if (li < static_cast<int>(m_fabs_v.size()) && m_fabs_v[li] != nullptr) {
+    if (li < std::ssize(m_fabs_v) && m_fabs_v[li] != nullptr) {
         return true;
     }
     else {
@@ -1874,7 +1875,7 @@ FAB*
 FabArray<FAB>::release (int K)
 {
     const int li = localindex(K);
-    if (li >= 0 && li < static_cast<int>(m_fabs_v.size()) && m_fabs_v[li] != nullptr) {
+    if (li >= 0 && li < std::ssize(m_fabs_v) && m_fabs_v[li] != nullptr) {
         AMREX_ASSERT(m_single_chunk_arena == nullptr);
         Long nbytes = amrex::nBytesOwned(*m_fabs_v[li]);
         if (nbytes > 0) {
@@ -1894,7 +1895,7 @@ FAB*
 FabArray<FAB>::release (const MFIter& mfi)
 {
     const int li = mfi.LocalIndex();
-    if (li >= 0 && li < static_cast<int>(m_fabs_v.size()) && m_fabs_v[li] != nullptr) {
+    if (li >= 0 && li < std::ssize(m_fabs_v) && m_fabs_v[li] != nullptr) {
         AMREX_ASSERT(m_single_chunk_arena == nullptr);
         Long nbytes = amrex::nBytesOwned(*m_fabs_v[li]);
         if (nbytes > 0) {

Src/Base/AMReX_FabConv.cpp

@@ -770,7 +770,7 @@ PD_fconvert (void*       out,
         for (i = 0L; i < nitems; i++, rout += outbytes)
         {
             for (j = 0; j < outbytes; j++) {
-                if ((j == indxout) ? (rout[j] != mask) : rout[j]) {
+                if ((j == indxout) ? std::cmp_not_equal(rout[j], mask) : rout[j]) {
                     break;
                 }
             }

Src/Base/AMReX_GpuDevice.cpp

@@ -12,11 +12,12 @@
 #endif
 
 #include <iostream>
-#include <map>
 #include <algorithm>
+#include <exception>
+#include <iterator>
+#include <map>
 #include <string>
 #include <unordered_set>
-#include <exception>
 
 #if defined(AMREX_USE_CUDA)
 #include <cuda_profiler_api.h>
@@ -758,7 +759,7 @@ Device::setStream (gpuStream_t s) noexcept
         }
     }
     int const idx = streamIndex(s);
-    if (idx == static_cast<int>(gpu_stream_pool.size())) {
+    if (idx == std::ssize(gpu_stream_pool)) {
         amrex::Abort("Gpu::Device::setStream: stream is not managed by AMReX.");
     }
     gpu_stream_index[tid] = idx;

Src/Base/AMReX_NFiles.cpp

@@ -1,6 +1,7 @@
 
 #include <AMReX_NFiles.H>
 #include <deque>
+#include <iterator>
 #include <set>
 #include <utility>
 
@@ -504,7 +505,7 @@ bool NFilesIter::CheckNFiles(int nProcs, int nOutFiles, bool groupSets)
     }
 //    amrex::Print() << "nOutFiles fileNumbers.size() = " << nOutFiles
 //              << "  " << fileNumbers.size() << '\n';
-    if(nOutFiles != static_cast<int>(fileNumbers.size())) {
+    if(nOutFiles != std::ssize(fileNumbers)) {
 //      amrex::Print() << "**** Different number of files." << '\n';
       return false;
     }
@@ -529,7 +530,7 @@ Vector<int> NFilesIter::FileNumbersWritten()
         procSet.insert(fileNumbersWriteOrder[f][r]);
       }
     }
-    if(total != nProcs || static_cast<int>(procSet.size()) != nProcs) {
+    if(total != nProcs || std::ssize(procSet) != nProcs) {
       amrex::AllPrint() << "**** Error in NFilesIter::FileNumbersWritten():  "
                 << " coordinatorProc nProcs total procSet.size() = "
                 << coordinatorProc << "  " << nProcs << "  "