From 76cbb78b1a9256d732906f227d2ff34bc69160ba Mon Sep 17 00:00:00 2001
From: Luca Bertagna <lbertag@sandia.gov>
Date: Tue, 11 Jun 2024 17:32:56 -0600
Subject: [PATCH 1/2] EAMxx: fix usage of code deprecated in Kokkos 4

---
 .../eamxx/src/dynamics/homme/physics_dynamics_remapper.cpp    | 4 ++--
 .../eamxx/src/dynamics/homme/physics_dynamics_remapper.hpp    | 4 ++--
 components/eamxx/src/share/field/field_impl.hpp               | 2 +-
 components/eamxx/src/share/tests/column_ops.cpp               | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/eamxx/src/dynamics/homme/physics_dynamics_remapper.cpp b/components/eamxx/src/dynamics/homme/physics_dynamics_remapper.cpp
index 531a513fc70..65158fdc390 100644
--- a/components/eamxx/src/dynamics/homme/physics_dynamics_remapper.cpp
+++ b/components/eamxx/src/dynamics/homme/physics_dynamics_remapper.cpp
@@ -413,7 +413,7 @@ do_remap_fwd()
 
   using TeamPolicy = typename KT::TeamTagPolicy<RemapFwdTag>;
 
-  const auto concurrency = KT::ExeSpace::concurrency();
+  const auto concurrency = KT::ExeSpace().concurrency();
 #ifdef KOKKOS_ENABLE_CUDA
 #ifdef KOKKOS_ENABLE_DEBUG
   const int team_size = std::min(256, std::min(128*m_num_phys_cols,32*(concurrency/this->m_num_fields+31)/32));
@@ -450,7 +450,7 @@ do_remap_bwd()
 
   using TeamPolicy = typename KT::TeamTagPolicy<RemapBwdTag>;
 
-  const auto concurrency = KT::ExeSpace::concurrency();
+  const auto concurrency = KT::ExeSpace().concurrency();
 #ifdef KOKKOS_ENABLE_CUDA
   const int num_levs  = m_phys_grid->get_num_vertical_levels();
   const int team_size = std::min(128,32*(int)ceil(((Real)num_levs)/32));
diff --git a/components/eamxx/src/dynamics/homme/physics_dynamics_remapper.hpp b/components/eamxx/src/dynamics/homme/physics_dynamics_remapper.hpp
index 0a346ad2c1b..ff61b26e327 100644
--- a/components/eamxx/src/dynamics/homme/physics_dynamics_remapper.hpp
+++ b/components/eamxx/src/dynamics/homme/physics_dynamics_remapper.hpp
@@ -135,8 +135,8 @@ class PhysicsDynamicsRemapper : public AbstractRemapper
   //       so we'll just force to call this as pack_view<const T>(v).
   template<typename NewValueT, typename OldViewT>
   KOKKOS_INLINE_FUNCTION
-  view_Nd<NewValueT,OldViewT::Rank> pack_view (const OldViewT& v) const {
-    constexpr int N = OldViewT::Rank;
+  view_Nd<NewValueT,OldViewT::rank> pack_view (const OldViewT& v) const {
+    constexpr int N = OldViewT::rank;
     Kokkos::LayoutRight kl;
     for (int i=0; i<N; ++i) {
       kl.dimension[i] = v.extent(i);
diff --git a/components/eamxx/src/share/field/field_impl.hpp b/components/eamxx/src/share/field/field_impl.hpp
index 42a0a6cd61e..67753605864 100644
--- a/components/eamxx/src/share/field/field_impl.hpp
+++ b/components/eamxx/src/share/field/field_impl.hpp
@@ -16,7 +16,7 @@ Field (const identifier_type& id,
        const ViewT& view_d)
  : Field(id)
 {
-  constexpr auto N = ViewT::Rank;
+  constexpr int N = ViewT::rank;
   using ScalarT  = typename ViewT::traits::value_type;
   using ExeSpace = typename ViewT::traits::execution_space;
 
diff --git a/components/eamxx/src/share/tests/column_ops.cpp b/components/eamxx/src/share/tests/column_ops.cpp
index 06204cde8f7..70bc5087aa9 100644
--- a/components/eamxx/src/share/tests/column_ops.cpp
+++ b/components/eamxx/src/share/tests/column_ops.cpp
@@ -79,7 +79,7 @@ TEST_CASE("column_ops_ps_1") {
   constexpr int num_cols = 1;
   constexpr int num_levs = 16;
 
-  policy_type policy(num_cols,std::min(num_levs,exec_space::concurrency()));
+  policy_type policy(num_cols,std::min(num_levs,exec_space().concurrency()));
 
   view_2d_type v_int("",num_cols,num_levs+1);
   view_2d_type v_mid("",num_cols,num_levs);
@@ -560,7 +560,7 @@ TEST_CASE("column_ops_ps_N") {
       auto dv_mid_h = Kokkos::create_mirror_view(dv_mid);
       auto dz_mid_h = Kokkos::create_mirror_view(dz_mid);
 
-      policy_type policy(num_cols,std::min(num_mid_packs,exec_space::concurrency()));
+      policy_type policy(num_cols,std::min(num_mid_packs,exec_space().concurrency()));
 
       SECTION ("int_to_mid") {
 

From 83d015a53456e57ffe6307799ad9a1f9cc4b4c79 Mon Sep 17 00:00:00 2001
From: Luca Bertagna <lbertag@sandia.gov>
Date: Thu, 13 Jun 2024 16:56:24 -0600
Subject: [PATCH 2/2] Update EKAT submodule

---
 externals/ekat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/externals/ekat b/externals/ekat
index 1c944624fe4..b39fd9fbd81 160000
--- a/externals/ekat
+++ b/externals/ekat
@@ -1 +1 @@
-Subproject commit 1c944624fe4888bf4cd7ddf14bec1e4e7e596504
+Subproject commit b39fd9fbd81439470e146d7915ed9a22c688ac6a