Skip to content

Update UFS (no GOCART updates) #3872

Merged
DavidHuber-NOAA merged 13 commits into
NOAA-EMC:developfrom
JessicaMeixner-NOAA:updatemodel_pregocart
Jul 17, 2025
Merged

Update UFS (no GOCART updates) #3872
DavidHuber-NOAA merged 13 commits into
NOAA-EMC:developfrom
JessicaMeixner-NOAA:updatemodel_pregocart

Conversation

@JessicaMeixner-NOAA
Copy link
Copy Markdown
Contributor

@JessicaMeixner-NOAA JessicaMeixner-NOAA commented Jul 15, 2025

Description

This PR is a stop-gap while issues with #3840 are being resolved.

This PR updates UFS to the commit prior to the update of spack-stack (then Ursa porting) and does not update GOCART. This does update MOM6, which requires a GDASApp/Soca update.

Refs #3881

Type of change

  • Bug fix (fixes something broken)
  • New feature (adds functionality)
  • Maintenance (code refactor, clean-up, new CI test, etc.) routine update of model

Change characteristics

  • Is this a breaking change (a change in existing functionality)? NO
  • Does this change require a documentation update? NO
  • Does this change require an update to any of the following submodules? YES (If YES, please add a link to any PRs that are pending.)
    • EMC verif-global
    • GDAS currently pointing to feature/nightlystable
    • GFS-utils
    • GSI
    • GSI-monitor
    • GSI-utils
    • UFS-utils
    • UFS-weather-model
    • wxflow

How has this been tested?

Ran the GEFS & GCAFS tests on gaeac6 that were previously failing with updates to GOCART.

******** C48_S2SWA_gefs_prego01 ********
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202103231200        Done    Jul 14 2025 15:20:13    Jul 14 2025 16:25:15

******** C96_gcafs_cycled_noDA_prego01 ********
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202112201200        Done    Jul 14 2025 15:20:13    Jul 14 2025 15:40:06
202112201800        Done    Jul 14 2025 15:20:13    Jul 14 2025 17:30:19
202112210000        Done    Jul 14 2025 15:20:13    Jul 14 2025 16:35:18

******** C96_gcafs_cycled_prego01 ********
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
202112201200        Done    Jul 14 2025 15:20:13    Jul 14 2025 15:40:05
202112201800        Done    Jul 14 2025 15:20:13    Jul 14 2025 17:35:19
202112210000        Done    Jul 14 2025 15:20:13    Jul 14 2025 17:00:07

******** C96mx100_S2S_prego01 ********
   CYCLE         STATE           ACTIVATED              DEACTIVATED     
199405010000        Done    Jul 14 2025 15:20:14    Jul 14 2025 16:40:06

Checklist

  • Any dependent changes have been merged and published
  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have documented my code, including function, input, and output descriptions
  • My changes generate no new warnings
  • New and existing tests pass with my changes
  • This change is covered by an existing CI test or a new one has been added
  • Any new scripts have been added to the .github/CODEOWNERS file with owners
  • I have made corresponding changes to the system documentation if necessary

@RussTreadon-NOAA
Copy link
Copy Markdown
Contributor

GDASApp CI

Install JessicaMeixner-NOAA:updatemodel_pregocart at f1fd4b8 in /scratch3/NCEPDEV/da/Russ.Treadon/CI/GDASApp/stable/20250715/global-workflow. Run GDASApp ctests from Hera. 158 out of 158 tests pass ... provided the change to config.resources.HERA from g-w PR #3868 is added to the working copy of the g-w.

