Skip to content

Rename files for JEDI atm EE2#4193

Merged
DavidHuber-NOAA merged 16 commits into
NOAA-EMC:developfrom
DavidNew-NOAA:feature/atm_file_rename
Oct 31, 2025
Merged

Rename files for JEDI atm EE2#4193
DavidHuber-NOAA merged 16 commits into
NOAA-EMC:developfrom
DavidNew-NOAA:feature/atm_file_rename

Conversation

@DavidNew-NOAA
Copy link
Copy Markdown
Contributor

@DavidNew-NOAA DavidNew-NOAA commented Oct 29, 2025

Description

This PR makes changes to JEDI atm filenames to comply with EE2 standards and get JEDI atm DA working again in Global Workflow after changes made in #4117.

Resolves #4168

Type of change

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

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.)

How has this been tested?

Hera clone, build, and full CI suite

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

Comment thread ush/forecast_postdet.sh Fixed
@DavidNew-NOAA
Copy link
Copy Markdown
Contributor Author

@aerorahul @DavidHuber-NOAA @CoryMartin-NOAA @RussTreadon-NOAA Hera CI completed successfully. I would like to expedite the review/merger of this PR to get JEDI atm CI running again.

******** C48_ATM ********
CYCLE STATE ACTIVATED DEACTIVATED
202103231200 Done Oct 29 2025 23:55:09 Oct 30 2025 00:50:09
******** C48mx500_3DVarAOWCDA ********
CYCLE STATE ACTIVATED DEACTIVATED
202103241800 Done Oct 29 2025 23:55:09 Oct 30 2025 00:12:05
202103250000 Done Oct 29 2025 23:55:09 Oct 30 2025 01:26:04
******** C48mx500_hybAOWCDA ********
CYCLE STATE ACTIVATED DEACTIVATED
202103241800 Done Oct 29 2025 23:55:09 Oct 30 2025 00:12:04
202103250000 Done Oct 29 2025 23:55:09 Oct 30 2025 00:54:04
******** C48_S2SWA_gefs ********
CYCLE STATE ACTIVATED DEACTIVATED
202103231200 Done Oct 29 2025 23:55:09 Oct 30 2025 00:58:05
******** C48_S2SW ********
CYCLE STATE ACTIVATED DEACTIVATED
202103231200 Done Oct 29 2025 23:55:09 Oct 30 2025 00:52:04
******** C96_atm3DVar ********
CYCLE STATE ACTIVATED DEACTIVATED
202112201800 Done Oct 29 2025 23:55:09 Oct 30 2025 00:12:04
202112210000 Done Oct 29 2025 23:55:09 Oct 30 2025 02:16:04
202112210600 Done Oct 29 2025 23:55:09 Oct 30 2025 01:46:08
******** C96C48_hybatmDA ********
CYCLE STATE ACTIVATED DEACTIVATED
202112201800 Done Oct 29 2025 23:55:09 Oct 30 2025 00:12:04
202112210000 Done Oct 29 2025 23:55:09 Oct 30 2025 02:06:08
202112210600 Done Oct 29 2025 23:55:09 Oct 30 2025 01:28:03
******** C96C48_hybatmsnowDA ********
CYCLE STATE ACTIVATED DEACTIVATED
202112201200 Done Oct 29 2025 23:55:09 Oct 30 2025 00:12:04
202112201800 Done Oct 29 2025 23:55:09 Oct 30 2025 02:02:03
202112210000 Done Oct 29 2025 23:55:09 Oct 30 2025 01:32:04
******** C96C48_hybatmsoilDA ********
CYCLE STATE ACTIVATED DEACTIVATED
202205150600 Done Oct 29 2025 23:55:09 Oct 30 2025 00:12:04
202205151200 Done Oct 29 2025 23:55:09 Oct 30 2025 02:10:11
202205151800 Done Oct 29 2025 23:55:09 Oct 30 2025 01:40:11
******** C96C48mx500_S2SW_cyc_gfs ********
CYCLE STATE ACTIVATED DEACTIVATED
202112201200 Done Oct 29 2025 23:55:09 Oct 30 2025 00:12:05
202112201800 Done Oct 29 2025 23:55:09 Oct 30 2025 02:16:05
202112210000 Done Oct 29 2025 23:55:09 Oct 30 2025 02:50:11
202112211800 Done Oct 30 2025 00:14:04 Oct 30 2025 02:46:04
******** C96C48_ufs_hybatmDA ********
CYCLE STATE ACTIVATED DEACTIVATED
202402231800 Done Oct 29 2025 23:55:09 Oct 30 2025 00:12:04
202402240000 Done Oct 29 2025 23:55:09 Oct 30 2025 02:18:04
202402240600 Done Oct 29 2025 23:55:09 Oct 30 2025 01:44:04
******** C96_gcafs_cycled ********
CYCLE STATE ACTIVATED DEACTIVATED
202112201200 Done Oct 29 2025 23:55:09 Oct 30 2025 00:14:04
202112201800 Done Oct 29 2025 23:55:09 Oct 30 2025 02:14:04
202112210000 Done Oct 29 2025 23:55:09 Oct 30 2025 00:56:03
******** C96_gcafs_cycled_noDA ********
CYCLE STATE ACTIVATED DEACTIVATED
202112201200 Done Oct 29 2025 23:55:09 Oct 30 2025 00:12:04
202112201800 Done Oct 29 2025 23:55:09 Oct 30 2025 02:10:10
202112210000 Done Oct 29 2025 23:55:09 Oct 30 2025 00:50:09
******** C96mx100_S2S ********
CYCLE STATE ACTIVATED DEACTIVATED
199405010000 Done Oct 29 2025 23:55:09 Oct 30 2025 01:30:12

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.

