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

Fifth reconciliation PR from production/RRFS.v1 #2485

Merged
merged 20 commits into from
Dec 30, 2024
Merged

Fifth reconciliation PR from production/RRFS.v1 #2485

merged 20 commits into from
Dec 30, 2024

Conversation

grantfirl
Copy link
Collaborator

@grantfirl grantfirl commented Oct 29, 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:

This work is identical to #2214, but targeting the develop branch instead.

This is work from @jordanschnell and their description is as follows:
For ebb_dcycle==1 (retrospective fire emissions), the 3-d emissions were incorrectly assgined assigned at all levels using the surface data.

Commit Message:

* UFSWM - Fix improperly assigned fire emissions for ebb_dcycle==1 for retrospectives (NOT operational!)
  * FV3 - Fix improperly assigned fire emissions for ebb_dcycle==1 for retrospectives (NOT operational!)
    * ccpp-physics - Fix improperly assigned fire emissions for ebb_dcycle==1 for retrospectives (NOT operational!)

Priority:

  • High: Needed for SRW App

Git Tracking

UFSWM:

  • None

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)

@grantfirl grantfirl mentioned this pull request Nov 15, 2024
Merged
3 tasks
@grantfirl grantfirl marked this pull request as ready for review November 15, 2024 16:15
@grantfirl
Copy link
Collaborator Author

As of Monday morning Dec. 9, I'm re-running regression tests due to a bug fix that I needed to add into ufs-community/ccpp-physics#231. This bugfix is expected to change the same tests as in ufs-community/ccpp-physics#194: merra2_thompson intel
atmaero_control_p8_rad_micro intel

@jkbk2004
Copy link
Collaborator

@grantfirl can you sync up branches? We can start working on this pr.

@grantfirl
Copy link
Collaborator Author

@grantfirl can you sync up branches? We can start working on this pr.

OK, it should be ready to test. Regarding my retests, they actually didn't cause changes to the other tests (merra2_thompson intel
atmaero_control_p8_rad_micro intel) as expected. So, the original test_changes.list that is currently committed should still be valid, I think.

@jkbk2004 jkbk2004 added 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. labels Dec 16, 2024
@BrianCurtis-NOAA
Copy link
Collaborator

WCOSS2 and Acorn are down tomorrow. We might need to move on to a PR that doesn't change baselines.

@jkbk2004
Copy link
Collaborator

@grantfirl we can restart testing this pr. can you sync up branch one more time?

@grantfirl
Copy link
Collaborator Author

@grantfirl we can restart testing this pr. can you sync up branch one more time?

@jkbk2004 Finished syncing

@jkbk2004
Copy link
Collaborator

@BrianCurtis-NOAA @FernandoAndrade-NOAA We can go ahead to merge if we skip acorn.

@BrianCurtis-NOAA
Copy link
Collaborator

I have a ticket about some Acorn issues sent out without a resolution yet. We can skip that machine.

@jkbk2004
Copy link
Collaborator

@grantfirl new fv3 hash is NOAA-EMC/fv3atm@a7d46ee

@jkbk2004 jkbk2004 merged commit 241dd8e into ufs-community:develop Dec 30, 2024
4 checks passed
@JessicaMeixner-NOAA JessicaMeixner-NOAA mentioned this pull request Jan 6, 2025
Merged
21 tasks
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 <aerorahul@users.noreply.github.com>
Co-authored-by: Saeideh Banihashemi <saeideh.banihashemi@noaa.gov>
Co-authored-by: David Huber <69919478+DavidHuber-NOAA@users.noreply.github.com>
Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NickSzapiro-NOAA NickSzapiro-NOAA NickSzapiro-NOAA approved these changes

@BrianCurtis-NOAA BrianCurtis-NOAA BrianCurtis-NOAA approved these changes

@jkbk2004 jkbk2004 jkbk2004 approved these changes

@FernandoAndrade-NOAA FernandoAndrade-NOAA Awaiting requested review from FernandoAndrade-NOAA

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

Successfully merging this pull request may close these issues.
4 participants
@grantfirl @jkbk2004 @BrianCurtis-NOAA @NickSzapiro-NOAA