Merge remote-tracking branch 'origin/develop' into remove_findesmf

DusanJovic-NOAA · Oct 7, 2024 · 8219286 · 8219286
2 parents 7d7eb20 + e3750c2
commit 8219286
Show file tree

Hide file tree

Showing 68 changed files with 4,258 additions and 2,907 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -42,6 +42,7 @@ Please delete what is not needed.
   * MOM6 - 
   * NOAHMP - 
   * WW3 - 
+  * fire_behavior
   * stochastic_physics - 
 ```
 
@@ -89,6 +90,7 @@ Example:
 * MOM6:
 * NOAHMP:
 * WW3:
+* fire_behavior:
 * stochastic_physics:
 * None
 

diff --git a/.gitignore b/.gitignore
@@ -72,6 +72,7 @@ tests/fv3_conf/compile_slurm.IN
 tests/fv3_conf/compile_qsub.IN
 tests/fv3_conf/fv3_slurm.IN
 tests/fv3_conf/fv3_qsub.IN
+tests/rt_temp.conf
 build*.log*
 rocoto_workflow*
 fail_compile_*

diff --git a/.gitmodules b/.gitmodules
@@ -37,7 +37,7 @@
 [submodule "CICE"]
   path = CICE-interface/CICE
   url = https://github.com/NOAA-EMC/CICE
-  branch = emc/develop
+  branch = develop
 [submodule "CDEPS"]
   path = CDEPS-interface/CDEPS
   #url = https://github.com/NOAA-EMC/CDEPS
@@ -60,3 +60,7 @@
   #branch = develop
   url = https://github.com/DusanJovic-NOAA/noahmp
   branch = remove_findesmf
+[submodule "fire_behavior"]
+  path = fire_behavior
+  url = https://github.com/NOAA-EMC/fire_behavior
+  branch = emc/develop
diff --git a/CICE-interface/CMakeLists.txt b/CICE-interface/CMakeLists.txt
@@ -8,7 +8,13 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
   set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -Wall -Wextra -fcheck=bounds -ffpe-trap=invalid,zero,overflow,underflow" )
   set(CMAKE_Fortran_LINK_FLAGS "" )
-elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
+elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback")
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -FR -convert big_endian -assume byterecl -ftz -align array64byte")
+  set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fp-model precise")
+  set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created -init=snan,arrays")
+  set(CMAKE_Fortran_LINK_FLAGS "")
+elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(IntelLLVM)$")
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback")
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -FR -convert big_endian -assume byterecl -ftz -align array64byte")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fp-model precise")
@@ -24,11 +30,16 @@ if(CMAKE_C_COMPILER_ID MATCHES "GNU")
   set(CMAKE_C_FLAGS_RELEASE "-O3")
   set(CMAKE_C_FLAGS_DEBUG "-O0")
   set(CMAKE_C_LINK_FLAGS "")
-elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
+elseif(CMAKE_C_COMPILER_ID MATCHES "^(Intel)$")
   set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -traceback")
   set( CMAKE_C_FLAGS_RELEASE "-O2 -fp-model precise")
   set( CMAKE_C_FLAGS_DEBUG "-O0 -ftrapuv")
   set( CMAKE_C_LINK_FLAGS "")
+elseif(CMAKE_C_COMPILER_ID MATCHES "^(IntelLLVM)$")
+  set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -traceback")
+  set( CMAKE_C_FLAGS_RELEASE "-O2 -fp-model precise")
+  set( CMAKE_C_FLAGS_DEBUG "-O0")
+  set( CMAKE_C_LINK_FLAGS "")
 elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
   set( CMAKE_C_FLAGS_RELEASE "-O3" )

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,7 +23,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules/Modules)
 ###############################################################################
 
 # Valid applications and choices
-list(APPEND VALID_APPS ATM ATMAERO ATMAQ ATMW ATMWM ATML LND S2S S2SA S2SW S2SWA S2SWAL ATM_DS2S ATM_DS2S-PCICE HAFS HAFSW HAFS-MOM6 HAFS-MOM6W HAFS-ALL NG-GODAS)
+list(APPEND VALID_APPS ATM ATMAERO ATMAQ ATMW ATMWM ATML ATMF LND S2S S2SA S2SW S2SWA S2SWAL ATM_DS2S ATM_DS2S-PCICE HAFS HAFSW HAFS-MOM6 HAFS-MOM6W 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}")
@@ -41,6 +41,7 @@ set(STOCH_PHYS      OFF CACHE BOOL "Enable Stochastic Physics")
 set(CMEPS           OFF CACHE BOOL "Enable CMEPS")
 set(CDEPS           OFF CACHE BOOL "Enable CDEPS")
 set(NOAHMP          OFF CACHE BOOL "Enable NOAHMP")
+set(FIRE_BEHAVIOR   OFF CACHE BOOL "Enable Fire Behavior")
 
 # Configure selected application specific components
 message("")
@@ -59,6 +60,7 @@ message("STOCH_PHYS ....... ${STOCH_PHYS}")
 message("CDEPS ............ ${CDEPS}")
 message("CMEPS ............ ${CMEPS}")
 message("NOAHMP ........... ${NOAHMP}")
+message("FIRE_BEHAVIOR .... ${FIRE_BEHAVIOR}")
 
 ###############################################################################
 ### Build Options
@@ -167,7 +169,7 @@ if(FMS)
   elseif (APP MATCHES "^(S2S|S2SA|S2SW|S2SWA|S2SWAL|ATM_DS2S|ATM_DS2S-PCICE|NG-GODAS|HAFS-MOM6|HAFS-MOM6W)$")
     add_library(fms ALIAS FMS::fms_r8)
   endif()
-  if(APP MATCHES "^(ATM|ATMAERO|ATMAQ|ATMWM|ATMW|ATML|HAFS|HAFS-ALL)$")
+  if(APP MATCHES "^(ATM|ATMAERO|ATMAQ|ATMWM|ATMW|ATML|ATMF|HAFS|HAFS-ALL)$")
     if(32BIT)
       add_library(fms ALIAS FMS::fms_r4)
     else()
@@ -272,6 +274,14 @@ if(NOAHMP)
   add_subdirectory(NOAHMP-interface)
 endif()
 
+###############################################################################
+### Fire Components [FIRE_BEHAVIOR]
+###############################################################################
+if(FIRE_BEHAVIOR)
+  set(NUOPC "ON" CACHE STRING "Build fire_behavior with NUOPC cap" FORCE)
+  add_subdirectory(fire_behavior)
+endif()
+
 ###############################################################################
 ### UFS Library
 ###############################################################################
@@ -351,6 +361,12 @@ if(NOAHMP)
   list(APPEND _ufs_libs_public noahmp)
 endif()
 
+if(FIRE_BEHAVIOR)
+  add_dependencies(ufs fire_behavior_nuopc)
+  list(APPEND _ufs_defs_private FRONT_FIRE_BEHAVIOR=fire_behavior_nuopc)
+  list(APPEND _ufs_libs_public fire_behavior_nuopc)
+endif()
+
 target_compile_definitions(ufs PRIVATE "${_ufs_defs_private}")
 target_link_libraries(ufs PUBLIC "${_ufs_libs_public}")
 

diff --git a/HYCOM-interface/CMakeLists.txt b/HYCOM-interface/CMakeLists.txt
@@ -8,7 +8,12 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O3")
   set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -fcheck=bounds -ffpe-trap=invalid,zero,overflow,underflow" )
   set(CMAKE_Fortran_LINK_FLAGS "")
-elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
+elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
+  set(CMAKE_Fortran_FLAGS "-g -traceback -mcmodel=small -r8 ${HYCOM_Extra_FORTRAN_FLAGS}")
+  set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model source -warn nogeneral")
+  set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check all -fpe0 -ftrapuv -link_mpi=dbg -init=snan,arrays")
+  set(CMAKE_Fortran_LINK_FLAGS "-V ${CMAKE_Fortran_FLAGS} -static-intel")
+elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(IntelLLVM)$")
   set(CMAKE_Fortran_FLAGS "-g -traceback -mcmodel=small -r8 ${HYCOM_Extra_FORTRAN_FLAGS}")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model source -warn nogeneral")
   set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check all -fpe0 -ftrapuv -link_mpi=dbg -init=snan,arrays")
@@ -23,11 +28,16 @@ if(CMAKE_C_COMPILER_ID MATCHES "GNU")
   set(CMAKE_C_FLAGS_RELEASE "-O3")
   set(CMAKE_C_FLAGS_DEBUG "-O0")
   set(CMAKE_C_LINK_FLAGS "")
-elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
+elseif(CMAKE_C_COMPILER_ID MATCHES "^(Intel)$")
   set(CMAKE_C_FLAGS "-g -traceback -mcmodel=small ${HYCOM_Extra_C_FLAGS}")
   set(CMAKE_C_FLAGS_RELEASE "-O")
   set(CMAKE_C_FLAGS_DEBUG "-O0 -ftrapuv")
   set(CMAKE_C_LINK_FLAGS "-V ${CMAKE_C_FLAGS} -static-intel")
+elseif(CMAKE_C_COMPILER_ID MATCHES "^(IntelLLVM)$")
+  set(CMAKE_C_FLAGS "-g -traceback -mcmodel=small ${HYCOM_Extra_C_FLAGS}")
+  set(CMAKE_C_FLAGS_RELEASE "-O")
+  set(CMAKE_C_FLAGS_DEBUG "-O0")
+  set(CMAKE_C_LINK_FLAGS "-V ${CMAKE_C_FLAGS} -static-intel")
 else()
   message(WARNING "C compiler with ID ${CMAKE_C_COMPILER_ID} will be used with CMake default options")
 endif()

diff --git a/MOM6-interface/CMakeLists.txt b/MOM6-interface/CMakeLists.txt
@@ -6,13 +6,20 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
   set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -fcheck=bounds -ffpe-trap=invalid,zero,overflow,underflow" )
   set(CMAKE_Fortran_LINK_FLAGS "")
-elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
+elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback")
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -i4 -r8")
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fno-alias -auto -safe-cray-ptr -ftz -assume byterecl -sox")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -debug minimal -fp-model source")
   set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check -check noarg_temp_created -check nopointer -fpe0 -ftrapuv -init=snan,arrays")
   set(CMAKE_Fortran_LINK_FLAGS "")
+elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(IntelLLVM)$")
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback")
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -i4 -r8")
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fno-alias -auto -safe-cray-ptr -ftz -assume byterecl")
+  set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -debug minimal -fp-model precise")
+  set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check -check noarg_temp_created -check nopointer -fpe0 -ftrapuv -init=snan,arrays")
+  set(CMAKE_Fortran_LINK_FLAGS "")
 else()
   message(WARNING "Fortran compiler with ID ${CMAKE_Fortran_COMPILER_ID} will be used with CMake default options")
 endif()

diff --git a/cmake/IntelLLVM.cmake b/cmake/IntelLLVM.cmake
@@ -0,0 +1,60 @@
+set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback -fpp -fno-alias -auto -safe-cray-ptr -ftz -assume byterecl -align array64byte -qno-opt-dynamic-align")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -qno-opt-dynamic-align -fp-model precise")
+
+# warning #5462: Global name too long.
+set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -diag-disable 5462")
+
+# remark #7712: This variable has not been used.
+set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -diag-disable 7712")
+
+# remark #8291: Recommended relationship between field width 'W' and the number of fractional digits 'D' in this edit descriptor is 'W>=D+7'.
+set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -diag-disable 8291")
+
+# warning #5194: Source line truncated.
+set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -diag-disable 5194")
+
+if(CMAKE_Platform STREQUAL "derecho.intel")
+  set(CMAKE_Fortran_LINK_FLAGS "-Wl,--copy-dt-needed-entries")
+endif()
+
+if(NOT 32BIT)
+    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -real-size 64")
+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 minimal -ftrapuv -init=snan,arrays")
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ftrapuv")
+else()
+    if(FASTER)
+      set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model precise -assume buffered_stdout -fno-alias -align all -debug minimal -qoverride-limits -ftz")
+      set(CMAKE_C_FLAGS_RELEASE       "-O3 -fp-model precise -debug minimal -qoverride-limits -ftz")
+    else()
+      set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -debug minimal -qoverride-limits")
+      set(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -fp-model precise")
+      set(CMAKE_C_FLAGS_RELEASE       "-O2 -debug minimal")
+    endif()
+    if(AVX2)
+        set(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -march=core-avx2")
+        set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -march=core-avx2")
+    elseif(SIMDMULTIARCH)
+        set(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -axSSE4.2,CORE-AVX2")
+        set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -axSSE4.2,CORE-AVX2")
+        set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -mcmodel=medium")
+    elseif(AVX)
+        set(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -march=core-avx-i")
+        set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -march=core-avx-i")
+    endif()
+endif()
+
+if(APPLE)
+  # The linker on macOS does not include `common symbols` by default
+  # 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()
diff --git a/cmake/configure_apps.cmake b/cmake/configure_apps.cmake
@@ -13,7 +13,7 @@
 ###############################################################################
 ### Configure Application Components
 ###############################################################################
-if(APP MATCHES "^(ATM|ATMW|ATMWM|ATMAQ|ATML)$")
+if(APP MATCHES "^(ATM|ATMW|ATMWM|ATMAQ|ATML|ATMF)$")
   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)
@@ -31,6 +31,8 @@ if(APP MATCHES "^(ATM|ATMW|ATMWM|ATMAQ|ATML)$")
     set(CMEPS    ON  CACHE BOOL "Enable CMEPS"               FORCE)
     set(NOAHMP   ON  CACHE BOOL "Enable NOAHMP"              FORCE)
     message("Configuring UFS app in Atmosphere with Air Quality mode")
+  elseif(APP MATCHES "ATMF")
+    set(FIRE_BEHAVIOR ON CACHE BOOL "Enable Fire Behavior"   FORCE)
   else()
     message("Configuring UFS app in Atmosphere Only mode")
   endif()

diff --git a/cmake/configure_gaea.intelllvm.cmake b/cmake/configure_gaea.intelllvm.cmake
@@ -0,0 +1,2 @@
+set(PARALLEL_NETCDF ON  CACHE BOOL "Enable parallel NetCDF" FORCE)
+set(AVX2            OFF CACHE BOOL "Enable AVX2 instruction set" FORCE)
diff --git a/driver/UFS.F90 b/driver/UFS.F90
@@ -32,6 +32,8 @@ PROGRAM UFS
 !
 !-----------------------------------------------------------------------
 !
+      use, intrinsic :: iso_fortran_env, only : compiler_version
+
       USE MPI
       USE ESMF
 !
@@ -127,9 +129,10 @@ PROGRAM UFS
 !
       if (mype == 0) then
         call w3tagb('ufs-weather-model',0,0,0,'np23')
+        write(*,'(A,A)') 'Compiler version: ', compiler_version() // new_line("")
         call MPI_Get_library_version(library_version, resultlen, rc)
-        write(*,'(A,A)')      'MPI Library = ', library_version(1:resultlen)
-        write(*,'(A,I0,A,I0)')'MPI Version = ', mpi_version,'.',mpi_subversion
+        write(*,'(A,A)')      'MPI Library: ', library_version(1:resultlen)
+        write(*,'(A,I0,A,I0)')'MPI Version: ', mpi_version,'.',mpi_subversion
       endif
 !
 !-----------------------------------------------------------------------

diff --git a/driver/UFSDriver.F90 b/driver/UFSDriver.F90
@@ -23,7 +23,7 @@ MODULE UFSDriver
 !          UFS Driver component
 !              /|\
 !             / | \
-!          ATM/OCN/ICE/WAV/LND/IPM/HYD .. components
+!          ATM/OCN/ICE/WAV/LND/IPM/HYD/FIR .. components
 !          |    |   |
 !          |    |   (CICE, etc.)
 !          |    |
@@ -81,6 +81,10 @@ MODULE UFSDriver
 #endif
 #ifdef FRONT_NOAHMP
       use FRONT_NOAHMP,     only: NOAHMP_SS  => SetServices
+#endif
+  ! - Handle build time FIR options:
+#ifdef FRONT_FIRE_BEHAVIOR
+      use FRONT_FIRE_BEHAVIOR, only: FIRE_BEHAVIOR_SS => SetServices
 #endif
 #ifdef FRONT_LIS
       use FRONT_LIS,        only: LIS_SS   => SetServices
@@ -471,6 +475,14 @@ subroutine SetModelServices(driver, rc)
             found_comp = .true.
           end if
 #endif
+#ifdef FRONT_FIRE_BEHAVIOR
+          if (trim(model) == "fire_behavior") then
+            call NUOPC_DriverAddComp(driver, trim(prefix), FIRE_BEHAVIOR_SS, &
+              petList=petList, comp=comp, rc=rc)
+            if (ChkErr(rc,__LINE__,u_FILE_u)) return
+            found_comp = .true.
+          end if
+#endif
 #ifdef FRONT_LIS
           if (trim(model) == "lis") then
             !TODO: Remove bail code and pass info and SetVM to DriverAddComp

diff --git a/fire_behavior b/fire_behavior
diff --git a/modulefiles/ufs_acorn.intel.lua b/modulefiles/ufs_acorn.intel.lua
@@ -2,7 +2,7 @@ help([[
 Load environment to build UFS on Acorn with Intel compiler
 ]])
 
-prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/spack-stack/spack-stack-1.6.0/envs/unified-env-fms-2024.01/install/modulefiles/Core")
 
 load("stack-intel")
 load("stack-cray-mpich")
@@ -17,9 +17,6 @@ remove_path("MODULEPATH", "/apps/prod/lmodules/INTEL_cray_mpich/19.1.3.304/cray-
 load("cmake")
 load("ufs_common")
 
-prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/UPP_IFI/modulefiles")
-load("ifi/20230118-intel-19.1.3.304")
-
 setenv("CC", "cc")
 setenv("CXX", "CC")
 setenv("FC", "ftn")

diff --git a/modulefiles/ufs_common.lua b/modulefiles/ufs_common.lua
@@ -11,7 +11,7 @@ local ufs_modules = {
   {["netcdf-fortran"]  = "4.6.1"},
   {["parallelio"]      = "2.5.10"},
   {["esmf"]            = "8.6.1"},
-  {["fms"]             = "2023.04"},
+  {["fms"]             = "2024.01"},
   {["bacio"]           = "2.4.1"},
   {["crtm"]            = "2.4.0"},
   {["g2"]              = "3.5.1"},

diff --git a/modulefiles/ufs_derecho.gnu.lua b/modulefiles/ufs_derecho.gnu.lua
@@ -9,7 +9,7 @@ load("mysql/8.0.33")
 
 setenv("LMOD_TMOD_FIND_FIRST","yes")
 prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/modulefiles_extra")
-prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core")
 
 unload("ncarcompilers")
 stack_gnu_ver=os.getenv("stack_gnu_ver") or "12.2.0"

diff --git a/modulefiles/ufs_derecho.intel.lua b/modulefiles/ufs_derecho.intel.lua
@@ -9,7 +9,7 @@ load("mysql/8.0.33")
 
 setenv("LMOD_TMOD_FIND_FIRST","yes")
 prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/modulefiles_extra")
-prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core")
 
 unload("ncarcompilers")
 stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0"

diff --git a/modulefiles/ufs_gaea.intel.lua b/modulefiles/ufs_gaea.intel.lua
@@ -5,7 +5,7 @@ help([[
 
 whatis([===[Loads libraries needed for building the UFS Weather Model on Gaea ]===])
 
-prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2023.1.0"
 load(pathJoin("stack-intel", stack_intel_ver))