Merge pull request #609 from streeve/particle_init_cajita

Grid-based particle initialization and random init rewrite
ECP-copa · Sep 1, 2023 · fbbbb0a · fbbbb0a
2 parents 1579e88 + a3763e5
commit fbbbb0a
Show file tree

Hide file tree

Showing 16 changed files with 1,411 additions and 109 deletions.
diff --git a/benchmark/cajita/Cajita_SparseMapPerformance.cpp b/benchmark/cajita/Cajita_SparseMapPerformance.cpp
@@ -53,9 +53,9 @@ void performanceTest( std::ostream& stream, const std::string& test_prefix,
         positions[p] = position_type(
             Kokkos::ViewAllocateWithoutInitializing( "positions" ),
             problem_sizes[p] );
-        Cabana::createRandomParticles( positions[p], problem_sizes[p],
-                                       global_low_corner[0],
-                                       global_high_corner[0] );
+        Cabana::createParticles( Cabana::InitRandom(), positions[p],
+                                 problem_sizes[p], global_low_corner,
+                                 global_high_corner );
     }
     // Number of runs in the test loops.
     int num_run = 10;

diff --git a/benchmark/cajita/Cajita_SparsePartitionerPerformance.cpp b/benchmark/cajita/Cajita_SparsePartitionerPerformance.cpp
@@ -129,9 +129,9 @@ void performanceTest( ParticleWorkloadTag, std::ostream& stream, MPI_Comm comm,
         positions[p] = position_type(
             Kokkos::ViewAllocateWithoutInitializing( "positions" ),
             problem_sizes[p] );
-        Cabana::createRandomParticles( positions[p], problem_sizes[p],
-                                       global_low_corner[0],
-                                       global_high_corner[0] );
+        Cabana::createParticles( Cabana::InitRandom(), positions[p],
+                                 problem_sizes[p], global_low_corner,
+                                 global_high_corner );
     }
 
     for ( int c = 0; c < num_cells_per_dim_size; ++c )

diff --git a/benchmark/core/Cabana_LinkedCellPerformance.cpp b/benchmark/core/Cabana_LinkedCellPerformance.cpp
@@ -55,9 +55,12 @@ void performanceTest( std::ostream& stream, const std::string& test_prefix,
         // Define problem grid.
         x_min[p] = 0.0;
         x_max[p] = 1.3 * std::pow( num_p, 1.0 / 3.0 );
+        double grid_min[3] = { x_min[p], x_min[p], x_min[p] };
+        double grid_max[3] = { x_max[p], x_max[p], x_max[p] };
         aosoas[p].resize( num_p );
         auto x = Cabana::slice<0>( aosoas[p], "position" );
-        Cabana::createRandomParticles( x, x.size(), x_min[p], x_max[p] );
+        Cabana::createParticles( Cabana::InitRandom(), x, x.size(), grid_min,
+                                 grid_max );
     }
 
     // Loop over number of ratios (neighbors per particle).

diff --git a/benchmark/core/Cabana_NeighborArborXPerformance.cpp b/benchmark/core/Cabana_NeighborArborXPerformance.cpp
@@ -62,9 +62,12 @@ void performanceTest( std::ostream& stream, const std::string& test_prefix,
         // Define problem grid.
         x_min[p] = 0.0;
         x_max[p] = 1.3 * std::pow( num_p, 1.0 / 3.0 );
+        double grid_min[3] = { x_min[p], x_min[p], x_min[p] };
+        double grid_max[3] = { x_max[p], x_max[p], x_max[p] };
         aosoas[p].resize( num_p );
         auto x = Cabana::slice<0>( aosoas[p], "position" );
-        Cabana::createRandomParticles( x, x.size(), x_min[p], x_max[p] );
+        Cabana::createParticles( Cabana::InitRandom(), x, x.size(), grid_min,
+                                 grid_max );
 
         if ( sort )
         {
@@ -74,8 +77,6 @@ void performanceTest( std::ostream& stream, const std::string& test_prefix,
             // in cells the size of the smallest cutoff distance.
             double cutoff = cutoff_ratios.front();
             double sort_delta[3] = { cutoff, cutoff, cutoff };
-            double grid_min[3] = { x_min[p], x_min[p], x_min[p] };
-            double grid_max[3] = { x_max[p], x_max[p], x_max[p] };
             auto x = Cabana::slice<0>( aosoas[p], "position" );
             Cabana::LinkedCellList<Device> linked_cell_list(
                 x, sort_delta, grid_min, grid_max );

diff --git a/benchmark/core/Cabana_NeighborVerletPerformance.cpp b/benchmark/core/Cabana_NeighborVerletPerformance.cpp
@@ -68,9 +68,12 @@ void performanceTest( std::ostream& stream, const std::string& test_prefix,
         // Define problem grid.
         x_min[p] = 0.0;
         x_max[p] = 1.3 * std::pow( num_p, 1.0 / 3.0 );
+        double grid_min[3] = { x_min[p], x_min[p], x_min[p] };
+        double grid_max[3] = { x_max[p], x_max[p], x_max[p] };
         aosoas[p].resize( num_p );
         auto x = Cabana::slice<0>( aosoas[p], "position" );
-        Cabana::createRandomParticles( x, x.size(), x_min[p], x_max[p] );
+        Cabana::createParticles( Cabana::InitRandom(), x, x.size(), grid_min,
+                                 grid_max );
 
         if ( sort )
         {
@@ -80,8 +83,6 @@ void performanceTest( std::ostream& stream, const std::string& test_prefix,
             // in cells the size of the smallest cutoff distance.
             double cutoff = cutoff_ratios.front();
             double sort_delta[3] = { cutoff, cutoff, cutoff };
-            double grid_min[3] = { x_min[p], x_min[p], x_min[p] };
-            double grid_max[3] = { x_max[p], x_max[p], x_max[p] };
             Cabana::LinkedCellList<Device> linked_cell_list(
                 x, sort_delta, grid_min, grid_max );
             Cabana::permute( linked_cell_list, aosoas[p] );