ufs-community · gspetro-NOAA · Apr 1, 2026 · Apr 1, 2026 · Apr 1, 2026 · Apr 1, 2026
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,9 @@
 [submodule "UFSATM"]
   path = UFSATM
-  url = https://github.com/NOAA-EMC/ufsatm
-  branch = develop
+  #url = https://github.com/NOAA-EMC/ufsatm
+  #branch = develop
+  url = https://github.com/gspetro-NOAA/ufsatm
+  branch = feature/ss2.x
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3
@@ -44,8 +46,10 @@
   branch = develop
 [submodule "LM4-driver"]
   path = LM4-driver
-  url = https://github.com/NOAA-GFDL/LM4-NUOPC-driver
-  branch = develop
+  #url = https://github.com/NOAA-GFDL/LM4-NUOPC-driver
+  #branch = develop
+  url = https://github.com/JustinPerket/LM4-NUOPC-driver.git
+  branch = tmp/LM42025.03
 [submodule "fire_behavior"]
   path = fire_behavior
   url = https://github.com/NOAA-EMC/fire_behavior

diff --git a/CDEPS-interface/CMakeLists.txt b/CDEPS-interface/CMakeLists.txt
@@ -12,7 +12,7 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback")
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -assume realloc_lhs")
   if(FASTER)
-    set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model precise -assume buffered_stdout -fno-alias -align all -debug minimal -qoverride-limits -ftz -no-ip")
+    set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model precise -assume buffered_stdout -fno-alias -align all -debug minimal -qoverride-limits -ftz")
   else()
     set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fp-model precise")
   endif()

diff --git a/CICE-interface/CMakeLists.txt b/CICE-interface/CMakeLists.txt
@@ -12,7 +12,7 @@ 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")
   if(FASTER)
-    set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model precise -assume buffered_stdout -fno-alias -align all -debug minimal -qoverride-limits -ftz -no-ip")
+    set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model precise -assume buffered_stdout -fno-alias -align all -debug minimal -qoverride-limits -ftz")
   else()
     set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fp-model precise")
   endif()

diff --git a/CMEPS-interface/CMakeLists.txt b/CMEPS-interface/CMakeLists.txt
@@ -16,7 +16,7 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback")
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -assume realloc_lhs")
   if(FASTER)
-    set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model precise -assume buffered_stdout -fno-alias -align all -debug minimal -qoverride-limits -ftz -no-ip")
+    set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model precise -assume buffered_stdout -fno-alias -align all -debug minimal -qoverride-limits -ftz")
   else()
     set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fp-model precise")
   endif()

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -187,7 +187,7 @@ if(CMEPS OR CDEPS)
 endif()
 
 find_package(bacio 2.4.0 REQUIRED)
-find_package(sp 2.3.3 REQUIRED)
+find_package(ip 5 REQUIRED)
 find_package(w3emc 2.9.2 REQUIRED)
 
 if(MPAS)
@@ -235,6 +235,32 @@ endif()
 ###############################################################################
 if(UFS_GOCART)
   add_subdirectory(GOCART)
+  # This ugly hack is necessary to avoid the error from buggy fpp in Intel compiler version 2025.2.1
+  #
+  #   If:
+  # 1) we are on Gaea C6 AND
+  # 2) the Fortran compiler is IntelLLVM version 2025.2.1 AND
+  # 3) an fpp from an earlier compiler version exists THEN
+  #   explicitly set the name of the fpp preprocessor executable for all targets in GOCART
+  #
+  # Once newer Intel compiler (with fixed fpp) is installed on Gaea C6 this should be removed
+  #
+  if(CMAKE_Platform STREQUAL "gaeac6.oneapi" AND
+     CMAKE_Fortran_COMPILER_ID STREQUAL "IntelLLVM" AND CMAKE_Fortran_COMPILER_VERSION VERSION_EQUAL 2025.2.1 AND
+     EXISTS "/opt/intel/oneapi/compiler/2025.0/bin/fpp")
+
+    target_compile_options(Process_Library   PRIVATE -fpp-name=/opt/intel/oneapi/compiler/2025.0/bin/fpp -Qoption,fpp,-P)
+    target_compile_options(Chem_Shared2G     PRIVATE -fpp-name=/opt/intel/oneapi/compiler/2025.0/bin/fpp -Qoption,fpp,-P)
+    target_compile_options(GA_Environment    PRIVATE -fpp-name=/opt/intel/oneapi/compiler/2025.0/bin/fpp -Qoption,fpp,-P)
+    target_compile_options(CA2G_GridComp     PRIVATE -fpp-name=/opt/intel/oneapi/compiler/2025.0/bin/fpp -Qoption,fpp,-P)
+    target_compile_options(DU2G_GridComp     PRIVATE -fpp-name=/opt/intel/oneapi/compiler/2025.0/bin/fpp -Qoption,fpp,-P)
+    target_compile_options(NI2G_GridComp     PRIVATE -fpp-name=/opt/intel/oneapi/compiler/2025.0/bin/fpp -Qoption,fpp,-P)
+    target_compile_options(SS2G_GridComp     PRIVATE -fpp-name=/opt/intel/oneapi/compiler/2025.0/bin/fpp -Qoption,fpp,-P)
+    target_compile_options(SU2G_GridComp     PRIVATE -fpp-name=/opt/intel/oneapi/compiler/2025.0/bin/fpp -Qoption,fpp,-P)
+    target_compile_options(GOCART2G_GridComp PRIVATE -fpp-name=/opt/intel/oneapi/compiler/2025.0/bin/fpp -Qoption,fpp,-P)
+    target_compile_options(Aerosol_GridComp  PRIVATE -fpp-name=/opt/intel/oneapi/compiler/2025.0/bin/fpp -Qoption,fpp,-P)
+    target_compile_options(UFS_Aerosols      PRIVATE -fpp-name=/opt/intel/oneapi/compiler/2025.0/bin/fpp -Qoption,fpp,-P)
+  endif()
 endif()
 
 ###############################################################################

