Merge branch 'NOAA-EMC:develop' into spectral_strm_vpot

NOAA-EMC · Nov 21, 2024 · 6401b6f · 6401b6f
2 parents 26aaeb0 + 4fba2fb
commit 6401b6f
Show file tree

Hide file tree

Showing 26 changed files with 429 additions and 258 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -89,7 +89,11 @@ if(BUILD_POSTEXEC)
     find_package(nemsio REQUIRED)
     find_package(sigio REQUIRED)
   endif()
-  find_package(sp REQUIRED)
+  find_package(sp QUIET)
+  find_package(ip 5.0 QUIET)
+  if((NOT ip_VERSION VERSION_GREATER_EQUAL 5.0) AND (NOT sp_FOUND))
+    message(SEND_ERROR "UPP requires sp or ip v5+.")
+  endif()
   find_package(w3emc REQUIRED)
   if(BUILD_WITH_WRFIO)
     find_package(wrf_io REQUIRED)

diff --git a/README.md b/README.md
@@ -72,7 +72,6 @@ Required NCEPLIBS packages:
 
 - [NCEPLIBS-g2](https://github.com/NOAA-EMC/NCEPLIBS-g2)
 - [NCEPLIBS-g2tmpl](https://github.com/NOAA-EMC/NCEPLIBS-g2tmpl)
-- [NCEPLIBS-sp](https://github.com/NOAA-EMC/NCEPLIBS-sp)
 - [NCEPLIBS-ip](https://github.com/NOAA-EMC/NCEPLIBS-ip)
 - [NCEPLIBS-bacio](https://github.com/NOAA-EMC/NCEPLIBS-bacio)
 - [NCEPLIBS-w3emc](https://github.com/NOAA-EMC/NCEPLIBS-w3emc)
@@ -135,4 +134,4 @@ States Government.
 
 ## UPP Terms of Use Notice
 
-The UPP Terms of Use Notice is available at: https://github.com/NOAA-EMC/UPP/wiki/UPP-Terms-of-Use-Notice
+The UPP Terms of Use Notice is available at: https://github.com/NOAA-EMC/UPP/wiki/UPP-Terms-of-Use-Notice
diff --git a/ci/rt.sh b/ci/rt.sh
@@ -67,15 +67,15 @@ if [ $mac2 = hf ]; then # for HERA
  export machine=HERA
  export homedir=${homedir:-"/scratch2/NAGAPE/epic/UPP/test_suite"}
  export rundir=${rundir:-"/scratch1/NCEPDEV/stmp2/${USER}"}
- module use /scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core
+ module use /contrib/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.5.0/install/modulefiles/Core
  module load stack-intel/2021.5.0
  module load stack-intel-oneapi-mpi/2021.5.1
  module load prod_util/2.1.1
 elif [ $mac3 = orio ] ; then
  export machine=ORION
  export homedir=${homedir:-"/work/noaa/epic/UPP"}
  export rundir=${rundir:-"/work2/noaa/stmp/$USER"}
- module use /work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core
+ module use /apps/contrib/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.9.0/install/modulefiles/Core
  module load stack-intel/2021.9.0
  module load stack-intel-oneapi-mpi/2021.9.0
  module load prod_util/2.1.1
@@ -84,7 +84,7 @@ elif [ $mac3 = herc ] ; then
  export machine=HERCULES
  export homedir=${homedir:-"/work/noaa/epic/UPP"}
  export rundir=${rundir:-"/work2/noaa/stmp/$USER"}
- module use /work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core
+ module use /apps/contrib/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.9.0/install/modulefiles/Core
  module load stack-intel/2021.9.0
  module load stack-intel-oneapi-mpi/2021.9.0
  module load prod_util/2.1.1

diff --git a/ci/spack.yaml b/ci/spack.yaml
@@ -12,8 +12,7 @@ spack:
   - [email protected]
   - [email protected]
   - [email protected]
-  - [email protected]
-  - [email protected]
+  - [email protected]
   - [email protected]
   - [email protected]
   - [email protected]

diff --git a/doc/UserGuide/BuildingRunningTesting/BuildingUPP.rst b/doc/UserGuide/BuildingRunningTesting/BuildingUPP.rst
@@ -31,7 +31,7 @@ the instructions in the :doc:`spack-stack User's Guide <spack-stack:index>`.
 Common Modules
 ----------------
 
-As of February 1, 2024, the UPP uses the following `common modules <https://github.com/NOAA-EMC/UPP/blob/develop/modulefiles/upp_common.lua>`__ from spack-stack: 
+As of October 2024, the UPP uses the following `common modules <https://github.com/NOAA-EMC/UPP/blob/develop/modulefiles/upp_common.lua>`__ from spack-stack: 
 
 .. code-block:: console
 
@@ -46,8 +46,7 @@ As of February 1, 2024, the UPP uses the following `common modules <https://gith
    g2tmpl 1.10.2
    parallelio 2.5.10
    bacio 2.4.1
-   ip 4.3.0
-   sp 2.5.0
+   ip 5.0.0
    crtm 2.4.0.1
    w3emc 2.10.0
    nemsio 2.5.4

diff --git a/modulefiles/gaeac5.lua b/modulefiles/gaeac5.lua
@@ -5,15 +5,15 @@ help([[
 
 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")
+prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.9.0/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"
+cmake_ver=os.getenv("cmake_ver") or "3.27.9"
 load(pathJoin("cmake", cmake_ver))
 
 load("upp_common")

diff --git a/modulefiles/gaeac6.lua b/modulefiles/gaeac6.lua
@@ -5,12 +5,12 @@ help([[
 
 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")
+prepend_path("MODULEPATH", "/autofs/ncrc-svm1_proj/epic/spack-stack/c6/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"
+stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.29"
 load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
 
 cmake_ver=os.getenv("cmake_ver") or "3.23.1"

diff --git a/modulefiles/hera.lua b/modulefiles/hera.lua
@@ -3,15 +3,15 @@ Load environment to build UPP on hera
 ]])
 
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.5.0/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
 load(pathJoin("stack-intel", stack_intel_ver))
 
 stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
 load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
 
-cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+cmake_ver=os.getenv("cmake_ver") or "3.27.9"
 load(pathJoin("cmake", cmake_ver))
 
 load("upp_common")

diff --git a/modulefiles/hercules.lua b/modulefiles/hercules.lua
@@ -3,15 +3,15 @@ Load environment to build UPP on hecules
 ]])
 
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.9.0/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
 load(pathJoin("stack-intel", stack_intel_ver))
 
 stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
 load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
 
-cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+cmake_ver=os.getenv("cmake_ver") or "3.27.9"
 load(pathJoin("cmake", cmake_ver))
 
 python_ver=os.getenv("python_ver") or "3.10.8"

diff --git a/modulefiles/orion.lua b/modulefiles/orion.lua
@@ -3,15 +3,15 @@ Load environment to build UPP on orion
 ]])
 
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.9.0/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
 load(pathJoin("stack-intel", stack_intel_ver))
 
 stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
 load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
 
-cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+cmake_ver=os.getenv("cmake_ver") or "3.27.9"
 load(pathJoin("cmake", cmake_ver))
 
 python_ver=os.getenv("python_ver") or "3.10.8"

diff --git a/modulefiles/upp_common.lua b/modulefiles/upp_common.lua
@@ -3,22 +3,21 @@ whatis("Description: UPP build environment common libraries")
 help([[Load UFS Model common libraries]])
 
 local ufs_modules = {
-  {["jasper"]          = "2.0.32"},
-  {["zlib"]            = "1.2.13"},
-  {["libpng"]          = "1.6.37"},
-  {["hdf5"]            = "1.14.0"},
-  {["netcdf-c"]        = "4.9.2"},
-  {["netcdf-fortran"]  = "4.6.1"},
-  {["bacio"]           = "2.4.1"},
+  {["jasper"]          = "2.0.32" },
+  {["zlib-ng"]         = "2.1.6"  },
+  {["libpng"]          = "1.6.37" },
+  {["hdf5"]            = "1.14.3" },
+  {["netcdf-c"]        = "4.9.2"  },
+  {["netcdf-fortran"]  = "4.6.1"  },
+  {["bacio"]           = "2.4.1"  },
   {["crtm"]            = "2.4.0.1"},
-  {["g2"]              = "3.5.1"},
-  {["g2tmpl"]          = "1.13.0"},
-  {["ip"]              = "4.3.0"},
-  {["sp"]              = "2.5.0"},
-  {["w3emc"]           = "2.10.0"},
-  {["nemsio"]          = "2.5.4"},
-  {["sigio"]           = "2.3.2"},
-  {["wrf-io"]          = "1.2.0"},
+  {["g2"]              = "3.5.1"  },
+  {["g2tmpl"]          = "1.13.0" },
+  {["ip"]              = "5.0.0"  },
+  {["w3emc"]           = "2.10.0" },
+  {["nemsio"]          = "2.5.4"  },
+  {["sigio"]           = "2.3.2"  },
+  {["wrf-io"]          = "1.2.0"  },
 }
 
 for i = 1, #ufs_modules do

diff --git a/parm/gefs/postcntrl_gefs.xml b/parm/gefs/postcntrl_gefs.xml
@@ -22,7 +22,7 @@
 
     <param>
        <shortname>HGT_ON_ISOBARIC_SFC</shortname>
-       <level>100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 22500. 25000. 27500. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.</level>
+       <level>100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
        <scale>6.0</scale>
     </param>
 
@@ -34,13 +34,13 @@
 
     <param>
        <shortname>TMP_ON_ISOBARIC_SFC</shortname>
-       <level>100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.</level>
+       <level>100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
        <scale>3.0</scale>       
     </param>
 
     <param>
        <shortname>SPFH_ON_ISOBARIC_SFC</shortname>
-       <level>100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.</level>
+       <level>100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
        <scale>4.0</scale>       
     </param>
 
@@ -52,19 +52,19 @@
 
     <param>
        <shortname>UGRD_ON_ISOBARIC_SFC</shortname>
-       <level>100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 22500. 25000. 27500. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.</level>
+       <level>100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
        <scale>4.0</scale>       
     </param>
 
     <param>
        <shortname>VGRD_ON_ISOBARIC_SFC</shortname>
-       <level>100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 22500. 25000. 27500. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.</level>
+       <level>100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
        <scale>4.0</scale>       
     </param>
 
     <param>
        <shortname>VVEL_ON_ISOBARIC_SFC</shortname>
-       <level>100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.</level>
+       <level>100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
        <scale>5.0</scale>
     </param>
 
@@ -1327,6 +1327,21 @@
        <scale> 9.0</scale>
     </param>
 
+    <param>
+        <shortname>MAX_WIND_ON_SPEC_HGT_LVL_ABOVE_GRND_10m</shortname>
+        <scale>-4.0</scale>
+    </param>
+
+    <param>
+        <shortname>MAX_UGD_ON_SPEC_HGT_LVL_ABOVE_GRND_10m</shortname>
+        <scale>-4.0</scale>
+    </param>
+
+    <param>
+        <shortname>MAX_VGD_ON_SPEC_HGT_LVL_ABOVE_GRND_10m</shortname>
+        <scale>-4.0</scale>
+    </param>
+
     <!--  comments wherever I like -->
   </paramset>
 </postxml>