Test project /scratch3/NCEPDEV/da/Russ.Treadon/CI/GDASApp/stable/20250715/global-workflow/sorc/gdas.cd/build
        Start 2072: test_gdasapp_C96C48_ufs_hybatmDA
        Start 2053: test_gdasapp_C96C48_hybatmDA
        Start 2096: test_gdasapp_C96_gcafs_cycled
        Start 2111: test_gdasapp_C96C48_hybatmsnowDA
        Start 2132: test_gdasapp_C48mx500_3DVarAOWCDA
        Start 2143: test_gdasapp_C48mx500_hybAOWCDA
        Start 2159: test_gdasapp_setup_atm_jjob_cycled_exp
        Start 1653: test_gdasapp_utils_incrhandler
        Start 1654: test_gdasapp_utils_incrhandler_8pes
        Start 1663: test_gdasapp_util_prepdata
        Start 1656: test_gdasapp_utils_hybridweights
        Start 1657: test_gdasapp_utils_setcorscales
  1/158 Test #2159: test_gdasapp_setup_atm_jjob_cycled_exp ...................................   Passed    0.89 sec

...

156/158 Test #2104: test_gdasapp_C96_gcafs_cycled_gcdas_aeroanlgenb_202112201800 .............   Passed  122.98 sec
157/158 Test #2095: test_gdasapp_C96C48_ufs_hybatmDA_enkfgdas_fcst_202402240000 ..............   Passed  294.45 sec
158/158 Test #2087: test_gdasapp_C96C48_ufs_hybatmDA_gdas_fcst_202402240000 ..................   Passed  474.02 sec

100% tests passed, 0 tests failed out of 158

Label Time Summary:
gdas-utils    =   7.45 sec*proc (14 tests)
gdasapp       = 22370.89 sec*proc (116 tests)
script        = 22378.34 sec*proc (130 tests)

Total Test time (real) = 3086.13 sec

@RussTreadon-NOAA RussTreadon-NOAA self-requested a review July 15, 2025 15:49
Copy link
Copy Markdown
Contributor

@RussTreadon-NOAA RussTreadon-NOAA left a comment

Choose a reason for hiding this comment

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

Changes work in GDASApp stable-nightly run.

Automated GW-GDASApp Testing Results:
Machine: hera

Start: Tue Jul 15 15:25:58 UTC 2025 on hfe10
---------------------------------------------------
Build:                                 *SUCCESS*
Build: Completed at Tue Jul 15 16:02:25 UTC 2025
---------------------------------------------------
Tests: ctest -j12 -R gdasapp
Tests:                                 *SUCCESS*
Tests: Completed at Tue Jul 15 16:55:56 UTC 2025
Tests: 100% tests passed, 0 tests failed out of 158

Comment thread dev/parm/config/gefs/config.ufs
aerorahul
aerorahul previously approved these changes Jul 15, 2025
@aerorahul aerorahul added Ready for CI This PR is ready for CM's to launch automated testing on the platforms CI-Hera-Ready **CM use only** PR is ready for CI testing on Hera CI-Wcoss2-Ready PR is ready for CI testing on WCOSS2. CI-Gaeac6-Ready **CM use only** PR is ready for CI testing on Gaea C6 and removed Ready for CI This PR is ready for CM's to launch automated testing on the platforms labels Jul 15, 2025
@emcbot emcbot added CI-Gaeac6-Building **Bot use only** CI testing is cloning/building on Gaea C6 CI-Hera-Building **Bot use only** CI testing is cloning/building on Hera CI-Hera-Running **Bot use only** CI testing on Hera for this PR is in-progress and removed CI-Gaeac6-Ready **CM use only** PR is ready for CI testing on Gaea C6 CI-Hera-Ready **CM use only** PR is ready for CI testing on Hera CI-Hera-Building **Bot use only** CI testing is cloning/building on Hera labels Jul 15, 2025
@DavidHuber-NOAA DavidHuber-NOAA added CI-Wcoss2-Building CI testing is cloning/building on WCOSS2 CI-Wcoss2-Running CI testing on WCOSS for this PR is in-progress and removed CI-Wcoss2-Ready PR is ready for CI testing on WCOSS2. CI-Wcoss2-Building CI testing is cloning/building on WCOSS2 labels Jul 16, 2025
@DavidHuber-NOAA
Copy link
Copy Markdown
Contributor

Jobs are setup to run from this directory on Cactus: /lfs/h2/emc/ptmp/david.huber/para_3872.