Thank you @DavidNew-NOAA for confirming that g-w CI, especially C96C48_ufs_hybatmDA, passes on Hera.

Approve.

Comment thread ush/python/pygfs/task/fv3_analysis_calc.py Outdated
Copy link
Copy Markdown
Contributor

@DavidHuber-NOAA DavidHuber-NOAA left a comment

Choose a reason for hiding this comment

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

Looks good. Just one suggestion on a logger write.

@DavidHuber-NOAA
Copy link
Copy Markdown
Contributor

DavidHuber-NOAA commented Oct 30, 2025

Starting CI on C6 and WCOSS2.

@DavidHuber-NOAA
Copy link
Copy Markdown
Contributor

DavidHuber-NOAA commented Oct 30, 2025

To help expedite this, I will limit the tests on C6 (C96C48_ufs_hybatmDA) and WCOSS2 (C96_atm3DVar_extended and C48_S2SW_extended).

EDIT: C96C48_ufs_hybatmDA is unsupported on C6, so skipping that platform.

Comment thread dev/parm/config/gfs/config.efcs Outdated
Comment thread parm/archive/enkf_grp.yaml.j2
Comment thread parm/archive/enkf_restarta_grp.yaml.j2
Comment thread parm/archive/enkf_restarta_grp.yaml.j2 Outdated
Comment thread parm/archive/enkf_restarta_grp.yaml.j2
Comment thread ush/forecast_postdet.sh Outdated
@DavidHuber-NOAA DavidHuber-NOAA added the CI-Wcoss2-Running CI testing on WCOSS for this PR is in-progress label Oct 30, 2025
@DavidNew-NOAA
Copy link
Copy Markdown
Contributor Author

Thanks @DavidHuber-NOAA . I'm re-running C96C48_ufs_hybatmDA on Hera just to make sure my revisions didn't break anything. Then I'll be ready for retest

@DavidHuber-NOAA DavidHuber-NOAA removed CI-Wcoss2-Passed CI testing on WCOSS for this PR has completed successfully CI-Hera-Passed (cm) Manual CI passed on Hera labels Oct 30, 2025
@emcbot emcbot added CI-Gaeac6-Ready **CM use only** PR is ready for CI testing on Gaea C6 CI-Ursa-Ready **CM use only** PR is ready for CI testing on Ursa labels Oct 30, 2025
@DavidNew-NOAA
Copy link
Copy Markdown
Contributor Author

Hera C96C48_ufs_hybatmDA passes. Triggering Ursa and C6

@emcbot emcbot added CI-Gaeac6-Building **Bot use only** CI testing is cloning/building on Gaea C6 CI-Ursa-Building **Bot use only** CI testing is cloning/building on Ursa CI-Ursa-Running **Bot use only** CI testing on Ursa for this PR is in-progress CI-Gaeac6-Running CI-Ursa-Passed **Bot use only** CI testing on Ursa for this PR has completed successfully CI-Gaeac6-Passed **Bot use only** CI testing on Gaea C6 for this PR has completed successfully and removed CI-Gaeac6-Ready **CM use only** PR is ready for CI testing on Gaea C6 CI-Ursa-Ready **CM use only** PR is ready for CI testing on Ursa CI-Ursa-Building **Bot use only** CI testing is cloning/building on Ursa CI-Gaeac6-Building **Bot use only** CI testing is cloning/building on Gaea C6 CI-Ursa-Running **Bot use only** CI testing on Ursa for this PR is in-progress CI-Gaeac6-Running labels Oct 30, 2025
@RussTreadon-NOAA
Copy link
Copy Markdown
Contributor

