From cd70b7f1be9109bb315a26288d0f7f52a0b6bf30 Mon Sep 17 00:00:00 2001 From: Sam Reeve <6740307+streeve@users.noreply.github.com> Date: Fri, 11 Oct 2024 18:11:13 -0400 Subject: [PATCH] fixup: add dim to ArborX test - no 2d Point --- core/unit_test/tstNeighborListArborX.hpp | 25 ++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/core/unit_test/tstNeighborListArborX.hpp b/core/unit_test/tstNeighborListArborX.hpp index 17ae577d9..5c485b80d 100644 --- a/core/unit_test/tstNeighborListArborX.hpp +++ b/core/unit_test/tstNeighborListArborX.hpp @@ -23,10 +23,11 @@ namespace Test { //---------------------------------------------------------------------------// +template void testArborXListFull() { // Create the AoSoA and fill with random particle positions. - NeighborListTestData<3> test_data; + NeighborListTestData test_data; auto position = Cabana::slice<0>( test_data.aosoa ); // Check CSR neighbor lists. @@ -84,10 +85,11 @@ void testArborXListFull() } //---------------------------------------------------------------------------// +template void testArborXListHalf() { // Create the AoSoA and fill with random particle positions. - NeighborListTestData<3> test_data; + NeighborListTestData test_data; auto position = Cabana::slice<0>( test_data.aosoa ); // Check CSR neighbor lists. @@ -145,10 +147,11 @@ void testArborXListHalf() } //---------------------------------------------------------------------------// +template void testArborXListFullPartialRange() { // Create the AoSoA and fill with random particle positions. - NeighborListTestData<3> test_data; + NeighborListTestData test_data; auto position = Cabana::slice<0>( test_data.aosoa ); { @@ -176,10 +179,11 @@ void testArborXListFullPartialRange() } //---------------------------------------------------------------------------// +template void testNeighborArborXParallelFor() { // Create the AoSoA and fill with random particle positions. - NeighborListTestData<3> test_data; + NeighborListTestData test_data; auto position = Cabana::slice<0>( test_data.aosoa ); { @@ -235,10 +239,11 @@ void testNeighborArborXParallelFor() } //---------------------------------------------------------------------------// +template void testNeighborArborXParallelReduce() { // Create the AoSoA and fill with random particle positions. - NeighborListTestData<3> test_data; + NeighborListTestData test_data; auto position = Cabana::slice<0>( test_data.aosoa ); { @@ -290,19 +295,19 @@ void testNeighborArborXParallelReduce() //---------------------------------------------------------------------------// // TESTS //---------------------------------------------------------------------------// -TEST( ArborXList, Full ) { testArborXListFull(); } +TEST( ArborXList, Full3d ) { testArborXListFull<3>(); } //---------------------------------------------------------------------------// -TEST( ArborXList, Half ) { testArborXListHalf(); } +TEST( ArborXList, Half3d ) { testArborXListHalf<3>(); } //---------------------------------------------------------------------------// -TEST( ArborXList, FullRange ) { testArborXListFullPartialRange(); } +TEST( ArborXList, FullRange3d ) { testArborXListFullPartialRange<3>(); } //---------------------------------------------------------------------------// -TEST( ArborXList, ParallelFor ) { testNeighborArborXParallelFor(); } +TEST( ArborXList, ParallelFor3d ) { testNeighborArborXParallelFor<3>(); } //---------------------------------------------------------------------------// -TEST( ArborXList, ParallelReduce ) { testNeighborArborXParallelReduce(); } +TEST( ArborXList, ParallelReduce3d ) { testNeighborArborXParallelReduce<3>(); } //---------------------------------------------------------------------------// } // end namespace Test