Merge branch 'NOAA-EMC:develop' into develop

.github/workflows/gcc.yml

@@ -31,7 +31,7 @@ env:
 
 jobs:
   setup:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: checkout-upp  # This is for getting spack.yaml
@@ -67,7 +67,7 @@ jobs:
 
   build:
     needs: setup
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: checkout-upp

CMakeLists.txt

@@ -30,7 +30,7 @@ if(NOT CMAKE_BUILD_TYPE MATCHES "^(Debug|Release|RelWithDebInfo|MinSizeRel)$")
                                                "MinSizeRel" "RelWithDebInfo")
 endif()
 
-if(NOT CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel|GNU|Clang|AppleClang)$")
+if(NOT CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel|IntelLLVM|GNU|Clang|AppleClang)$")
   message(WARNING "Compiler not officially supported: ${CMAKE_Fortran_COMPILER_ID}")
 endif()
 

doc/user_guide.md

@@ -2,6 +2,15 @@
 
 # Unified Post-Processing (UPP)
 
+The UPP code is publicly available on GitHub at https://github.com/NOAA-EMC/UPP.
+
+## Documentation for Previous Versions of UPP
+
+* [UPP Version UPP-SRW-v2.2.0](upp-srw-v2.2.0/index.html)
+* [UPP Version 11.0.0](upp_v11.0.0/index.html)
+
+## Background Information
+
 The Unified Post Processor (UPP) software package is a software
 package designed to generate useful products from raw model
 output. The UPP is currently used in operations with the Global
@@ -33,9 +42,10 @@ techniques. Examples of UPP products include:
 - Radar reflectivity products
 - Satellite look-alike products
 
-**Prerequisites**
+## Prerequisites
 The UPP requires certain NCEPLIBS packages to be installed via the spack-stack project. For instructions on installing these packages as a bundle via spack-stack, see: https://spack-stack.readthedocs.io/en/latest/. The UPP/modulefiles directory indicates which package versions are used and supported on Level 1 systems.
 
+## Community Support
 Community support for the Unified Forecast System (UFS) UPP in FV3-based applications is provided by the
 Earth Prediction Innovation Center (EPIC). Community support for the UPP with WRF is no longer available. 
 
@@ -47,4 +57,3 @@ Earth Prediction Innovation Center (EPIC). Community support for the UPP with WR
 
 Code Managers: Wen Meng (EMC), Huiya Chuang (EMC), Fernando Andrade-Maldonado (EPIC)
 
-

modulefiles/gaea.lua → modulefiles/gaeac5.lua

@@ -1,16 +1,16 @@
 help([[
   This module loads libraries required for building and running UPP
-  on the NOAA RDHPC machine Gaea C5 using Intel-2023.1.0.
+  on the NOAA RDHPC machine Gaea C5 using Intel-2023.2.0.
 ]])
 
-whatis([===[Loads libraries needed for building the UPP on Gaea ]===])
+whatis([===[Loads libraries needed for building the UPP on Gaea C5 ]===])
 
 prepend_path("MODULEPATH", "/autofs/ncrc-svm1_proj/epic/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")
 
-stack_intel_ver=os.getenv("stack_intel_ver") or "2023.1.0"
+stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
 load(pathJoin("stack-intel", stack_intel_ver))
 
-stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.25"
+stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.28"
 load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
 
 cmake_ver=os.getenv("cmake_ver") or "3.23.1"
@@ -25,4 +25,4 @@ setenv("CC","cc")
 setenv("CXX","CC")
 setenv("FC","ftn")
 
-setenv("CMAKE_Platform","gaea.intel")
+setenv("CMAKE_Platform","gaeac5.intel")

modulefiles/gaeac6.lua

