From 10169effc8bab71f99036a27525911b986dc6ed0 Mon Sep 17 00:00:00 2001
From: Dusan Jovic <dusan.jovic@noaa.gov>
Date: Thu, 19 Oct 2023 08:34:58 -0400
Subject: [PATCH] Update libraries

  crtm/2.4.0
  g2tmpl/1.10.2
  ip/4.3.0
  w3emc/2.10.0

  openmpi-4.1.5
---
 build.sh                    |  3 ++-
 libs/mpilibs/build.sh       |  6 +++---
 libs/ufslibs/CMakeLists.txt | 27 +++++++++++++++++++++------
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/build.sh b/build.sh
index a349908..b5ba7d9 100755
--- a/build.sh
+++ b/build.sh
@@ -146,7 +146,7 @@ export ESMFMKFILE=${ufslibs_install_prefix}/esmf/lib/esmf.mk
 export FMS_ROOT=${ufslibs_install_prefix}/fms
 
 export bacio_ROOT=${ufslibs_install_prefix}/NCEPLIBS-bacio
-export crtm_ROOT=${ufslibs_install_prefix}/EMC_crtm
+export crtm_ROOT=${ufslibs_install_prefix}/crtm
 export g2_ROOT=${ufslibs_install_prefix}/NCEPLIBS-g2
 export g2tmpl_ROOT=${ufslibs_install_prefix}/NCEPLIBS-g2tmpl
 export gfsio_ROOT=${ufslibs_install_prefix}/NCEPLIBS-gfsio
@@ -247,3 +247,4 @@ printf 'done [%4d sec]\n' ${SECONDS}
 fi
 
 echo "Done!"
+
diff --git a/libs/mpilibs/build.sh b/libs/mpilibs/build.sh
index 372a32b..9ff51c8 100755
--- a/libs/mpilibs/build.sh
+++ b/libs/mpilibs/build.sh
@@ -132,11 +132,11 @@ MPICH_MD5SUM=2d680f620583beadd7a08acdcfe355e6
 # MPICH=mpich-4.1.1
 # MPICH_MD5SUM=bd0ecf550e4a3e54128f377b65743370
 
-OPENMPI=openmpi-4.1.2
-OPENMPI_MD5SUM=2f86dc37b7a00b96ca964637ee68826e
+OPENMPI=openmpi-4.1.5
+OPENMPI_MD5SUM=2593008bea4bc721b9f304428abbf94b
 
 [ $BUILD_MPICH   == yes ] && download_and_check_md5sum ${MPICH_MD5SUM}   https://www.mpich.org/static/downloads/${MPICH:6}/${MPICH}.tar.gz
-[ $BUILD_OPENMPI == yes ] && download_and_check_md5sum ${OPENMPI_MD5SUM} https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.2.tar.gz
+[ $BUILD_OPENMPI == yes ] && download_and_check_md5sum ${OPENMPI_MD5SUM} https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.5.tar.gz
 
 #
 # print compiler version
diff --git a/libs/ufslibs/CMakeLists.txt b/libs/ufslibs/CMakeLists.txt
index 23a1351..d3ae8f5 100644
--- a/libs/ufslibs/CMakeLists.txt
+++ b/libs/ufslibs/CMakeLists.txt
@@ -384,21 +384,19 @@ ExternalProject_Add_StepDependencies(esmf build netcdf_fortran pio)
 ##
 ## NCEPLIBS
 ##
-set(EMC_crtm_tag        v2.3.0)
 set(NCEPLIBS-bacio_tag  v2.4.1)
 set(NCEPLIBS-g2_tag     v3.4.5)
-set(NCEPLIBS-g2tmpl_tag v1.10.0)
+set(NCEPLIBS-g2tmpl_tag v1.10.2)
 set(NCEPLIBS-gfsio_tag  v1.4.1)
-set(NCEPLIBS-ip_tag     v3.3.3)
+set(NCEPLIBS-ip_tag     v4.3.0)
 set(NCEPLIBS-nemsio_tag v2.5.4)
 set(NCEPLIBS-sfcio_tag  v1.4.1)
 set(NCEPLIBS-sigio_tag  v2.3.2)
 set(NCEPLIBS-sp_tag     v2.3.3)
-set(NCEPLIBS-w3emc_tag  v2.9.2)
+set(NCEPLIBS-w3emc_tag  v2.10.0)
 set(NCEPLIBS-w3nco_tag  v2.4.1)
 
 foreach(lib_name
-                 EMC_crtm
                  NCEPLIBS-bacio
                  NCEPLIBS-g2
                  NCEPLIBS-g2tmpl
@@ -422,7 +420,6 @@ foreach(lib_name
                    -DCMAKE_INSTALL_LIBDIR=lib
                    -DCMAKE_PREFIX_PATH=${install_prefix}/netcdf,${install_prefix}/jpeg,${install_prefix}/jasper,${install_prefix}/libpng,${install_prefix}/zlib
                    -Dbacio_ROOT=${install_prefix}/NCEPLIBS-bacio
-                   -Dcrtm_ROOT=${install_prefix}/EMC_crtm
                    -Dg2_ROOT=${install_prefix}/NCEPLIBS-g2
                    -Dg2tmpl_ROOT=${install_prefix}/NCEPLIBS-g2tmpl
                    -Dgfsio_ROOT=${install_prefix}/NCEPLIBS-gfsio
@@ -433,6 +430,7 @@ foreach(lib_name
                    -Dsp_ROOT=${install_prefix}/NCEPLIBS-sp
                    -Dw3nco_ROOT=${install_prefix}/NCEPLIBS-w3nco
                    -Dw3emc_ROOT=${install_prefix}/NCEPLIBS-w3emc
+                   -DBUILD_WITH_BUFR=OFF
         LOG_DOWNLOAD ON
         LOG_CONFIGURE ON
         LOG_BUILD ON
@@ -446,6 +444,23 @@ ExternalProject_Add_StepDependencies(NCEPLIBS-ip     build NCEPLIBS-sp)
 ExternalProject_Add_StepDependencies(NCEPLIBS-nemsio build NCEPLIBS-bacio NCEPLIBS-w3emc)
 ExternalProject_Add_StepDependencies(NCEPLIBS-w3emc  build NCEPLIBS-bacio)
 
+##
+## crtm
+##
+ExternalProject_Add(crtm
+    URL https://github.com/JCSDA/crtm/archive/refs/tags/v2.4.0_emc.tar.gz
+    URL_HASH MD5=fc7506c73d042699450c3114ea449ea4
+    BUILD_IN_SOURCE OFF
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_prefix}/crtm
+               -DCMAKE_INSTALL_LIBDIR=lib
+               -DNetCDF_ROOT=${install_prefix}/netcdf
+    LOG_DOWNLOAD ON
+    LOG_CONFIGURE ON
+    LOG_BUILD ON
+    LOG_INSTALL ON
+)
+ExternalProject_Add_StepDependencies(crtm build netcdf_fortran)
+
 ##
 ## ecbuild
 ##