Move cajita/ -> grid/

ECP-copa · Sep 1, 2023 · 266d95d · 266d95d
1 parent 3358af3
commit 266d95d
Show file tree

Hide file tree

Showing 121 changed files with 238 additions and 75 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -230,7 +230,7 @@ endif()
 # enable doxygen
 find_package(Doxygen)
 if(Doxygen_FOUND)
-  doxygen_add_docs(doxygen core/src cajita/src)
+  doxygen_add_docs(doxygen core/src grid/src)
 endif()
 
 ##---------------------------------------------------------------------------##
@@ -248,7 +248,7 @@ endif()
 
 if(Cabana_ENABLE_GRID)
   if(MPI_FOUND)
-    add_subdirectory(cajita)
+    add_subdirectory(grid)
   else()
     message(FATAL_ERROR "Grid subpackage requires MPI")
   endif()
@@ -284,7 +284,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/CabanaConfig.cmake" "${CMAKE_CURRENT_
 ## Clang Format
 ##---------------------------------------------------------------------------##
 if(CLANG_FORMAT_FOUND)
-  file(GLOB_RECURSE FORMAT_SOURCES core/*.cpp core/*.hpp cajita/*hpp cajita/*cpp example/*cpp example/*hpp cmake/*cpp cmake/*hpp benchmark/*cpp benchmark/*hpp)
+  file(GLOB_RECURSE FORMAT_SOURCES core/*.cpp core/*.hpp grid/*hpp grid/*cpp example/*cpp example/*hpp cmake/*cpp cmake/*hpp benchmark/*cpp benchmark/*hpp)
   add_custom_target(cabana-format
     COMMAND ${CLANG_FORMAT_EXECUTABLE} -i -style=file ${FORMAT_SOURCES}
     DEPENDS ${FORMAT_SOURCES})

diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
@@ -11,6 +11,6 @@
 
 add_subdirectory(core)
 
-if(Cabana_ENABLE_CAJITA)
-  add_subdirectory(cajita)
+if(Cabana_ENABLE_GRID)
+  add_subdirectory(grid)
 endif()
diff --git a/benchmark/cajita/CMakeLists.txt → benchmark/grid/CMakeLists.txt b/benchmark/cajita/CMakeLists.txt → benchmark/grid/CMakeLists.txt
diff --git a/..._Grid_FastFourierTransformPerformance.cpp → ..._Grid_FastFourierTransformPerformance.cpp b/..._Grid_FastFourierTransformPerformance.cpp → ..._Grid_FastFourierTransformPerformance.cpp
diff --git a/...rk/cajita/Cabana_Grid_HaloPerformance.cpp → ...mark/grid/Cabana_Grid_HaloPerformance.cpp b/...rk/cajita/Cabana_Grid_HaloPerformance.cpp → ...mark/grid/Cabana_Grid_HaloPerformance.cpp
diff --git a/.../Cabana_Grid_InterpolationPerformance.cpp → .../Cabana_Grid_InterpolationPerformance.cpp b/.../Cabana_Grid_InterpolationPerformance.cpp → .../Cabana_Grid_InterpolationPerformance.cpp
diff --git a/...jita/Cabana_Grid_SparseMapPerformance.cpp → ...grid/Cabana_Grid_SparseMapPerformance.cpp b/...jita/Cabana_Grid_SparseMapPerformance.cpp → ...grid/Cabana_Grid_SparseMapPerformance.cpp
diff --git a/...ana_Grid_SparsePartitionerPerformance.cpp → ...ana_Grid_SparsePartitionerPerformance.cpp b/...ana_Grid_SparsePartitionerPerformance.cpp → ...ana_Grid_SparsePartitionerPerformance.cpp
diff --git a/cajita/src/Cabana_Grid.hpp b/cajita/src/Cabana_Grid.hpp
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
@@ -11,6 +11,6 @@
 
 add_subdirectory(core_tutorial)
 
-if(Cabana_ENABLE_CAJITA)
-  add_subdirectory(cajita_tutorial)
+if(Cabana_ENABLE_GRID)
+  add_subdirectory(grid_tutorial)
 endif()
diff --git a/...e/cajita_tutorial/01_types/CMakeLists.txt → ...ple/grid_tutorial/01_types/CMakeLists.txt b/...e/cajita_tutorial/01_types/CMakeLists.txt → ...ple/grid_tutorial/01_types/CMakeLists.txt
diff --git a/...ajita_tutorial/01_types/types_example.cpp → .../grid_tutorial/01_types/types_example.cpp b/...ajita_tutorial/01_types/types_example.cpp → .../grid_tutorial/01_types/types_example.cpp
diff --git a/...ta_tutorial/02_global_mesh/CMakeLists.txt → ...id_tutorial/02_global_mesh/CMakeLists.txt b/...ta_tutorial/02_global_mesh/CMakeLists.txt → ...id_tutorial/02_global_mesh/CMakeLists.txt
diff --git a/...al/02_global_mesh/global_mesh_example.cpp → ...al/02_global_mesh/global_mesh_example.cpp b/...al/02_global_mesh/global_mesh_example.cpp → ...al/02_global_mesh/global_mesh_example.cpp
diff --git a/...ta_tutorial/03_partitioner/CMakeLists.txt → ...id_tutorial/03_partitioner/CMakeLists.txt b/...ta_tutorial/03_partitioner/CMakeLists.txt → ...id_tutorial/03_partitioner/CMakeLists.txt
diff --git a/...al/03_partitioner/partitioner_example.cpp → ...al/03_partitioner/partitioner_example.cpp b/...al/03_partitioner/partitioner_example.cpp → ...al/03_partitioner/partitioner_example.cpp
diff --git a/...ta_tutorial/04_global_grid/CMakeLists.txt → ...id_tutorial/04_global_grid/CMakeLists.txt b/...ta_tutorial/04_global_grid/CMakeLists.txt → ...id_tutorial/04_global_grid/CMakeLists.txt
diff --git a/...al/04_global_grid/global_grid_example.cpp → ...al/04_global_grid/global_grid_example.cpp b/...al/04_global_grid/global_grid_example.cpp → ...al/04_global_grid/global_grid_example.cpp
diff --git a/...ta_tutorial/05_index_space/CMakeLists.txt → ...id_tutorial/05_index_space/CMakeLists.txt b/...ta_tutorial/05_index_space/CMakeLists.txt → ...id_tutorial/05_index_space/CMakeLists.txt
diff --git a/...al/05_index_space/index_space_example.cpp → ...al/05_index_space/index_space_example.cpp b/...al/05_index_space/index_space_example.cpp → ...al/05_index_space/index_space_example.cpp
diff --git a/...ita_tutorial/06_local_grid/CMakeLists.txt → ...rid_tutorial/06_local_grid/CMakeLists.txt b/...ita_tutorial/06_local_grid/CMakeLists.txt → ...rid_tutorial/06_local_grid/CMakeLists.txt
diff --git a/...rial/06_local_grid/local_grid_example.cpp → ...rial/06_local_grid/local_grid_example.cpp b/...rial/06_local_grid/local_grid_example.cpp → ...rial/06_local_grid/local_grid_example.cpp
diff --git a/...ita_tutorial/07_local_mesh/CMakeLists.txt → ...rid_tutorial/07_local_mesh/CMakeLists.txt b/...ita_tutorial/07_local_mesh/CMakeLists.txt → ...rid_tutorial/07_local_mesh/CMakeLists.txt
diff --git a/...rial/07_local_mesh/local_mesh_example.cpp → ...rial/07_local_mesh/local_mesh_example.cpp b/...rial/07_local_mesh/local_mesh_example.cpp → ...rial/07_local_mesh/local_mesh_example.cpp
diff --git a/...e/cajita_tutorial/08_array/CMakeLists.txt → ...ple/grid_tutorial/08_array/CMakeLists.txt b/...e/cajita_tutorial/08_array/CMakeLists.txt → ...ple/grid_tutorial/08_array/CMakeLists.txt
diff --git a/...ajita_tutorial/08_array/array_example.cpp → .../grid_tutorial/08_array/array_example.cpp b/...ajita_tutorial/08_array/array_example.cpp → .../grid_tutorial/08_array/array_example.cpp
diff --git a/..._tutorial/09_grid_parallel/CMakeLists.txt → ..._tutorial/09_grid_parallel/CMakeLists.txt b/..._tutorial/09_grid_parallel/CMakeLists.txt → ..._tutorial/09_grid_parallel/CMakeLists.txt
diff --git a/...9_grid_parallel/grid_parallel_example.cpp → ...9_grid_parallel/grid_parallel_example.cpp b/...9_grid_parallel/grid_parallel_example.cpp → ...9_grid_parallel/grid_parallel_example.cpp
diff --git a/...ita_tutorial/10_fft_heffte/CMakeLists.txt → ...rid_tutorial/10_fft_heffte/CMakeLists.txt b/...ita_tutorial/10_fft_heffte/CMakeLists.txt → ...rid_tutorial/10_fft_heffte/CMakeLists.txt
diff --git a/...heffte_fast_fourier_transform_example.cpp → ...heffte_fast_fourier_transform_example.cpp b/...heffte_fast_fourier_transform_example.cpp → ...heffte_fast_fourier_transform_example.cpp
diff --git a/...tured_solver_multi_variate/CMakeLists.txt → ...tured_solver_multi_variate/CMakeLists.txt b/...tured_solver_multi_variate/CMakeLists.txt → ...tured_solver_multi_variate/CMakeLists.txt
diff --git a/..._semi_structured_solver_multi_example.cpp → ..._semi_structured_solver_multi_example.cpp b/..._semi_structured_solver_multi_example.cpp → ..._semi_structured_solver_multi_example.cpp
diff --git a/...orial/11_structured_solver/CMakeLists.txt → ...orial/11_structured_solver/CMakeLists.txt b/...orial/11_structured_solver/CMakeLists.txt → ...orial/11_structured_solver/CMakeLists.txt
diff --git a/...ured_solver/structured_solver_example.cpp → ...ured_solver/structured_solver_example.cpp b/...ured_solver/structured_solver_example.cpp → ...ured_solver/structured_solver_example.cpp
diff --git a/...11_structured_solver_hypre/CMakeLists.txt → ...11_structured_solver_hypre/CMakeLists.txt b/...11_structured_solver_hypre/CMakeLists.txt → ...11_structured_solver_hypre/CMakeLists.txt
diff --git a/...hypre/hypre_structured_solver_example.cpp → ...hypre/hypre_structured_solver_example.cpp b/...hypre/hypre_structured_solver_example.cpp → ...hypre/hypre_structured_solver_example.cpp
diff --git a/...le/cajita_tutorial/12_halo/CMakeLists.txt → example/grid_tutorial/12_halo/CMakeLists.txt b/...le/cajita_tutorial/12_halo/CMakeLists.txt → example/grid_tutorial/12_halo/CMakeLists.txt
diff --git a/.../cajita_tutorial/12_halo/halo_example.cpp → ...le/grid_tutorial/12_halo/halo_example.cpp b/.../cajita_tutorial/12_halo/halo_example.cpp → ...le/grid_tutorial/12_halo/halo_example.cpp
diff --git a/...torial/13_all_loadbalancer/CMakeLists.txt → ...torial/13_all_loadbalancer/CMakeLists.txt b/...torial/13_all_loadbalancer/CMakeLists.txt → ...torial/13_all_loadbalancer/CMakeLists.txt
diff --git a/...all_loadbalancer/loadbalancer_example.cpp → ...all_loadbalancer/loadbalancer_example.cpp b/...all_loadbalancer/loadbalancer_example.cpp → ...all_loadbalancer/loadbalancer_example.cpp
diff --git a/.../cajita_tutorial/14_spline/CMakeLists.txt → ...le/grid_tutorial/14_spline/CMakeLists.txt b/.../cajita_tutorial/14_spline/CMakeLists.txt → ...le/grid_tutorial/14_spline/CMakeLists.txt
diff --git a/...ita_tutorial/14_spline/spline_example.cpp → ...rid_tutorial/14_spline/spline_example.cpp b/...ita_tutorial/14_spline/spline_example.cpp → ...rid_tutorial/14_spline/spline_example.cpp
diff --git a/..._tutorial/15_interpolation/CMakeLists.txt → ..._tutorial/15_interpolation/CMakeLists.txt b/..._tutorial/15_interpolation/CMakeLists.txt → ..._tutorial/15_interpolation/CMakeLists.txt
diff --git a/...5_interpolation/interpolation_example.cpp → ...5_interpolation/interpolation_example.cpp b/...5_interpolation/interpolation_example.cpp → ...5_interpolation/interpolation_example.cpp
diff --git a/example/cajita_tutorial/CMakeLists.txt → example/grid_tutorial/CMakeLists.txt b/example/cajita_tutorial/CMakeLists.txt → example/grid_tutorial/CMakeLists.txt
diff --git a/cajita/CMakeLists.txt → grid/CMakeLists.txt b/cajita/CMakeLists.txt → grid/CMakeLists.txt
diff --git a/cajita/src/CMakeLists.txt → grid/src/CMakeLists.txt b/cajita/src/CMakeLists.txt → grid/src/CMakeLists.txt
diff --git a/cajita/src/Cabana_Grid_Array.hpp → grid/src/Cabana_Grid_Array.hpp b/cajita/src/Cabana_Grid_Array.hpp → grid/src/Cabana_Grid_Array.hpp
diff --git a/cajita/src/Cabana_Grid_BovWriter.hpp → grid/src/Cabana_Grid_BovWriter.hpp b/cajita/src/Cabana_Grid_BovWriter.hpp → grid/src/Cabana_Grid_BovWriter.hpp
diff --git a/cajita/src/Cabana_Grid_Config.hpp.in → grid/src/Cabana_Grid_Config.hpp.in b/cajita/src/Cabana_Grid_Config.hpp.in → grid/src/Cabana_Grid_Config.hpp.in
diff --git a/.../src/Cabana_Grid_FastFourierTransform.hpp → .../src/Cabana_Grid_FastFourierTransform.hpp b/.../src/Cabana_Grid_FastFourierTransform.hpp → .../src/Cabana_Grid_FastFourierTransform.hpp
diff --git a/cajita/src/Cabana_Grid_GlobalGrid.hpp → grid/src/Cabana_Grid_GlobalGrid.hpp b/cajita/src/Cabana_Grid_GlobalGrid.hpp → grid/src/Cabana_Grid_GlobalGrid.hpp
diff --git a/cajita/src/Cabana_Grid_GlobalGrid_impl.hpp → grid/src/Cabana_Grid_GlobalGrid_impl.hpp b/cajita/src/Cabana_Grid_GlobalGrid_impl.hpp → grid/src/Cabana_Grid_GlobalGrid_impl.hpp
diff --git a/cajita/src/Cabana_Grid_GlobalMesh.hpp → grid/src/Cabana_Grid_GlobalMesh.hpp b/cajita/src/Cabana_Grid_GlobalMesh.hpp → grid/src/Cabana_Grid_GlobalMesh.hpp
diff --git a/cajita/src/Cabana_Grid_Halo.hpp → grid/src/Cabana_Grid_Halo.hpp b/cajita/src/Cabana_Grid_Halo.hpp → grid/src/Cabana_Grid_Halo.hpp
diff --git a/cajita/src/Cabana_Grid_Hypre.hpp → grid/src/Cabana_Grid_Hypre.hpp b/cajita/src/Cabana_Grid_Hypre.hpp → grid/src/Cabana_Grid_Hypre.hpp
diff --git a/...Cabana_Grid_HypreSemiStructuredSolver.hpp → ...Cabana_Grid_HypreSemiStructuredSolver.hpp b/...Cabana_Grid_HypreSemiStructuredSolver.hpp → ...Cabana_Grid_HypreSemiStructuredSolver.hpp
diff --git a/...src/Cabana_Grid_HypreStructuredSolver.hpp → ...src/Cabana_Grid_HypreStructuredSolver.hpp b/...src/Cabana_Grid_HypreStructuredSolver.hpp → ...src/Cabana_Grid_HypreStructuredSolver.hpp
diff --git a/cajita/src/Cabana_Grid_IndexConversion.hpp → grid/src/Cabana_Grid_IndexConversion.hpp b/cajita/src/Cabana_Grid_IndexConversion.hpp → grid/src/Cabana_Grid_IndexConversion.hpp
diff --git a/cajita/src/Cabana_Grid_IndexSpace.hpp → grid/src/Cabana_Grid_IndexSpace.hpp b/cajita/src/Cabana_Grid_IndexSpace.hpp → grid/src/Cabana_Grid_IndexSpace.hpp
diff --git a/cajita/src/Cabana_Grid_Interpolation.hpp → grid/src/Cabana_Grid_Interpolation.hpp b/cajita/src/Cabana_Grid_Interpolation.hpp → grid/src/Cabana_Grid_Interpolation.hpp
diff --git a/cajita/src/Cabana_Grid_LoadBalancer.hpp → grid/src/Cabana_Grid_LoadBalancer.hpp b/cajita/src/Cabana_Grid_LoadBalancer.hpp → grid/src/Cabana_Grid_LoadBalancer.hpp
diff --git a/cajita/src/Cabana_Grid_LocalGrid.hpp → grid/src/Cabana_Grid_LocalGrid.hpp b/cajita/src/Cabana_Grid_LocalGrid.hpp → grid/src/Cabana_Grid_LocalGrid.hpp
diff --git a/cajita/src/Cabana_Grid_LocalGrid_impl.hpp → grid/src/Cabana_Grid_LocalGrid_impl.hpp b/cajita/src/Cabana_Grid_LocalGrid_impl.hpp → grid/src/Cabana_Grid_LocalGrid_impl.hpp
diff --git a/cajita/src/Cabana_Grid_LocalMesh.hpp → grid/src/Cabana_Grid_LocalMesh.hpp b/cajita/src/Cabana_Grid_LocalMesh.hpp → grid/src/Cabana_Grid_LocalMesh.hpp
diff --git a/cajita/src/Cabana_Grid_ManualPartitioner.hpp → grid/src/Cabana_Grid_ManualPartitioner.hpp b/cajita/src/Cabana_Grid_ManualPartitioner.hpp → grid/src/Cabana_Grid_ManualPartitioner.hpp
diff --git a/cajita/src/Cabana_Grid_MpiTraits.hpp → grid/src/Cabana_Grid_MpiTraits.hpp b/cajita/src/Cabana_Grid_MpiTraits.hpp → grid/src/Cabana_Grid_MpiTraits.hpp
diff --git a/cajita/src/Cabana_Grid_Parallel.hpp → grid/src/Cabana_Grid_Parallel.hpp b/cajita/src/Cabana_Grid_Parallel.hpp → grid/src/Cabana_Grid_Parallel.hpp
diff --git a/...c/Cabana_Grid_ParticleGridDistributor.hpp → ...c/Cabana_Grid_ParticleGridDistributor.hpp b/...c/Cabana_Grid_ParticleGridDistributor.hpp → ...c/Cabana_Grid_ParticleGridDistributor.hpp
diff --git a/cajita/src/Cabana_Grid_ParticleInit.hpp → grid/src/Cabana_Grid_ParticleInit.hpp b/cajita/src/Cabana_Grid_ParticleInit.hpp → grid/src/Cabana_Grid_ParticleInit.hpp
diff --git a/cajita/src/Cabana_Grid_ParticleList.hpp → grid/src/Cabana_Grid_ParticleList.hpp b/cajita/src/Cabana_Grid_ParticleList.hpp → grid/src/Cabana_Grid_ParticleList.hpp
diff --git a/cajita/src/Cabana_Grid_Partitioner.hpp → grid/src/Cabana_Grid_Partitioner.hpp b/cajita/src/Cabana_Grid_Partitioner.hpp → grid/src/Cabana_Grid_Partitioner.hpp
diff --git a/...Cabana_Grid_ReferenceStructuredSolver.hpp → ...Cabana_Grid_ReferenceStructuredSolver.hpp b/...Cabana_Grid_ReferenceStructuredSolver.hpp → ...Cabana_Grid_ReferenceStructuredSolver.hpp
diff --git a/...ta/src/Cabana_Grid_SiloParticleOutput.hpp → grid/src/Cabana_Grid_SiloParticleOutput.hpp b/...ta/src/Cabana_Grid_SiloParticleOutput.hpp → grid/src/Cabana_Grid_SiloParticleOutput.hpp
diff --git a/cajita/src/Cabana_Grid_SparseArray.hpp → grid/src/Cabana_Grid_SparseArray.hpp b/cajita/src/Cabana_Grid_SparseArray.hpp → grid/src/Cabana_Grid_SparseArray.hpp
diff --git a/.../src/Cabana_Grid_SparseDimPartitioner.hpp → .../src/Cabana_Grid_SparseDimPartitioner.hpp b/.../src/Cabana_Grid_SparseDimPartitioner.hpp → .../src/Cabana_Grid_SparseDimPartitioner.hpp
diff --git a/cajita/src/Cabana_Grid_SparseHalo.hpp → grid/src/Cabana_Grid_SparseHalo.hpp b/cajita/src/Cabana_Grid_SparseHalo.hpp → grid/src/Cabana_Grid_SparseHalo.hpp
diff --git a/cajita/src/Cabana_Grid_SparseIndexSpace.hpp → grid/src/Cabana_Grid_SparseIndexSpace.hpp b/cajita/src/Cabana_Grid_SparseIndexSpace.hpp → grid/src/Cabana_Grid_SparseIndexSpace.hpp
diff --git a/cajita/src/Cabana_Grid_SparseLocalGrid.hpp → grid/src/Cabana_Grid_SparseLocalGrid.hpp b/cajita/src/Cabana_Grid_SparseLocalGrid.hpp → grid/src/Cabana_Grid_SparseLocalGrid.hpp
diff --git a/.../src/Cabana_Grid_SparseLocalGrid_impl.hpp → .../src/Cabana_Grid_SparseLocalGrid_impl.hpp b/.../src/Cabana_Grid_SparseLocalGrid_impl.hpp → .../src/Cabana_Grid_SparseLocalGrid_impl.hpp
diff --git a/cajita/src/Cabana_Grid_Splines.hpp → grid/src/Cabana_Grid_Splines.hpp b/cajita/src/Cabana_Grid_Splines.hpp → grid/src/Cabana_Grid_Splines.hpp
diff --git a/cajita/src/Cabana_Grid_Types.hpp → grid/src/Cabana_Grid_Types.hpp b/cajita/src/Cabana_Grid_Types.hpp → grid/src/Cabana_Grid_Types.hpp
diff --git a/...src/Cabana_Grid_UniformDimPartitioner.hpp → ...src/Cabana_Grid_UniformDimPartitioner.hpp b/...src/Cabana_Grid_UniformDimPartitioner.hpp → ...src/Cabana_Grid_UniformDimPartitioner.hpp
diff --git a/cajita/src/Cajita.hpp → grid/src/Cajita.hpp b/cajita/src/Cajita.hpp → grid/src/Cajita.hpp
diff --git a/cajita/unit_test/CMakeLists.txt → grid/unit_test/CMakeLists.txt b/cajita/unit_test/CMakeLists.txt → grid/unit_test/CMakeLists.txt
diff --git a/cajita/unit_test/tstArray2d.hpp → grid/unit_test/tstArray2d.hpp b/cajita/unit_test/tstArray2d.hpp → grid/unit_test/tstArray2d.hpp
diff --git a/cajita/unit_test/tstArray3d.hpp → grid/unit_test/tstArray3d.hpp b/cajita/unit_test/tstArray3d.hpp → grid/unit_test/tstArray3d.hpp
diff --git a/cajita/unit_test/tstBovWriter.hpp → grid/unit_test/tstBovWriter.hpp b/cajita/unit_test/tstBovWriter.hpp → grid/unit_test/tstBovWriter.hpp
diff --git a/cajita/unit_test/tstFastFourierTransform.hpp → grid/unit_test/tstFastFourierTransform.hpp b/cajita/unit_test/tstFastFourierTransform.hpp → grid/unit_test/tstFastFourierTransform.hpp
diff --git a/cajita/unit_test/tstGlobalGrid.hpp → grid/unit_test/tstGlobalGrid.hpp b/cajita/unit_test/tstGlobalGrid.hpp → grid/unit_test/tstGlobalGrid.hpp
diff --git a/cajita/unit_test/tstGlobalMesh.hpp → grid/unit_test/tstGlobalMesh.hpp b/cajita/unit_test/tstGlobalMesh.hpp → grid/unit_test/tstGlobalMesh.hpp
diff --git a/cajita/unit_test/tstHalo2d.hpp → grid/unit_test/tstHalo2d.hpp b/cajita/unit_test/tstHalo2d.hpp → grid/unit_test/tstHalo2d.hpp
diff --git a/cajita/unit_test/tstHalo3d.hpp → grid/unit_test/tstHalo3d.hpp b/cajita/unit_test/tstHalo3d.hpp → grid/unit_test/tstHalo3d.hpp
diff --git a/...nit_test/tstHypreSemiStructuredSolver.hpp → ...nit_test/tstHypreSemiStructuredSolver.hpp b/...nit_test/tstHypreSemiStructuredSolver.hpp → ...nit_test/tstHypreSemiStructuredSolver.hpp
diff --git a/...est/tstHypreSemiStructuredSolverMulti.hpp → ...est/tstHypreSemiStructuredSolverMulti.hpp b/...est/tstHypreSemiStructuredSolverMulti.hpp → ...est/tstHypreSemiStructuredSolverMulti.hpp
diff --git a/.../unit_test/tstHypreStructuredSolver2d.hpp → .../unit_test/tstHypreStructuredSolver2d.hpp b/.../unit_test/tstHypreStructuredSolver2d.hpp → .../unit_test/tstHypreStructuredSolver2d.hpp
diff --git a/.../unit_test/tstHypreStructuredSolver3d.hpp → .../unit_test/tstHypreStructuredSolver3d.hpp b/.../unit_test/tstHypreStructuredSolver3d.hpp → .../unit_test/tstHypreStructuredSolver3d.hpp
diff --git a/cajita/unit_test/tstIndexConversion.hpp → grid/unit_test/tstIndexConversion.hpp b/cajita/unit_test/tstIndexConversion.hpp → grid/unit_test/tstIndexConversion.hpp
diff --git a/cajita/unit_test/tstIndexSpace.hpp → grid/unit_test/tstIndexSpace.hpp b/cajita/unit_test/tstIndexSpace.hpp → grid/unit_test/tstIndexSpace.hpp
diff --git a/cajita/unit_test/tstInterpolation2d.hpp → grid/unit_test/tstInterpolation2d.hpp b/cajita/unit_test/tstInterpolation2d.hpp → grid/unit_test/tstInterpolation2d.hpp
diff --git a/cajita/unit_test/tstInterpolation3d.hpp → grid/unit_test/tstInterpolation3d.hpp b/cajita/unit_test/tstInterpolation3d.hpp → grid/unit_test/tstInterpolation3d.hpp
diff --git a/cajita/unit_test/tstLoadBalancer.hpp → grid/unit_test/tstLoadBalancer.hpp b/cajita/unit_test/tstLoadBalancer.hpp → grid/unit_test/tstLoadBalancer.hpp
diff --git a/cajita/unit_test/tstLocalGrid.hpp → grid/unit_test/tstLocalGrid.hpp b/cajita/unit_test/tstLocalGrid.hpp → grid/unit_test/tstLocalGrid.hpp
diff --git a/cajita/unit_test/tstLocalMesh2d.hpp → grid/unit_test/tstLocalMesh2d.hpp b/cajita/unit_test/tstLocalMesh2d.hpp → grid/unit_test/tstLocalMesh2d.hpp
diff --git a/cajita/unit_test/tstLocalMesh3d.hpp → grid/unit_test/tstLocalMesh3d.hpp b/cajita/unit_test/tstLocalMesh3d.hpp → grid/unit_test/tstLocalMesh3d.hpp
diff --git a/cajita/unit_test/tstParallel.hpp → grid/unit_test/tstParallel.hpp b/cajita/unit_test/tstParallel.hpp → grid/unit_test/tstParallel.hpp
diff --git a/...nit_test/tstParticleGridDistributor2d.hpp → ...nit_test/tstParticleGridDistributor2d.hpp b/...nit_test/tstParticleGridDistributor2d.hpp → ...nit_test/tstParticleGridDistributor2d.hpp
diff --git a/...nit_test/tstParticleGridDistributor3d.hpp → ...nit_test/tstParticleGridDistributor3d.hpp b/...nit_test/tstParticleGridDistributor3d.hpp → ...nit_test/tstParticleGridDistributor3d.hpp
diff --git a/cajita/unit_test/tstParticleInit.hpp → grid/unit_test/tstParticleInit.hpp b/cajita/unit_test/tstParticleInit.hpp → grid/unit_test/tstParticleInit.hpp
diff --git a/grid/unit_test/tstParticleInit.hpp~HEAD b/grid/unit_test/tstParticleInit.hpp~HEAD
@@ -0,0 +1,231 @@
+/****************************************************************************
+ * Copyright (c) 2018-2022 by the Cabana authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the Cabana library. Cabana is distributed under a   *
+ * BSD 3-clause license. For the licensing terms see the LICENSE file in    *
+ * the top-level directory.                                                 *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <Cajita_GlobalGrid.hpp>
+#include <Cajita_GlobalMesh.hpp>
+#include <Cajita_LocalGrid.hpp>
+#include <Cajita_LocalMesh.hpp>
+#include <Cajita_ParticleInit.hpp>
+#include <Cajita_ParticleList.hpp>
+#include <Cajita_Types.hpp>
+
+#include <Cabana_DeepCopy.hpp>
+#include <Cabana_Fields.hpp>
+#include <Cabana_ParticleInit.hpp>
+
+#include <Kokkos_Core.hpp>
+
+#include <gtest/gtest.h>
+
+using Cajita::Dim;
+
+namespace Test
+{
+//---------------------------------------------------------------------------//
+int totalParticlesPerCell( Cabana::InitUniform, int ppc )
+{
+    return ppc * ppc * ppc;
+}
+
+int totalParticlesPerCell( Cabana::InitRandom, int ppc ) { return ppc; }
+
+//---------------------------------------------------------------------------//
+// Field tags.
+struct Foo : public Cabana::Field::Vector<double, 3>
+{
+    static std::string label() { return "foo"; }
+};
+
+struct Bar : public Cabana::Field::Scalar<double>
+{
+    static std::string label() { return "bar"; }
+};
+
+//---------------------------------------------------------------------------//
+template <class InitType>
+void initParticleListTest( InitType init_type, int ppc )
+{
+    // Global bounding box.
+    double cell_size = 0.23;
+    std::array<int, 3> global_num_cell = { 43, 32, 39 };
+    std::array<double, 3> global_low_corner = { 1.2, 3.3, -2.8 };
+    std::array<double, 3> global_high_corner = {
+        global_low_corner[0] + cell_size * global_num_cell[0],
+        global_low_corner[1] + cell_size * global_num_cell[1],
+        global_low_corner[2] + cell_size * global_num_cell[2] };
+    auto global_mesh = Cajita::createUniformGlobalMesh(
+        global_low_corner, global_high_corner, global_num_cell );
+
+    std::array<bool, 3> is_dim_periodic = { true, true, true };
+    Cajita::DimBlockPartitioner<3> partitioner;
+    auto global_grid = Cajita::createGlobalGrid( MPI_COMM_WORLD, global_mesh,
+                                                 is_dim_periodic, partitioner );
+    auto local_grid = Cajita::createLocalGrid( global_grid, 0 );
+
+    // Make a particle list.
+    auto fields = Cabana::ParticleTraits<Foo, Bar>();
+    auto particles =
+        Cajita::createParticleList<TEST_MEMSPACE>( "test_particles", fields );
+    using plist_type = decltype( particles );
+
+    // Particle initialization functor.
+    const Kokkos::Array<double, 6> box = {
+        global_low_corner[Dim::I] + cell_size,
+        global_high_corner[Dim::I] - cell_size,
+        global_low_corner[Dim::J] + cell_size,
+        global_high_corner[Dim::J] - cell_size,
+        global_low_corner[Dim::K] + cell_size,
+        global_high_corner[Dim::K] - cell_size };
+    auto init_func =
+        KOKKOS_LAMBDA( const int, const double x[3], const double v,
+                       typename plist_type::particle_type& p )
+    {
+        // Put particles in a box that is one cell smaller than the global
+        // mesh. This will give us a layer of empty cells.
+        if ( x[Dim::I] > box[0] && x[Dim::I] < box[1] && x[Dim::J] > box[2] &&
+             x[Dim::J] < box[3] && x[Dim::K] > box[4] && x[Dim::K] < box[5] )
+        {
+            for ( int d = 0; d < 3; ++d )
+                get( p, Foo(), d ) = x[d];
+
+            get( p, Bar() ) = v;
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    };
+
+    // Initialize particles.
+    int num_p = Cajita::createParticles( init_type, TEST_EXECSPACE(), init_func,
+                                         particles, ppc, *local_grid );
+
+    // Check that we made particles.
+    EXPECT_TRUE( num_p > 0 );
+
+    // Compute the global number of particles.
+    int global_num_particle = particles.size();
+    MPI_Allreduce( MPI_IN_PLACE, &global_num_particle, 1, MPI_INT, MPI_SUM,
+                   MPI_COMM_WORLD );
+    int expect_num_particle =
+        totalParticlesPerCell( init_type, ppc ) *
+        ( global_grid->globalNumEntity( Cajita::Cell(), Dim::I ) - 2 ) *
+        ( global_grid->globalNumEntity( Cajita::Cell(), Dim::J ) - 2 ) *
+        ( global_grid->globalNumEntity( Cajita::Cell(), Dim::K ) - 2 );
+    EXPECT_EQ( global_num_particle, expect_num_particle );
+
+    // Particle volume.
+    double cell_volume = global_mesh->cellSize( 0 ) *
+                         global_mesh->cellSize( 1 ) *
+                         global_mesh->cellSize( 2 );
+    double volume = cell_volume / totalParticlesPerCell( init_type, ppc );
+
+    // Check that all particles are in the box and got initialized correctly.
+    auto host_particles =
+        Cabana::create_mirror_view_and_copy( Kokkos::HostSpace(), particles );
+    for ( int p = 0; p < num_p; ++p )
+    {
+        auto particle = host_particles.getParticle( p );
+
+        for ( int d = 0; d < 3; ++d )
+        {
+            auto px = get( particle, Foo(), d );
+            EXPECT_TRUE( px > box[2 * d] );
+            EXPECT_TRUE( px < box[2 * d + 1] );
+        }
+        auto pv = get( particle, Bar() );
+        EXPECT_DOUBLE_EQ( pv, volume );
+    }
+}
+
+//---------------------------------------------------------------------------//
+template <class InitType>
+void initSliceTest( InitType init_type, int ppc )
+{
+    // Global bounding box.
+    double cell_size = 0.23;
+    std::array<int, 3> global_num_cell = { 43, 32, 39 };
+    std::array<double, 3> global_low_corner = { 1.2, 3.3, -2.8 };
+    std::array<double, 3> global_high_corner = {
+        global_low_corner[0] + cell_size * global_num_cell[0],
+        global_low_corner[1] + cell_size * global_num_cell[1],
+        global_low_corner[2] + cell_size * global_num_cell[2] };
+    auto global_mesh = Cajita::createUniformGlobalMesh(
+        global_low_corner, global_high_corner, global_num_cell );
+
+    std::array<bool, 3> is_dim_periodic = { true, true, true };
+    Cajita::DimBlockPartitioner<3> partitioner;
+    auto global_grid = Cajita::createGlobalGrid( MPI_COMM_WORLD, global_mesh,
+                                                 is_dim_periodic, partitioner );
+    auto local_grid = Cajita::createLocalGrid( global_grid, 0 );
+    auto owned_cells = local_grid->indexSpace( Cajita::Own(), Cajita::Cell(),
+                                               Cajita::Local() );
+
+    int num_particle =
+        owned_cells.size() * totalParticlesPerCell( init_type, ppc );
+    Cabana::AoSoA<Cabana::MemberTypes<double[3]>, TEST_MEMSPACE> aosoa(
+        "random", num_particle );
+    auto positions = Cabana::slice<0>( aosoa );
+
+    // Particle initialization functor.
+    const Kokkos::Array<double, 6> box = {
+        global_low_corner[Dim::I], global_high_corner[Dim::I],
+        global_low_corner[Dim::J], global_high_corner[Dim::J],
+        global_low_corner[Dim::K], global_high_corner[Dim::K] };
+
+    // Initialize all particles.
+    Cajita::createParticles( init_type, TEST_EXECSPACE(), positions, ppc,
+                             *local_grid );
+
+    // Check that we created all particles.
+    int global_num_particle = positions.size();
+    MPI_Allreduce( MPI_IN_PLACE, &global_num_particle, 1, MPI_INT, MPI_SUM,
+                   MPI_COMM_WORLD );
+    int expect_num_particle =
+        totalParticlesPerCell( init_type, ppc ) *
+        global_grid->globalNumEntity( Cajita::Cell(), Dim::I ) *
+        global_grid->globalNumEntity( Cajita::Cell(), Dim::J ) *
+        global_grid->globalNumEntity( Cajita::Cell(), Dim::K );
+    EXPECT_EQ( global_num_particle, expect_num_particle );
+
+    // Check that all particles are in the box.
+    auto host_aosoa =
+        Cabana::create_mirror_view_and_copy( Kokkos::HostSpace(), aosoa );
+    auto host_positions = Cabana::slice<0>( host_aosoa );
+    for ( std::size_t p = 0; p < host_positions.size(); ++p )
+    {
+        for ( std::size_t d = 0; d < 3; ++d )
+        {
+            EXPECT_TRUE( host_positions( p, d ) > box[2 * d] );
+            EXPECT_TRUE( host_positions( p, d ) < box[2 * d + 1] );
+        }
+    }
+}
+
+//---------------------------------------------------------------------------//
+// RUN TESTS
+//---------------------------------------------------------------------------//
+TEST( TEST_CATEGORY, random_init_test )
+{
+    initParticleListTest( Cabana::InitRandom(), 17 );
+    initSliceTest( Cabana::InitRandom(), 17 );
+}
+
+TEST( TEST_CATEGORY, uniform_init_test )
+{
+    initParticleListTest( Cabana::InitUniform(), 3 );
+    initSliceTest( Cabana::InitUniform(), 3 );
+}
+
+//---------------------------------------------------------------------------//
+
+} // end namespace Test
diff --git a/cajita/unit_test/tstParticleList.hpp → grid/unit_test/tstParticleList.hpp b/cajita/unit_test/tstParticleList.hpp → grid/unit_test/tstParticleList.hpp
diff --git a/cajita/unit_test/tstPartitioner.hpp → grid/unit_test/tstPartitioner.hpp b/cajita/unit_test/tstPartitioner.hpp → grid/unit_test/tstPartitioner.hpp
diff --git a/cajita/unit_test/tstSiloParticleOutput.hpp → grid/unit_test/tstSiloParticleOutput.hpp b/cajita/unit_test/tstSiloParticleOutput.hpp → grid/unit_test/tstSiloParticleOutput.hpp
diff --git a/cajita/unit_test/tstSparseArray.hpp → grid/unit_test/tstSparseArray.hpp b/cajita/unit_test/tstSparseArray.hpp → grid/unit_test/tstSparseArray.hpp
diff --git a/cajita/unit_test/tstSparseDimPartitioner.hpp → grid/unit_test/tstSparseDimPartitioner.hpp b/cajita/unit_test/tstSparseDimPartitioner.hpp → grid/unit_test/tstSparseDimPartitioner.hpp
diff --git a/cajita/unit_test/tstSparseHalo.hpp → grid/unit_test/tstSparseHalo.hpp b/cajita/unit_test/tstSparseHalo.hpp → grid/unit_test/tstSparseHalo.hpp
diff --git a/cajita/unit_test/tstSparseIndexSpace.hpp → grid/unit_test/tstSparseIndexSpace.hpp b/cajita/unit_test/tstSparseIndexSpace.hpp → grid/unit_test/tstSparseIndexSpace.hpp
diff --git a/cajita/unit_test/tstSparseLocalGrid.hpp → grid/unit_test/tstSparseLocalGrid.hpp b/cajita/unit_test/tstSparseLocalGrid.hpp → grid/unit_test/tstSparseLocalGrid.hpp
diff --git a/cajita/unit_test/tstSplineEvaluation2d.hpp → grid/unit_test/tstSplineEvaluation2d.hpp b/cajita/unit_test/tstSplineEvaluation2d.hpp → grid/unit_test/tstSplineEvaluation2d.hpp
diff --git a/cajita/unit_test/tstSplineEvaluation3d.hpp → grid/unit_test/tstSplineEvaluation3d.hpp b/cajita/unit_test/tstSplineEvaluation3d.hpp → grid/unit_test/tstSplineEvaluation3d.hpp
diff --git a/cajita/unit_test/tstSplines.hpp → grid/unit_test/tstSplines.hpp b/cajita/unit_test/tstSplines.hpp → grid/unit_test/tstSplines.hpp