fix cmake vars for mam, compose

E3SM-Project · Jan 21, 2025 · 4bbd63f · 4bbd63f
1 parent 63371af
commit 4bbd63f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/components/eamxx/CMakeLists.txt b/components/eamxx/CMakeLists.txt
@@ -205,7 +205,12 @@ set(NetCDF_Fortran_PATH ${DEFAULT_NetCDF_Fortran_PATH} CACHE FILEPATH "Path to n
 set(NetCDF_C_PATH ${DEFAULT_NetCDF_C_PATH} CACHE FILEPATH "Path to netcdf C installation")
 set(SCREAM_MACHINE ${DEFAULT_SCREAM_MACHINE} CACHE STRING "The CIME/SCREAM name for the current machine")
 option(SCREAM_MPI_ON_DEVICE "Whether to use device pointers for MPI calls" ON)
-option(SCREAM_ENABLE_MAM "Whether to enable MAM aerosol support" OFF)
+
+option(SCREAM_ENABLE_MAM "Whether to enable MAM aerosol support" ON)
+if (Kokkos_ENABLE_SYCL)
+  option(SCREAM_ENABLE_MAM "Whether to enable MAM aerosol support" OFF)
+endif()
+
 set(SCREAM_SMALL_KERNELS ${DEFAULT_SMALL_KERNELS} CACHE STRING "Use small, non-monolothic kokkos kernels for ALL components that support them")
 set(SCREAM_P3_SMALL_KERNELS ${SCREAM_SMALL_KERNELS} CACHE STRING "Use small, non-monolothic kokkos kernels for P3 only")
 set(SCREAM_SHOC_SMALL_KERNELS ${SCREAM_SMALL_KERNELS} CACHE STRING "Use small, non-monolothic kokkos kernels for SHOC only")

diff --git a/components/eamxx/src/dynamics/homme/CMakeLists.txt b/components/eamxx/src/dynamics/homme/CMakeLists.txt
@@ -23,8 +23,12 @@ set(BUILD_HOMME_PREQX_KOKKOS OFF CACHE BOOL "")
 set(BUILD_HOMME_PESE         OFF CACHE BOOL "")
 set(BUILD_HOMME_SWIM         OFF CACHE BOOL "")
 set(BUILD_HOMME_PRIM         OFF CACHE BOOL "")
-#set(HOMME_ENABLE_COMPOSE     ON  CACHE BOOL "")
-set(HOMME_ENABLE_COMPOSE     OFF  CACHE BOOL "")
+
+set(HOMME_ENABLE_COMPOSE     ON  CACHE BOOL "")
+if (Kokkos_ENABLE_SYCL)
+  set(HOMME_ENABLE_COMPOSE     OFF  CACHE BOOL "")
+endif()
+
 set(BUILD_HOMME_TOOL         OFF CACHE BOOL "")
 
 if (NOT Kokkos_ENABLE_SERIAL)