Skip to content

Weekly Merge: stable-nightly to develop (20261101) - #2312

Merged
RussTreadon-NOAA merged 8 commits into
developfrom
feature/stable-nightly
Nov 2, 2026
Merged

RussTreadon-NOAA merged 8 commits into
developfrom
feature/stable-nightly

Conversation

@RussTreadon-NOAA

@RussTreadon-NOAA RussTreadon-NOAA commented Oct 30, 2026 •

Copy link
Copy Markdown
Contributor

Automated weekly PR to sync stable-nightly updates into develop. Triggered on 20261101.

Automated CI tests to run in Global Workflow

  • atm_jjob
  • C96C48_ufs_hybatmDA
  • C96C48_hybatmsnowDA
  • C96_gcafs_cycled
  • C48mx500_3DVarAOWCDA
  • C48mx500_hybAOWCDA
  • C96C48_ufsgsi_hybatmDA
  • C48_ufsenkf_atmDA
  • C96C48_hybatmDA

@RussTreadon-NOAA

Copy link
Copy Markdown
Contributor Author

Ursa GDASApp CI

feature/stable-nightly branch of GDASApp updated successfully. See /scratch4/NCEPDEV/stmp/Russ.Treadon/CI/ursa/GDASApp/stable/20261031/global-workflow for details.

Automated GW-GDASApp Testing Results:
Machine: ursa

Start: Sat Oct 31 00:39:57 UTC 2026 on ufe02
---------------------------------------------------
Build:                                 *SUCCESS*
Build: Completed at Sat Oct 31 00:51:29 UTC 2026
---------------------------------------------------
Tests: ctest -j12 -R gdasapp
Tests:                                 *SUCCESS*
Tests: Completed at Sat Oct 31 01:41:27 UTC 2026
Tests: 100% tests passed, 0 tests failed out of 160

@github-actions github-actions Bot added gaeac6-GW-RT hera-GW-RT Queue for automated testing with global-workflow on Hera hercules-GW-RT Queue for automated testing with global-workflow on Hercules labels Oct 31, 2026
@github-actions github-actions Bot changed the title GDASApp: Fix JCB increment-output template rendering and valid-time alignment for marine/aero workflows Weekly Merge: stable-nightly to develop (20261031) Oct 31, 2026
@github-actions github-actions Bot added orion-GW-RT Queue for automated testing with global-workflow on Orion ursa-GW-RT labels Oct 31, 2026
@emcbot emcbot added hercules-GW-RT-Running Automated testing with global-workflow running on Hercules hera-GW-RT-Running Automated testing with global-workflow running on Hera ursa-GW-RT-Running gaeac6-GW-RT-Running and removed hercules-GW-RT Queue for automated testing with global-workflow on Hercules hera-GW-RT Queue for automated testing with global-workflow on Hera ursa-GW-RT gaeac6-GW-RT labels Oct 31, 2026
@RussTreadon-NOAA RussTreadon-NOAA added orion-GW-RT-Running Automated testing with global-workflow running on Orion and removed orion-GW-RT Queue for automated testing with global-workflow on Orion labels Oct 31, 2026
@RussTreadon-NOAA

Copy link
Copy Markdown
Contributor Author

WCOSS2 (Cactus) GDASApp CI

Automated GW-GDASApp Testing Results:
Machine: wcoss2

Start: Sat Oct 31 13:07:09 UTC 2026 on clogin03
---------------------------------------------------
Build:                                 *SUCCESS*
Build: Completed at Sat Oct 31 13:27:13 UTC 2026
---------------------------------------------------
Tests: ctest -j12 -R gdasapp
Tests:                                 *SUCCESS*
Tests: Completed at Sat Oct 31 14:17:24 UTC 2026
Tests: 100% tests passed, 0 tests failed out of 160

@emcbot

emcbot commented Oct 31, 2026

Copy link
Copy Markdown

CI Run Summary for PR #2312 (Commit: b832816)

Automated GW-GDASApp Testing Results:
Machine: hercules

