From 760e2febb1573bc9f1a3dd9b70ac5a36ebc8ce5c Mon Sep 17 00:00:00 2001
From: Bruce Perry <Bruce.Perry@nrel.gov>
Date: Thu, 12 Dec 2024 14:30:14 -0700
Subject: [PATCH] update sundials - sycl 2025 fix (#551)

* update sundials - sycl 2025 fix

* update deprecated funciton in ARKODE
---
 .../dependencies/dependencies_dpcpp.sh        |  2 +-
 Source/Reactions/ReactorArkode.cpp            | 27 +++++--------------
 Submodules/sundials                           |  2 +-
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/dependencies/dependencies_dpcpp.sh b/.github/workflows/dependencies/dependencies_dpcpp.sh
index b667ce14e..cc395a196 100755
--- a/.github/workflows/dependencies/dependencies_dpcpp.sh
+++ b/.github/workflows/dependencies/dependencies_dpcpp.sh
@@ -6,4 +6,4 @@ sudo wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUC
 sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
 echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
 sudo apt-get update
-sudo apt-get install -y intel-oneapi-compiler-dpcpp-cpp=2024.2.1-1079 intel-oneapi-mkl-devel=2024.2.2-15
+sudo apt-get install -y intel-oneapi-compiler-dpcpp-cpp intel-oneapi-mkl-devel
diff --git a/Source/Reactions/ReactorArkode.cpp b/Source/Reactions/ReactorArkode.cpp
index e1a54b247..bd52abf62 100644
--- a/Source/Reactions/ReactorArkode.cpp
+++ b/Source/Reactions/ReactorArkode.cpp
@@ -232,12 +232,8 @@ ReactorArkode::react(
   time = time_init;
 #endif
 
-  long int nfe, nfi;
-  if (use_erkstep == 0) {
-    ARKStepGetNumRhsEvals(arkode_mem, &nfe, &nfi);
-  } else {
-    ERKStepGetNumRhsEvals(arkode_mem, &nfe);
-  }
+  long int nfe;
+  ARKodeGetNumRhsEvals(arkode_mem, 0, &nfe);
 
   if (user_data->verbose > 1) {
     print_final_stats(arkode_mem);
@@ -370,12 +366,8 @@ ReactorArkode::react(
     rX_in[i] = rX_in[i] + dt_react * rX_src_in[i];
   }
 
-  long int nfe, nfi;
-  if (use_erkstep == 0) {
-    ARKStepGetNumRhsEvals(arkode_mem, &nfe, &nfi);
-  } else {
-    ERKStepGetNumRhsEvals(arkode_mem, &nfe);
-  }
+  long int nfe;
+  ARKodeGetNumRhsEvals(arkode_mem, 0, &nfe);
 
   if (user_data->verbose > 1) {
     print_final_stats(arkode_mem);
@@ -425,7 +417,7 @@ ReactorArkode::cF_RHS(
 void
 ReactorArkode::print_final_stats(void* arkode_mem)
 {
-  long int nst, nst_a, netf, nfe, nfi;
+  long int nst, nst_a, netf, nfe;
   int flag;
 
   flag = ARKodeGetNumSteps(arkode_mem, &nst);
@@ -434,13 +426,8 @@ ReactorArkode::print_final_stats(void* arkode_mem)
   utils::check_flag(&flag, "ARKodeGetNumStepAttempts", 1);
   flag = ARKodeGetNumErrTestFails(arkode_mem, &netf);
   utils::check_flag(&flag, "ARKodeGetNumErrTestFails", 1);
-  if (use_erkstep != 0) {
-    flag = ERKStepGetNumRhsEvals(arkode_mem, &nfe);
-    utils::check_flag(&flag, "ERKStepGetNumRhsEvals", 1);
-  } else {
-    flag = ARKStepGetNumRhsEvals(arkode_mem, &nfe, &nfi);
-    utils::check_flag(&flag, "ARKStepGetNumRhsEvals", 1);
-  }
+  flag = ARKodeGetNumRhsEvals(arkode_mem, 0, &nfe);
+  utils::check_flag(&flag, "ARKodeGetNumRhsEvals", 1);
 
 #ifdef AMREX_USE_OMP
   amrex::Print() << "\nFinal Statistics: "
diff --git a/Submodules/sundials b/Submodules/sundials
index c28eaa376..0eff39663 160000
--- a/Submodules/sundials
+++ b/Submodules/sundials
@@ -1 +1 @@
-Subproject commit c28eaa3764a03705d61decb6025b409360e9d53f
+Subproject commit 0eff39663606f2ff280c4059a947ed62ae38180a