From a76615caa2139181e7b4770891966bb8558dbd75 Mon Sep 17 00:00:00 2001 From: Clara Draper Date: Mon, 9 Feb 2026 19:59:51 +0000 Subject: [PATCH 1/4] Script / ush changes for ufs_utils/global_cycle update. -remove option to do land increment regridding in global_cycle -consolidate input and output file for global_cycle into one file. --- dev/scripts/exglobal_enkf_sfc.sh | 10 +++++----- sorc/ufs_utils.fd | 2 +- ush/global_cycle.sh | 4 ---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dev/scripts/exglobal_enkf_sfc.sh b/dev/scripts/exglobal_enkf_sfc.sh index e0fa15ab5ee..d4620dcec44 100755 --- a/dev/scripts/exglobal_enkf_sfc.sh +++ b/dev/scripts/exglobal_enkf_sfc.sh @@ -199,9 +199,9 @@ if [[ "${DOIAU}" == "YES" ]]; then if [[ ${TILE_NUM} -eq 1 ]]; then mkdir -p "${COMOUT_ATMOS_RESTART_MEM}" fi + cpreq "${sfcdata_dir}/${bPDY}.${bcyc}0000.${snow_prefix}sfc_data.tile${n}.nc" \ - "${DATA}/fnbgsi.${cmem}" - cpreq "${DATA}/fnbgsi.${cmem}" "${DATA}/fnbgso.${cmem}" + "${DATA}/sfc_data_cycle.${cmem}" cpreq "${FIXgfs}/orog/${CASE}/${CASE}_grid.tile${n}.nc" "${DATA}/fngrid.${cmem}" cpreq "${FIXgfs}/orog/${CASE}/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc" "${DATA}/fnorog.${cmem}" @@ -235,7 +235,7 @@ if [[ "${DOIAU}" == "YES" ]]; then mkdir -p "${COMOUT_ATMOS_RESTART_MEM}" fi - cpfs "${DATA}/fnbgso.${cmem}" "${COMOUT_ATMOS_RESTART_MEM}/${bPDY}.${bcyc}0000.sfcanl_data.tile${n}.nc" + cpfs "${DATA}/sfc_data_cycle.${cmem}" "${COMOUT_ATMOS_RESTART_MEM}/${bPDY}.${bcyc}0000.sfcanl_data.tile${n}.nc" done # ensembles @@ -243,6 +243,7 @@ if [[ "${DOIAU}" == "YES" ]]; then fi + if [[ "${DOSFCANL_ENKF}" == "YES" ]]; then for n in $(seq 1 "${ntiles}"); do @@ -321,7 +322,6 @@ fi ################################################################################ ################################################################################ -# Postprocessing -cd "${pwd}" || exit 1 exit "${err}" + diff --git a/sorc/ufs_utils.fd b/sorc/ufs_utils.fd index 4e93a9f60bf..1c1f6daf3a8 160000 --- a/sorc/ufs_utils.fd +++ b/sorc/ufs_utils.fd @@ -1 +1 @@ -Subproject commit 4e93a9f60bfdc77f4dd1815fb41ab30303694a67 +Subproject commit 1c1f6daf3a873bc315ff069869aa0fbc4b1afc7e diff --git a/ush/global_cycle.sh b/ush/global_cycle.sh index ec614f4edbc..6c349bf1c38 100755 --- a/ush/global_cycle.sh +++ b/ush/global_cycle.sh @@ -127,8 +127,6 @@ # DO_SFCCYCLE Call sfcsub routine # GCYCLE_DO_SOILINCR Call routine to add soil increments # GCYCLE_DO_SNOWINCR Call routine to add snow inrcements -# GCYCLE_INTERP_LANDINCR Flag to regrid input land increment from Gaus to native model -# grid inside gcycle # # zsea1/zsea2 When running with NST model, this is the lower/upper bound # of depth of sea temperature. In whole mm. @@ -230,7 +228,6 @@ if [[ "${GCYCLE_DO_SOILINCR}" == ".true." ]] || [[ "${GCYCLE_DO_SNOWINCR}" == ". else DO_LANDINCR=".false." fi -GCYCLE_INTERP_LANDINCR=${GCYCLE_INTERP_LANDINCR:-.false.} zsea1=${zsea1:-0} zsea2=${zsea2:-0} MAX_TASKS_CY=${MAX_TASKS_CY:-99999} @@ -335,7 +332,6 @@ cat << EOF > fort.37 NST_FILE="${NST_FILE}", DO_SOILINCR=${GCYCLE_DO_SOILINCR}, DO_SNOWINCR=${GCYCLE_DO_SNOWINCR}, - INTERP_LANDINCR=${GCYCLE_INTERP_LANDINCR}, lsoil_incr=${LSOIL_INCR}, / EOF From 091a29e9358bc96cb6a70bcce006d9e844f67add Mon Sep 17 00:00:00 2001 From: Clara Draper <33430543+ClaraDraper-NOAA@users.noreply.github.com> Date: Mon, 9 Feb 2026 15:41:06 -0500 Subject: [PATCH 2/4] Update dev/scripts/exglobal_enkf_sfc.sh Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- dev/scripts/exglobal_enkf_sfc.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/dev/scripts/exglobal_enkf_sfc.sh b/dev/scripts/exglobal_enkf_sfc.sh index d4620dcec44..0c1a89771a0 100755 --- a/dev/scripts/exglobal_enkf_sfc.sh +++ b/dev/scripts/exglobal_enkf_sfc.sh @@ -199,7 +199,6 @@ if [[ "${DOIAU}" == "YES" ]]; then if [[ ${TILE_NUM} -eq 1 ]]; then mkdir -p "${COMOUT_ATMOS_RESTART_MEM}" fi - cpreq "${sfcdata_dir}/${bPDY}.${bcyc}0000.${snow_prefix}sfc_data.tile${n}.nc" \ "${DATA}/sfc_data_cycle.${cmem}" cpreq "${FIXgfs}/orog/${CASE}/${CASE}_grid.tile${n}.nc" "${DATA}/fngrid.${cmem}" From 9cecf7eacadca66dbcce7ca9a6b548d15124c1f8 Mon Sep 17 00:00:00 2001 From: Clara Draper <33430543+ClaraDraper-NOAA@users.noreply.github.com> Date: Mon, 9 Feb 2026 15:41:16 -0500 Subject: [PATCH 3/4] Update dev/scripts/exglobal_enkf_sfc.sh Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- dev/scripts/exglobal_enkf_sfc.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/dev/scripts/exglobal_enkf_sfc.sh b/dev/scripts/exglobal_enkf_sfc.sh index 0c1a89771a0..1794001dde0 100755 --- a/dev/scripts/exglobal_enkf_sfc.sh +++ b/dev/scripts/exglobal_enkf_sfc.sh @@ -242,7 +242,6 @@ if [[ "${DOIAU}" == "YES" ]]; then fi - if [[ "${DOSFCANL_ENKF}" == "YES" ]]; then for n in $(seq 1 "${ntiles}"); do From 86e2843afd2e18dfbd4bb2b5b5ce36790e2afdcf Mon Sep 17 00:00:00 2001 From: Clara Draper <33430543+ClaraDraper-NOAA@users.noreply.github.com> Date: Mon, 9 Feb 2026 15:41:29 -0500 Subject: [PATCH 4/4] Update dev/scripts/exglobal_enkf_sfc.sh Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- dev/scripts/exglobal_enkf_sfc.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/dev/scripts/exglobal_enkf_sfc.sh b/dev/scripts/exglobal_enkf_sfc.sh index 1794001dde0..d6ac11ceed6 100755 --- a/dev/scripts/exglobal_enkf_sfc.sh +++ b/dev/scripts/exglobal_enkf_sfc.sh @@ -322,4 +322,3 @@ fi ################################################################################ exit "${err}" -