Update srw_common and hashes of UFS_UTILS and UPP

Externals.cfg

@@ -12,7 +12,7 @@ protocol = git
 repo_url = https://github.com/ufs-community/UFS_UTILS
 # Specify either a branch name or a hash but not both.
 #branch = develop
-hash = 31271f7
+hash = b6efa86
 local_path = src/UFS_UTILS
 required = True
 
@@ -30,7 +30,7 @@ protocol = git
 repo_url = https://github.com/NOAA-EMC/UPP
 # Specify either a branch name or a hash but not both.
 #branch = develop
-hash = 394917e
+hash = fbd41a5
 local_path = src/UPP
 required = True
 

modulefiles/build_cheyenne_gnu

@@ -8,27 +8,28 @@ proc ModulesHelp { } {
 module-whatis "Loads libraries needed for building SRW on Cheyenne"
 
 module load cmake/3.22.0
+module load python/3.7.9
 module load ncarenv/1.3
 module load gnu/10.1.0
 module load mpt/2.22
 module load ncarcompilers/0.5.0
-module load python/3.7.9
 module unload netcdf
 
-module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-v1.2.0/modulefiles/stack
+module use /glade/work/epicufsrt/GMTB/tools/gnu/10.1.0/hpc-stack-v1.2.0/modulefiles/stack
 module load hpc/1.2.0
 module load hpc-gnu/10.1.0
 module load hpc-mpt/2.22
 
 module load srw_common
-module load g2/3.4.3
-module load esmf/8_2_0
+
+module load g2/3.4.5
+module load esmf/8.3.0b09
 module load netcdf/4.7.4
-module load png/1.6.35
-module load pio/2.5.2
+module load libpng/1.6.37
+module load pio/2.5.3
+module load fms/2022.01
 
 setenv CMAKE_C_COMPILER mpicc
 setenv CMAKE_CXX_COMPILER mpicxx
 setenv CMAKE_Fortran_COMPILER mpif90
 setenv CMAKE_Platform cheyenne.gnu
-

modulefiles/build_cheyenne_intel

@@ -2,33 +2,34 @@
 
 proc ModulesHelp { } {
    puts stderr "This module loads libraries for building SRW on"
-   puts stderr "the CISL Cheyenne machine using Intel-19.1.1"
+   puts stderr "the CISL Cheyenne machine using Intel-2022.1"
 }
 
 module-whatis "Loads libraries needed for building SRW on Cheyenne"
 
 module load cmake/3.22.0
+module load python/3.7.9
 module load ncarenv/1.3
-module load intel/2021.2
-module load mpt/2.22
+module load intel/2022.1
+module load mpt/2.25
 module load ncarcompilers/0.5.0
-module load python/3.7.9
 module unload netcdf
 
-module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-v1.2.0/modulefiles/stack
+module use /glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack
 module load hpc/1.2.0
-module load hpc-intel/2021.2
-module load hpc-mpt/2.22
+module load hpc-intel/2022.1
+module load hpc-mpt/2.25
 
 module load srw_common
-module load g2/3.4.3
-module load esmf/8_2_0
+
+module load g2/3.4.5
+module load esmf/8.3.0b09
 module load netcdf/4.7.4
-module load png/1.6.35
-module load pio/2.5.2
+module load libpng/1.6.37
+module load pio/2.5.3
+module load fms/2022.01
 
 setenv CMAKE_C_COMPILER mpicc
 setenv CMAKE_CXX_COMPILER mpicxx
 setenv CMAKE_Fortran_COMPILER mpif90
 setenv CMAKE_Platform cheyenne.intel
-

modulefiles/build_gaea_intel

@@ -2,13 +2,28 @@
 
 proc ModulesHelp { } {
    puts stderr "This module loads libraries for building SRW on"
-   puts stderr "the NOAA RDHPC machine Gaea using Intel-18.0.6.288"
+   puts stderr "the NOAA RDHPC machine Gaea using Intel-2021.3.0"
 }
 
 module-whatis "Loads libraries needed for building SRW on Gaea"
 
+module load PrgEnv-intel/6.0.5
+module rm intel
+module rm cray-mpich
+module rm netcdf
+module load intel/18.0.6.288
+module load cray-mpich/7.7.11
+module load cray-python/3.7.3.2
+# Needed at runtime:
+module load alps
+#needed for WW3 build
+module load gcc/8.3.0
+
 module use /lustre/f2/pdata/ncep_shared/hpc-stack/modulefiles/stack
-module load hpc/1.2.0 hpc-intel/18.0.6.288  hpc-cray-mpich/7.7.11
+module load hpc/1.1.0
+module load hpc-intel/2021.3.0
+module load hpc-cray-mpich/7.7.11
+
 module load srw_common
 
 module use /lustre/f2/pdata/esrl/gsd/contrib/modulefiles
@@ -22,4 +37,3 @@ setenv CMAKE_C_COMPILER cc
 setenv CMAKE_CXX_COMPILER CC
 setenv CMAKE_Fortran_COMPILER ftn
 setenv CMAKE_Platform gaea.intel
-

modulefiles/build_hera_intel

@@ -2,34 +2,29 @@
 
 proc ModulesHelp { } {
    puts stderr "This module loads libraries for building SRW on"
-   puts stderr "the NOAA RDHPC machine Hera using Intel-18.0.5.274"
+   puts stderr "the NOAA RDHPC machine Hera using Intel-2022.1.2"
 }
 
 module-whatis "Loads libraries needed for building SRW on Hera"
 
-module use /scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles
-module load miniconda3/3.7.3
+module use /contrib/miniconda3/modulefiles
+module load miniconda3/4.5.12
 
 module use /contrib/sutils/modulefiles
 module load sutils
 
 module load cmake/3.20.1
 
 module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
-
-module load hpc/1.1.0
-module load hpc-intel/18.0.5.274
-module load hpc-impi/2018.0.4
+module load hpc/1.2.0
+module load hpc-intel/2022.1.2
+module load hpc-impi/2022.1.2
 
 module load srw_common
 
-module unload fms
-module load fms/2021.03-avx
+module load nccmp/1.8.9.0
 
 setenv CMAKE_C_COMPILER mpiicc
 setenv CMAKE_CXX_COMPILER mpiicpc
 setenv CMAKE_Fortran_COMPILER mpiifort
 setenv CMAKE_Platform hera.intel
-
-# use shared memory and OpenFabrics Alliance (OFA) fabric with Intel MPI to circumvent RDMA-related bug in DAPL.
-setenv I_MPI_Platform shm:ofa

modulefiles/build_jet_intel

@@ -2,7 +2,7 @@
 
 proc ModulesHelp { } {
    puts stderr "This module loads libraries for building SRW on"
-   puts stderr "the NOAA RDHPC machine JET using Intel-18.0.5.274"
+   puts stderr "the NOAA RDHPC machine JET using Intel-2022.1.2"
 }
 
 module-whatis "Loads libraries needed for building SRW on JET"
@@ -14,12 +14,15 @@ module load cmake/3.20.1
 
 module use /lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack
 
-module load hpc/1.1.0
-module load hpc-intel/18.0.5.274
-module load hpc-impi/2018.4.274
+module load hpc/1.2.0
+module load hpc-intel/2022.1.2
+module load hpc-impi/2022.1.2
 
 module load srw_common
 
+module load nccmp/1.8.9.0
+module load prod_util/1.2.2
+
 setenv CMAKE_C_COMPILER mpiicc
 setenv CMAKE_CXX_COMPILER mpiicpc
 setenv CMAKE_Fortran_COMPILER mpiifort

modulefiles/build_orion_intel

@@ -2,7 +2,7 @@
 
 proc ModulesHelp { } {
    puts stderr "This module loads libraries for building SRW on"
-   puts stderr "the MSU machineOrion using Intel-18.0.5"
+   puts stderr "the MSU machineOrion using Intel-2022.1.2"
 }
 
 module-whatis "Loads libraries needed for building SRW on Orion"
@@ -13,15 +13,15 @@ module load cmake/3.22.1
 module load python/3.9.2
 
 module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack
-
-module load hpc/1.1.0
-module load hpc-intel/2018.4
-module load hpc-impi/2018.4
+module load hpc/1.2.0
+module load hpc-intel/2022.1.2
+module load hpc-impi/2022.1.2
 
 module load srw_common
 
+module load nccmp/1.8.9.0
+
 setenv CMAKE_C_COMPILER mpiicc
 setenv CMAKE_CXX_COMPILER mpiicpc
 setenv CMAKE_Fortran_COMPILER mpiifort
 setenv CMAKE_Platform orion.intel
-

modulefiles/srw_common

@@ -2,33 +2,30 @@
 
 module load jasper/2.0.25
 module load zlib/1.2.11
-module load-any png/1.6.35 libpng/1.6.35
+module load-any png/1.6.35 libpng/1.6.37
 
 module load hdf5/1.10.6
 module load-any netcdf/4.7.4 netcdf-c/4.7.4
 module load-any netcdf/4.7.4 netcdf-fortran/4.5.4
-module load-any pio/2.5.2 parallelio/2.5.2
-module load-any esmf/8_2_0 esmf/8.2.0
-module load fms/2021.03
+module load-any pio/2.5.3 parallelio/2.5.2
+module load-any esmf/8.3.0b09 esmf/8.2.0
+module load fms/2022.01
 
 module load bacio/2.4.1
 module load crtm/2.3.0
-module load g2/3.4.3
+module load g2/3.4.5
 module load g2tmpl/1.10.0
 module load ip/3.3.3
 module load sp/2.3.3
 module load w3nco/2.4.1
-module load upp/10.0.10
 
 module load-any gftl-shared/v1.3.3 gftl-shared/1.3.3
 module load-any yafyaml/v0.5.1 yafyaml/0.5.1
-module load-any mapl/2.11.0-esmf-8_2_0 mapl/2.11.0-esmf-8.2.0
+module load-any mapl/2.11.0-esmf-8.3.0b09 mapl/2.11.0-esmf-8.2.0
 
-module load gfsio/1.4.1
-module load landsfcutil/2.4.1
-module load nemsio/2.5.2
-module load nemsiogfs/2.5.3
+module load nemsio/2.5.4
 module load sfcio/1.4.1
 module load sigio/2.3.2
-module load w3emc/2.7.3
-module load wgrib2/2.0.8
+
+module load w3emc/2.9.2
+module load wrf_io/1.2.0

modulefiles/wflow_jet

@@ -9,8 +9,8 @@ module-whatis "Loads libraries needed for running SRW on Jet"
 
 module load rocoto
 
-module use -a /contrib/miniconda3/modulefiles
-module load miniconda3
+module use /contrib/miniconda3/modulefiles
+module load miniconda3/4.5.12
 
 if { [module-info mode load] } {
   puts stderr "Please do the following to activate conda:

src/CMakeLists.txt

@@ -1,10 +1,15 @@
 include(ExternalProject)
 
+list(APPEND UFS_UTILS_ARGS
+  "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}"
+  "-DBUILD_TESTING=OFF"
+)
+
 ExternalProject_Add(UFS_UTILS
   PREFIX ${CMAKE_CURRENT_BINARY_DIR}/UFS_UTILS
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/UFS_UTILS
   INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
-  CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}"
+  CMAKE_ARGS ${UFS_UTILS_ARGS}
   BUILD_ALWAYS TRUE
   )