Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace Cajita->Grid #109

Merged
merged 1 commit into from
Jan 16, 2024
Merged

Replace Cajita->Grid #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ target_include_directories(CabanaMD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}

#------------------------------------------------------------

target_link_libraries(CabanaMD Cabana::cabanacore Cabana::Cajita)
target_link_libraries(CabanaMD Cabana::Core Cabana::Grid)

if(CabanaMD_ENABLE_NNP AND N2P2_DIR)
target_include_directories(CabanaMD PUBLIC ${N2P2_DIR}/include)
Expand Down
48 changes: 25 additions & 23 deletions src/system.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
#define SYSTEM_H

#include <Cabana_Core.hpp>
#include <Cajita.hpp>
#include <Cabana_Grid.hpp>
#include <Kokkos_Core.hpp>

#include <types.h>
Expand Down Expand Up @@ -90,7 +90,8 @@ class SystemCommon
T_X_FLOAT local_mesh_hi_x, local_mesh_hi_y, local_mesh_hi_z;
T_X_FLOAT ghost_mesh_lo_x, ghost_mesh_lo_y, ghost_mesh_lo_z;
T_X_FLOAT ghost_mesh_hi_x, ghost_mesh_hi_y, ghost_mesh_hi_z;
std::shared_ptr<Cajita::LocalGrid<Cajita::UniformMesh<T_X_FLOAT>>>
std::shared_ptr<
Cabana::Grid::LocalGrid<Cabana::Grid::UniformMesh<T_X_FLOAT>>>
local_grid;

// Only needed for current comm
Expand Down Expand Up @@ -129,11 +130,11 @@ class SystemCommon
std::array<double, 3> high_corner )
{
// Create the MPI partitions.
Cajita::DimBlockPartitioner<3> partitioner;
Cabana::Grid::DimBlockPartitioner<3> partitioner;
ranks_per_dim = partitioner.ranksPerDimension( MPI_COMM_WORLD, {} );

// Create global mesh of MPI partitions.
auto global_mesh = Cajita::createUniformGlobalMesh(
auto global_mesh = Cabana::Grid::createUniformGlobalMesh(
low_corner, high_corner, ranks_per_dim );

global_mesh_x = global_mesh->extent( 0 );
Expand All @@ -142,7 +143,7 @@ class SystemCommon

// Create the global grid.
std::array<bool, 3> is_periodic = { true, true, true };
auto global_grid = Cajita::createGlobalGrid(
auto global_grid = Cabana::Grid::createGlobalGrid(
MPI_COMM_WORLD, global_mesh, is_periodic, partitioner );

for ( int d = 0; d < 3; d++ )
Expand All @@ -152,24 +153,25 @@ class SystemCommon

// Create a local mesh
int halo_width = 1;
local_grid = Cajita::createLocalGrid( global_grid, halo_width );
auto local_mesh = Cajita::createLocalMesh<t_device>( *local_grid );

local_mesh_lo_x = local_mesh.lowCorner( Cajita::Own(), 0 );
local_mesh_lo_y = local_mesh.lowCorner( Cajita::Own(), 1 );
local_mesh_lo_z = local_mesh.lowCorner( Cajita::Own(), 2 );
local_mesh_hi_x = local_mesh.highCorner( Cajita::Own(), 0 );
local_mesh_hi_y = local_mesh.highCorner( Cajita::Own(), 1 );
local_mesh_hi_z = local_mesh.highCorner( Cajita::Own(), 2 );
ghost_mesh_lo_x = local_mesh.lowCorner( Cajita::Ghost(), 0 );
ghost_mesh_lo_y = local_mesh.lowCorner( Cajita::Ghost(), 1 );
ghost_mesh_lo_z = local_mesh.lowCorner( Cajita::Ghost(), 2 );
ghost_mesh_hi_x = local_mesh.highCorner( Cajita::Ghost(), 0 );
ghost_mesh_hi_y = local_mesh.highCorner( Cajita::Ghost(), 1 );
ghost_mesh_hi_z = local_mesh.highCorner( Cajita::Ghost(), 2 );
local_mesh_x = local_mesh.extent( Cajita::Own(), 0 );
local_mesh_y = local_mesh.extent( Cajita::Own(), 1 );
local_mesh_z = local_mesh.extent( Cajita::Own(), 2 );
local_grid = Cabana::Grid::createLocalGrid( global_grid, halo_width );
auto local_mesh =
Cabana::Grid::createLocalMesh<t_device>( *local_grid );

local_mesh_lo_x = local_mesh.lowCorner( Cabana::Grid::Own(), 0 );
local_mesh_lo_y = local_mesh.lowCorner( Cabana::Grid::Own(), 1 );
local_mesh_lo_z = local_mesh.lowCorner( Cabana::Grid::Own(), 2 );
local_mesh_hi_x = local_mesh.highCorner( Cabana::Grid::Own(), 0 );
local_mesh_hi_y = local_mesh.highCorner( Cabana::Grid::Own(), 1 );
local_mesh_hi_z = local_mesh.highCorner( Cabana::Grid::Own(), 2 );
ghost_mesh_lo_x = local_mesh.lowCorner( Cabana::Grid::Ghost(), 0 );
ghost_mesh_lo_y = local_mesh.lowCorner( Cabana::Grid::Ghost(), 1 );
ghost_mesh_lo_z = local_mesh.lowCorner( Cabana::Grid::Ghost(), 2 );
ghost_mesh_hi_x = local_mesh.highCorner( Cabana::Grid::Ghost(), 0 );
ghost_mesh_hi_y = local_mesh.highCorner( Cabana::Grid::Ghost(), 1 );
ghost_mesh_hi_z = local_mesh.highCorner( Cabana::Grid::Ghost(), 2 );
local_mesh_x = local_mesh.extent( Cabana::Grid::Own(), 0 );
local_mesh_y = local_mesh.extent( Cabana::Grid::Own(), 1 );
local_mesh_z = local_mesh.extent( Cabana::Grid::Own(), 2 );
}

void slice_all()
Expand Down