Start: Sat Oct 31 10:47:51 CDT 2026 on hercules-login-1.hpc.msstate.edu
---------------------------------------------------
Build:                                 *SUCCESS*
Build: Completed at Sat Oct 31 11:09:36 CDT 2026
---------------------------------------------------
Tests: ctest -j12 -R gdasapp -E C48_ufsenkf_atmDA
Tests:                                 *SUCCESS*
Tests: Completed at Sat Oct 31 11:43:19 CDT 2026
Tests: 100% tests passed, 0 tests failed out of 146

CI Status: Passed

@emcbot emcbot added hercules-GW-RT-Passed Automated testing with global-workflow successful on Hercules and removed hercules-GW-RT-Running Automated testing with global-workflow running on Hercules labels Oct 31, 2026
@emcbot

emcbot commented Oct 31, 2026

Copy link
Copy Markdown

CI Run Summary for PR #2312 (Commit: b832816)

Automated GW-GDASApp Testing Results:
Machine: ursa

Start: Sat Oct 31 15:47:03 UTC 2026 on ufe04
---------------------------------------------------
Build:                                 *SUCCESS*
Build: Completed at Sat Oct 31 15:59:52 UTC 2026
---------------------------------------------------
Tests: ctest -j12 -R gdasapp
Tests:                                 *SUCCESS*
Tests: Completed at Sat Oct 31 17:04:50 UTC 2026
Tests: 100% tests passed, 0 tests failed out of 160

CI Status: Passed

@emcbot

emcbot commented Nov 1, 2026

Copy link
Copy Markdown

CI Run Summary for PR #2312 (Commit: b832816)

Automated GW-GDASApp Testing Results:
Machine: hercules

Start: Sat Oct 31 19:33:32 CDT 2026 on hercules-login-1.hpc.msstate.edu
---------------------------------------------------
Build:                                 *SUCCESS*
Build: Completed at Sat Oct 31 19:54:01 CDT 2026
---------------------------------------------------
Tests: ctest -j12 -R gdasapp -E C48_ufsenkf_atmDA
Tests:                                 *SUCCESS*
Tests: Completed at Sat Oct 31 20:28:48 CDT 2026
Tests: 100% tests passed, 0 tests failed out of 146

CI Status: Passed

@emcbot emcbot removed the hercules-GW-RT-Running Automated testing with global-workflow running on Hercules label Nov 1, 2026
@emcbot

emcbot commented Nov 1, 2026

Copy link
Copy Markdown

CI Run Summary for PR #2312 (Commit: b832816)

Automated GW-GDASApp Testing Results:
Machine: ursa

Start: Sun Nov  1 00:32:59 UTC 2026 on ufe01
---------------------------------------------------
Build:                                 *SUCCESS*
Build: Completed at Sun Nov  1 00:45:47 UTC 2026
---------------------------------------------------
Tests: ctest -j12 -R gdasapp
Tests:                                 *SUCCESS*
Tests: Completed at Sun Nov  1 01:52:08 UTC 2026
Tests: 100% tests passed, 0 tests failed out of 160

CI Status: Passed

@emcbot

emcbot commented Nov 1, 2026

Copy link
Copy Markdown

CI Run Summary for PR #2312 (Commit: b832816)

Automated GW-GDASApp Testing Results:
Machine: hera

Start: Sun Nov  1 00:35:34 UTC 2026 on hfe09
---------------------------------------------------
Build:                                 *SUCCESS*
Build: Completed at Sun Nov  1 00:58:58 UTC 2026
---------------------------------------------------
Tests: ctest -j12 -R gdasapp
Tests:                                 *SUCCESS*
Tests: Completed at Sun Nov  1 01:57:02 UTC 2026
Tests: 100% tests passed, 0 tests failed out of 160

CI Status: Passed

@emcbot emcbot removed the hera-GW-RT-Running Automated testing with global-workflow running on Hera label Nov 1, 2026
@RussTreadon-NOAA

Copy link
Copy Markdown
Contributor Author

CI Run Summary for PR #2312 (Commit: b832816)

Automated GW-GDASApp Testing Results:
Machine: orion

