From 9e3824d5d07dcbd596cf35cd21e6ce2a50e28934 Mon Sep 17 00:00:00 2001 From: "jessica.meixner" Date: Fri, 30 Jan 2026 14:38:12 -0500 Subject: [PATCH 1/4] update hashes of gdas gsi and ufs --- sorc/gdas.cd | 2 +- sorc/gsi_enkf.fd | 2 +- sorc/ufs_model.fd | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sorc/gdas.cd b/sorc/gdas.cd index 740245c65a2..b747e5c70a5 160000 --- a/sorc/gdas.cd +++ b/sorc/gdas.cd @@ -1 +1 @@ -Subproject commit 740245c65a2ac036ea1778bb8c1870493b2d3204 +Subproject commit b747e5c70a5f463fcaf5a64b1816df52a7a016a5 diff --git a/sorc/gsi_enkf.fd b/sorc/gsi_enkf.fd index dcf055d690e..5f65a97fc00 160000 --- a/sorc/gsi_enkf.fd +++ b/sorc/gsi_enkf.fd @@ -1 +1 @@ -Subproject commit dcf055d690ecd132500f03a978b308b98edf375e +Subproject commit 5f65a97fc00c9d5ad060402e4d47390b72999c13 diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index de947560e97..7577e57ed81 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit de947560e9728c0f6dd25de9b8a7519579d3a9e7 +Subproject commit 7577e57ed812b82762813b04431608c5a7ea5899 From f0951f0bdab4ae27af249601cfc333c85931f5f5 Mon Sep 17 00:00:00 2001 From: "jessica.meixner" Date: Fri, 30 Jan 2026 14:40:59 -0500 Subject: [PATCH 2/4] update resources for wcoss2 jobs --- dev/parm/config/gfs/config.resources | 2 +- dev/parm/config/gfs/config.resources.WCOSS2 | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dev/parm/config/gfs/config.resources b/dev/parm/config/gfs/config.resources index f2eb37465d0..5b634ed7968 100644 --- a/dev/parm/config/gfs/config.resources +++ b/dev/parm/config/gfs/config.resources @@ -1064,7 +1064,7 @@ case ${step} in ntasks=1 threads_per_task=1 tasks_per_node=1 - memory="20G" + memory="25G" ;; "genesis_fsu") diff --git a/dev/parm/config/gfs/config.resources.WCOSS2 b/dev/parm/config/gfs/config.resources.WCOSS2 index 042317ac3bc..cc4a516a94b 100644 --- a/dev/parm/config/gfs/config.resources.WCOSS2 +++ b/dev/parm/config/gfs/config.resources.WCOSS2 @@ -41,7 +41,8 @@ case ${step} in "eupd") case "${CASE}" in "C1152" | "C768" | "C384") - if [[ "${RUN}" = *gdas ]]; then + walltime="00:55:00" + if [[ "${RUN}" = *gdas ]]; then export ntasks=315 elif [[ "${RUN}" = *gfs ]]; then export ntasks=135 @@ -58,7 +59,8 @@ case ${step} in case "${CASE}" in "C1152" | "C768" | "C384") export tasks_per_node=50 - ;; + export walltime="00:15:00" + ;; *) export tasks_per_node=40 ;; From 0076ed066f6ec3f9f4a08a23de2b9b4c4d6549b7 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Fri, 30 Jan 2026 21:24:48 +0000 Subject: [PATCH 3/4] update linking --- sorc/link_workflow.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/sorc/link_workflow.sh b/sorc/link_workflow.sh index 52fc5963c14..5e10d260832 100755 --- a/sorc/link_workflow.sh +++ b/sorc/link_workflow.sh @@ -439,7 +439,6 @@ fi # GDASApp executables if [[ -d "${HOMEgfs}/sorc/gdas.cd/install" ]]; then cp -f "${HOMEgfs}/sorc/gdas.cd/install/bin"/gdas* ./ - cp -f "${HOMEgfs}/sorc/gdas.cd/install/bin/calcfIMS.exe" ./gdas_calcfIMS.x cp -f "${HOMEgfs}/sorc/gdas.cd/install/bin/apply_incr.exe" ./gdas_apply_incr.x fi From 61e1d13d6e3d594a2bf97ccee86ea1ba474cde87 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Mon, 2 Feb 2026 13:29:58 +0000 Subject: [PATCH 4/4] turn off v18 tests on v17 branch --- dev/ci/cases/pr/C96C48_ufs_hybatmDA.yaml | 1 + dev/ci/cases/pr/C96C48_ufsgsi_hybatmDA.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/dev/ci/cases/pr/C96C48_ufs_hybatmDA.yaml b/dev/ci/cases/pr/C96C48_ufs_hybatmDA.yaml index eaafc4b3853..3647093797a 100644 --- a/dev/ci/cases/pr/C96C48_ufs_hybatmDA.yaml +++ b/dev/ci/cases/pr/C96C48_ufs_hybatmDA.yaml @@ -21,6 +21,7 @@ skip_ci_on_hosts: - orion - hercules - awsepicglobalworkflow + - wcoss2 workflow: engine: rocoto diff --git a/dev/ci/cases/pr/C96C48_ufsgsi_hybatmDA.yaml b/dev/ci/cases/pr/C96C48_ufsgsi_hybatmDA.yaml index 14cc30db214..758f1ae67bd 100644 --- a/dev/ci/cases/pr/C96C48_ufsgsi_hybatmDA.yaml +++ b/dev/ci/cases/pr/C96C48_ufsgsi_hybatmDA.yaml @@ -21,6 +21,7 @@ skip_ci_on_hosts: - orion - hercules - awsepicglobalworkflow + - wcoss2 workflow: engine: rocoto