From e87daf51e82327abde8ca169aa310d3dd2d53fe3 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Tue, 13 Aug 2024 14:38:05 -0500 Subject: [PATCH] Update build for sfc_climo_gen and grid_tools. Fixes #879. --- CMakeLists.txt | 4 ++-- sorc/grid_tools.fd/filter_topo.fd/CMakeLists.txt | 2 +- sorc/sfc_climo_gen.fd/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 41006ac3b..5874c0f91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,13 +21,13 @@ option(ICEBLEND "Enable building emcsfc_ice_blend.fd" ON) option(SNOW2MDL "Enable building emcsfc_snow2mdl.fd" ON) 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(GRIDTOOLS "Enable building grid_tools.fd" ON) option(CHGRES "Enable building chgres_cube.fd" ON) option(CHGRES_ALL "Build chgres with all input data options." OFF) option(OROG_MASK_TOOLS "Enable building orog_mask_tools.fd" OFF) # OROG_MASK_TOOLS must be ON for OROG_NETCDF_TOOLS to build. option(OROG_NETCDF_TOOLS "Enable building orog_netcdf_tools.fd" OFF) -option(SFC_CLIMO_GEN "Enable building sfc_climo_gen.fd" OFF) +option(SFC_CLIMO_GEN "Enable building sfc_climo_gen.fd" ON) option(VCOORD_GEN "Enable building vcoord_gen.fd" ON) option(FVCOMTOOLS "Enable building fvcom_tools.fd" OFF) option(GBLEVENTS "Enable building gblevents.fd" ON) diff --git a/sorc/grid_tools.fd/filter_topo.fd/CMakeLists.txt b/sorc/grid_tools.fd/filter_topo.fd/CMakeLists.txt index e8789caaf..229440a3e 100644 --- a/sorc/grid_tools.fd/filter_topo.fd/CMakeLists.txt +++ b/sorc/grid_tools.fd/filter_topo.fd/CMakeLists.txt @@ -4,7 +4,7 @@ set(lib_src set(exe_src filter_topo.F90) -if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$") +if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel|IntelLLVM)$") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -assume byterecl -real-size 64 -fno-alias -stack-temps -safe-cray-ptr -ftz") elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -ffree-line-length-0 -fdefault-real-8") diff --git a/sorc/sfc_climo_gen.fd/CMakeLists.txt b/sorc/sfc_climo_gen.fd/CMakeLists.txt index a9103106f..aa0f3c217 100644 --- a/sorc/sfc_climo_gen.fd/CMakeLists.txt +++ b/sorc/sfc_climo_gen.fd/CMakeLists.txt @@ -17,7 +17,7 @@ set(lib_src set(exe_src driver.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} -ffree-line-length-0 -fdefault-real-8")