Skip to content

Commit d6be3b5

Browse files
HenryRWinterbottomaerorahulDavidHuber-NOAA
authored
Update global-workflow and subcomponents to Hera/Rocky 8 partition (#2421)
This PR addresses issue #2329. The following is accomplished: - All submodule RDHPCS Hera stacks are updated to be compatible with the Rocky-8 distro spack-stack; - The global-workflow version files `versions/build.hera.ver` and `versions/run.hera.ver` are updated for Rocky-8; - All submodule hashes have been updated to be compliant with the Rocky-8 distro spack-stack (see the reference PRs below); - Update to `parm/config/config.base` is made for not yet compliant packages; - Relevant updates are made to `modulefiles/module_base.hera.lua` and `modulefiles/module_gwsetup.lua`. Resolves #2329 Refs: [#958](NOAA-EMC/GDASApp#958) [#49](NOAA-EMC/gfs-utils#49) [#124](NOAA-EMC/GSI-Monitor#124) [#31](NOAA-EMC/GSI-utils#31) [#2167](ufs-community/ufs-weather-model#2167) [#2143](ufs-community/ufs-weather-model#2143) [#913](ufs-community/UFS_UTILS#913) Co-authored-by: Rahul Mahajan <aerorahul@users.noreply.github.com> Co-authored-by: David Huber <69919478+DavidHuber-NOAA@users.noreply.github.com>
1 parent 4730215 commit d6be3b5

20 files changed

+31
-19
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,6 @@
2626
[submodule "sorc/gsi_monitor.fd"]
2727
path = sorc/gsi_monitor.fd
2828
url = https://github.com/NOAA-EMC/GSI-Monitor.git
29+
[submodule "sorc/upp.fd"]
30+
path = sorc/upp.fd
31+
url = https://github.com/NOAA-EMC/UPP.git

ci/cases/pr/C48_S2SWA_gefs.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@ arguments:
1616
idate: 2021032312
1717
edate: 2021032312
1818
yaml: {{ HOMEgfs }}/ci/cases/yamls/gefs_ci_defaults.yaml
19+
20+
skip_ci_on_hosts:
21+
- hera

ci/cases/pr/C48mx500_3DVarAOWCDA.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ arguments:
1919

2020
skip_ci_on_hosts:
2121
- orion
22+
- hera
2223
- hercules

modulefiles/module_base.hera.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ setenv("WGRIB2","wgrib2")
4242
setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))
4343

4444
--prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
45-
prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles"))
45+
prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/dev-gfsv17/modulefiles"))
4646
load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))
4747

4848
prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))

modulefiles/module_gwci.hera.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ help([[
22
Load environment to run GFS workflow setup scripts on Hera
33
]])
44

5-
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev/install/modulefiles/Core")
5+
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev-rocky8/install/modulefiles/Core")
66

77
load(pathJoin("stack-intel", os.getenv("2021.5.0")))
88
load(pathJoin("stack-intel-oneapi-mpi", os.getenv("2021.5.1")))

modulefiles/module_gwsetup.hera.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Load environment to run GFS workflow setup scripts on Hera
44

55
load(pathJoin("rocoto"))
66

7-
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev/install/modulefiles/Core")
7+
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev-rocky8/install/modulefiles/Core")
88

99
local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
1010
local python_ver=os.getenv("python_ver") or "3.11.6"

parm/config/gfs/config.base

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,11 +384,14 @@ export FITSARC="YES"
384384
export FHMAX_FITS=132
385385
[[ "${FHMAX_FITS}" -gt "${FHMAX_GFS}" ]] && export FHMAX_FITS=${FHMAX_GFS}
386386

387-
# The monitor jobs are not yet supported for JEDIATMVAR
387+
# The monitor jobs are not yet supported for JEDIATMVAR.
388388
if [[ ${DO_JEDIATMVAR} = "YES" ]]; then
389389
export DO_VERFOZN="NO" # Ozone data assimilation monitoring
390390
export DO_VERFRAD="NO" # Radiance data assimilation monitoring
391391
export DO_VMINMON="NO" # GSI minimization monitoring
392+
# The minimization monitor is not yet supported on RDHPCS Hera for Rocky-8
393+
elif [[ ${machine} = "HERA" ]]; then
394+
export DO_VMINMON="NO" # GSI minimization monitoring
392395
fi
393396

394397
echo "END: config.base"

sorc/build_upp.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ if [[ ! -d "../exec" ]]; then
2626
mkdir -p ../exec
2727
fi
2828

29-
cd ufs_model.fd/FV3/upp/tests
29+
cd upp.fd/tests
3030
# shellcheck disable=SC2086
3131
BUILD_JOBS=${BUILD_JOBS:-8} ./compile_upp.sh ${_opts}

sorc/gfs_utils.fd

Submodule gfs_utils.fd updated 50 files

sorc/gsi_enkf.fd

Submodule gsi_enkf.fd updated 78 files

sorc/link_workflow.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -352,10 +352,11 @@ fi
352352
#--link source code directories
353353
#------------------------------
354354
cd "${HOMEgfs}/sorc" || exit 8
355-
if [[ -d ufs_model.fd ]]; then
356-
[[ -d upp.fd ]] && rm -rf upp.fd
357-
${LINK} ufs_model.fd/FV3/upp upp.fd
358-
fi
355+
# TODO: Commenting out until UPP is up-to-date with Rocky-8.
356+
#if [[ -d ufs_model.fd ]]; then
357+
# [[ -d upp.fd ]] && rm -rf upp.fd
358+
# ${LINK} ufs_model.fd/FV3/upp upp.fd
359+
#fi
359360

360361
if [[ -d gsi_enkf.fd ]]; then
361362
[[ -d gsi.fd ]] && rm -rf gsi.fd

sorc/ufs_utils.fd

Submodule ufs_utils.fd updated 39 files

sorc/upp.fd

Submodule upp.fd added at 15e2a8c

versions/build.hera.ver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export stack_intel_ver=2021.5.0
22
export stack_impi_ver=2021.5.1
3-
export spack_env=gsi-addon-dev
3+
export spack_env=gsi-addon-dev-rocky8
44
source "${HOMEgfs:-}/versions/build.spack.ver"
55
export spack_mod_path="/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"

versions/run.hera.ver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export stack_intel_ver=2021.5.0
22
export stack_impi_ver=2021.5.1
3-
export spack_env=gsi-addon-dev
3+
export spack_env=gsi-addon-dev-rocky8
44

55
export hpss_ver=hpss
66
export ncl_ver=6.6.2

0 commit comments

Comments
 (0)