diff --git a/grid/src/Cabana_Grid_HypreSemiStructuredSolver.hpp b/grid/src/Cabana_Grid_HypreSemiStructuredSolver.hpp index 280571545..c825ed798 100644 --- a/grid/src/Cabana_Grid_HypreSemiStructuredSolver.hpp +++ b/grid/src/Cabana_Grid_HypreSemiStructuredSolver.hpp @@ -107,8 +107,8 @@ class HypreSemiStructuredSolver // this to KJI from IJK to be consistent with HYPRE ordering. By // setting up the grid like this, HYPRE will then want layout-right // data indexed as (i,j,k) or (i,j,k,l) which will allow us to - // directly use Kokkos::deep_copy to move data between Cajita arrays - // and HYPRE data structures. + // directly use Kokkos::deep_copy to move data between arrays and + // HYPRE data structures. auto global_space = layout.indexSpace( Own(), Global() ); _lower.resize( num_space_dim ); _upper.resize( num_space_dim ); diff --git a/grid/src/Cabana_Grid_HypreStructuredSolver.hpp b/grid/src/Cabana_Grid_HypreStructuredSolver.hpp index 4ba700890..2558386cc 100644 --- a/grid/src/Cabana_Grid_HypreStructuredSolver.hpp +++ b/grid/src/Cabana_Grid_HypreStructuredSolver.hpp @@ -94,8 +94,8 @@ class HypreStructuredSolver // this to KJI from IJK to be consistent with HYPRE ordering. By // setting up the grid like this, HYPRE will then want layout-right // data indexed as (i,j,k) or (i,j,k,l) which will allow us to - // directly use Kokkos::deep_copy to move data between Cajita arrays - // and HYPRE data structures. + // directly use Kokkos::deep_copy to move data between arrays and + // HYPRE data structures. auto global_space = layout.indexSpace( Own(), Global() ); _lower.resize( num_space_dim ); _upper.resize( num_space_dim ); diff --git a/grid/src/Cabana_Grid_ParticleGridDistributor.hpp b/grid/src/Cabana_Grid_ParticleGridDistributor.hpp index 3e3de1242..fd7eb8388 100644 --- a/grid/src/Cabana_Grid_ParticleGridDistributor.hpp +++ b/grid/src/Cabana_Grid_ParticleGridDistributor.hpp @@ -163,7 +163,7 @@ void getMigrateDestinations( const LocalGridType& local_grid, /*! \brief Check for the number of particles that must be communicated - \tparam LocalGridType Cajita LocalGrid type. + \tparam LocalGridType LocalGrid type. \tparam PositionSliceType Particle position type. \param local_grid The local grid containing periodicity and system bound @@ -225,10 +225,10 @@ int migrateCount( const LocalGridType& local_grid, //---------------------------------------------------------------------------// /*! \brief Determine which data should be migrated from one uniquely-owned - decomposition to another uniquely-owned decomposition, using bounds of a - Cajita grid and taking periodic boundaries into account. + decomposition to another uniquely-owned decomposition, using bounds of the + grid and taking periodic boundaries into account. - \tparam LocalGridType Cajita LocalGrid type. + \tparam LocalGridType LocalGrid type. \tparam PositionSliceType Position type. \param local_grid The local grid containing periodicity and system bound @@ -269,10 +269,10 @@ createParticleGridDistributor( const LocalGridType& local_grid, //---------------------------------------------------------------------------// /*! \brief Migrate data from one uniquely-owned decomposition to another - uniquely-owned decomposition, using the bounds and periodic boundaries of a - Cajita grid to determine which particles should be moved. In-place variant. + uniquely-owned decomposition, using the bounds and periodic boundaries of the + grid to determine which particles should be moved. In-place variant. - \tparam LocalGridType Cajita LocalGrid type. + \tparam LocalGridType LocalGrid type. \tparam ParticlePositions Particle position type. \tparam PositionContainer AoSoA type. @@ -316,11 +316,11 @@ bool particleGridMigrate( const LocalGridType& local_grid, //---------------------------------------------------------------------------// /*! \brief Migrate data from one uniquely-owned decomposition to another - uniquely-owned decomposition, using the bounds and periodic boundaries of a - Cajita grid to determine which particles should be moved. Separate AoSoA + uniquely-owned decomposition, using the bounds and periodic boundaries of the + grid to determine which particles should be moved. Separate AoSoA variant. - \tparam LocalGridType Cajita LocalGrid type. + \tparam LocalGridType LocalGrid type. \tparam ParticlePositions Particle position type. \tparam ParticleContainer AoSoA type. diff --git a/grid/src/Cabana_Grid_ParticleList.hpp b/grid/src/Cabana_Grid_ParticleList.hpp index db0d40152..eb93ff7b3 100644 --- a/grid/src/Cabana_Grid_ParticleList.hpp +++ b/grid/src/Cabana_Grid_ParticleList.hpp @@ -35,7 +35,7 @@ namespace Grid { //---------------------------------------------------------------------------// -//! List of particle fields stored in AoSoA with associated Cajita mesh. +//! List of particle fields stored in AoSoA with associated mesh. template class ParticleList : public Cabana::ParticleList diff --git a/grid/src/Cabana_Grid_SiloParticleOutput.hpp b/grid/src/Cabana_Grid_SiloParticleOutput.hpp index ff4b6c75e..3a82f01f3 100644 --- a/grid/src/Cabana_Grid_SiloParticleOutput.hpp +++ b/grid/src/Cabana_Grid_SiloParticleOutput.hpp @@ -42,7 +42,7 @@ namespace SiloParticleOutput /*! \brief Write particle output in Silo format using mesh information. \param prefix Filename prefix. - \param global_grid Cajita global grid. + \param global_grid Global grid. \param time_step_index Current simulation step index. \param time Current simulation time. \param begin The first particle index to output. @@ -75,7 +75,7 @@ void writePartialRangeTimeStep( const std::string& prefix, /*! \brief Write output in Silo format for all particles using mesh information. \param prefix Filename prefix. - \param global_grid Cajita global grid. + \param global_grid Global grid. \param time_step_index Current simulation step index. \param time Current simulation time. \param coords Particle coordinates.