diff --git a/MOM6-interface/CMakeLists.txt b/MOM6-interface/CMakeLists.txt
@@ -12,7 +12,7 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
   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")
   if(FASTER)
-    set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model precise -assume buffered_stdout -fno-alias -align all -debug minimal -qoverride-limits -ftz -no-ip")
+    set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model precise -assume buffered_stdout -fno-alias -align all -debug minimal -qoverride-limits -ftz")
   else()
     set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -debug minimal -fp-model source")
   endif()

diff --git a/UFSATM b/UFSATM
diff --git a/cmake/Intel.cmake b/cmake/Intel.cmake
@@ -25,7 +25,7 @@ if(DEBUG)
     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 -no-ip")
+      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")

diff --git a/cmake/IntelLLVM.cmake b/cmake/IntelLLVM.cmake
@@ -17,6 +17,10 @@ if(CMAKE_Platform STREQUAL "derecho.intel")
   set(CMAKE_Fortran_LINK_FLAGS "-Wl,--copy-dt-needed-entries")
 endif()
 
+if(CMAKE_Platform STREQUAL "derecho.oneapi")
+  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()

diff --git a/cmake/configure_cheyenne.gnu.cmake b/cmake/configure_cheyenne.gnu.cmake
diff --git a/cmake/configure_gaeac6.intelllvm.cmake → cmake/configure_gaeac6.oneapi.cmake b/cmake/configure_gaeac6.intelllvm.cmake → cmake/configure_gaeac6.oneapi.cmake
diff --git a/cmake/configure_cheyenne.intel.cmake → cmake/configure_hercules.oneapi.cmake b/cmake/configure_cheyenne.intel.cmake → cmake/configure_hercules.oneapi.cmake
diff --git a/cmake/configure_orion.oneapi.cmake b/cmake/configure_orion.oneapi.cmake
@@ -0,0 +1 @@
+set(PARALLEL_NETCDF ON  CACHE BOOL "Enable parallel NetCDF" FORCE)
diff --git a/cmake/configure_ursa.oneapi.cmake b/cmake/configure_ursa.oneapi.cmake
@@ -0,0 +1 @@
+set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)
diff --git a/fire_behavior b/fire_behavior
diff --git a/modulefiles/ufs_acorn.oneapi.lua b/modulefiles/ufs_acorn.oneapi.lua
@@ -0,0 +1,25 @@
+help([[
+Load environment to build UFS on Acorn with Intel compiler
+]])
+
+prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/spack-stack/spack-stack-2.1.0/envs/ue-oneapi-2024.2.1/modules/Core")
+
+load("stack-intel-oneapi-compilers/2024.2.1") -- or load("stack-intel-oneapi-compilers") ?
+load("stack-cray-mpich/8.1.29") -- or load("stack-cray-mpich") ?
+
+--Avoid production installations; use spack-stack only:
+remove_path("MODULEPATH", "/apps/ops/prod/libs/modulefiles/compiler/intel/19.1.3.304")
+remove_path("MODULEPATH", "/apps/ops/prod/libs/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.4")
+remove_path("MODULEPATH", "/apps/ops/prod/libs/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.7")
+remove_path("MODULEPATH", "/apps/prod/lmodules/intel/19.1.3.304")
+remove_path("MODULEPATH", "/apps/prod/lmodules/INTEL_cray_mpich/19.1.3.304/cray-mpich/8.1.4")
+
+load("cmake") -- or load("cmake/3.31.8") ?
+load("ufs_common")
+
+setenv("CC", "cc")
+setenv("CXX", "CC")
+setenv("FC", "ftn")
+setenv("CMAKE_Platform", "acorn")
+
+whatis("Description: UFS build environment")
diff --git a/modulefiles/ufs_common.lua b/modulefiles/ufs_common.lua
@@ -3,24 +3,23 @@ whatis("Description: UFS build environment common libraries")
 help([[Load UFS Model common libraries]])
 
 local ufs_modules = {
-  {["jasper"]          = "2.0.32"},
+  {["jasper"]          = "4.2.4"},
   {["libpng"]          = "1.6.37"},
-  {["hdf5"]            = "1.14.3"},
+  {["hdf5"]            = "1.14.5"},
   {["netcdf-c"]        = "4.9.2"},
   {["netcdf-fortran"]  = "4.6.1"},
   {["parallelio"]      = "2.6.2"},
   {["esmf"]            = "8.8.0"},
-  {["fms"]             = "2024.02"},
-  {["bacio"]           = "2.4.1"},
-  {["crtm"]            = "2.4.0.1"},
+  {["fms"]             = "2025.03-gfs-constants"},
+  {["bacio"]           = "2.6.0"},
+  {["crtm"]            = "3.1.3"},
   {["g2"]              = "3.5.1"},
-  {["g2tmpl"]          = "1.13.0"},
-  {["ip"]              = "5.1.0"},
-  {["sp"]              = "2.5.0"},
-  {["w3emc"]           = "2.10.0"},
-  {["gftl-shared"]     = "1.9.0"},
+  {["g2tmpl"]          = "1.17.0"},
+  {["ip"]              = "5.4.0"},
+  {["w3emc"]           = "2.13.0"},
+  {["gftl-shared"]     = "1.11.0"},
   {["mapl"]            = "2.53.4-esmf-8.8.0"},
-  {["scotch"]          = "7.0.4"},
+  {["scotch"]          = "7.0.10"},
 }
 
 for i = 1, #ufs_modules do