Additional GDASApp testing

All ctests, including select g-w CI, Passed with Hera GDASApp stable-nightly testing using DavidNew-NOAA:feature/atm_file_rename for g-w.

GDASApp branch feature/stable-nightly includes changes to the cubed_sphere_grid filenames that are used in the atm_jjob ctests. feature/stable-nightly should enter GDASApp develop on Monday, 11/3/2025, assuming this PR is merged into g-w develop today.

@DavidNew-NOAA
Copy link
Copy Markdown
Contributor Author

DavidNew-NOAA commented Oct 31, 2025

@aerorahul CI is successful on Ursa and C6. I just need your approval to dismiss requested changes which have been addressed and then we can merge.

@RussTreadon-NOAA RussTreadon-NOAA self-requested a review October 31, 2025 11:34
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.

g-w CI passes on Gaea C6 and Ursa. GDASApp ctests pass on Hera.

Approve.

@DavidHuber-NOAA
Copy link
Copy Markdown
Contributor

Merging. I believe all of @aerorahul's comments have been addressed. If not, I will address them in #4195.

@DavidHuber-NOAA DavidHuber-NOAA merged commit 678ec7a into NOAA-EMC:develop Oct 31, 2025
5 checks passed
@DavidNew-NOAA
Copy link
Copy Markdown
Contributor Author

weihuang-jedi added a commit to NOAA-EPIC/global-workflow-cloud that referenced this pull request Nov 5, 2025
…NOAA-EPIC/global-workflow-cloud into feature/use_container_spack-stack-1.9.2

* 'feature/use_container_spack-stack-1.9.2' of github.com:NOAA-EPIC/global-workflow-cloud:
  reverse few changes
  re-sync with EMC repo
  Add master grib files to GFS HPSS archive for AIGFS (NOAA-EMC#4203)
  Update Snow filenames to comply with EE2 (NOAA-EMC#4195)
  Rename files for JEDI atm EE2 (NOAA-EMC#4193)
  Generate `pres_b` files for `RUN=gdas` and update `APCP` to `598`. (NOAA-EMC#4196)
  Update checks for MOM6 restarts when performing a re-run on failure (NOAA-EMC#4179)
  Decrease HPSS storage for GFS retros and address hpss bugs (NOAA-EMC#4184)
  Add noaacloud to ufsda case in dev/ush/load_modules (NOAA-EMC#4198)
  Remove replay from global workflow  (NOAA-EMC#4182)
  Add IODA stats text file to COM (NOAA-EMC#4176)
  Update UFS_UTILS submodule (NOAA-EMC#4178)
  Atm COM File Rename to Standardized Form  (NOAA-EMC#4117)
  Replace cp with cpfs/cpreq for atomic copies to COM directories (NOAA-EMC#4130)
  Create a UPP module for the global workflow (NOAA-EMC#4174)
  Refactor marine DA tasks (NOAA-EMC#4160)
  Delay ocean post-processing trigger to next-next forecast (NOAA-EMC#4167)
  Make options hashes
  Remove multiple option from static data template
  Fix static_data yaml (descriptions and labels)
  Fix static_data yaml (remove colon)
  Add Ursa to and remove C5 from list of HPCs in the bug report template (NOAA-EMC#4164)
  Rename marine (ocean/ice) files following EE2 conventions (NOAA-EMC#4162)
  Add attributes to Gaussian grid sfcanl file (NOAA-EMC#4149)
  Remove the snow analysis from archive (NOAA-EMC#4157)
  Update verif-global to fix pcp failures on special cases (NOAA-EMC#4154)
  Add CRTM fix directory paths to global-workflow (NOAA-EMC#4143)
  Update UFS Model  (NOAA-EMC#4138)
  Add functionality to assimilate the new snow observations (NOAA-EMC#4132)
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-Ursa-Passed **Bot use only** CI testing on Ursa for this PR has completed successfully

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Update JEDI-ATM naming convention to EE2 standards

6 participants