From f1b0e911e16886493e89ea5d201c17f860fa1a04 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Thu, 23 Mar 2023 17:56:26 -0400 Subject: [PATCH] support using old fix wall/gran files with KOKKOS in CMake --- cmake/Modules/Packages/KOKKOS.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake/Modules/Packages/KOKKOS.cmake b/cmake/Modules/Packages/KOKKOS.cmake index 00486e73db..5731f3d827 100644 --- a/cmake/Modules/Packages/KOKKOS.cmake +++ b/cmake/Modules/Packages/KOKKOS.cmake @@ -121,6 +121,11 @@ set(KOKKOS_PKG_SOURCES ${KOKKOS_PKG_SOURCES_DIR}/kokkos.cpp ${KOKKOS_PKG_SOURCES_DIR}/domain_kokkos.cpp ${KOKKOS_PKG_SOURCES_DIR}/modify_kokkos.cpp) +# fix wall/gran has been refactored in an incompatible way. Use old version of base class for now +if(PKG_GRANULAR) + list(APPEND KOKKOS_PKG_SOURCES ${KOKKOS_PKG_SOURCES_DIR}/fix_wall_gran_old.cpp) +endif() + if(PKG_KSPACE) list(APPEND KOKKOS_PKG_SOURCES ${KOKKOS_PKG_SOURCES_DIR}/fft3d_kokkos.cpp ${KOKKOS_PKG_SOURCES_DIR}/grid3d_kokkos.cpp