Skip to content

Fix 06z gfs_sfcanl jobs failing due to a bug in CCPP #4389

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

Merged
DavidHuber-NOAA merged 18 commits into from
Jan 20, 2026
+20 −2
Merged

Fix 06z gfs_sfcanl jobs failing due to a bug in CCPP #4389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
99dbd9a
Update ufs_utils to allow global_cycle to run on 03z.
DavidHuber-NOAA Dec 29, 2025
d5e7e49
Added my fork to UFS_Utils
DavidHuber-NOAA Dec 29, 2025
f9a2e4e
Update UFS to incorporate the same CCPP as UFS_Utils
DavidHuber-NOAA Dec 29, 2025
2a0ca7a
Merge remote-tracking branch 'emc/develop' into fix/gfs_sfcanl
DavidHuber-NOAA Jan 6, 2026
d9c5e40
Update the WM and UFS_Utils to include sfcsub.F fix
DavidHuber-NOAA Jan 6, 2026
97d1c4b
Add MOM6 namelist variables
DavidHuber-NOAA Jan 6, 2026
446b134
Make mom6 dirs non-configurable
DavidHuber-NOAA Jan 7, 2026
0f38670
Merge remote-tracking branch 'emc/develop' into fix/gfs_sfcanl
DavidHuber-NOAA Jan 7, 2026
94c179d
Merge branch 'develop' into fix/gfs_sfcanl
DavidHuber-NOAA Jan 8, 2026
c6769d5
Merge remote-tracking branch 'emc/develop' into fix/gfs_sfcanl
DavidHuber-NOAA Jan 14, 2026
10d1018
Update UFS to include updated namelist variable
DavidHuber-NOAA Jan 14, 2026
e37f1d6
Add new MOM6 namelist variable
DavidHuber-NOAA Jan 14, 2026
a60a2e0
Make nccmp.sh run to completion if there is an error
DavidHuber-NOAA Jan 14, 2026
b227dfd
Correct the location of MOM6_HISTFREQ_N
DavidHuber-NOAA Jan 14, 2026
d22ddd2
Merge remote-tracking branch 'emc/develop' into fix/gfs_sfcanl
DavidHuber-NOAA Jan 16, 2026
7d7fe51
Add awips dependencies to arch_tars
DavidHuber-NOAA Jan 16, 2026
117d387
Fix dep name
DavidHuber-NOAA Jan 16, 2026
dbe1e28
Merge branch 'develop' into fix/gfs_sfcanl
DavidHuber-NOAA Jan 20, 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
2 changes: 2 additions & 0 deletions dev/test/nccmp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ HOMEgfs=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}")")" && git rev-par
declare -rx HOMEgfs

source "${HOMEgfs}/dev/ush/load_modules.sh" run
set +eu
module load "nccmp/${nccmp_ver:-"1.9.0.1"}"

file1=${1:?}
file2=${2:?}

nccmp -d -S -f -B --warn=format "${file1}" "${file2}"
echo $?
13 changes: 13 additions & 0 deletions dev/workflow/rocoto/gfs_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2217,6 +2217,19 @@ def _arch_tars_deps(self):
dep_dict = {'type': 'metatask', 'name': f'{self.run}_gempakgrb2spec'}
deps.append(rocoto.add_dependency(dep_dict))

if self.options['do_awips'] and self.run in ['gfs']:

dep_dict = {'type': 'metatask', 'name': f'{self.run}_awips_20km_1p0deg'}
deps.append(rocoto.add_dependency(dep_dict))
dep_dict = {'type': 'task', 'name': f'{self.run}_fbwind'}
deps.append(rocoto.add_dependency(dep_dict))

if self.options['do_wave']:
Copy link
Contributor

@JessicaMeixner-NOAA JessicaMeixner-NOAA Jan 20, 2026

Choose a reason for hiding this comment

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

This is okay to add but we don't actually archive any of the awips files for waves to my knowledge, so I don't think this is actually needed.

Copy link
Contributor Author

@DavidHuber-NOAA DavidHuber-NOAA Jan 20, 2026

Choose a reason for hiding this comment

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

Good to know! I'll open an issue to remove this tarball/job.

Copy link
Contributor Author

@DavidHuber-NOAA DavidHuber-NOAA Jan 20, 2026

Choose a reason for hiding this comment

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

Opened issues #4454 to retire AWIPS waves archiving.

dep_dict = {'type': 'task', 'name': f'{self.run}_waveawipsbulls'}
deps.append(rocoto.add_dependency(dep_dict))
dep_dict = {'type': 'task', 'name': f'{self.run}_waveawipsgridded'}
deps.append(rocoto.add_dependency(dep_dict))

if self.options['do_metp'] and self.run in ['gfs']:
deps2 = []
# taskvalid only handles regular tasks, so just check the first metp job exists
Expand Down
2 changes: 1 addition & 1 deletion sorc/ufs_model.fd
Open in desktop
Submodule ufs_model.fd updated 126 files
2 changes: 1 addition & 1 deletion sorc/ufs_utils.fd
Open in desktop
Submodule ufs_utils.fd updated 7 files
+1 −1 ccpp-physics
+18 −0 reg_tests/cpld_gridgen/cpld_gridgen.sh
+1 −0 reg_tests/cpld_gridgen/rt.conf
+9 −3 reg_tests/cpld_gridgen/rt.sh
+4 −3 sorc/cpld_gridgen.fd/gen_fixgrid.F90
+0 −0 sorc/cpld_gridgen.fd/rt.conf
+1 −0 sorc/global_cycle.fd/cycle.F90
3 changes: 3 additions & 0 deletions ush/parsing_ufs_configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ UFS_configure() {
local MED_history_n=1000000

local histaux_enabled=".false."
local MOM6_OUTPUT_DIR="./MOM6_OUTPUT"
local MOM6_RESTART_DIR="./MOM6_RESTART"
local MOM6_HISTFREQ_N=${FHOUT_OCN:-6}
fi

if [[ "${cplice}" = ".true." ]]; then
Expand Down
Loading