From cb6d5fcdc22d6e901c01c6820f138ab3b9a9e9d6 Mon Sep 17 00:00:00 2001
From: Dusan Jovic <dusan.jovic@noaa.gov>
Date: Fri, 27 Dec 2024 09:11:07 -0600
Subject: [PATCH] Update FMS to 2024.01

---
 libs/ufslibs/CMakeLists.txt | 24 +-----------------------
 libs/ufslibs/fetch.sh       |  2 +-
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/libs/ufslibs/CMakeLists.txt b/libs/ufslibs/CMakeLists.txt
index 077b61b..1e20ade 100644
--- a/libs/ufslibs/CMakeLists.txt
+++ b/libs/ufslibs/CMakeLists.txt
@@ -278,12 +278,10 @@ ExternalProject_Add_StepDependencies(pio build netcdf_fortran pnetcdf genf90 cma
 ##
 ## FMS
 ##
-if (${CMAKE_Fortran_COMPILER_ID} MATCHES "IntelLLVM")
 ExternalProject_Add(fms
     URL ${downloads_prefix}/fms.tar.gz
-    URL_HASH MD5=2725e558eaa53fa1016fe785444759ae
+    URL_HASH MD5=82a26e62825d4439b58535d9b29da7a4
     BUILD_IN_SOURCE OFF
-    # CMAKE_COMMAND env I_MPI_F90=ifort cmake # Temporary until ifx fixes ICE
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_prefix}/fms
                -DCMAKE_PREFIX_PATH=${install_prefix}/netcdf
                -DCMAKE_Fortran_COMPILER=${MPI_Fortran_COMPILER}
@@ -292,31 +290,11 @@ ExternalProject_Add(fms
                -D64BIT=ON
                -DOPENMP=ON
                -DUSE_DEPRECATED_IO=ON
-    # BUILD_COMMAND env I_MPI_F90=ifort make -j 8
     LOG_DOWNLOAD ON
     LOG_CONFIGURE ON
     LOG_BUILD ON
     LOG_INSTALL ON
 )
-else()
-ExternalProject_Add(fms
-    URL ${downloads_prefix}/fms.tar.gz
-    URL_HASH MD5=2725e558eaa53fa1016fe785444759ae
-    BUILD_IN_SOURCE OFF
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_prefix}/fms
-               -DCMAKE_PREFIX_PATH=${install_prefix}/netcdf
-               -DCMAKE_Fortran_COMPILER=${MPI_Fortran_COMPILER}
-               -DGFS_PHYS=ON
-               -DCONSTANTS=GFS
-               -D64BIT=ON
-               -DOPENMP=ON
-               -DUSE_DEPRECATED_IO=ON
-    LOG_DOWNLOAD ON
-    LOG_CONFIGURE ON
-    LOG_BUILD ON
-    LOG_INSTALL ON
-)
-endif()
 ExternalProject_Add_StepDependencies(fms build netcdf_fortran)
 
 ##
diff --git a/libs/ufslibs/fetch.sh b/libs/ufslibs/fetch.sh
index 69c77ad..aae8207 100755
--- a/libs/ufslibs/fetch.sh
+++ b/libs/ufslibs/fetch.sh
@@ -62,7 +62,7 @@ download_and_check_md5sum 31b94d39462b1f1f2293f735c9819bf2  https://parallel-net
 download_and_check_md5sum 7f3504dfb5aab846f4a9018dda7bb8ad  https://github.com/PARALLELIO/genf90/archive/refs/tags/genf90_200608.tar.gz               genf90.tar.gz
 download_and_check_md5sum 171ee9a2b31a73108314a35b4db1dfaa  https://github.com/NCAR/ParallelIO/archive/refs/tags/pio2_5_10.tar.gz                     pio.tar.gz
 
-download_and_check_md5sum 2725e558eaa53fa1016fe785444759ae  https://github.com/NOAA-GFDL/FMS/archive/refs/tags/2023.04.tar.gz                         fms.tar.gz
+download_and_check_md5sum 82a26e62825d4439b58535d9b29da7a4  https://github.com/NOAA-GFDL/FMS/archive/refs/tags/2024.01.tar.gz                         fms.tar.gz
 download_and_check_md5sum ddf8e428e5d9cc3b17a6ed8408aade41  https://github.com/esmf-org/esmf/archive/refs/tags/v8.6.1.tar.gz                          esmf.tar.gz