support sigma max

SCOREC · Oct 30, 2023 · c54466d · c54466d
1 parent 1517d94
commit c54466d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/particle_structs/src/scs/SCS_sort.h b/particle_structs/src/scs/SCS_sort.h
@@ -22,10 +22,11 @@ namespace pumipic {
       });
 
       ReverseComparator comp;
-      lid_t n_sigma = num_elems/sigma;
+      lid_t sigmaOrMax = std::min(sigma, num_elems);
+      lid_t n_sigma = num_elems/sigmaOrMax;
       Kokkos::parallel_for( PolicyType(n_sigma, 1), KOKKOS_LAMBDA(const TeamMem& t){
-        lid_t start = t.league_rank() * sigma;
-        lid_t end = (t.league_rank() == n_sigma-1) ? num_elems : start + sigma;
+        lid_t start = t.league_rank() * sigmaOrMax;
+        lid_t end = (t.league_rank() == n_sigma-1) ? num_elems : start + sigmaOrMax;
         auto range = Kokkos::make_pair(start, end);
         auto ptcl_subview = Kokkos::subview(ptcls, range);
         auto index_subview = Kokkos::subview(index, range);

diff --git a/particle_structs/test/test_structure.cpp b/particle_structs/test/test_structure.cpp
@@ -117,7 +117,7 @@ PS* buildNextStructure(int num, lid_t num_elems, lid_t num_ptcls, kkLidView ppe,
       //Build SCS with C = 32, sigma = ne, V = 1024
       error_message = "SCS (C=32, sigma=ne, V=1024)";
       lid_t maxC = 32;
-      lid_t sigma = num_elems;
+      lid_t sigma = INT_MAX;
       lid_t V = 1024;
       Kokkos::TeamPolicy<ExeSpace> policy = pumipic::TeamPolicyAuto(4, maxC);
       name = "scs_C32_SMAX_V1024";