Update CDEPS component; update documentation FAQ about setting resour…

CDEPS-interface/cdeps_files.cmake

@@ -14,7 +14,6 @@ list(APPEND cdeps_share_files
   CDEPS/share/shr_const_mod.F90
   CDEPS/share/shr_kind_mod.F90
   CDEPS/share/shr_log_mod.F90
-  CDEPS/share/shr_mpi_mod.F90
   CDEPS/share/shr_orb_mod.F90
   CDEPS/share/shr_precip_mod.F90
   CDEPS/share/shr_strconvert_mod.F90

CMakeLists.txt

@@ -16,7 +16,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules/Modules)
 ###############################################################################
 
 # Valid applications and choices
-list(APPEND VALID_APPS ATM ATMAERO ATMAQ ATMW ATML LND S2S S2SA S2SW S2SWA S2SWAL HAFS HAFSW HAFS-ALL NG-GODAS)
+list(APPEND VALID_APPS ATM ATMAERO ATMAQ ATMW ATMWM ATML LND S2S S2SA S2SW S2SWA S2SWAL HAFS HAFSW HAFS-ALL NG-GODAS)
 set(APP NONE CACHE BOOL "Application Name")
 if(NOT (APP IN_LIST VALID_APPS))
   message(FATAL_ERROR "${APP} is not a valid application.\nValid Applications are: ${VALID_APPS}")
@@ -62,14 +62,15 @@ set(AVX2            ON  CACHE BOOL "Enable AVX2 instruction set")
 set(AVX             OFF CACHE BOOL "Enable AVX-I instruction set")
 set(SIMDMULTIARCH   OFF CACHE BOOL "Enable multi-target SIMD instruction sets")
 set(DEBUG           OFF CACHE BOOL "Enable DEBUG mode")
-set(DEBUG_LINKMPI   ON  CACHE BOOL "Enable linkmpi option when DEBUG mode is on")
+set(DISABLE_FMA     OFF CACHE BOOL "Disable Fused Multiply-Add instructions (workaround needed for AMD EPYC)" FORCE)
 set(INLINE_POST     ON  CACHE BOOL "Enable inline post")
 set(MULTI_GASES     OFF CACHE BOOL "Enable MULTI_GASES")
 set(MOVING_NEST     OFF CACHE BOOL "Enable moving nest code")
 set(OPENMP          ON  CACHE BOOL "Enable OpenMP threading")
 set(PARALLEL_NETCDF OFF CACHE BOOL "Enable parallel NetCDF")
 set(JEDI_DRIVER     OFF CACHE BOOL "Enable JEDI as top level driver")
-set(CMEPS_AOFLUX    OFF CACHE BOOL "Enable atmosphere-ocean flux calculation in mediator") 
+set(CMEPS_AOFLUX    OFF CACHE BOOL "Enable atmosphere-ocean flux calculation in mediator")
+set(PDLIB           OFF CACHE BOOL "Enable Domain Decomposition in WW3 via PDLIB")
 
 set(CMAKE_Platform $ENV{CMAKE_Platform})
 if(CMAKE_Platform)
@@ -82,13 +83,34 @@ if(CMAKE_Platform)
   endif()
 endif()
 
+option(BUILD_WITH_IFI "Build NCEPpost with In-Flight Icing (IFI) library if present" OFF)
+option(REQUIRE_IFI "Abort if libIFI is not found ; enables BUILD_WITH_IFI=ON" OFF)
+option(INTERNAL_IFI "Compile with IFI inside the executable, instead of a library" OFF)
+
+if(INTERNAL_IFI)
+  message("Building with libIFI inside executable. Do not distribute executable outside of WCOSS2.")
+  set(BUILD_WITH_IFI OFF)
+  set(REQUIRE_IFI OFF)
+endif()
+
+if(REQUIRE_IFI)
+  set(BUILD_WITH_IFI ON)
+endif()
+
+if(BUILD_WITH_IFI)
+  if(REQUIRE_IFI)
+    find_package(IFI CONFIG REQUIRED)
+  else()
+    find_package(IFI CONFIG)
+  endif()
+endif()
+
 message("")
 message("32BIT ............ ${32BIT}")
 message("CCPP_32BIT ....... ${CCPP_32BIT}")
 message("AVX2 ............. ${AVX2}")
 message("SIMDMULTIARCH .... ${SIMDMULTIARCH}")
 message("DEBUG ............ ${DEBUG}")