Start: Sat Oct 31 07:34:12 PM CDT 2026 on orion-login-1.hpc.msstate.edu
---------------------------------------------------
Build:                                 *SUCCESS*
Build: Completed at Sat Oct 31 08:01:38 PM CDT 2026
---------------------------------------------------
Tests: ctest -j12 -R gdasapp -E C48_ufsenkf_atmDA
Tests:                                 *SUCCESS*
Tests: Completed at Sat Oct 31 09:08:38 PM CDT 2026
Tests: 100% tests passed, 0 tests failed out of 146

CI Status: Passed

@RussTreadon-NOAA RussTreadon-NOAA removed orion-GW-RT-Running Automated testing with global-workflow running on Orion gaeac6-GW-RT-Running labels Nov 1, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🔵 Needs a closer look

The change depends on the deployed upstream JEDI/SOCA writer interface version, which cannot be verified within the repository and shows unresolved inconsistencies between aero and soil configs.

No open issues 🎉

What changed in this PR

This is an automated weekly sync PR that merges stable-nightly into develop (dated 20261101). The substantive content is a set of upstream JEDI/JCB interface updates to the GDAS configuration client, primarily flattening the increment-writer templates (removing the output:/state component: wrapper so it is supplied by the consuming algorithm template) and adopting newer SOCA/fv3-jedi writer fields (times:, ISO-formatted date:, variables:). It also adjusts the weekly-PR cron schedule and refreshes a test reference file to include the new increment-print block.

Changes:

  • Flatten output:/state component: nesting out of all *_final_increment*.yaml.j2 writer templates (atmosphere, marine, aero, snow, soil) consistently.
  • Adopt updated writer fields: add times: lists, switch marine date: to ISO (marine_window_begin_iso), rename aero gaussian variables to output: → variables:, and add final_j_evaluation: true for marine.
  • Shift the weekly stable-PR cron schedule (primary 10:17→08:17 UTC, fallback 21:37→14:37 UTC) and update the atm_jjob_3dvar.ref reference with the new increment-print output.
File Description
parm/​jcb-gdas/​model/​atmosphere/​atmosphere_final_increment_cubed_sphere.yaml.j2 Remove output:/state component: wrapper; flat writer config
parm/​jcb-gdas/​model/​atmosphere/​atmosphere_final_increment_fms_nonrestart.yaml.j2 Same flattening of writer config
parm/​jcb-gdas/​model/​atmosphere/​atmosphere_final_increment_gaussian.yaml.j2 Same flattening of writer config
parm/​jcb-gdas/​model/​snow/​snow_final_increment_fms.yaml.j2 Same flattening of writer config
parm/​jcb-gdas/​model/​soil/​soil_final_increment_csg.yaml.j2 Same flattening of writer config
parm/​jcb-gdas/​model/​marine/​marine_final_increment.yaml.j2 Flatten; switch date to ISO var and add times: list
parm/​jcb-gdas/​model/​aero/​aero_final_increment_cubed_sphere.yaml.j2 Flatten; add times: list
parm/​jcb-gdas/​model/​aero/​aero_final_increment_gaussian.yaml.j2 Rename variables to output:→variables:; add times:
parm/​marine/​jcb-base.yaml.j2 Add final_j_evaluation: true
.github/​workflows/​weekly-stable-pr.yaml Adjust primary/fallback cron times
test/​testreference/​atm_jjob_3dvar.ref Update reference to include increment-print block

No high-confidence objective defects were found within the diffed regions. The new template variables are defined in the corresponding jcb-base.yaml.j2 files, the cron comments match their expressions, and the writer flattening is applied consistently across all *_final_increment* templates. The changes are an automated sync of already-CI-validated upstream commits, so their correctness primarily depends on compatibility with the deployed upstream JEDI/fv3-jedi/SOCA version, which cannot be verified from this repository alone.

Review effort: Balanced

@RussTreadon-NOAA

Copy link
Copy Markdown
Contributor Author

@CoryMartin-NOAA and @DavidNew-NOAA :

GDASApp parm templates have been updated to the new JEDI output structure. GDASApp ctests pass on Gaea C6, Hera, Hercules, Orion, Ursa and WCOSS2 (Cactus).

