Skip to content

Combination #2777 (maintask writes CMEPS restart log), #2779 (FV3 CI/CD), and fix RT if statement blocks#2795

Merged
jkbk2004 merged 12 commits into
ufs-community:developfrom
dpsarmie:feature/FV3_CICD-CMEPS_maintask
Jul 9, 2025
Merged

Combination #2777 (maintask writes CMEPS restart log), #2779 (FV3 CI/CD), and fix RT if statement blocks#2795
jkbk2004 merged 12 commits into
ufs-community:developfrom
dpsarmie:feature/FV3_CICD-CMEPS_maintask

Conversation

@dpsarmie
Copy link
Copy Markdown
Collaborator

@dpsarmie dpsarmie commented Jul 8, 2025

Commit Queue Requirements:

  • Fill out all sections of this template.
  • All sub component pull requests have been reviewed by their code managers.
  • Run the full Intel+GNU RT suite (compared to current baselines) on either Hera/Derecho/Hercules
  • Commit 'test_changes.list' from previous step

Description:

This brings in changes from the FV3 repo to UFS. The changes include modifications of the FV3 code to add more submodules, fixes the CI/CD workflow in GitHub for the FV3 repo, and the addition of unit tests to the FV3 repo.

There are no baseline changes expected with this commit.

PR #2777

#2698 enabled writing of a log file to indicate that CMEPS has completed writing a restart file. If all mediator tasks do this for the same file, there are race conditions. So different tasks aren't opening and closing same filename, add 1 line change so that only if maintask call log_restart_fh

RT If statement typo

Fixes if statements in RTs with typo.

Commit Message:

* UFSWM - Add FV3 PR#966, Fix RT if statement blocks
  * FV3 - Adds unit tests and fixes CI/CD workflow
  * CMEPS - if maintask call log_restart_fh

Priority:

  • Normal

Git Tracking

UFSWM:

Combined in this PR

Sub component Pull Requests:

UFSWM Blocking Dependencies:

  • None

Documentation:

  • No documentation update is required for this PR (please explain).

Changes

  • No Baseline Changes.

Input data Changes:

  • None.

Library Changes/Upgrades:

  • No Updates

Testing Log:

  • RDHPCS
    • Hera
    • Orion
    • Hercules
    • GaeaC6
    • Derecho
  • WCOSS2
    • Dogwood/Cactus
    • Acorn
  • CI
  • opnReqTest (complete task if unnecessary)

@dpsarmie dpsarmie mentioned this pull request Jul 8, 2025
13 tasks
@dpsarmie dpsarmie self-assigned this Jul 8, 2025
@jkbk2004 jkbk2004 added No Baseline Change No Baseline Change Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked. hera-RT Run Hera regression testing hercules-RT Run Hera regression testing orion-RT derecho-RT Run regression tests on Derecho In Testing The PR that is currently in testing stages labels Jul 8, 2025
@epic-cicd-jenkins epic-cicd-jenkins removed the hercules-RT Run Hera regression testing label Jul 8, 2025
@epic-cicd-jenkins epic-cicd-jenkins removed the derecho-RT Run regression tests on Derecho label Jul 8, 2025
@jkbk2004 jkbk2004 removed In Testing The PR that is currently in testing stages hera-RT Run Hera regression testing labels Jul 9, 2025
@jkbk2004
Copy link
Copy Markdown
Collaborator

jkbk2004 commented Jul 9, 2025

All tests are done ok. We can start merging process.

@DeniseWorthen
Copy link
Copy Markdown
Collaborator

CMEPS hash ae6db21

@jkbk2004
Copy link
Copy Markdown
Collaborator

jkbk2004 commented Jul 9, 2025

@dpsarmie new fv3 hash is NOAA-EMC/ufsatm@207d984

jkbk2004
jkbk2004 previously approved these changes Jul 9, 2025
@BrianCurtis-NOAA
Copy link
Copy Markdown
Collaborator

Waiting on CMEPS to get to NOAA-EMC/CMEPS@ae6db21

@dpsarmie
Copy link
Copy Markdown
Collaborator Author

dpsarmie commented Jul 9, 2025

Sorry about that. Hashes for FV3 and CMEPS should be updated now.

@jkbk2004 jkbk2004 merged commit 0e96057 into ufs-community:develop Jul 9, 2025
4 checks passed
@dpsarmie dpsarmie deleted the feature/FV3_CICD-CMEPS_maintask branch July 31, 2025 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

No Baseline Change No Baseline Change Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked.

Projects

None yet

6 participants