-message("DEBUG_LINKMPI .... ${DEBUG_LINKMPI}")
 message("INLINE_POST ...... ${INLINE_POST}")
 message("MULTI_GASES ...... ${MULTI_GASES}")
 message("MOVING_NEST ...... ${MOVING_NEST}")
@@ -127,7 +149,7 @@ if(FMS)
   elseif (APP MATCHES "^(S2S|S2SA|S2SW|S2SWA|S2SWAL|NG-GODAS)$")
     add_library(fms ALIAS FMS::fms_r8)
   endif()
-  if(APP MATCHES "^(ATM|ATMAERO|ATMAQ|ATMW|ATML|LND|HAFS|HAFS-ALL)$")
+  if(APP MATCHES "^(ATM|ATMAERO|ATMAQ|ATMWM|ATMW|ATML|LND|HAFS|HAFS-ALL)$")
     if(32BIT)
       add_library(fms ALIAS FMS::fms_r4)
     else()
@@ -137,7 +159,7 @@ if(FMS)
 endif()
 
 if(CMEPS)
-  find_package(PIO 2.5.3 REQUIRED COMPONENTS C Fortran STATIC)
+  find_package(PIO 2.5.3 REQUIRED COMPONENTS C Fortran)
 endif()
 
 find_package(bacio 2.4.0 REQUIRED)
@@ -180,12 +202,16 @@ endif()
 ### Wave components [WW3]
 ###############################################################################
 if(WW3)
-  if(APP MATCHES "^(ATMW)$")
+  if(APP MATCHES "^(ATMWM)$")
     set(SWITCH "multi_esmf" CACHE STRING "ESMF cap")
     set(UFS_CAP "MULTI_ESMF" CACHE STRING "Build with MULTI_ESMF cap")
     list(APPEND _ufs_defs_private FRONT_WW3=WMESMFMD)
   else()
-    set(SWITCH "meshcap" CACHE STRING "NUOPC mesh cap")
+    if(PDLIB)
+      set(SWITCH "meshcap_pdlib" CACHE STRING "NUOPC mesh cap")
+    else()
+      set(SWITCH "meshcap" CACHE STRING "NUOPC mesh cap")
+    endif()
     set(UFS_CAP "NUOPC_MESH" CACHE STRING "Build with NUOPC_MESH cap")
     list(APPEND _ufs_defs_private FRONT_WW3=wav_comp_nuopc)
   endif()
@@ -315,6 +341,7 @@ target_link_libraries(ufs PUBLIC "${_ufs_libs_public}")
 add_executable(ufs_model driver/UFS.F90)
 add_dependencies(ufs_model ufs)
 target_link_libraries(ufs_model ufs esmf w3emc::w3emc_d)
+set_target_properties(ufs_model PROPERTIES LINKER_LANGUAGE Fortran)
 
 ###############################################################################
 ### Install

cmake/Intel.cmake

@@ -8,13 +8,6 @@ endif()
 if(DEBUG)
     add_definitions(-DDEBUG)
     set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -O0 -check -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -ftrapuv -init=snan,arrays")
-    if(DEBUG_LINKMPI)
-      if(OPENMP)
-        set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -link_mpi=dbg_mt")
-      else()
-        set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -link_mpi=dbg")
-      endif()
-    endif()
     set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ftrapuv")
 else()
     if(FASTER)
@@ -43,3 +36,9 @@ if(APPLE)
   # Passing the -c flag includes them and fixes an error with undefined symbols
   set(CMAKE_Fortran_ARCHIVE_FINISH "<CMAKE_RANLIB> -c <TARGET>")
 endif()
