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.

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

Sync with ESCOMP/CDEPS (2024-12) + Update global_control.nml.IN based on GW specs (#2528) + Sync with ESCOMP/CMEPS #2469

Merged

Conversation

NickSzapiro-NOAA
Copy link
Collaborator

@NickSzapiro-NOAA NickSzapiro-NOAA commented Oct 14, 2024

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:

Since February, a number of developments and bug fixes in authoritative ESCOMP/CDEPS upstream have been merged and should be brought to EMC fork, including

  • data glacier model
  • multilevel data ocean model
  • add nuopc_shr_methods for UFS
  • allow input of stream on unstructured mesh
  • increase in filename length (baseline changing)
  • extend JRA 1.5 streams
  • change nextsw_cday calculation for CAM7 in cplhist mode
  • add rpointer timestamp

For CMEPS

  • improved usability of the RegridStatus diagnostic returned during CMEPS RH formation
  • use of share code under CDEPS to initialize Alarms

Commit Message:

* UFSWM - Sync with ESCOMP/CDEPS (2024-12).  Sync with ESCOMP/CMEPS (2024-12). Make additional changes to global_control.nml.IN based on GW needs. 
  * CDEPS - Sync with ESCOMP/main (2024-12)
  * CMEPS - Sync with ESCOMP/main (2024-12)

Priority:

  • Normal

Git Tracking

UFSWM:

Other:

Sub component Pull Requests:

UFSWM Blocking Dependencies:

  • None

Changes

Regression Test Changes (Please commit test_changes.list):

  • PR Updates/Changes Baselines.

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 added the Baseline Updates Current baselines will be updated. label Oct 14, 2024
@NickSzapiro-NOAA NickSzapiro-NOAA self-assigned this Oct 14, 2024
@zach1221
Copy link
Collaborator

Hey, @NickSzapiro-NOAA . Would you mind if I added the CSP changes from PR#2456 to your PR here?

@NickSzapiro-NOAA
Copy link
Collaborator Author

Ok with me, @zach1221

@zach1221 zach1221 changed the title Sync with ESCOMP/CDEPS (2024-10) Sync with ESCOMP/CDEPS (2024-10)(Combined PR#2456) Oct 24, 2024
@DeniseWorthen
Copy link
Collaborator

DeniseWorthen commented Dec 6, 2024

@NickSzapiro-NOAA I wonder if you'd consider re-opening this PR w/ the latest updates from CDEPS and then asking some priority on it? It has been languishing since mid-Oct and at this point I need the latest update from CDEPS in order to update CMEPS (I need the shr_get_rpointer_name in nuopc_shr_methods). I have a feature branch I want to push to ESCOMP and we'll also have the flexible restart write feature to push up. If both of those need to wait for another CDEPS update cycle....

I've tested the latest CMEPS and it gives the same non-b4b result (in the hafs tests only, because of the filename length issue. (BTW, I think this should be marked baseline change and not baseline update?)

@NickSzapiro-NOAA
Copy link
Collaborator Author

@DeniseWorthen Sure, I didn't know anyone was waiting on CDEPS. Sorry for the delay...looks like ~4-5 days per commit for the past few months

@DeniseWorthen
Copy link
Collaborator

No worries...the feature branch I want to push came out of the grid imprint work I've been doing, so it's only now that I realized I need the latest CDEPS.

I could add a sync/ESCOMP PR for CMEPS also; that is what I tested and that will get us up-to-date w/ the upstreams for both CDEPS and CMEPS.

@NickSzapiro-NOAA
Copy link
Collaborator Author

@zach1221 Were these CSP changes all merged in #2461 ?

@zach1221
Copy link
Collaborator

zach1221 commented Dec 6, 2024

@zach1221 Were these CSP changes all merged in #2461 ?

Yes, looks like everything merged with 2461.

@NickSzapiro-NOAA NickSzapiro-NOAA added New Baselines New baselines will be added to project. Baseline Updates Current baselines will be updated. and removed Baseline Updates Current baselines will be updated. New Baselines New baselines will be added to project. labels Dec 6, 2024
dpsarmie
dpsarmie previously approved these changes Dec 12, 2024
DeniseWorthen
DeniseWorthen previously approved these changes Dec 12, 2024
@FernandoAndrade-NOAA FernandoAndrade-NOAA added the Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked. label Dec 12, 2024
@FernandoAndrade-NOAA
Copy link
Collaborator

Ok, testing should be all set. I'll let subcomponent PRs know to continue with merging.

@NickSzapiro-NOAA
Copy link
Collaborator Author

Subcomponents were merged and updated here. Should be okay...please let me know

@FernandoAndrade-NOAA FernandoAndrade-NOAA merged commit 6ec6b45 into ufs-community:develop Dec 16, 2024
4 checks passed
@NickSzapiro-NOAA NickSzapiro-NOAA deleted the sync_cdeps_2024-10 branch January 14, 2025 07:33
WalterKolczynski-NOAA added a commit to NOAA-EMC/global-workflow that referenced this pull request Jan 17, 2025
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
Labels
Baseline Updates Current baselines will be updated. Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

update NOAA-EMC from ESCOMP improve usability of dststatus fields Sync with ESCOMP/main (2024-12-10)
7 participants