Update (partially) global-workflow for orion+rocky9 (#2741)

This PR: - updates a few submodules (GSI, GSI-utils, GSI-monitor, UFS_utils, GFS-utils) to include recent update to their modulefiles for Orion+Rocky9 upgrade - updates the modulefiles in global-workflow to load modules from Orion+Rocky9 paths - updates modulefiles for `gwsetup` and `gwci` as well. - removes NCL and GEMPAK from Orion. NCL is not used and GEMPAK is not installed. - adds `parm/config.gfs/config.resources.ORION` to address GSI performance degradation after Rocky 9 upgrade. This PR: - does not update the build for UPP. Standalone UPP is not available via ufs-weather-model as of #2729 - will need a follow-up update for `prepobs` and `fit2obs` updated locations when they are installed in `glopara` space on Orion. # Type of change - Maintenance (code refactor, clean-up, new CI test, etc.) # Change characteristics - Is this a breaking change (a change in existing functionality)? NO - Does this change require a documentation update? NO # How has this been tested? This PR is not sufficient for Orion. This PR must be tested on other platforms (Hera, WCOSS2) as this PR updates submodules. # Checklist - [ ] Any dependent changes have been merged and published - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] My changes generate no new warnings - [ ] New and existing tests pass with my changes - [ ] I have made corresponding changes to the documentation if necessary --------- Co-authored-by: Kate Friedman <[email protected]>
NOAA-EMC · Jul 5, 2024 · 58fca16 · 58fca16
1 parent d65d3d2
commit 58fca16
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 30 deletions.
diff --git a/modulefiles/module_base.orion.lua b/modulefiles/module_base.orion.lua
@@ -9,8 +9,6 @@ load(pathJoin("stack-intel", (os.getenv("stack_intel_ver") or "None")))
 load(pathJoin("stack-intel-oneapi-mpi", (os.getenv("stack_impi_ver") or "None")))
 load(pathJoin("python", (os.getenv("python_ver") or "None")))
 
-load(pathJoin("gempak", (os.getenv("gempak_ver") or "None")))
-load(pathJoin("ncl", (os.getenv("ncl_ver") or "None")))
 load(pathJoin("jasper", (os.getenv("jasper_ver") or "None")))
 load(pathJoin("libpng", (os.getenv("libpng_ver") or "None")))
 load(pathJoin("cdo", (os.getenv("cdo_ver") or "None")))
@@ -44,11 +42,12 @@ setenv("WGRIB2","wgrib2")
 setenv("WGRIB","wgrib")
 setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))
 
---prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
-prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles"))
+--prepend_path("MODULEPATH", "/work/noaa/global/glopara/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles")
+prepend_path("MODULEPATH", pathJoin("/work/noaa/global/kfriedma/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
 load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))
 
-prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
+--prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
+prepend_path("MODULEPATH", pathJoin("/work/noaa/global/kfriedma/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
 load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None")))
 
 whatis("Description: GFS run environment")
diff --git a/modulefiles/module_gwci.orion.lua b/modulefiles/module_gwci.orion.lua
@@ -2,10 +2,10 @@ help([[
 Load environment to run GFS workflow ci scripts on Orion
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env-rocky9/install/modulefiles/Core")
 
-load(pathJoin("stack-intel", os.getenv("2022.0.2")))
-load(pathJoin("stack-intel-oneapi-mpi", os.getenv("2021.5.1")))
+load(pathJoin("stack-intel", os.getenv("2021.9.0")))
+load(pathJoin("stack-intel-oneapi-mpi", os.getenv("2021.9.0")))
 
 load(pathJoin("netcdf-c", os.getenv("4.9.2")))
 load(pathJoin("netcdf-fortran", os.getenv("4.6.1")))

diff --git a/modulefiles/module_gwsetup.orion.lua b/modulefiles/module_gwsetup.orion.lua
@@ -4,11 +4,11 @@ Load environment to run GFS workflow ci scripts on Orion
 
 prepend_path("MODULEPATH", "/apps/modulefiles/core")
 load(pathJoin("contrib","0.1"))
-load(pathJoin("rocoto","1.3.3"))
+load(pathJoin("rocoto","1.3.7"))
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env-rocky9/install/modulefiles/Core")
 
-local stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2"
+local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
 local python_ver=os.getenv("python_ver") or "3.11.6"
 
 load(pathJoin("stack-intel", stack_intel_ver))

diff --git a/parm/config/gfs/config.resources.ORION b/parm/config/gfs/config.resources.ORION
@@ -0,0 +1,17 @@
+#! /usr/bin/env bash
+
+# Orion-specific job resources
+
+case ${step} in
+  "anal")
+    # TODO:
+    # On Orion, after Rocky 9 upgrade, GSI performance is degraded.
+    # Remove this block once GSI issue is resolved
+    # https://github.com/NOAA-EMC/GSI/pull/764
+    # https://github.com/JCSDA/spack-stack/issues/1166
+    export wtime_anal_gdas="02:40:00"
+    export wtime_anal_gfs="02:00:00"
+  ;;
+  *)
+  ;;
+esac
diff --git a/sorc/gfs_utils.fd b/sorc/gfs_utils.fd
diff --git a/sorc/gsi_enkf.fd b/sorc/gsi_enkf.fd
diff --git a/sorc/gsi_monitor.fd b/sorc/gsi_monitor.fd
diff --git a/sorc/gsi_utils.fd b/sorc/gsi_utils.fd
diff --git a/sorc/ufs_utils.fd b/sorc/ufs_utils.fd
diff --git a/ush/detect_machine.sh b/ush/detect_machine.sh
@@ -45,7 +45,7 @@ case $(hostname -f) in
   *) MACHINE_ID=UNKNOWN ;;  # Unknown platform
 esac
 
-if [[ ${MACHINE_ID} == "UNKNOWN" ]]; then 
+if [[ ${MACHINE_ID} == "UNKNOWN" ]]; then
    case ${PW_CSP:-} in
       "aws" | "google" | "azure") MACHINE_ID=noaacloud ;;
       *) PW_CSP="UNKNOWN"
@@ -75,7 +75,7 @@ elif [[ -d /scratch1 ]]; then
   MACHINE_ID=hera
 elif [[ -d /work ]]; then
   # We are on MSU Orion or Hercules
-  mount=$(findmnt -n -o SOURCE /home)   
+  mount=$(findmnt -n -o SOURCE /home)
   if [[ ${mount} =~ "hercules" ]]; then
     MACHINE_ID=hercules
   else

diff --git a/versions/build.orion.ver b/versions/build.orion.ver
@@ -1,5 +1,5 @@
-export stack_intel_ver=2022.0.2
-export stack_impi_ver=2021.5.1
-export spack_env=gsi-addon-env
+export stack_intel_ver=2021.9.0
+export stack_impi_ver=2021.9.0
+export spack_env=gsi-addon-env-rocky9
 source "${HOMEgfs:-}/versions/build.spack.ver"
 export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/run.orion.ver b/versions/run.orion.ver
@@ -1,12 +1,6 @@
-export stack_intel_ver=2022.0.2
-export stack_impi_ver=2021.5.1
-export spack_env=gsi-addon-env
-
-export ncl_ver=6.6.2
-export gempak_ver=7.5.1
+export stack_intel_ver=2021.9.0
+export stack_impi_ver=2021.9.0
+export spack_env=gsi-addon-env-rocky9
 
 source "${HOMEgfs:-}/versions/run.spack.ver"
 export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
-
-#cdo is older on Orion
-export cdo_ver=2.0.5