Eighth reconciliation PR from production/RRFS.v1 #2531

grantfirl · 2024-12-05T21:47:12Z

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 : no changes

Description:

This is work from @haiqinli and the changes are identical to #2298

Commit Message:

* UFSWM - minor bugfixes for smoke/dust for RRFS.v1
  * FV3 - minor bugfixes for smoke/dust for RRFS.v1
    * ccpp-physics - minor bugfixes for smoke/dust for RRFS.v1

Priority:

High: Needed for SRW App

Git Tracking

UFSWM:

None

Sub component Pull Requests:

FV3: Eighth reconciliation PR from production/RRFS.v1 NOAA-EMC/fv3atm#898
- ccpp-physics: Eighth reconciliation PR from production/RRFS.v1 ccpp-physics#237

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:

grantfirl · 2024-12-05T21:48:51Z

@jkbk2004 @MatthewPyle-NOAA @haiqinli Do you know if the Hercules platform change from #2298 needs to go to the develop branch?

MatthewMasarik-NOAA · 2024-12-05T21:56:37Z

@jkbk2004 @MatthewMasarik-NOAA @haiqinli Do you know if the Hercules platform change from #2298 needs to go to the develop branch?

Good afternoon, @grantfirl! I don't think I know the answer to that.. just wanted to check if you meant to tag @MatthewPyle-NOAA?

grantfirl · 2024-12-05T22:03:05Z

@jkbk2004 @MatthewMasarik-NOAA @haiqinli Do you know if the Hercules platform change from #2298 needs to go to the develop branch?

Good afternoon, @grantfirl! I don't think I know the answer to that.. just wanted to check if you meant to tag @MatthewPyle-NOAA?

Yes, indeed. Sorry @MatthewMasarik-NOAA !

MatthewMasarik-NOAA · 2024-12-05T22:04:23Z

@jkbk2004 @MatthewMasarik-NOAA @haiqinli Do you know if the Hercules platform change from #2298 needs to go to the develop branch?

Good afternoon, @grantfirl! I don't think I know the answer to that.. just wanted to check if you meant to tag @MatthewPyle-NOAA?

Yes, indeed. Sorry @MatthewMasarik-NOAA !

All good @grantfirl!

jkbk2004 · 2024-12-05T22:05:56Z

@grantfirl I think current hercules modulefiles on develop branch are ok. But we can do some pre-test to make sure.

MatthewPyle-NOAA · 2024-12-05T22:21:26Z

@grantfirl I'm not sure if I'm seeing what you mean in #2298 with regards to a Hercules change.

grantfirl · 2024-12-05T22:25:17Z

@grantfirl I'm not sure if I'm seeing what you mean in #2298 with regards to a Hercules change.

It looks like there was a change in the rocoto module for use with hercules in tests/rt.sh in that PR.

jkbk2004 · 2024-12-05T22:41:29Z

@grantfirl I'm not sure if I'm seeing what you mean in #2298 with regards to a Hercules change.

It looks like there was a change in the rocoto module for use with hercules in tests/rt.sh in that PR.

Current develop branch is most updated one on hercules:

(base) [jongkim@hercules-login-3 ~]$ module list

Currently Loaded Modules:
  1) contrib/0.1   2) rocoto/1.3.7

grantfirl · 2024-12-05T22:43:12Z

@grantfirl I'm not sure if I'm seeing what you mean in #2298 with regards to a Hercules change.

It looks like there was a change in the rocoto module for use with hercules in tests/rt.sh in that PR.

Current develop branch is most updated one on hercules:
(base) [jongkim@hercules-login-3 ~]$ module list

Currently Loaded Modules:
  1) contrib/0.1   2) rocoto/1.3.7

Thanks @jkbk2004 . I'll leave this change out of this PR, then.

jkbk2004 · 2025-01-07T00:42:19Z

we can start merging process.

grantfirl · 2025-01-07T18:13:30Z

@jkbk2004 Updated and ready for review/merge

tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log

# Description This PR updates the wave fix which was unintentionally left out of PR #3190 Additionally, this updates what ICs the highres ci tests are pointing to (IC update issues: #3287 #3288) Resolves #3260 Refs #3326 - small changes in comments Additionally, some smaller bug fixes and changes were made: * Removes logic that tries to copy files to fix directory in ush/wave_grid_interp_sbs.sh -- Fixes #3162 * Adds MPI variables that were found needed when investigating the HR4 hang ufs-community/ufs-weather-model#2486 -- Fixes #3259 * Changes the log file output directory corresponding to an update requested by NCO in v16.3.22 in scripts/exgfs_wave_post_pnt.sh * Through debugging HR5 (#3260) it was noticed the wave ICs were not used. While there is a code change required (NOAA-EMC/WW3#1359), this PR fixes the scripting level issues & updates UFS to fix WW3 code issues. * Removes COMOUT_WAVE_PREP from wave post job that did not need it, plus ensured temporary files were not copied back to COM and then over-written (NCO bug) --- Fixes #297 * Updates ufs-weather-model hash. Details in table below Notes on ufs-weather-model updates: | Commit date | Commit hash/ PR | Notes for g-w changes | Baseline Changes | | :------------- | :------------- | :------------- | :------------- | | Jan 7, 2025 | ufs-community/ufs-weather-model@5324d64 ufs-community/ufs-weather-model#2531 | n/a | changes in regional tests, no global changes | | Jan 13, 2025 | ufs-community/ufs-weather-model@c7412fa | n/a | changes in some global coupled tests | | Jan 17, 2025 | ufs-community/ufs-weather-model@3a5e52e | n/a | no changes | | Jan 21, 2025 | ufs-community/ufs-weather-model@33cde4b | extra variable needed for waves | no changes | | Jan 22, 2025 | ufs-community/ufs-weather-model@b9d2bec | n/a | no changes | Jan 28, 2025 | ufs-community/ufs-weather-model@0682f90 | n/a | | Feb 3, 2025 | ufs-community/ufs-weather-model@a498735 | add fv3atm_output_dir to model_configure | answers change | | Feb 5, 2025 | ufs-community/ufs-weather-model@ee3d52d | changes in this PR for initialization for wave fixes | if using WW3 binary restart, answers will change |