@@ -0,0 +1,28 @@
+help([[
+  This module loads libraries required for building and running UPP
+  on the NOAA RDHPC machine Gaea C6 using Intel-2023.2.0.
+]])
+
+whatis([===[Loads libraries needed for building the UPP on Gaea C6 ]===])
+
+prepend_path("MODULEPATH", "/autofs/ncrc-svm1_proj/epic/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")
+
+stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
+load(pathJoin("stack-intel", stack_intel_ver))
+
+stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.28"
+load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
+
+cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+load(pathJoin("cmake", cmake_ver))
+
+load("upp_common")
+
+unload("darshan-runtime")
+unload("cray-libsci")
+
+setenv("CC","cc")
+setenv("CXX","CC")
+setenv("FC","ftn")
+
+setenv("CMAKE_Platform","gaeac6.intel")

modulefiles/hera_external_ifi.lua

@@ -0,0 +1,6 @@
+help([[
+Load external libIFI for UPP on hera
+]])
+
+prepend_path("MODULEPATH", "/scratch2/BMC/ifi/modulefiles")
+load("ifi/20230511-intel-2022.1.2")

modulefiles/hera_ifi_test_prereqs.lua

@@ -0,0 +1,6 @@
+help([[
+Load prerequisites for IFI's own internal test programs and its "fip2 lookalike." This is only needed with the internal IFI when building with -DBUILD_IFI_EXECUTABLES=ON (the -B option to compile_upp.sh).
+]])
+
+
+load("netcdf-cxx4/4.3.1")

modulefiles/jet_external_ifi.lua

@@ -0,0 +1,6 @@
+help([[
+Load external libIFI for UPP on hera
+]])
+
+prepend_path("MODULEPATH", "/lfs5/BMC/ifi/modulefiles")
+load("ifi/20241001-intel-2022.1.2")

modulefiles/jet_ifi_test_prereqs.lua

@@ -0,0 +1,6 @@
+help([[
+Load prerequisites for IFI's own internal test programs and its "fip2 lookalike." This is only needed with the internal IFI when building with -DBUILD_IFI_EXECUTABLES=ON (the -B option to compile_upp.sh).
+]])
+
+
+load("netcdf-cxx4/4.3.1")

modulefiles/noaacloud.lua

@@ -2,15 +2,12 @@ help([[
 Load environment to build UPP on NOAA Cloud
 ]])
 
-
-prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
-prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")
-
-stack_intel_ver=os.getenv("stack_intel_ver") or "2021.3.0"
-load(pathJoin("stack-intel", stack_intel_ver))
-
-stack_impi_ver=os.getenv("stack_impi_ver") or "2021.3.0"
-load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+prepend_path("MODULEPATH", "/contrib/spack-stack-rocky8/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/apps/modules/modulefiles")
+load("gnu")
+load("stack-intel")
+load("stack-intel-oneapi-mpi")
+unload("gnu")
 
 cmake_ver=os.getenv("cmake_ver") or "3.23.1"
 load(pathJoin("cmake", cmake_ver))

modulefiles/wcoss2.lua

@@ -26,10 +26,10 @@ load(pathJoin("zlib", zlib_ver))
 g2_ver=os.getenv("g2_ver") or "3.5.1"
 g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.13.0"
 bacio_ver=os.getenv("bacio_ver") or "2.4.1"
-ip_ver=os.getenv("ip_ver") or "3.3.3"
+ip_ver=os.getenv("ip_ver") or "4.0.0"
 sp_ver=os.getenv("sp_ver") or "2.3.3"
 crtm_ver=os.getenv("crtm_ver") or "2.4.0.1"
-w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
+w3emc_ver=os.getenv("w3emc_ver") or "2.12.0"
 load(pathJoin("g2", g2_ver))
 load(pathJoin("g2tmpl", g2tmpl_ver))
 load(pathJoin("bacio", bacio_ver))

parm/gefs/post_itag_gefs128

@@ -0,0 +1,7 @@
+&MODEL_INPUTS
+MODELNAME='GFS'
+/
+&NAMPGB
+KPO=50,PO=1000.,975.,950.,925.,900.,875.,850.,825.,800.,775.,750.,725.,700.,675.,650.,625.,600.,575.,550.,525.,500.,475.,450.,425.,400.,375.,350.,325.,300.,275.,250.,225.,200.,175.,150.,125.,100.,70.,50.,40.,30.,20.,15.,10.,7.,5.,3.,2.,1.,0.4,nasa_on=.true.,
+/
+EOF