Skip to content

Zero-diff changes to sfc updates, to speed up v17 #4659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ClaraDraper-NOAA wants to merge 12 commits into
base: dev/gfs.v17
Choose a base branch
from
+210 −85
Draft

Zero-diff changes to sfc updates, to speed up v17 #4659

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1f79961
Merge in hash and script changes for UFS_UTILS gcycle speed-up.
ClaraDraper-NOAA Mar 13, 2026
82ae19e
bugfix
ClaraDraper-NOAA Mar 13, 2026
4a77a4e
Fixed temporary branch name for ufs_utils.
ClaraDraper-NOAA Mar 16, 2026
722cc04
First pass at splitting up sfcanl job.
ClaraDraper-NOAA Mar 17, 2026
a6d8849
Bug-fixes.
ClaraDraper-NOAA Mar 17, 2026
08efd4a
bug fixes.
ClaraDraper-NOAA Mar 19, 2026
f77a4c1
typo
ClaraDraper-NOAA Mar 19, 2026
0570c20
rename a and b to gcycle and regrid for sfcanl jobs
ClaraDraper-NOAA Mar 25, 2026
4ad9f6f
Add land-iau off and no soil DA options back in.
ClaraDraper-NOAA Mar 25, 2026
955d089
ammend.
ClaraDraper-NOAA Mar 25, 2026
82f1d5a
Correct dependency for esfc job.
ClaraDraper-NOAA Mar 25, 2026
ac4ac2a
Apply suggestion from @github-actions[bot]
ClaraDraper-NOAA Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
url = https://github.com/NOAA-EMC/gfs-utils
[submodule "sorc/ufs_utils.fd"]
path = sorc/ufs_utils.fd
url = https://github.com/ufs-community/UFS_UTILS.git
url = https://github.com/ClaraDraper-NOAA/UFS_UTILS.git
branch = speedup_sfcanl
Copy link
Contributor

@tsga tsga Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be feature/speedup_sfcanl?

Copy link
Contributor Author

@ClaraDraper-NOAA ClaraDraper-NOAA Mar 16, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes! Thanks. I'll push an update.

[submodule "sorc/verif-global.fd"]
path = sorc/verif-global.fd
url = https://github.com/NOAA-EMC/EMC_verif-global.git
Expand Down
1 change: 0 additions & 1 deletion dev/parm/config/gfs/config.esfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ if [[ ${DO_GSISOILDA} == "YES" ]]; then
else
export GCYCLE_DO_SOILINCR=".true."
fi
export GCYCLE_INTERP_LANDINCR=".false."
export REGRID_EXEC="${HOMEgfs}/exec/regridStates.x"
fi

Expand Down
1 change: 0 additions & 1 deletion dev/parm/config/gfs/config.sfcanl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ if [[ "${DO_GSISOILDA}" == "YES" ]]; then
else
export GCYCLE_DO_SOILINCR=".true."
fi
export GCYCLE_INTERP_LANDINCR=".false."
export REGRID_EXEC="${HOMEgfs}/exec/regridStates.x"
fi

Expand Down
5 changes: 2 additions & 3 deletions dev/scripts/exglobal_atmos_sfcanl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,7 @@ for hr in "${!gcycle_dates[@]}"; do

# Copy inputs from COMIN to DATA
for ((nn = 1; nn <= ntiles; nn++)); do
cpreq "${sfcdata_dir}/${datestr}.${snow_prefix}sfc_data.tile${nn}.nc" "${DATA}/fnbgsi.00${nn}"
cpreq "${DATA}/fnbgsi.00${nn}" "${DATA}/fnbgso.00${nn}"
cpreq "${sfcdata_dir}/${datestr}.${snow_prefix}sfc_data.tile${nn}.nc" "${DATA}/sfc_data_cycle.00${nn}"
done

"${CYCLESH}" && true
Expand All @@ -183,7 +182,7 @@ for hr in "${!gcycle_dates[@]}"; do

# Copy outputs from DATA to COMOUT
for ((nn = 1; nn <= ntiles; nn++)); do
cpfs "${DATA}/fnbgso.00${nn}" "${COMOUT_ATMOS_RESTART}/${datestr}.sfcanl_data.tile${nn}.nc"
cpfs "${DATA}/sfc_data_cycle.00${nn}" "${COMOUT_ATMOS_RESTART}/${datestr}.sfcanl_data.tile${nn}.nc"
done

done
Expand Down
10 changes: 4 additions & 6 deletions dev/scripts/exglobal_enkf_sfc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -277,8 +276,7 @@ if [[ "${DOSFCANL_ENKF}" == "YES" ]]; then
fi

cpreq "${sfcdata_dir}/${PDY}.${cyc}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}"

Expand Down Expand Up @@ -311,7 +309,7 @@ if [[ "${DOSFCANL_ENKF}" == "YES" ]]; then
mkdir -p "${COMOUT_ATMOS_RESTART_MEM}"
fi

cpfs "${DATA}/fnbgso.${cmem}" "${COMOUT_ATMOS_RESTART_MEM}/${PDY}.${cyc}0000.sfcanl_data.tile${n}.nc"
cpfs "${DATA}/sfc_data_cycle.${cmem}" "${COMOUT_ATMOS_RESTART_MEM}/${PDY}.${cyc}0000.sfcanl_data.tile${n}.nc"

done

Expand Down
2 changes: 1 addition & 1 deletion sorc/ufs_utils.fd
Open in desktop
Submodule ufs_utils.fd updated 14 files
+1 −1 ccpp-physics
+0 −107 reg_tests/global_cycle/C192.gsi_lndincsoilnoahmp.sh
+0 −1 reg_tests/global_cycle/C192.gsitile_lndincsoilnoahmp.sh
+0 −1 reg_tests/global_cycle/C192.jedi_lndincsoilnoahmp.sh
+0 −1 reg_tests/global_cycle/C768.lndincsnow.sh
+8 −14 reg_tests/global_cycle/driver.hercules.sh
+8 −14 reg_tests/global_cycle/driver.jet.sh
+8 −14 reg_tests/global_cycle/driver.orion.sh
+8 −14 reg_tests/global_cycle/driver.ursa.sh
+4 −9 reg_tests/global_cycle/driver.wcoss2.sh
+48 −145 sorc/global_cycle.fd/cycle.F90
+46 −91 sorc/global_cycle.fd/read_write_data.f90
+0 −4 ush/global_cycle.sh
+2 −11 ush/global_cycle_driver.sh
4 changes: 0 additions & 4 deletions ush/global_cycle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down
Loading