grantfirl added 2 commits December 5, 2024 16:44

update FV3 commit hash

7b5790a

add change to rrfs_conus13km_hrrr.nml.IN

6e68f85

grantfirl added 3 commits December 19, 2024 15:30

Merge branch 'develop' into rrfsv1-to-ufs/dev8

ed23e95

update FV3 submodule

b904bb1

add successful Hera RT log

8d1c644

grantfirl marked this pull request as ready for review December 23, 2024 19:46

grantfirl added 2 commits January 3, 2025 12:41

Merge branch 'develop' into rrfsv1-to-ufs/dev8

45229b7

point to correct FV3 hash

c4ea32e

FernandoAndrade-NOAA added the No Baseline Change No Baseline Change label Jan 3, 2025

jkbk2004 added 2 commits January 4, 2025 13:42

add hercules RT log: passed

5f23597

add derecho RT log: passed

4367cb7

jkbk2004 added the Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked. label Jan 5, 2025

FernandoAndrade-NOAA and others added 4 commits January 6, 2025 04:04

add hera RT log passed

e1efe7a

add gaea c6 RT log passed

39720f3

add jet RT log passed

c5bd8ce

add orion RT log: passed

e7f9b63

jkbk2004 added the jenkins-ort run ORT testing label Jan 6, 2025

jkbk2004 and others added 3 commits January 6, 2025 12:05

add gaeac5 RT log: passed

a611dd5

WCOSS2 Log: Passed

e083296

add hera ORT logs: passed

4a709ce

jkbk2004 removed the jenkins-ort run ORT testing label Jan 7, 2025

jkbk2004 mentioned this pull request Jan 7, 2025

Eighth reconciliation PR from production/RRFS.v1 ufs-community/ccpp-physics#237

Merged

update FV3 after merge

3e47da8

jkbk2004 requested review from BrianCurtis-NOAA, dpsarmie and NickSzapiro-NOAA January 7, 2025 18:28

jkbk2004 previously approved these changes Jan 7, 2025

View reviewed changes

BrianCurtis-NOAA reviewed Jan 7, 2025

View reviewed changes

tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log Show resolved Hide resolved

update cpld_control_nowave_noaero_p8 ORT log

657d89b

jkbk2004 dismissed their stale review via 657d89b January 7, 2025 19:01

jkbk2004 approved these changes Jan 7, 2025

View reviewed changes

jkbk2004 requested a review from BrianCurtis-NOAA January 7, 2025 19:16

BrianCurtis-NOAA approved these changes Jan 7, 2025

View reviewed changes

jkbk2004 merged commit 5324d64 into ufs-community:develop Jan 7, 2025
4 checks passed

JessicaMeixner-NOAA mentioned this pull request Feb 5, 2025

Update high resolution tests and fix minor wave issues NOAA-EMC/global-workflow#3289

Merged

13 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Eighth reconciliation PR from production/RRFS.v1 #2531

Eighth reconciliation PR from production/RRFS.v1 #2531

grantfirl commented Dec 5, 2024 •

edited by jkbk2004

Loading

grantfirl commented Dec 5, 2024 •

edited

Loading

MatthewMasarik-NOAA commented Dec 5, 2024

grantfirl commented Dec 5, 2024

MatthewMasarik-NOAA commented Dec 5, 2024

jkbk2004 commented Dec 5, 2024

MatthewPyle-NOAA commented Dec 5, 2024

grantfirl commented Dec 5, 2024

jkbk2004 commented Dec 5, 2024

grantfirl commented Dec 5, 2024

jkbk2004 commented Jan 7, 2025

grantfirl commented Jan 7, 2025

Eighth reconciliation PR from production/RRFS.v1 #2531

Eighth reconciliation PR from production/RRFS.v1 #2531

Conversation

grantfirl commented Dec 5, 2024 • edited by jkbk2004 Loading

Commit Queue Requirements:

Description:

Commit Message:

Priority:

Git Tracking

UFSWM:

Sub component Pull Requests:

UFSWM Blocking Dependencies:

Changes

Regression Test Changes (Please commit test_changes.list):

Input data Changes:

Library Changes/Upgrades:

Testing Log:

grantfirl commented Dec 5, 2024 • edited Loading

MatthewMasarik-NOAA commented Dec 5, 2024

grantfirl commented Dec 5, 2024

MatthewMasarik-NOAA commented Dec 5, 2024

jkbk2004 commented Dec 5, 2024

MatthewPyle-NOAA commented Dec 5, 2024

grantfirl commented Dec 5, 2024

jkbk2004 commented Dec 5, 2024

grantfirl commented Dec 5, 2024

jkbk2004 commented Jan 7, 2025

grantfirl commented Jan 7, 2025

grantfirl commented Dec 5, 2024 •

edited by jkbk2004

Loading

grantfirl commented Dec 5, 2024 •

edited

Loading