From aa23ccf1d0d229f9ff1398d84af1fa7ee5bed262 Mon Sep 17 00:00:00 2001 From: RussTreadon-NOAA <26926959+RussTreadon-NOAA@users.noreply.github.com> Date: Wed, 5 Jun 2024 12:50:14 -0400 Subject: [PATCH] Enable wcoss2 ufsda build and module load (#2620) This PR enables ufsda (`sorc/gdas.cd`) to be built and run on WCOSS2. Resolves #2602 Resolves #2579 --- ci/cases/pr/C96C48_ufs_hybatmDA.yaml | 1 - ci/scripts/clone-build_ci.sh | 2 +- sorc/build_all.sh | 2 +- sorc/gdas.cd | 2 +- sorc/gsi_utils.fd | 2 +- sorc/jcb | 2 +- ush/load_ufsda_modules.sh | 4 ++-- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ci/cases/pr/C96C48_ufs_hybatmDA.yaml b/ci/cases/pr/C96C48_ufs_hybatmDA.yaml index 1b57be63eb..d1556dc1d0 100644 --- a/ci/cases/pr/C96C48_ufs_hybatmDA.yaml +++ b/ci/cases/pr/C96C48_ufs_hybatmDA.yaml @@ -21,5 +21,4 @@ skip_ci_on_hosts: - hera - orion - hercules - - wcoss2 diff --git a/ci/scripts/clone-build_ci.sh b/ci/scripts/clone-build_ci.sh index 2b0ca5f072..3cef7fc230 100755 --- a/ci/scripts/clone-build_ci.sh +++ b/ci/scripts/clone-build_ci.sh @@ -74,7 +74,7 @@ set +e source "${HOMEgfs}/ush/module-setup.sh" export BUILD_JOBS=8 rm -rf log.build -./build_all.sh -gk >> log.build 2>&1 +./build_all.sh -guk >> log.build 2>&1 build_status=$? DATE=$(date +'%D %r') diff --git a/sorc/build_all.sh b/sorc/build_all.sh index e3040fc0fa..28f52fd306 100755 --- a/sorc/build_all.sh +++ b/sorc/build_all.sh @@ -145,7 +145,7 @@ build_opts["ww3prepost"]="${_wave_opt} ${_verbose_opt} ${_build_ufs_opt} ${_buil # Optional DA builds if [[ "${_build_ufsda}" == "YES" ]]; then - if [[ "${MACHINE_ID}" != "orion" && "${MACHINE_ID}" != "hera" && "${MACHINE_ID}" != "hercules" ]]; then + if [[ "${MACHINE_ID}" != "orion" && "${MACHINE_ID}" != "hera" && "${MACHINE_ID}" != "hercules" && "${MACHINE_ID}" != "wcoss2" ]]; then echo "NOTE: The GDAS App is not supported on ${MACHINE_ID}. Disabling build." else build_jobs["gdas"]=8 diff --git a/sorc/gdas.cd b/sorc/gdas.cd index 6742ec62a1..3e50a8fdcd 160000 --- a/sorc/gdas.cd +++ b/sorc/gdas.cd @@ -1 +1 @@ -Subproject commit 6742ec62a12d7d6f8129057bcf77cee0e2175022 +Subproject commit 3e50a8fdcd07305a3464a02e20eaf4b033179167 diff --git a/sorc/gsi_utils.fd b/sorc/gsi_utils.fd index bb03e172e0..d940406161 160000 --- a/sorc/gsi_utils.fd +++ b/sorc/gsi_utils.fd @@ -1 +1 @@ -Subproject commit bb03e172e0d0d9c56d6da7788ca033bfb5ef5119 +Subproject commit d9404061611553459394173c3ff33116db306326 diff --git a/sorc/jcb b/sorc/jcb index de75655d81..f62b9df37f 160000 --- a/sorc/jcb +++ b/sorc/jcb @@ -1 +1 @@ -Subproject commit de75655d81ec2ee668d8d47bf4a43625c81dde7c +Subproject commit f62b9df37f131c9ff68b62eb6e19c1109c314cf0 diff --git a/ush/load_ufsda_modules.sh b/ush/load_ufsda_modules.sh index e8e72b8fbe..d7aa08e1ae 100755 --- a/ush/load_ufsda_modules.sh +++ b/ush/load_ufsda_modules.sh @@ -34,13 +34,13 @@ source "${HOMEgfs}/ush/module-setup.sh" module use "${HOMEgfs}/sorc/gdas.cd/modulefiles" case "${MACHINE_ID}" in - ("hera" | "orion" | "hercules") + ("hera" | "orion" | "hercules" | "wcoss2") module load "${MODS}/${MACHINE_ID}" ncdump=$( command -v ncdump ) NETCDF=$( echo "${ncdump}" | cut -d " " -f 3 ) export NETCDF ;; - ("wcoss2" | "acorn" | "jet" | "gaea" | "s4") + ("jet" | "gaea" | "s4" | "acorn") echo WARNING: UFSDA NOT SUPPORTED ON THIS PLATFORM ;; *)