2d neighbors

benchmark/core/Cabana_LinkedCellPerformance.cpp

@@ -112,7 +112,7 @@ void performanceTest( std::ostream& stream, const std::string& test_prefix,
             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 linked_cell_list = Cabana::createLinkedCellList<memory_space>(
+            auto linked_cell_list = Cabana::createLinkedCellList(
                 x, sort_delta, grid_min, grid_max );
 
             // Setup for neighbor iteration.

benchmark/core/Cabana_NeighborArborXPerformance.cpp

@@ -78,7 +78,7 @@ void performanceTest( std::ostream& stream, const std::string& test_prefix,
             double cutoff = cutoff_ratios.front();
             double sort_delta[3] = { cutoff, cutoff, cutoff };
             auto x = Cabana::slice<0>( aosoas[p], "position" );
-            auto linked_cell_list = Cabana::createLinkedCellList<memory_space>(
+            auto linked_cell_list = Cabana::createLinkedCellList(
                 x, sort_delta, grid_min, grid_max );
             Cabana::permute( linked_cell_list, aosoas[p] );
         }

benchmark/core/Cabana_NeighborVerletPerformance.cpp

@@ -85,7 +85,7 @@ 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 };
-            auto linked_cell_list = Cabana::createLinkedCellList<memory_space>(
+            auto linked_cell_list = Cabana::createLinkedCellList(
                 x, sort_delta, grid_min, grid_max );
             Cabana::permute( linked_cell_list, aosoas[p] );
         }

core/src/Cabana_Experimental_NeighborList.hpp

@@ -114,18 +114,34 @@ struct AccessTraits<Positions, PrimitivesTag,
     using memory_space = typename Positions::memory_space;
     //! Size type.
     using size_type = typename Positions::size_type;
+    //! Position array data type.
+    using data_type = typename Positions::data_type;
+    //! Spatial dimension.
+    static constexpr std::size_t num_space_dim =
+        Cabana::arraySize( data_type{} );
+
     //! Get number of particles.
     static KOKKOS_FUNCTION size_type size( Positions const& x )
     {
         return Cabana::size( x );
     }
     //! Get the particle at the index.
-    static KOKKOS_FUNCTION Point get( Positions const& x, size_type i )
+    template <std::size_t NSD = num_space_dim>
+    static KOKKOS_FUNCTION std::enable_if_t<3 == NSD, Point>
+    get( Positions const& x, size_type i )
     {
         return { static_cast<float>( x( i, 0 ) ),
                  static_cast<float>( x( i, 1 ) ),
                  static_cast<float>( x( i, 2 ) ) };
     }
+    //! Get the particle at the index.
+    template <std::size_t NSD = num_space_dim>
+    static KOKKOS_FUNCTION std::enable_if_t<2 == NSD, Point>
+    get( Positions const& x, size_type i )
+    {
+        return { static_cast<float>( x( i, 0 ) ),
+                 static_cast<float>( x( i, 1 ) ) };
+    }
 };
 //! Neighbor access trait.
 template <typename Positions>