diff --git a/modulefiles/ufs_derecho.gnu.lua b/modulefiles/ufs_derecho.gnu.lua
@@ -3,20 +3,24 @@ loads UFS Model prerequisites for Derecho/GNU
 ]])
 
 setenv("LMOD_TMOD_FIND_FIRST","yes")
-prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.9.2/envs/ue-gcc-12.4-zlib-1.2.13/install/modulefiles/Core")
 
-unload("ncarcompilers")
-stack_gnu_ver=os.getenv("stack_gnu_ver") or "12.4.0"
+prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-2.1.0/envs/ue-gcc-13.3.1/modules/Core")
+prepend_path("MODULEPATH", "/opt/cray/pe/modulefiles")
+
+-- unload("ncarcompilers")
+
+load("crayenv/25.03")
+
+stack_gnu_ver=os.getenv("stack_gnu_ver") or "13.3.1"
 load(pathJoin("stack-gcc", stack_gnu_ver))
 
-stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.29"
+stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.32"
 load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
 
-cmake_ver=os.getenv("cmake_ver") or "3.27.9"
-load(pathJoin("cmake", cmake_ver))
+unload("cray-libsci")
 
-stack_python_ver=os.getenv("stack_python_ver") or "3.11.7"
-load(pathJoin("stack-python", stack_python_ver))
+cmake_ver=os.getenv("cmake_ver") or "3.31.8"
+load(pathJoin("cmake", cmake_ver))
 
 load("ufs_common")
 

