Skip to content
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

Jump to bottom

Sync with ESCOMP/CDEPS (2024-12-16) + Add support for traditional threading (#2533) #2538

Merged
merged 19 commits into from
Dec 23, 2024
Merged

Sync with ESCOMP/CDEPS (2024-12-16) + Add support for traditional threading (#2533) #2538

merged 19 commits into from
Dec 23, 2024

Conversation

NickSzapiro-NOAA
Copy link
Collaborator

@NickSzapiro-NOAA NickSzapiro-NOAA commented Dec 17, 2024 •
edited by jkbk2004
Loading

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:

Merge authoritative ESCOMP into EMC fork for bug fix for alarm code in CDEPS share code used by CMEPS

Description of adding support for traditional threading is available in #2533

Commit Message:

* UFSWM - This PR adds support for traditional (non esmf managed) threading. ESMF managed threading is still default.
* UFSWM - Sync with ESCOMP/CDEPS (2024-12-16)
  * CDEPS - Sync with ESCOMP/CDEPS (2024-12-16)

Priority:

  • High: bugfix blocking CMEPS from writing mediator history files (critical for debugging)

Git Tracking

UFSWM:

Sub component Pull Requests:

UFSWM Blocking Dependencies:

  • None

Changes

Regression Test Changes (Please commit test_changes.list):

  • No Baseline Changes.

Input data Changes:

  • None.

Library Changes/Upgrades:

  • No Updates

Testing Log:

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

@NickSzapiro-NOAA NickSzapiro-NOAA mentioned this pull request Dec 17, 2024
Merged
@NickSzapiro-NOAA NickSzapiro-NOAA self-assigned this Dec 17, 2024
@NickSzapiro-NOAA NickSzapiro-NOAA added the No Baseline Change No Baseline Change label Dec 17, 2024
DeniseWorthen
DeniseWorthen previously approved these changes Dec 17, 2024
View reviewed changes
Copy link
Collaborator

@DeniseWorthen DeniseWorthen 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. Thanks for getting this fix in so quickly.

@jkbk2004 jkbk2004 mentioned this pull request Dec 18, 2024
Open
14 tasks
@jkbk2004
Copy link
Collaborator

@NickSzapiro-NOAA Please, go ahead to sync up branch and combine in #2533. @DusanJovic-NOAA FYI

@NickSzapiro-NOAA
Copy link
Collaborator Author

NickSzapiro-NOAA commented Dec 19, 2024 via email

@NickSzapiro-NOAA
Copy link
Collaborator Author

@jkbk2004 @DusanJovic-NOAA Should be ready

@NickSzapiro-NOAA NickSzapiro-NOAA changed the title Sync with ESCOMP/CDEPS (2024-12-16) Sync with ESCOMP/CDEPS (2024-12-16) + Add support for traditional threading (#2533) Dec 20, 2024
@jkbk2004 jkbk2004 added the Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked. label Dec 23, 2024
@jkbk2004
Copy link
Collaborator

we can start merging process.

@NickSzapiro-NOAA
Copy link
Collaborator Author

CDEPS was merged and updated here. Should be ready. Thank you @jkbk2004 @BrianCurtis-NOAA

@jkbk2004 jkbk2004 merged commit 2950089 into ufs-community:develop Dec 23, 2024
4 checks passed
@jkbk2004 jkbk2004 mentioned this pull request Dec 23, 2024
Closed
13 tasks
@JessicaMeixner-NOAA JessicaMeixner-NOAA mentioned this pull request Jan 6, 2025
Merged
21 tasks
@NickSzapiro-NOAA NickSzapiro-NOAA deleted the sync_cdeps_2024-12-16 branch January 14, 2025 07:33
WalterKolczynski-NOAA added a commit to NOAA-EMC/global-workflow that referenced this pull request Jan 17, 2025
@JessicaMeixner-NOAA @aerorahul
@sbanihash @DavidHuber-NOAA @WalterKolczynski-NOAA
Make assorted updates to waves (#3190)
57ce1b0 
This PR adds the following: 
* converting from inp -> nml (@sbanihash) 
* turning on PIO for waves for restarts (@sbanihash) 
* enabling cycling for WW3 which required some updates to wave prep jobs
+ changing what restarts are being saved/etc
* changed the way CEMPS, MOM6, CICE and WW3 write restarts to be in sync
with FV3 for IAU, which required moving the ufs-weather-model forward
one hash to use the new flexible restart feature. (UFS PR
ufs-community/ufs-weather-model#2419)
* adds uglo_15km - the targeted new wave grid. 
* Update to use new esmf_threading ufs.configure files which changes the
toggle between how you use esmf threading versus traditional threading
(UFS PR ufs-community/ufs-weather-model#2538)

Notes on ufs-weather-model updates: 
| Commit date | Commit hash/ PR | Notes for g-w changes | Baseline
Changes |
| :------------- | :------------- | :------------- | :------------- |
| Dec 11, 2024 |
ufs-community/ufs-weather-model@409bc85
ufs-community/ufs-weather-model#2419 | Enables
flexible restart writes - changes included in g-w PR | none|
| Dec 16, 2024 |
ufs-community/ufs-weather-model@6ec6b45
ufs-community/ufs-weather-model#2528
ufs-community/ufs-weather-model#2469 | n/a |
HAFs test changes, no global changes |
| Dec 18, 2024
|ufs-community/ufs-weather-model@e119370
ufs-community/ufs-weather-model#2448 | Adds Gaea
C6 support (changes in other g-w PRs, not here) | none |
|Dec 23, 2024 |
ufs-community/ufs-weather-model@2950089
ufs-community/ufs-weather-model#2533
ufs-community/ufs-weather-model#2538 | changes
for ESMF vs traditional threading | none |
|Dec 30, 2024 |
ufs-community/ufs-weather-model@241dd8e
ufs-community/ufs-weather-model#2485 | n/a |
changes in conus13km, no global changes|
|Jan 3, 2025 |
ufs-community/ufs-weather-model@76471dc
ufs-community/ufs-weather-model#2530 | n/a |
changes in regional tests, no global changes |

Note this PR requires the following: 
* update to fix files to add uglo_15km 
* staging ICs for high resolution test case for uglo_15km 

Co-author: @sbanihash 

Related Issues: 
- Fixes #1457 
- Fixes #3154
- Fixes #1795 
- related to #1776 

---------

Co-authored-by: Rahul Mahajan <[email protected]>
Co-authored-by: Saeideh Banihashemi <[email protected]>
Co-authored-by: David Huber <[email protected]>
Co-authored-by: Walter Kolczynski - NOAA <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dpsarmie dpsarmie dpsarmie approved these changes

@jkbk2004 jkbk2004 jkbk2004 approved these changes

@DeniseWorthen DeniseWorthen DeniseWorthen left review comments

@BrianCurtis-NOAA BrianCurtis-NOAA Awaiting requested review from BrianCurtis-NOAA

Assignees

@NickSzapiro-NOAA NickSzapiro-NOAA

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@NickSzapiro-NOAA @jkbk2004 @DeniseWorthen @dpsarmie @DusanJovic-NOAA @BrianCurtis-NOAA