From 5eea52eada6cd6a222489890977fa7f131b044bd Mon Sep 17 00:00:00 2001 From: "catherine.thomas" Date: Fri, 26 Jan 2024 10:18:16 -0500 Subject: [PATCH] Update global_cycle for fractional grid The hash for ufs_utils is updated to include the updates for fractional grid support within global_cycle. This commit also removes the hack to skip global_cycle in cycling mode. Resolves: #1775 --- sorc/ufs_utils.fd | 2 +- ush/forecast_postdet.sh | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/sorc/ufs_utils.fd b/sorc/ufs_utils.fd index ce385cedfa..c3fb3bceaa 160000 --- a/sorc/ufs_utils.fd +++ b/sorc/ufs_utils.fd @@ -1 +1 @@ -Subproject commit ce385cedfa9abd46b0905e8d6486b0339a9e4267 +Subproject commit c3fb3bceaa1a324599597c9cf8a42d19af817254 diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh index 02f69c63ed..8e40d6c881 100755 --- a/ush/forecast_postdet.sh +++ b/ush/forecast_postdet.sh @@ -33,16 +33,14 @@ FV3_postdet(){ done # Replace sfc_data with sfcanl_data restart files from current cycle (if found) - if [[ "${MODE}" = "cycled" ]] && [[ "${CCPP_SUITE}" = "FV3_GFS_v16" ]]; then # TODO: remove if statement when global_cycle can handle NOAHMP - for file in "${COM_ATMOS_RESTART}/${sPDY}.${scyc}0000."*.nc; do - file2=$(basename "${file}") - file2=$(echo "${file2}" | cut -d. -f3-) # remove the date from file - fsufanl=$(echo "${file2}" | cut -d. -f1) - file2=$(echo "${file2}" | sed -e "s/sfcanl_data/sfc_data/g") - rm -f "${DATA}/INPUT/${file2}" - ${NLN} "${file}" "${DATA}/INPUT/${file2}" - done - fi + for file in "${COM_ATMOS_RESTART}/${sPDY}.${scyc}0000."*.nc; do + file2=$(basename "${file}") + file2=$(echo "${file2}" | cut -d. -f3-) # remove the date from file + fsufanl=$(echo "${file2}" | cut -d. -f1) + file2=$(echo "${file2}" | sed -e "s/sfcanl_data/sfc_data/g") + rm -f "${DATA}/INPUT/${file2}" + ${NLN} "${file}" "${DATA}/INPUT/${file2}" + done # Need a coupler.res when doing IAU # FIXME: This is needed for warm_start, regardless of IAU. if [[ ${DOIAU} = "YES" ]]; then