diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f0e9d984..4f5453413 100644 --- 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 index 9327ffd29..1ec98bc7c 100644 --- 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 b/benchmark/grid/CMakeLists.txt similarity index 100% rename from benchmark/cajita/CMakeLists.txt rename to benchmark/grid/CMakeLists.txt diff --git a/benchmark/cajita/Cabana_Grid_FastFourierTransformPerformance.cpp b/benchmark/grid/Cabana_Grid_FastFourierTransformPerformance.cpp similarity index 100% rename from benchmark/cajita/Cabana_Grid_FastFourierTransformPerformance.cpp rename to benchmark/grid/Cabana_Grid_FastFourierTransformPerformance.cpp diff --git a/benchmark/cajita/Cabana_Grid_HaloPerformance.cpp b/benchmark/grid/Cabana_Grid_HaloPerformance.cpp similarity index 100% rename from benchmark/cajita/Cabana_Grid_HaloPerformance.cpp rename to benchmark/grid/Cabana_Grid_HaloPerformance.cpp diff --git a/benchmark/cajita/Cabana_Grid_InterpolationPerformance.cpp b/benchmark/grid/Cabana_Grid_InterpolationPerformance.cpp similarity index 100% rename from benchmark/cajita/Cabana_Grid_InterpolationPerformance.cpp rename to benchmark/grid/Cabana_Grid_InterpolationPerformance.cpp diff --git a/benchmark/cajita/Cabana_Grid_SparseMapPerformance.cpp b/benchmark/grid/Cabana_Grid_SparseMapPerformance.cpp similarity index 100% rename from benchmark/cajita/Cabana_Grid_SparseMapPerformance.cpp rename to benchmark/grid/Cabana_Grid_SparseMapPerformance.cpp diff --git a/benchmark/cajita/Cabana_Grid_SparsePartitionerPerformance.cpp b/benchmark/grid/Cabana_Grid_SparsePartitionerPerformance.cpp similarity index 100% rename from benchmark/cajita/Cabana_Grid_SparsePartitionerPerformance.cpp rename to benchmark/grid/Cabana_Grid_SparsePartitionerPerformance.cpp diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 6641cb5b8..595d2fde1 100644 --- 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/example/cajita_tutorial/01_types/CMakeLists.txt b/example/grid_tutorial/01_types/CMakeLists.txt similarity index 100% rename from example/cajita_tutorial/01_types/CMakeLists.txt rename to example/grid_tutorial/01_types/CMakeLists.txt diff --git a/example/cajita_tutorial/01_types/types_example.cpp b/example/grid_tutorial/01_types/types_example.cpp similarity index 100% rename from example/cajita_tutorial/01_types/types_example.cpp rename to example/grid_tutorial/01_types/types_example.cpp diff --git a/example/cajita_tutorial/02_global_mesh/CMakeLists.txt b/example/grid_tutorial/02_global_mesh/CMakeLists.txt similarity index 100% rename from example/cajita_tutorial/02_global_mesh/CMakeLists.txt rename to example/grid_tutorial/02_global_mesh/CMakeLists.txt diff --git a/example/cajita_tutorial/02_global_mesh/global_mesh_example.cpp b/example/grid_tutorial/02_global_mesh/global_mesh_example.cpp similarity index 100% rename from example/cajita_tutorial/02_global_mesh/global_mesh_example.cpp rename to example/grid_tutorial/02_global_mesh/global_mesh_example.cpp diff --git a/example/cajita_tutorial/03_partitioner/CMakeLists.txt b/example/grid_tutorial/03_partitioner/CMakeLists.txt similarity index 100% rename from example/cajita_tutorial/03_partitioner/CMakeLists.txt rename to example/grid_tutorial/03_partitioner/CMakeLists.txt diff --git a/example/cajita_tutorial/03_partitioner/partitioner_example.cpp b/example/grid_tutorial/03_partitioner/partitioner_example.cpp similarity index 100% rename from example/cajita_tutorial/03_partitioner/partitioner_example.cpp rename to example/grid_tutorial/03_partitioner/partitioner_example.cpp diff --git a/example/cajita_tutorial/04_global_grid/CMakeLists.txt b/example/grid_tutorial/04_global_grid/CMakeLists.txt similarity index 100% rename from example/cajita_tutorial/04_global_grid/CMakeLists.txt rename to example/grid_tutorial/04_global_grid/CMakeLists.txt diff --git a/example/cajita_tutorial/04_global_grid/global_grid_example.cpp b/example/grid_tutorial/04_global_grid/global_grid_example.cpp similarity index 100% rename from example/cajita_tutorial/04_global_grid/global_grid_example.cpp rename to example/grid_tutorial/04_global_grid/global_grid_example.cpp diff --git a/example/cajita_tutorial/05_index_space/CMakeLists.txt b/example/grid_tutorial/05_index_space/CMakeLists.txt similarity index 100% rename from example/cajita_tutorial/05_index_space/CMakeLists.txt rename to example/grid_tutorial/05_index_space/CMakeLists.txt diff --git a/example/cajita_tutorial/05_index_space/index_space_example.cpp b/example/grid_tutorial/05_index_space/index_space_example.cpp similarity index 100% rename from example/cajita_tutorial/05_index_space/index_space_example.cpp rename to example/grid_tutorial/05_index_space/index_space_example.cpp diff --git a/example/cajita_tutorial/06_local_grid/CMakeLists.txt b/example/grid_tutorial/06_local_grid/CMakeLists.txt similarity index 100% rename from example/cajita_tutorial/06_local_grid/CMakeLists.txt rename to example/grid_tutorial/06_local_grid/CMakeLists.txt diff --git a/example/cajita_tutorial/06_local_grid/local_grid_example.cpp b/example/grid_tutorial/06_local_grid/local_grid_example.cpp similarity index 100% rename from example/cajita_tutorial/06_local_grid/local_grid_example.cpp rename to example/grid_tutorial/06_local_grid/local_grid_example.cpp diff --git a/example/cajita_tutorial/07_local_mesh/CMakeLists.txt b/example/grid_tutorial/07_local_mesh/CMakeLists.txt similarity index 100% rename from example/cajita_tutorial/07_local_mesh/CMakeLists.txt rename to example/grid_tutorial/07_local_mesh/CMakeLists.txt diff --git a/example/cajita_tutorial/07_local_mesh/local_mesh_example.cpp b/example/grid_tutorial/07_local_mesh/local_mesh_example.cpp similarity index 100% rename from example/cajita_tutorial/07_local_mesh/local_mesh_example.cpp rename to example/grid_tutorial/07_local_mesh/local_mesh_example.cpp diff --git a/example/cajita_tutorial/08_array/CMakeLists.txt b/example/grid_tutorial/08_array/CMakeLists.txt similarity index 100% rename from example/cajita_tutorial/08_array/CMakeLists.txt rename to example/grid_tutorial/08_array/CMakeLists.txt diff --git a/example/cajita_tutorial/08_array/array_example.cpp b/example/grid_tutorial/08_array/array_example.cpp similarity index 100% rename from example/cajita_tutorial/08_array/array_example.cpp rename to example/grid_tutorial/08_array/array_example.cpp diff --git a/example/cajita_tutorial/09_grid_parallel/CMakeLists.txt b/example/grid_tutorial/09_grid_parallel/CMakeLists.txt similarity index 100% rename from example/cajita_tutorial/09_grid_parallel/CMakeLists.txt rename to example/grid_tutorial/09_grid_parallel/CMakeLists.txt diff --git a/example/cajita_tutorial/09_grid_parallel/grid_parallel_example.cpp b/example/grid_tutorial/09_grid_parallel/grid_parallel_example.cpp similarity index 100% rename from example/cajita_tutorial/09_grid_parallel/grid_parallel_example.cpp rename to example/grid_tutorial/09_grid_parallel/grid_parallel_example.cpp diff --git a/example/cajita_tutorial/10_fft_heffte/CMakeLists.txt b/example/grid_tutorial/10_fft_heffte/CMakeLists.txt similarity index 100% rename from example/cajita_tutorial/10_fft_heffte/CMakeLists.txt rename to example/grid_tutorial/10_fft_heffte/CMakeLists.txt diff --git a/example/cajita_tutorial/10_fft_heffte/heffte_fast_fourier_transform_example.cpp b/example/grid_tutorial/10_fft_heffte/heffte_fast_fourier_transform_example.cpp similarity index 100% rename from example/cajita_tutorial/10_fft_heffte/heffte_fast_fourier_transform_example.cpp rename to example/grid_tutorial/10_fft_heffte/heffte_fast_fourier_transform_example.cpp diff --git a/example/cajita_tutorial/11_semi_structured_solver_multi_variate/CMakeLists.txt b/example/grid_tutorial/11_semi_structured_solver_multi_variate/CMakeLists.txt similarity index 100% rename from example/cajita_tutorial/11_semi_structured_solver_multi_variate/CMakeLists.txt rename to example/grid_tutorial/11_semi_structured_solver_multi_variate/CMakeLists.txt diff --git a/example/cajita_tutorial/11_semi_structured_solver_multi_variate/hypre_semi_structured_solver_multi_example.cpp b/example/grid_tutorial/11_semi_structured_solver_multi_variate/hypre_semi_structured_solver_multi_example.cpp similarity index 100% rename from example/cajita_tutorial/11_semi_structured_solver_multi_variate/hypre_semi_structured_solver_multi_example.cpp rename to example/grid_tutorial/11_semi_structured_solver_multi_variate/hypre_semi_structured_solver_multi_example.cpp diff --git a/example/cajita_tutorial/11_structured_solver/CMakeLists.txt b/example/grid_tutorial/11_structured_solver/CMakeLists.txt similarity index 100% rename from example/cajita_tutorial/11_structured_solver/CMakeLists.txt rename to example/grid_tutorial/11_structured_solver/CMakeLists.txt diff --git a/example/cajita_tutorial/11_structured_solver/structured_solver_example.cpp b/example/grid_tutorial/11_structured_solver/structured_solver_example.cpp similarity index 100% rename from example/cajita_tutorial/11_structured_solver/structured_solver_example.cpp rename to example/grid_tutorial/11_structured_solver/structured_solver_example.cpp diff --git a/example/cajita_tutorial/11_structured_solver_hypre/CMakeLists.txt b/example/grid_tutorial/11_structured_solver_hypre/CMakeLists.txt similarity index 100% rename from example/cajita_tutorial/11_structured_solver_hypre/CMakeLists.txt rename to example/grid_tutorial/11_structured_solver_hypre/CMakeLists.txt diff --git a/example/cajita_tutorial/11_structured_solver_hypre/hypre_structured_solver_example.cpp b/example/grid_tutorial/11_structured_solver_hypre/hypre_structured_solver_example.cpp similarity index 100% rename from example/cajita_tutorial/11_structured_solver_hypre/hypre_structured_solver_example.cpp rename to example/grid_tutorial/11_structured_solver_hypre/hypre_structured_solver_example.cpp diff --git a/example/cajita_tutorial/12_halo/CMakeLists.txt b/example/grid_tutorial/12_halo/CMakeLists.txt similarity index 100% rename from example/cajita_tutorial/12_halo/CMakeLists.txt rename to example/grid_tutorial/12_halo/CMakeLists.txt diff --git a/example/cajita_tutorial/12_halo/halo_example.cpp b/example/grid_tutorial/12_halo/halo_example.cpp similarity index 100% rename from example/cajita_tutorial/12_halo/halo_example.cpp rename to example/grid_tutorial/12_halo/halo_example.cpp diff --git a/example/cajita_tutorial/13_all_loadbalancer/CMakeLists.txt b/example/grid_tutorial/13_all_loadbalancer/CMakeLists.txt similarity index 100% rename from example/cajita_tutorial/13_all_loadbalancer/CMakeLists.txt rename to example/grid_tutorial/13_all_loadbalancer/CMakeLists.txt diff --git a/example/cajita_tutorial/13_all_loadbalancer/loadbalancer_example.cpp b/example/grid_tutorial/13_all_loadbalancer/loadbalancer_example.cpp similarity index 100% rename from example/cajita_tutorial/13_all_loadbalancer/loadbalancer_example.cpp rename to example/grid_tutorial/13_all_loadbalancer/loadbalancer_example.cpp diff --git a/example/cajita_tutorial/14_spline/CMakeLists.txt b/example/grid_tutorial/14_spline/CMakeLists.txt similarity index 100% rename from example/cajita_tutorial/14_spline/CMakeLists.txt rename to example/grid_tutorial/14_spline/CMakeLists.txt diff --git a/example/cajita_tutorial/14_spline/spline_example.cpp b/example/grid_tutorial/14_spline/spline_example.cpp similarity index 100% rename from example/cajita_tutorial/14_spline/spline_example.cpp rename to example/grid_tutorial/14_spline/spline_example.cpp diff --git a/example/cajita_tutorial/15_interpolation/CMakeLists.txt b/example/grid_tutorial/15_interpolation/CMakeLists.txt similarity index 100% rename from example/cajita_tutorial/15_interpolation/CMakeLists.txt rename to example/grid_tutorial/15_interpolation/CMakeLists.txt diff --git a/example/cajita_tutorial/15_interpolation/interpolation_example.cpp b/example/grid_tutorial/15_interpolation/interpolation_example.cpp similarity index 100% rename from example/cajita_tutorial/15_interpolation/interpolation_example.cpp rename to example/grid_tutorial/15_interpolation/interpolation_example.cpp diff --git a/example/cajita_tutorial/CMakeLists.txt b/example/grid_tutorial/CMakeLists.txt similarity index 100% rename from example/cajita_tutorial/CMakeLists.txt rename to example/grid_tutorial/CMakeLists.txt diff --git a/cajita/CMakeLists.txt b/grid/CMakeLists.txt similarity index 100% rename from cajita/CMakeLists.txt rename to grid/CMakeLists.txt diff --git a/cajita/src/CMakeLists.txt b/grid/src/CMakeLists.txt similarity index 100% rename from cajita/src/CMakeLists.txt rename to grid/src/CMakeLists.txt diff --git a/cajita/src/Cabana_Grid.hpp b/grid/src/Cabana_Grid.hpp similarity index 100% rename from cajita/src/Cabana_Grid.hpp rename to grid/src/Cabana_Grid.hpp diff --git a/cajita/src/Cabana_Grid_Array.hpp b/grid/src/Cabana_Grid_Array.hpp similarity index 100% rename from cajita/src/Cabana_Grid_Array.hpp rename to grid/src/Cabana_Grid_Array.hpp diff --git a/cajita/src/Cabana_Grid_BovWriter.hpp b/grid/src/Cabana_Grid_BovWriter.hpp similarity index 100% rename from cajita/src/Cabana_Grid_BovWriter.hpp rename to grid/src/Cabana_Grid_BovWriter.hpp diff --git a/cajita/src/Cabana_Grid_Config.hpp.in b/grid/src/Cabana_Grid_Config.hpp.in similarity index 100% rename from cajita/src/Cabana_Grid_Config.hpp.in rename to grid/src/Cabana_Grid_Config.hpp.in diff --git a/cajita/src/Cabana_Grid_FastFourierTransform.hpp b/grid/src/Cabana_Grid_FastFourierTransform.hpp similarity index 100% rename from cajita/src/Cabana_Grid_FastFourierTransform.hpp rename to grid/src/Cabana_Grid_FastFourierTransform.hpp diff --git a/cajita/src/Cabana_Grid_GlobalGrid.hpp b/grid/src/Cabana_Grid_GlobalGrid.hpp similarity index 100% rename from cajita/src/Cabana_Grid_GlobalGrid.hpp rename to grid/src/Cabana_Grid_GlobalGrid.hpp diff --git a/cajita/src/Cabana_Grid_GlobalGrid_impl.hpp b/grid/src/Cabana_Grid_GlobalGrid_impl.hpp similarity index 100% rename from cajita/src/Cabana_Grid_GlobalGrid_impl.hpp rename to grid/src/Cabana_Grid_GlobalGrid_impl.hpp diff --git a/cajita/src/Cabana_Grid_GlobalMesh.hpp b/grid/src/Cabana_Grid_GlobalMesh.hpp similarity index 100% rename from cajita/src/Cabana_Grid_GlobalMesh.hpp rename to grid/src/Cabana_Grid_GlobalMesh.hpp diff --git a/cajita/src/Cabana_Grid_Halo.hpp b/grid/src/Cabana_Grid_Halo.hpp similarity index 100% rename from cajita/src/Cabana_Grid_Halo.hpp rename to grid/src/Cabana_Grid_Halo.hpp diff --git a/cajita/src/Cabana_Grid_Hypre.hpp b/grid/src/Cabana_Grid_Hypre.hpp similarity index 100% rename from cajita/src/Cabana_Grid_Hypre.hpp rename to grid/src/Cabana_Grid_Hypre.hpp diff --git a/cajita/src/Cabana_Grid_HypreSemiStructuredSolver.hpp b/grid/src/Cabana_Grid_HypreSemiStructuredSolver.hpp similarity index 100% rename from cajita/src/Cabana_Grid_HypreSemiStructuredSolver.hpp rename to grid/src/Cabana_Grid_HypreSemiStructuredSolver.hpp diff --git a/cajita/src/Cabana_Grid_HypreStructuredSolver.hpp b/grid/src/Cabana_Grid_HypreStructuredSolver.hpp similarity index 100% rename from cajita/src/Cabana_Grid_HypreStructuredSolver.hpp rename to grid/src/Cabana_Grid_HypreStructuredSolver.hpp diff --git a/cajita/src/Cabana_Grid_IndexConversion.hpp b/grid/src/Cabana_Grid_IndexConversion.hpp similarity index 100% rename from cajita/src/Cabana_Grid_IndexConversion.hpp rename to grid/src/Cabana_Grid_IndexConversion.hpp diff --git a/cajita/src/Cabana_Grid_IndexSpace.hpp b/grid/src/Cabana_Grid_IndexSpace.hpp similarity index 100% rename from cajita/src/Cabana_Grid_IndexSpace.hpp rename to grid/src/Cabana_Grid_IndexSpace.hpp diff --git a/cajita/src/Cabana_Grid_Interpolation.hpp b/grid/src/Cabana_Grid_Interpolation.hpp similarity index 100% rename from cajita/src/Cabana_Grid_Interpolation.hpp rename to grid/src/Cabana_Grid_Interpolation.hpp diff --git a/cajita/src/Cabana_Grid_LoadBalancer.hpp b/grid/src/Cabana_Grid_LoadBalancer.hpp similarity index 100% rename from cajita/src/Cabana_Grid_LoadBalancer.hpp rename to grid/src/Cabana_Grid_LoadBalancer.hpp diff --git a/cajita/src/Cabana_Grid_LocalGrid.hpp b/grid/src/Cabana_Grid_LocalGrid.hpp similarity index 100% rename from cajita/src/Cabana_Grid_LocalGrid.hpp rename to grid/src/Cabana_Grid_LocalGrid.hpp diff --git a/cajita/src/Cabana_Grid_LocalGrid_impl.hpp b/grid/src/Cabana_Grid_LocalGrid_impl.hpp similarity index 100% rename from cajita/src/Cabana_Grid_LocalGrid_impl.hpp rename to grid/src/Cabana_Grid_LocalGrid_impl.hpp diff --git a/cajita/src/Cabana_Grid_LocalMesh.hpp b/grid/src/Cabana_Grid_LocalMesh.hpp similarity index 100% rename from cajita/src/Cabana_Grid_LocalMesh.hpp rename to grid/src/Cabana_Grid_LocalMesh.hpp diff --git a/cajita/src/Cabana_Grid_ManualPartitioner.hpp b/grid/src/Cabana_Grid_ManualPartitioner.hpp similarity index 100% rename from cajita/src/Cabana_Grid_ManualPartitioner.hpp rename to grid/src/Cabana_Grid_ManualPartitioner.hpp diff --git a/cajita/src/Cabana_Grid_MpiTraits.hpp b/grid/src/Cabana_Grid_MpiTraits.hpp similarity index 100% rename from cajita/src/Cabana_Grid_MpiTraits.hpp rename to grid/src/Cabana_Grid_MpiTraits.hpp diff --git a/cajita/src/Cabana_Grid_Parallel.hpp b/grid/src/Cabana_Grid_Parallel.hpp similarity index 100% rename from cajita/src/Cabana_Grid_Parallel.hpp rename to grid/src/Cabana_Grid_Parallel.hpp diff --git a/cajita/src/Cabana_Grid_ParticleGridDistributor.hpp b/grid/src/Cabana_Grid_ParticleGridDistributor.hpp similarity index 100% rename from cajita/src/Cabana_Grid_ParticleGridDistributor.hpp rename to grid/src/Cabana_Grid_ParticleGridDistributor.hpp diff --git a/cajita/src/Cabana_Grid_ParticleList.hpp b/grid/src/Cabana_Grid_ParticleList.hpp similarity index 100% rename from cajita/src/Cabana_Grid_ParticleList.hpp rename to grid/src/Cabana_Grid_ParticleList.hpp diff --git a/cajita/src/Cabana_Grid_Partitioner.hpp b/grid/src/Cabana_Grid_Partitioner.hpp similarity index 100% rename from cajita/src/Cabana_Grid_Partitioner.hpp rename to grid/src/Cabana_Grid_Partitioner.hpp diff --git a/cajita/src/Cabana_Grid_ReferenceStructuredSolver.hpp b/grid/src/Cabana_Grid_ReferenceStructuredSolver.hpp similarity index 100% rename from cajita/src/Cabana_Grid_ReferenceStructuredSolver.hpp rename to grid/src/Cabana_Grid_ReferenceStructuredSolver.hpp diff --git a/cajita/src/Cabana_Grid_SiloParticleOutput.hpp b/grid/src/Cabana_Grid_SiloParticleOutput.hpp similarity index 100% rename from cajita/src/Cabana_Grid_SiloParticleOutput.hpp rename to grid/src/Cabana_Grid_SiloParticleOutput.hpp diff --git a/cajita/src/Cabana_Grid_SparseArray.hpp b/grid/src/Cabana_Grid_SparseArray.hpp similarity index 100% rename from cajita/src/Cabana_Grid_SparseArray.hpp rename to grid/src/Cabana_Grid_SparseArray.hpp diff --git a/cajita/src/Cabana_Grid_SparseDimPartitioner.hpp b/grid/src/Cabana_Grid_SparseDimPartitioner.hpp similarity index 100% rename from cajita/src/Cabana_Grid_SparseDimPartitioner.hpp rename to grid/src/Cabana_Grid_SparseDimPartitioner.hpp diff --git a/cajita/src/Cabana_Grid_SparseHalo.hpp b/grid/src/Cabana_Grid_SparseHalo.hpp similarity index 100% rename from cajita/src/Cabana_Grid_SparseHalo.hpp rename to grid/src/Cabana_Grid_SparseHalo.hpp diff --git a/cajita/src/Cabana_Grid_SparseIndexSpace.hpp b/grid/src/Cabana_Grid_SparseIndexSpace.hpp similarity index 100% rename from cajita/src/Cabana_Grid_SparseIndexSpace.hpp rename to grid/src/Cabana_Grid_SparseIndexSpace.hpp diff --git a/cajita/src/Cabana_Grid_SparseLocalGrid.hpp b/grid/src/Cabana_Grid_SparseLocalGrid.hpp similarity index 100% rename from cajita/src/Cabana_Grid_SparseLocalGrid.hpp rename to grid/src/Cabana_Grid_SparseLocalGrid.hpp diff --git a/cajita/src/Cabana_Grid_SparseLocalGrid_impl.hpp b/grid/src/Cabana_Grid_SparseLocalGrid_impl.hpp similarity index 100% rename from cajita/src/Cabana_Grid_SparseLocalGrid_impl.hpp rename to grid/src/Cabana_Grid_SparseLocalGrid_impl.hpp diff --git a/cajita/src/Cabana_Grid_Splines.hpp b/grid/src/Cabana_Grid_Splines.hpp similarity index 100% rename from cajita/src/Cabana_Grid_Splines.hpp rename to grid/src/Cabana_Grid_Splines.hpp diff --git a/cajita/src/Cabana_Grid_Types.hpp b/grid/src/Cabana_Grid_Types.hpp similarity index 100% rename from cajita/src/Cabana_Grid_Types.hpp rename to grid/src/Cabana_Grid_Types.hpp diff --git a/cajita/src/Cabana_Grid_UniformDimPartitioner.hpp b/grid/src/Cabana_Grid_UniformDimPartitioner.hpp similarity index 100% rename from cajita/src/Cabana_Grid_UniformDimPartitioner.hpp rename to grid/src/Cabana_Grid_UniformDimPartitioner.hpp diff --git a/cajita/src/Cajita.hpp b/grid/src/Cajita.hpp similarity index 100% rename from cajita/src/Cajita.hpp rename to grid/src/Cajita.hpp diff --git a/cajita/unit_test/CMakeLists.txt b/grid/unit_test/CMakeLists.txt similarity index 100% rename from cajita/unit_test/CMakeLists.txt rename to grid/unit_test/CMakeLists.txt diff --git a/cajita/unit_test/tstArray2d.hpp b/grid/unit_test/tstArray2d.hpp similarity index 100% rename from cajita/unit_test/tstArray2d.hpp rename to grid/unit_test/tstArray2d.hpp diff --git a/cajita/unit_test/tstArray3d.hpp b/grid/unit_test/tstArray3d.hpp similarity index 100% rename from cajita/unit_test/tstArray3d.hpp rename to grid/unit_test/tstArray3d.hpp diff --git a/cajita/unit_test/tstBovWriter.hpp b/grid/unit_test/tstBovWriter.hpp similarity index 100% rename from cajita/unit_test/tstBovWriter.hpp rename to grid/unit_test/tstBovWriter.hpp diff --git a/cajita/unit_test/tstFastFourierTransform.hpp b/grid/unit_test/tstFastFourierTransform.hpp similarity index 100% rename from cajita/unit_test/tstFastFourierTransform.hpp rename to grid/unit_test/tstFastFourierTransform.hpp diff --git a/cajita/unit_test/tstGlobalGrid.hpp b/grid/unit_test/tstGlobalGrid.hpp similarity index 100% rename from cajita/unit_test/tstGlobalGrid.hpp rename to grid/unit_test/tstGlobalGrid.hpp diff --git a/cajita/unit_test/tstGlobalMesh.hpp b/grid/unit_test/tstGlobalMesh.hpp similarity index 100% rename from cajita/unit_test/tstGlobalMesh.hpp rename to grid/unit_test/tstGlobalMesh.hpp diff --git a/cajita/unit_test/tstHalo2d.hpp b/grid/unit_test/tstHalo2d.hpp similarity index 100% rename from cajita/unit_test/tstHalo2d.hpp rename to grid/unit_test/tstHalo2d.hpp diff --git a/cajita/unit_test/tstHalo3d.hpp b/grid/unit_test/tstHalo3d.hpp similarity index 100% rename from cajita/unit_test/tstHalo3d.hpp rename to grid/unit_test/tstHalo3d.hpp diff --git a/cajita/unit_test/tstHypreSemiStructuredSolver.hpp b/grid/unit_test/tstHypreSemiStructuredSolver.hpp similarity index 100% rename from cajita/unit_test/tstHypreSemiStructuredSolver.hpp rename to grid/unit_test/tstHypreSemiStructuredSolver.hpp diff --git a/cajita/unit_test/tstHypreSemiStructuredSolverMulti.hpp b/grid/unit_test/tstHypreSemiStructuredSolverMulti.hpp similarity index 100% rename from cajita/unit_test/tstHypreSemiStructuredSolverMulti.hpp rename to grid/unit_test/tstHypreSemiStructuredSolverMulti.hpp diff --git a/cajita/unit_test/tstHypreStructuredSolver2d.hpp b/grid/unit_test/tstHypreStructuredSolver2d.hpp similarity index 100% rename from cajita/unit_test/tstHypreStructuredSolver2d.hpp rename to grid/unit_test/tstHypreStructuredSolver2d.hpp diff --git a/cajita/unit_test/tstHypreStructuredSolver3d.hpp b/grid/unit_test/tstHypreStructuredSolver3d.hpp similarity index 100% rename from cajita/unit_test/tstHypreStructuredSolver3d.hpp rename to grid/unit_test/tstHypreStructuredSolver3d.hpp diff --git a/cajita/unit_test/tstIndexConversion.hpp b/grid/unit_test/tstIndexConversion.hpp similarity index 100% rename from cajita/unit_test/tstIndexConversion.hpp rename to grid/unit_test/tstIndexConversion.hpp diff --git a/cajita/unit_test/tstIndexSpace.hpp b/grid/unit_test/tstIndexSpace.hpp similarity index 100% rename from cajita/unit_test/tstIndexSpace.hpp rename to grid/unit_test/tstIndexSpace.hpp diff --git a/cajita/unit_test/tstInterpolation2d.hpp b/grid/unit_test/tstInterpolation2d.hpp similarity index 100% rename from cajita/unit_test/tstInterpolation2d.hpp rename to grid/unit_test/tstInterpolation2d.hpp diff --git a/cajita/unit_test/tstInterpolation3d.hpp b/grid/unit_test/tstInterpolation3d.hpp similarity index 100% rename from cajita/unit_test/tstInterpolation3d.hpp rename to grid/unit_test/tstInterpolation3d.hpp diff --git a/cajita/unit_test/tstLoadBalancer.hpp b/grid/unit_test/tstLoadBalancer.hpp similarity index 100% rename from cajita/unit_test/tstLoadBalancer.hpp rename to grid/unit_test/tstLoadBalancer.hpp diff --git a/cajita/unit_test/tstLocalGrid.hpp b/grid/unit_test/tstLocalGrid.hpp similarity index 100% rename from cajita/unit_test/tstLocalGrid.hpp rename to grid/unit_test/tstLocalGrid.hpp diff --git a/cajita/unit_test/tstLocalMesh2d.hpp b/grid/unit_test/tstLocalMesh2d.hpp similarity index 100% rename from cajita/unit_test/tstLocalMesh2d.hpp rename to grid/unit_test/tstLocalMesh2d.hpp diff --git a/cajita/unit_test/tstLocalMesh3d.hpp b/grid/unit_test/tstLocalMesh3d.hpp similarity index 100% rename from cajita/unit_test/tstLocalMesh3d.hpp rename to grid/unit_test/tstLocalMesh3d.hpp diff --git a/cajita/unit_test/tstParallel.hpp b/grid/unit_test/tstParallel.hpp similarity index 100% rename from cajita/unit_test/tstParallel.hpp rename to grid/unit_test/tstParallel.hpp diff --git a/cajita/unit_test/tstParticleGridDistributor2d.hpp b/grid/unit_test/tstParticleGridDistributor2d.hpp similarity index 100% rename from cajita/unit_test/tstParticleGridDistributor2d.hpp rename to grid/unit_test/tstParticleGridDistributor2d.hpp diff --git a/cajita/unit_test/tstParticleGridDistributor3d.hpp b/grid/unit_test/tstParticleGridDistributor3d.hpp similarity index 100% rename from cajita/unit_test/tstParticleGridDistributor3d.hpp rename to grid/unit_test/tstParticleGridDistributor3d.hpp diff --git a/cajita/unit_test/tstParticleList.hpp b/grid/unit_test/tstParticleList.hpp similarity index 100% rename from cajita/unit_test/tstParticleList.hpp rename to grid/unit_test/tstParticleList.hpp diff --git a/cajita/unit_test/tstPartitioner.hpp b/grid/unit_test/tstPartitioner.hpp similarity index 100% rename from cajita/unit_test/tstPartitioner.hpp rename to grid/unit_test/tstPartitioner.hpp diff --git a/cajita/unit_test/tstSiloParticleOutput.hpp b/grid/unit_test/tstSiloParticleOutput.hpp similarity index 100% rename from cajita/unit_test/tstSiloParticleOutput.hpp rename to grid/unit_test/tstSiloParticleOutput.hpp diff --git a/cajita/unit_test/tstSparseArray.hpp b/grid/unit_test/tstSparseArray.hpp similarity index 100% rename from cajita/unit_test/tstSparseArray.hpp rename to grid/unit_test/tstSparseArray.hpp diff --git a/cajita/unit_test/tstSparseDimPartitioner.hpp b/grid/unit_test/tstSparseDimPartitioner.hpp similarity index 100% rename from cajita/unit_test/tstSparseDimPartitioner.hpp rename to grid/unit_test/tstSparseDimPartitioner.hpp diff --git a/cajita/unit_test/tstSparseHalo.hpp b/grid/unit_test/tstSparseHalo.hpp similarity index 100% rename from cajita/unit_test/tstSparseHalo.hpp rename to grid/unit_test/tstSparseHalo.hpp diff --git a/cajita/unit_test/tstSparseIndexSpace.hpp b/grid/unit_test/tstSparseIndexSpace.hpp similarity index 100% rename from cajita/unit_test/tstSparseIndexSpace.hpp rename to grid/unit_test/tstSparseIndexSpace.hpp diff --git a/cajita/unit_test/tstSparseLocalGrid.hpp b/grid/unit_test/tstSparseLocalGrid.hpp similarity index 100% rename from cajita/unit_test/tstSparseLocalGrid.hpp rename to grid/unit_test/tstSparseLocalGrid.hpp diff --git a/cajita/unit_test/tstSplineEvaluation2d.hpp b/grid/unit_test/tstSplineEvaluation2d.hpp similarity index 100% rename from cajita/unit_test/tstSplineEvaluation2d.hpp rename to grid/unit_test/tstSplineEvaluation2d.hpp diff --git a/cajita/unit_test/tstSplineEvaluation3d.hpp b/grid/unit_test/tstSplineEvaluation3d.hpp similarity index 100% rename from cajita/unit_test/tstSplineEvaluation3d.hpp rename to grid/unit_test/tstSplineEvaluation3d.hpp diff --git a/cajita/unit_test/tstSplines.hpp b/grid/unit_test/tstSplines.hpp similarity index 100% rename from cajita/unit_test/tstSplines.hpp rename to grid/unit_test/tstSplines.hpp