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

Ninth reconciliation PR from production/RRFS.v1 + Add CCPP host variable to track initialization of GFS_phys_time_vary (#2544) + develop of WW3 up to 2024-01-11 to dev/ufs-weather-model #1342 (#2549) #2532

Open
wants to merge 26 commits into
base: develop
Choose a base branch
from

Conversation

grantfirl
Copy link
Collaborator

@grantfirl grantfirl commented Dec 5, 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:

This PR combines 3 into 1.

The first is identical to #2405 and #2428 and is the work of @JiliDong-NOAA

The second is #2544: The set of PRs listed belows adds support for multiple physics instances running the GFS_phys_time_vary scheme. No changes in the ufs-weather-model repository itself. See associated PRs below for more information.

The third is #2549: Merge develop of WW3 up to 2024-01-11 to dev/ufs-weather-model

Commit Message:

* UFSWM - fix REFS ensemble member and add GF convection cold start parameter; Add CCPP host variable to track initialization of GFS_phys_time_vary; Update WW3 with develop up to 2024-01-11
  * FV3 - fix REFS ensemble member and add GF convection cold start parameter; Add CCPP host variable to track initialization of GFS_phys_time_vary, fix bug for MP Thompson init flag
    * ccpp-physics - fix REFS ensemble member and add GF convection cold start parameter; In GFS_phys_time_vary.fv3: make is_initialized a host model variable to support multiple instances of CCPP physics in a model run
  * WW3 - Update one commit hash

Priority:

  • High: Needed for SRW App

Git Tracking

UFSWM:

Closes (replaces) NCAR/ccpp-physics#1000

Sub component Pull Requests:

UFSWM Blocking Dependencies:

  • None

Changes

Regression Test Changes (Please commit test_changes.list):

  • No Baseline Changes.

Input data Changes:

New input data: New WW3 Input data currently located on hera at: /scratch1/NCEPDEV/climate/Jessica.Meixner/PR_WW3/UFSPRww3Jan11/WW3_input_data_20240111

Library Changes/Upgrades:

  • No Updates

Testing Log:

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

@grantfirl grantfirl marked this pull request as ready for review January 2, 2025 19:50
@grantfirl
Copy link
Collaborator Author

@jkbk2004 I combined #2544 into this one because neither changes baselines and I thought it would lighten the merge queue load a bit. Please let me know if you'd like this reversed. Also, I noticed on your updated merge queue that you'd like to combine #2549 as well. I'm happy to do this. Please let me know if you'd like me to do that.

@FernandoAndrade-NOAA
Copy link
Collaborator

@jkbk2004 I combined #2544 into this one because neither changes baselines and I thought it would lighten the merge queue load a bit. Please let me know if you'd like this reversed. Also, I noticed on your updated merge queue that you'd like to combine #2549 as well. I'm happy to do this. Please let me know if you'd like me to do that.

Hi @grantfirl, yes we'd like to bring #2549 into this PR as well , thank you!

@grantfirl
Copy link
Collaborator Author

@jkbk2004 @FernandoAndrade-NOAA OK, the PRs have been combined and should be ready to test. They have each been tested independently and one can still look at the RT logs from the original PRs if necessary. The RT log left in PR branch right now is only valid for the pre-test that I did for the original, un-combined PR, although it will get re-written with the final tests before merge.

@BrianCurtis-NOAA
Copy link
Collaborator

@jkbk2004 @FernandoAndrade-NOAA Are the WW3 inputs synced to Hera?

@FernandoAndrade-NOAA
Copy link
Collaborator

@jkbk2004 @FernandoAndrade-NOAA Are the WW3 inputs synced to Hera?

They should be available on Hera at
/scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/input-data-20240501/WW3_input_data_20240111

@FernandoAndrade-NOAA FernandoAndrade-NOAA changed the title Ninth reconciliation PR from production/RRFS.v1 Ninth reconciliation PR from production/RRFS.v1 + Add CCPP host variable to track initialization of GFS_phys_time_vary (#2544) + develop of WW3 up to 2024-01-11 to dev/ufs-weather-model #1342 (#2549) Jan 14, 2025
@BrianCurtis-NOAA
Copy link
Collaborator

@FernandoAndrade-NOAA can you make the changes mentioned in NOAA-EMC/WW3#1342 (comment) to this PR?

@BrianCurtis-NOAA BrianCurtis-NOAA added the No Baseline Change No Baseline Change label Jan 15, 2025
@BrianCurtis-NOAA
Copy link
Collaborator

@jkbk2004 and @FernandoAndrade-NOAA you'll need to change the date on the hera input-data-20240501 directory for the WW3_input_data as well. This is still showing as 20240111

@jkbk2004
Copy link
Collaborator

@BrianCurtis-NOAA do you mean to update the date of /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/input-data-20240501 ? In that case, we need to keep input-data-20240501 and create new input directory to add WW3_input_data_20240111. There are a few WW3_input_data_* already in input-data-20240501: we are using WW3_input_data_20240214. Adding WW3_input_data_20240111 under input-data-20240501 looks ok. @JessicaMeixner-NOAA any comment?

@BrianCurtis-NOAA
Copy link
Collaborator

@jkbk2004 @FernandoAndrade-NOAA Actually, looking through the WW3_input_data_20240111 directory it seems that you've synced over directories that are completely irrelevant to the .NC files that are needed for regression testing. I would assume we don't need (@JessicaMeixner-NOAA can correct me if i'm wrong)

4.0K drwxr-sr-x 4 Jessica.Meixner climate 4.0K Jan  3 22:08 createmoddefs
4.0K drwxr-sr-x 8 Jessica.Meixner climate 4.0K Jan  3 22:18 workdir

@jkbk2004 I mean in rt.sh we renamed WW3_input_data_20240111 to WW3_input_data_20250114 and I was asking for EPIC to make sure that on Hera, that directory was also renamed to match that new date. I did a test sync and it still shows WW3_input_data_20240111 in /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/input-data-20240501

@JessicaMeixner-NOAA
Copy link
Collaborator

/scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/input-data-20240501

@BrianCurtis-NOAA - good catch about the extra files. However, the createmoddefs directory should be kept, the workdir should be removed.

@BrianCurtis-NOAA
Copy link
Collaborator

/scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/input-data-20240501

@BrianCurtis-NOAA - good catch about the extra files. However, the createmoddefs directory should be kept, the workdir should be removed.

Thanks for the clarification!

@BrianCurtis-NOAA
Copy link
Collaborator

@JessicaMeixner-NOAA in createmoddefs, do we need the work or worktemp directories?

@JessicaMeixner-NOAA
Copy link
Collaborator

@JessicaMeixner-NOAA in createmoddefs, do we need the work or worktemp directories?

@BrianCurtis-NOAA - thanks again for finding this, no we do not need either of those directories.

@FernandoAndrade-NOAA FernandoAndrade-NOAA added New Input Data Req'd This PR requires new data to be sync across platforms jenkins-ort run ORT testing labels Jan 15, 2025
@FernandoAndrade-NOAA FernandoAndrade-NOAA removed the jenkins-ort run ORT testing label Jan 16, 2025
@FernandoAndrade-NOAA
Copy link
Collaborator

Testing is complete, I'll leave a note in subcomponents to continue with merging.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
New Input Data Req'd This PR requires new data to be sync across platforms No Baseline Change No Baseline Change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants