diff --git a/dev/scripts/exglobal_enkf_sfc.sh b/dev/scripts/exglobal_enkf_sfc.sh index e0fa15ab5ee..d6ac11ceed6 100755 --- a/dev/scripts/exglobal_enkf_sfc.sh +++ b/dev/scripts/exglobal_enkf_sfc.sh @@ -200,8 +200,7 @@ if [[ "${DOIAU}" == "YES" ]]; 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 +234,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 @@ -321,7 +320,5 @@ 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