Merge pull request #59 from dineshadepu/master

particleGridMigrate -> particleMigrate (Update to latest Cabana)
ECP-copa · Nov 4, 2024 · 1542526 · 1542526
2 parents c53e4c9 + ccae8e4
commit 1542526
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -45,19 +45,20 @@ jobs:
         uses: actions/[email protected]
         with:
           repository: kokkos/kokkos
-          ref: 3.7.02
+          ref: 4.1.00
           path: kokkos
       - name: Build kokkos
         working-directory: kokkos
         run: |
-          cmake -B build -DCMAKE_INSTALL_PREFIX=$HOME/kokkos -DKokkos_CXX_STANDARD=14 -DKokkos_ENABLE_${{ matrix.backend }}=ON
+          cmake -B build -DCMAKE_INSTALL_PREFIX=$HOME/kokkos -DKokkos_ENABLE_${{ matrix.backend }}=ON
           cmake --build build --parallel 2
           cmake --install build
       - name: Checkout Cabana
         uses: actions/[email protected]
         with:
           repository: ECP-copa/Cabana
-          ref: 0.6.1
+          # Post 0.7.0
+          ref: facdb9097b68b733626911d1935a946f467cf143
           path: Cabana
       - name: Build Cabana
         working-directory: Cabana

diff --git a/src/ExaMPM_ProblemManager.hpp b/src/ExaMPM_ProblemManager.hpp
@@ -272,8 +272,8 @@ class ProblemManager
     void communicateParticles( const int minimum_halo_width )
     {
         auto positions = get( Location::Particle(), Field::Position() );
-        Cabana::Grid::particleGridMigrate( *( _mesh->localGrid() ), positions,
-                                           _particles, minimum_halo_width );
+        Cabana::Grid::particleMigrate( *( _mesh->localGrid() ), positions,
+                                       _particles, minimum_halo_width );
     }
 
   private: