From b56fe412268826da04aa38c5c98e1fddb4b7a8ec Mon Sep 17 00:00:00 2001 From: George Gayno Date: Tue, 13 Aug 2024 12:41:54 -0500 Subject: [PATCH] Update glbevents and global_cycle builds to use IntelLLVM. Fixes #879. --- CMakeLists.txt | 4 ++-- sorc/gblevents.fd/CMakeLists.txt | 2 +- sorc/global_cycle.fd/CMakeLists.txt | 2 +- sorc/lsm_routines.fd/noah.fd/CMakeLists.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f965312ed..41006ac3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ option(ENABLE_DOCS "Enable generation of doxygen-based documentation." OFF) # Utilities to be built (Default: ALL) option(ICEBLEND "Enable building emcsfc_ice_blend.fd" ON) option(SNOW2MDL "Enable building emcsfc_snow2mdl.fd" ON) -option(GCYCLE "Enable building global_cycle.fd" OFF) +option(GCYCLE "Enable building global_cycle.fd" ON) option(FRENCTOOLS "Enable building fre-nctools.fd" OFF) option(GRIDTOOLS "Enable building grid_tools.fd" OFF) option(CHGRES "Enable building chgres_cube.fd" ON) @@ -30,7 +30,7 @@ option(OROG_NETCDF_TOOLS "Enable building orog_netcdf_tools.fd" OFF) option(SFC_CLIMO_GEN "Enable building sfc_climo_gen.fd" OFF) option(VCOORD_GEN "Enable building vcoord_gen.fd" ON) option(FVCOMTOOLS "Enable building fvcom_tools.fd" OFF) -option(GBLEVENTS "Enable building gblevents.fd" OFF) +option(GBLEVENTS "Enable building gblevents.fd" ON) option(CPLD_GRIDGEN "Enable building cpld_gridgen.fd" ON) option(OCNICE_PREP "Enable building ocnice_prep.fd" ON) option(WEIGHT_GEN "Enable building weight_gen.fd" ON) diff --git a/sorc/gblevents.fd/CMakeLists.txt b/sorc/gblevents.fd/CMakeLists.txt index 22086de19..42835ed38 100644 --- a/sorc/gblevents.fd/CMakeLists.txt +++ b/sorc/gblevents.fd/CMakeLists.txt @@ -1,5 +1,5 @@ -if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$") +if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel|IntelLLVM)$") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -r8") set(CMAKE_Fortran_FLAGS_RELEASE "-O3") elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$") diff --git a/sorc/global_cycle.fd/CMakeLists.txt b/sorc/global_cycle.fd/CMakeLists.txt index f52c2d86d..f8120f00a 100644 --- a/sorc/global_cycle.fd/CMakeLists.txt +++ b/sorc/global_cycle.fd/CMakeLists.txt @@ -13,7 +13,7 @@ set(lib_src set(exe_src cycle.f90) -if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$") +if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel|IntelLLVM)$") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -r8") elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8") diff --git a/sorc/lsm_routines.fd/noah.fd/CMakeLists.txt b/sorc/lsm_routines.fd/noah.fd/CMakeLists.txt index daa252e56..3e159b10e 100644 --- a/sorc/lsm_routines.fd/noah.fd/CMakeLists.txt +++ b/sorc/lsm_routines.fd/noah.fd/CMakeLists.txt @@ -8,7 +8,7 @@ set(fortran_src sflx_snippet.f90 bulk_snow_module.f90) -if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$") +if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel|IntelLLVM)$") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -r8 -convert big_endian") elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8 -fconvert=big-endian")