From e815acac5c46df596f4a2fd5e2f554087bd2b757 Mon Sep 17 00:00:00 2001 From: Russ-Treadon-NOAA Date: Wed, 22 May 2024 15:26:18 +0000 Subject: [PATCH 1/9] enable wcoss2 ufsda build and module load (#2602) --- sorc/build_all.sh | 2 +- ush/load_ufsda_modules.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sorc/build_all.sh b/sorc/build_all.sh index e3040fc0fae..28f52fd306e 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/ush/load_ufsda_modules.sh b/ush/load_ufsda_modules.sh index e8e72b8fbe1..7d61012ceef 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" | "acorn") 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") echo WARNING: UFSDA NOT SUPPORTED ON THIS PLATFORM ;; *) From d41366218b735dc132c2dee850c9ba25f581d322 Mon Sep 17 00:00:00 2001 From: Russ-Treadon-NOAA Date: Tue, 28 May 2024 13:52:42 +0000 Subject: [PATCH 2/9] enable JEDI ATM CI on wcoss2 (#2602) --- ci/cases/pr/C96C48_ufs_hybatmDA.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/cases/pr/C96C48_ufs_hybatmDA.yaml b/ci/cases/pr/C96C48_ufs_hybatmDA.yaml index 1b57be63eb1..d1556dc1d05 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 From 10a2bc5df1563de7a876ed507b1d3b6fbe7c3478 Mon Sep 17 00:00:00 2001 From: Russ-Treadon-NOAA Date: Tue, 28 May 2024 18:01:11 +0000 Subject: [PATCH 3/9] update sorc/gdas.cd hash to bring in wcoss2 build (#2602) --- sorc/gdas.cd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/gdas.cd b/sorc/gdas.cd index 249e242e33a..95218e75711 160000 --- a/sorc/gdas.cd +++ b/sorc/gdas.cd @@ -1 +1 @@ -Subproject commit 249e242e33a33feeb1c81bedd51198309f669de0 +Subproject commit 95218e75711a3a64edba5b786e6ba5a265feda1d From a0ef54c9fdab3a3739e209c2821e4f25d810d0c7 Mon Sep 17 00:00:00 2001 From: RussTreadon-NOAA Date: Wed, 29 May 2024 12:28:54 +0000 Subject: [PATCH 4/9] remove acorn from usfda module load list (#2602) --- ush/load_ufsda_modules.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ush/load_ufsda_modules.sh b/ush/load_ufsda_modules.sh index 7d61012ceef..37ce8b3e48c 100755 --- a/ush/load_ufsda_modules.sh +++ b/ush/load_ufsda_modules.sh @@ -34,7 +34,7 @@ source "${HOMEgfs}/ush/module-setup.sh" module use "${HOMEgfs}/sorc/gdas.cd/modulefiles" case "${MACHINE_ID}" in - ("hera" | "orion" | "hercules" | "wcoss2" | "acorn") + ("hera" | "orion" | "hercules" | "wcoss2") module load "${MODS}/${MACHINE_ID}" ncdump=$( command -v ncdump ) NETCDF=$( echo "${ncdump}" | cut -d " " -f 3 ) From 7ebfdde398542fb3648b1665b3937326a4a25b17 Mon Sep 17 00:00:00 2001 From: RussTreadon-NOAA Date: Wed, 29 May 2024 17:57:26 +0000 Subject: [PATCH 5/9] add acorn to list of not supported usfda platforms (#2602) --- ush/load_ufsda_modules.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ush/load_ufsda_modules.sh b/ush/load_ufsda_modules.sh index 37ce8b3e48c..d7aa08e1aee 100755 --- a/ush/load_ufsda_modules.sh +++ b/ush/load_ufsda_modules.sh @@ -40,7 +40,7 @@ case "${MACHINE_ID}" in NETCDF=$( echo "${ncdump}" | cut -d " " -f 3 ) export NETCDF ;; - ("jet" | "gaea" | "s4") + ("jet" | "gaea" | "s4" | "acorn") echo WARNING: UFSDA NOT SUPPORTED ON THIS PLATFORM ;; *) From d6f6ae0c758280e8a1aca777a14aff50b415f962 Mon Sep 17 00:00:00 2001 From: RussTreadon-NOAA Date: Thu, 30 May 2024 09:34:55 +0000 Subject: [PATCH 6/9] update gsi_utils.fd hash (#2620) --- sorc/gsi_utils.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/gsi_utils.fd b/sorc/gsi_utils.fd index bb03e172e0d..d9404061611 160000 --- a/sorc/gsi_utils.fd +++ b/sorc/gsi_utils.fd @@ -1 +1 @@ -Subproject commit bb03e172e0d0d9c56d6da7788ca033bfb5ef5119 +Subproject commit d9404061611553459394173c3ff33116db306326 From ad499915010b028cf8d0c4f4111287c9fc6a3ca4 Mon Sep 17 00:00:00 2001 From: RussTreadon-NOAA <26926959+RussTreadon-NOAA@users.noreply.github.com> Date: Sun, 2 Jun 2024 21:10:53 -0400 Subject: [PATCH 7/9] activate UFS-DA build in clone-build_ci.sh (#2602) --- ci/scripts/clone-build_ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/scripts/clone-build_ci.sh b/ci/scripts/clone-build_ci.sh index 2b0ca5f072d..3cef7fc230b 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') From 1a235db9959ff9d0e7285d53b723b7de6a8bf555 Mon Sep 17 00:00:00 2001 From: RussTreadon-NOAA Date: Tue, 4 Jun 2024 13:20:52 +0000 Subject: [PATCH 8/9] update gdas.cd hash to use production bufr/12.0.1 on wcoss2 (#2602) --- sorc/gdas.cd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/gdas.cd b/sorc/gdas.cd index 95218e75711..3e50a8fdcd0 160000 --- a/sorc/gdas.cd +++ b/sorc/gdas.cd @@ -1 +1 @@ -Subproject commit 95218e75711a3a64edba5b786e6ba5a265feda1d +Subproject commit 3e50a8fdcd07305a3464a02e20eaf4b033179167 From ca024035148977a120f8e35c3d8ea92ce131d8b2 Mon Sep 17 00:00:00 2001 From: Russ-Treadon-NOAA Date: Tue, 4 Jun 2024 15:28:03 +0000 Subject: [PATCH 9/9] update sorc/jcb hash to be consistent with sorc/gdas.cd (#2602) --- sorc/jcb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/jcb b/sorc/jcb index de75655d81e..f62b9df37f1 160000 --- a/sorc/jcb +++ b/sorc/jcb @@ -1 +1 @@ -Subproject commit de75655d81ec2ee668d8d47bf4a43625c81dde7c +Subproject commit f62b9df37f131c9ff68b62eb6e19c1109c314cf0