+
+# This must be last, to override all other optimization settings.
+if(DISABLE_FMA)
+  set(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -no-fma")
+  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -no-fma")
+endif()

cmake/configure_acorn.cmake

@@ -1,3 +1,6 @@
 set(PARALLEL_NETCDF ON  CACHE BOOL "Enable parallel NetCDF" FORCE)
-set(DEBUG_LINKMPI   OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)
 set(AVX2            OFF CACHE BOOL "Enable AVX2 instruction set" FORCE)
+
+if(FASTER)
+  set(DISABLE_FMA   ON  CACHE BOOL "Disable Fused Multiply-Add instructions (workaround needed for AMD EPYC)" FORCE)
+endif()

cmake/configure_apps.cmake

@@ -13,13 +13,17 @@
 ###############################################################################
 ### Configure Application Components
 ###############################################################################
-if(APP MATCHES "^(ATM|ATMW|ATMAQ|ATML)$")
+if(APP MATCHES "^(ATM|ATMW|ATMWM|ATMAQ|ATML)$")
   set(FMS        ON  CACHE BOOL "Enable FMS"                 FORCE)
   set(FV3        ON  CACHE BOOL "Enable FV3"                 FORCE)
   set(STOCH_PHYS ON  CACHE BOOL "Enable Stochastic Physics"  FORCE)
   if(APP MATCHES "ATMW")
     set(WW3      ON  CACHE BOOL "Enable WAVEWATCH III"       FORCE)
     message("Configuring UFS app in Atmosphere with Waves mode")
+    set(CMEPS    ON  CACHE BOOL "Enable CMEPS"               FORCE)
+  elseif(APP MATCHES "ATMWM")
+    set(WW3      ON  CACHE BOOL "Enable WAVEWATCH III"       FORCE)
+    message("Configuring UFS app in Atmosphere with Waves mode")
   elseif(APP MATCHES "ATMAQ")
     set(AQM      ON  CACHE BOOL "Enable AQM"                 FORCE)
     message("Configuring UFS app in Atmosphere with Air Quality mode")

cmake/configure_cheyenne.intel.cmake

@@ -1,2 +1 @@
 set(PARALLEL_NETCDF ON  CACHE BOOL "Enable parallel NetCDF" FORCE)
-set(DEBUG_LINKMPI   OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)

cmake/configure_gaea.intel.cmake

@@ -1,5 +1,4 @@
 set(PARALLEL_NETCDF ON  CACHE BOOL "Enable parallel NetCDF" FORCE)
-set(DEBUG_LINKMPI   OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)
 set(MOM6_Extra_FORTRAN_FLAGS "-xsse2")
 set(HYCOM_Extra_FORTRAN_FLAGS "-xSSE4.2")
 set(HYCOM_Extra_C_FLAGS "-xSSE4.2")

cmake/configure_macosx.intel.cmake

@@ -1,2 +1 @@
 set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)
-set(DEBUG_LINKMPI  OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)

cmake/configure_wcoss2.cmake

@@ -1,3 +1,6 @@
 set(PARALLEL_NETCDF ON  CACHE BOOL "Enable parallel NetCDF" FORCE)
-set(DEBUG_LINKMPI   OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)
 set(AVX2            OFF CACHE BOOL "Enable AVX2 instruction set" FORCE)
+
+if(FASTER)
+  set(DISABLE_FMA   ON  CACHE BOOL "Disable Fused Multiply-Add instructions (workaround needed for AMD EPYC)" FORCE)
+endif()

doc/UsersGuide/source/ConfigParameters.rst

@@ -169,7 +169,6 @@ Other Build Options
       set(AVX2            ON  CACHE BOOL "Enable AVX2 instruction set")
       set(AVX             OFF CACHE BOOL "Enable AVX-I instruction set")
       set(SIMDMULTIARCH   OFF CACHE BOOL "Enable multi-target SIMD instruction sets")
-      set(DEBUG_LINKMPI   ON  CACHE BOOL "Enable linkmpi option when DEBUG mode is on")
       set(INLINE_POST     OFF CACHE BOOL "Enable inline post")
       set(OPENMP          ON  CACHE BOOL "Enable OpenMP threading")
       set(PARALLEL_NETCDF OFF CACHE BOOL "Enable parallel NetCDF")