diff --git a/modulefiles/ufs_derecho.oneapi.lua b/modulefiles/ufs_derecho.oneapi.lua
@@ -0,0 +1,40 @@
+help([[
+loads UFS Model prerequisites for NOAA Parallelworks/Intel
+]])
+
+purge()
+
+setenv("LMOD_TMOD_FIND_FIRST","yes")
+
+prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-2.1.0/envs/ue-oneapi-2025.3.1/modules/Core")
+prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/installs/oneapi-2025.3.1/modulefiles")
+prepend_path("MODULEPATH", "/opt/cray/pe/modulefiles")
+
+load("crayenv/25.03")
+-- unload("ncarcompilers")
+
+stack_intel_ver=os.getenv("stack_intel_ver") or "2025.3.1"
+load(pathJoin("stack-intel-oneapi-compilers", stack_intel_ver))
+
+stack_cray_mpich_ver=os.getenv("stack-cray-mpich_ver") or "8.1.32"
+load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
+
+unload("cray-libsci")
+
+cmake_ver=os.getenv("cmake_ver") or "3.31.8"
+load(pathJoin("cmake", cmake_ver))
+
+load("ufs_common")
+
+nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
+load(pathJoin("nccmp", nccmp_ver))
+
+setenv("CC", "cc")
+setenv("CXX", "CC")
+setenv("FC", "ftn")
+setenv("I_MPI_CC", "icx")
+setenv("I_MPI_CXX", "icpx")
+setenv("I_MPI_FC", "ifx")
+
+setenv("CMAKE_Platform", "derecho.oneapi")
+whatis("Description: UFS build environment")
diff --git a/modulefiles/ufs_gaeac6.intelllvm.lua → modulefiles/ufs_gaeac6.oneapi.lua b/modulefiles/ufs_gaeac6.intelllvm.lua → modulefiles/ufs_gaeac6.oneapi.lua
@@ -5,38 +5,30 @@ help([[
 
 whatis([===[Loads libraries needed for building the UFS Weather Model on Gaea C6]===])
 
-prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.9.2/envs/ue-intel-2023.2.0/install/modulefiles/Core")
-prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/modulefiles")
+prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-2.1.0/envs/ue-oneapi-2025.2.1/modules/Core")
 
-stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
-load(pathJoin("stack-intel", stack_intel_ver))
+stack_intel_ver=os.getenv("stack_intel_ver") or "2025.2.1"
+load(pathJoin("stack-intel-oneapi-compilers", stack_intel_ver))
 
-stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.30"
+stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.32"
 load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
 
-stack_python_ver=os.getenv("stack_python_ver") or "3.11.7"
-load(pathJoin("stack-python", stack_python_ver))
-
-cmake_ver=os.getenv("cmake_ver") or "3.27.9"
+cmake_ver=os.getenv("cmake_ver") or "3.31.8"
 load(pathJoin("cmake", cmake_ver))
 
 load("ufs_common")
-load("zlib/1.2.13")
 
 nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
 load(pathJoin("nccmp", nccmp_ver))
 
 unload("darshan-runtime")
 unload("cray-libsci")
 
-unload("intel-classic/2023.2.0")
-load("intel-oneapi/2023.2.0")
-
 setenv("I_MPI_CC", "icx")
 setenv("I_MPI_CXX", "icpx")
-setenv("I_MPI_F90", "ifx")
-
+setenv("I_MPI_FC", "ifx")
 setenv("CC","cc")
 setenv("CXX","CC")
 setenv("FC","ftn")
-setenv("CMAKE_Platform","gaeac6.intelllvm")
+
+setenv("CMAKE_Platform","gaeac6.oneapi")
diff --git a/modulefiles/ufs_hercules.gnu.lua b/modulefiles/ufs_hercules.gnu.lua
@@ -2,20 +2,18 @@ help([[
 loads UFS Model prerequisites for Hercules/GNU
 ]])
 
-prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.2/envs/ue-gcc-13.3.0/install/modulefiles/Core")
-prepend_path("MODULEPATH", "/apps/contrib/spack-stack/modulefiles")
+prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-2.1.0/envs/ue-gcc-12.2.0/modules/Core")
 
-stack_gnu_ver=os.getenv("stack_gnu_ver") or "13.3.0"
+stack_gnu_ver=os.getenv("stack_gnu_ver") or "12.2.0"
 load(pathJoin("stack-gcc", stack_gnu_ver))
 
-stack_openmpi_ver=os.getenv("stack_openmpi_ver") or "4.1.6"
+stack_openmpi_ver=os.getenv("stack_openmpi_ver") or "4.1.4"
 load(pathJoin("stack-openmpi", stack_openmpi_ver))
 
-cmake_ver=os.getenv("cmake_ver") or "3.27.9"
+cmake_ver=os.getenv("cmake_ver") or "3.31.8"
 load(pathJoin("cmake", cmake_ver))
 
 load("ufs_common")
-load("zlib/1.2.13")
 
 nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
 load(pathJoin("nccmp", nccmp_ver))

diff --git a/modulefiles/ufs_hercules.intelllvm.lua b/modulefiles/ufs_hercules.intelllvm.lua
+12 −6		.gitmodules
+2 −2		CMakeLists.txt
+1 −1		ccpp/physics
+1 −1		fv3/atmos_cubed_sphere
+2 −2		fv3/moving_nest/fv_moving_nest_main.F90
+1 −1		upp
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)