Skip to content

Commit

Permalink
Merge pull request #9 from AMReX-Combustion/development
Browse files Browse the repository at this point in the history
update sundials - sycl 2025 fix (AMReX-Combustion#551)
  • Loading branch information
terencelehmann authored Dec 18, 2024
2 parents 8a741ce + 760e2fe commit a216073
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dependencies/dependencies_dpcpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
27 changes: 7 additions & 20 deletions Source/Reactions/ReactorArkode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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: "
Expand Down
2 changes: 1 addition & 1 deletion Submodules/sundials
Submodule sundials updated 1426 files

0 comments on commit a216073

Please sign in to comment.