Merge branch 'master' into ci_update

Author: streeve

.github/workflows/CI.yml

@@ -97,7 +97,7 @@ jobs:
             cxx: 'g++'
             backend: 'OPENMP'
             cmake_build_type: 'Release'
-            kokkos_ver: '4.1.00'
+            kokkos_ver: '4.6.01'
             arborx: 'OFF'
             heffte: 'OFF'
             hypre: 'OFF'
@@ -107,7 +107,7 @@ jobs:
             cxx: 'clang++'
             backend: 'OPENMP'
             cmake_build_type: 'Release'
-            kokkos_ver: '4.1.00'
+            kokkos_ver: '4.6.01'
             arborx: 'OFF'
             heffte: 'OFF'
             hypre: 'OFF'
@@ -153,7 +153,7 @@ jobs:
             cxx: 'g++'
             backend: 'OPENMP'
             cmake_build_type: 'Debug'
-            kokkos_ver: '4.2.00'
+            kokkos_ver: '4.6.01'
             arborx: 'v1.7'
             heffte: 'OFF'
             hypre: 'OFF'

grid/src/Cabana_Grid_SparseDimPartitioner.hpp

@@ -381,7 +381,7 @@ class SparseDimPartitioner : public BlockPartitioner<NumSpaceDim>
                 int tz = static_cast<int>(
                              ( view( i, 2 ) - lower_corner[2] ) / dx - 0.5 ) >>
                          cell_bits_per_tile_dim;
-                Kokkos::atomic_increment( &workload( ti + 1, tj + 1, tz + 1 ) );
+                Kokkos::atomic_inc( &workload( ti + 1, tj + 1, tz + 1 ) );
             } );
         Kokkos::fence();
     }
@@ -406,8 +406,7 @@ class SparseDimPartitioner : public BlockPartitioner<NumSpaceDim>
                     auto key = sparseMap.key_at( i );
                     int ti, tj, tk;
                     sparseMap.key2ijk( key, ti, tj, tk );
-                    Kokkos::atomic_increment(
-                        &workload( ti + 1, tj + 1, tk + 1 ) );
+                    Kokkos::atomic_inc( &workload( ti + 1, tj + 1, tk + 1 ) );
                 }
             } );
         Kokkos::fence();