The parm/jcb-algorithms hash in feature/stable-nightly current points at jcb-algorithms PR #23 . Would one of you review jcb-algorithms PR #23? You or I can merge PR #23 once it is approved.

After this, I will update the parm/jcb-algorithms hash in feature/stabe-nightly. I can't approve my own PR so if one of you can review and approve after I update the jcb-algorithms hash this would much appreciated.

@RussTreadon-NOAA

Copy link
Copy Markdown
Contributor Author

WCOSS2 GDASApp CI

Run GDASApp feature/stable-nightly at 3a32394 inside g-w develop at fd51ba1 on Cactus. All tests Passed.

Test project /lfs/h2/emc/da/noscrub/russ.treadon/CI/wcoss2/GDASApp/stable/20261031/global-workflow/sorc/gdas.cd/build
        Start 216: test_gdasapp_C96C48_ufsgsi_hybatmDA
        Start 238: test_gdasapp_C48_ufsenkf_atmDA
        Start 172: test_gdasapp_C96C48_hybatmDA
        Start 193: test_gdasapp_C96C48_ufs_hybatmDA
        Start 252: test_gdasapp_C96_gcafs_cycled
        Start 268: test_gdasapp_C96C48_hybatmsnowDA
        Start 289: test_gdasapp_C48mx500_3DVarAOWCDA
        Start 300: test_gdasapp_C48mx500_hybAOWCDA
        Start 315: test_gdasapp_setup_atm_jjob_cycled_exp
        Start 168: test_gdasapp_check_python_norms
        Start 169: test_gdasapp_check_yaml_keys
        Start 170: test_gdasapp_jcb_installation
  1/160 Test #169: test_gdasapp_check_yaml_keys .............................................   Passed    1.37 sec
        Start 171: test_gdasapp_snow_create_ens
  2/160 Test #170: test_gdasapp_jcb_installation ............................................   Passed    2.19 sec
...
159/160 Test #288: test_gdasapp_C96C48_hybatmsnowDA_enkfgdas_fcst_202112201800 ..............   Passed  322.35 sec
160/160 Test #326: test_gdasapp_atm_jjob_ens_final ..........................................   Passed   34.20 sec

100% tests passed, 0 tests failed out of 160

Label Time Summary:
gdasapp    = 26675.10 sec*proc (154 tests)
script     = 26675.10 sec*proc (154 tests)

Total Test time (real) = 2605.50 sec

@RussTreadon-NOAA

Copy link
Copy Markdown
Contributor Author

Thank you @CoryMartin-NOAA for the review and approval. I'll merge once the Ursa tests completes or we reached 4 pm today, whichever comes first. The Ursa tests are 70% complete with no failures so far.

@emcbot

emcbot commented Nov 2, 2026

Copy link
Copy Markdown

CI Run Summary for PR #2312 (Commit: 3a32394)

Automated GW-GDASApp Testing Results:
Machine: ursa

Start: Mon Nov  2 15:32:56 UTC 2026 on ufe04
---------------------------------------------------
Build:                                 *SUCCESS*
Build: Completed at Mon Nov  2 15:47:01 UTC 2026
---------------------------------------------------
Tests: ctest -j12 -R gdasapp
Tests:                                 *SUCCESS*
Tests: Completed at Mon Nov  2 17:19:15 UTC 2026
Tests: 100% tests passed, 0 tests failed out of 160

CI Status: Passed

@RussTreadon-NOAA

Copy link
Copy Markdown
Contributor Author

GDASApp CI Passed on Ursa and WCOSS2 (Cactus). Merging now.

@RussTreadon-NOAA
RussTreadon-NOAA merged commit 0369969 into develop Nov 2, 2026
12 checks passed
@RussTreadon-NOAA
RussTreadon-NOAA deleted the feature/stable-nightly branch November 2, 2026 17:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

gaeac6-GW-RT-Passed hera-GW-RT-Passed Automated testing with global-workflow successful on Hera hercules-GW-RT-Passed Automated testing with global-workflow successful on Hercules orion-GW-RT-Passed Automated testing with global-workflow successful on Orion ursa-GW-RT-Passed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants