fixup: use createVerletList

ECP-copa · Oct 11, 2024 · e72aafc · e72aafc
1 parent fbc5c3b
commit e72aafc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/core/src/Cabana_VerletList.hpp b/core/src/Cabana_VerletList.hpp
@@ -902,8 +902,8 @@ class VerletList
 //---------------------------------------------------------------------------//
 // VerletList creation functions.
 //---------------------------------------------------------------------------//
-template <class PositionType, class MinArrayType, class MaxArrayType,
-          class AlgorithmTag, class LayoutTag, class BuildTag = TeamVectorOpTag>
+template <class AlgorithmTag, class LayoutTag, class BuildTag,
+          class PositionType, class MinArrayType, class MaxArrayType>
 auto createVerletList( PositionType positions, const std::size_t begin,
                        const std::size_t end,
                        const typename PositionType::value_type radius,
@@ -922,8 +922,8 @@ auto createVerletList( PositionType positions, const std::size_t begin,
                                               grid_max, max_neigh );
 }
 
-template <class PositionType, class MinArrayType, class MaxArrayType,
-          class AlgorithmTag, class LayoutTag, class BuildTag = TeamVectorOpTag>
+template <class AlgorithmTag, class LayoutTag, class BuildTag,
+          class PositionType, class MinArrayType, class MaxArrayType>
 auto createVerletList( PositionType positions,
                        const typename PositionType::value_type radius,
                        const typename PositionType::value_type cell_size_ratio,

diff --git a/core/unit_test/tstNeighborList.hpp b/core/unit_test/tstNeighborList.hpp
@@ -149,11 +149,10 @@ void testNeighborParallelFor()
     auto position = Cabana::slice<0>( test_data.aosoa );
 
     // Create the neighbor list.
-    using ListType = Cabana::VerletList<TEST_MEMSPACE, Cabana::FullNeighborTag,
-                                        LayoutTag, Cabana::TeamOpTag, Dim>;
-    ListType nlist( position, 0, position.size(), test_data.test_radius,
-                    test_data.cell_size_ratio, test_data.grid_min,
-                    test_data.grid_max );
+    auto nlist = Cabana::createVerletList<Cabana::FullNeighborTag, LayoutTag,
+                                          Cabana::TeamOpTag>(
+        position, 0, position.size(), test_data.test_radius,
+        test_data.cell_size_ratio, test_data.grid_min, test_data.grid_max );
 
     checkFirstNeighborParallelForLambda( nlist, test_data.N2_list_copy,
                                          test_data.num_particle );