@DavidHuber-NOAA
Copy link
Copy Markdown
Contributor

All tests have run to completion on Cactus except the C96_atm3DVar_extended case, which is in its final cycle. I believe this PR is ready to merge and will do so at COB today.

@DavidNew-NOAA
Copy link
Copy Markdown
Contributor

@RussTreadon-NOAA This branch points to gdas stable-nightly branch. We probably want it to point to develop, no? Since CI passes, should we just merge stable nightly and have @JessicaMeixner-NOAA update gdas hash to new develop?

@DavidHuber-NOAA DavidHuber-NOAA added CI-Wcoss2-Passed CI testing on WCOSS for this PR has completed successfully and removed CI-Wcoss2-Running CI testing on WCOSS for this PR is in-progress labels Jul 16, 2025
@DavidHuber-NOAA
Copy link
Copy Markdown
Contributor

@DavidNew-NOAA Sorry I missed your comment. Stopping the merge process.

@RussTreadon-NOAA
Copy link
Copy Markdown
Contributor

@DavidHuber-NOAA and @JessicaMeixner-NOAA

GDASApp PR #1791 will merge feature/stable-nightly into GDASApp develop. This PR has been tested on Hera and WCOSS2 using GDASApp CI which includes select jobs from g-w CI. All tests pass on both machines. The Hera and WCOSS2 tests use JessicaMeixner-NOAA:updatemodel_pregocart for g-w.

I agree with you, @DavidHuber-NOAA. We should

  1. merge GDASApp PR #1791 into GDASApp develop. Note that feature/stable-nightly is 5 hashes ahead of the sorc/gdas.cd hash in JessicaMeixner-NOAA:updatemodel_pregocart.
  2. update the sorc/gdas.cd hash in JessicaMeixner-NOAA:updatemodel_pregocart to GDASApp develop after PR #1791 is merged
  3. merge this PR into g-w develop

@JessicaMeixner-NOAA
Copy link
Copy Markdown
Contributor Author

GDAS app hash is updated.

@RussTreadon-NOAA
Copy link
Copy Markdown
Contributor

GDASApp develop at 5ca8a67 contains

  • feature/stable-nightly
  • removes CDATE from GDASApp

@DavidHuber-NOAA
Copy link
Copy Markdown
Contributor

@JessicaMeixner-NOAA I believe @RussTreadon-NOAA and @DavidNew-NOAA wanted to see the GDASApp hash update to this branch, rather than #3840. Could you push the hash update to this branch (updatemodel_pregocart) as well, please?

@JessicaMeixner-NOAA
Copy link
Copy Markdown
Contributor Author

@DavidHuber-NOAA - I thought I did that before I left work yesterday, but must not have pushed or something. Updating now! One minute...

@JessicaMeixner-NOAA
Copy link
Copy Markdown
Contributor Author

@DavidHuber-NOAA - I pushed that unintentionally to the other branch last night. I have now pushed it to this branch.

@RussTreadon-NOAA
Copy link
Copy Markdown
Contributor

Thank you @JessicaMeixner-NOAA . gdas.cd @ 5ca8a67 is correct!

@RussTreadon-NOAA RussTreadon-NOAA self-requested a review July 17, 2025 14:38
Copy link
Copy Markdown
Contributor

@RussTreadon-NOAA RussTreadon-NOAA left a comment

Choose a reason for hiding this comment

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

GDASApp ctests including a subset of g-w CI tests pass on Hera and WCOSS2 (Cactus) when using gdas.cd @ 5ca8a67 and with this PR.

Approve.

@DavidHuber-NOAA DavidHuber-NOAA merged commit 6f1c278 into NOAA-EMC:develop Jul 17, 2025
5 checks passed
@JessicaMeixner-NOAA JessicaMeixner-NOAA deleted the updatemodel_pregocart branch August 22, 2025 16:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CI-Gaeac6-Passed **Bot use only** CI testing on Gaea C6 for this PR has completed successfully CI-Wcoss2-Passed CI testing on WCOSS for this PR has completed successfully

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants