Skip to content

NCAR/main ccpp-physics sync#2998

Merged
gspetro-NOAA merged 17 commits intoufs-community:developfrom
grantfirl:NCAR_sync_20251112
Dec 22, 2025
Merged

NCAR/main ccpp-physics sync#2998
gspetro-NOAA merged 17 commits intoufs-community:developfrom
grantfirl:NCAR_sync_20251112

Conversation

@grantfirl
Copy link
Collaborator

@grantfirl grantfirl commented Nov 21, 2025

Commit Queue Requirements:

  • This PR addresses a relevant WM issue (if not, create an issue).
  • All subcomponent pull requests (if any) have been reviewed by their code managers.
  • Run the full Intel+GNU RT suite (compared to current baselines), preferably on Ursa (Derecho or Hercules are acceptable alternatives). Exceptions: documentation-only PRs, CI-only PRs, etc.
    • Commit log file w/full results from RT suite run (if applicable).
    • Verify that test_changes.list indicates which tests, if any, are changed by this PR. Commit test_changes.list, even if it is empty.
  • Fill out all sections of this template.

Description:

This is primarily a ccpp-physics sync from NCAR/main back to the ufs-community/ufs/dev branch. Some changes to UFSATM files were necessary are as follows:

  • move some static variables from the CCPP_typedefs/Interstitial DDT to GFS_typedefs/GFS_control DDT. This simplifies the interstitial%reset type-bound procedure and was necessary for the SCM code structure.
  • add xr_con and xr_eps namelist variables to allow recent changes to the Xu-Randall cloud fraction algorithms configurable by the host. If these variables are not set in the namelist (which is the default for all current workflows and UFS RTs), these are set using the same logic that was used in radiation_clouds.F
  • addition of number_of_diagnostic_buckets variable and array dimension growth for 2 diagnostic variables. By default this is set to 1 and the change is transparent for UFS users but this functionality could be used in the future if multiple bucket-clearing intervals are desired

Commit Message:

* UFSWM - NCAR/main ccpp-physics sync
  * UFSATM - NCAR/main ccpp-physics sync
    * ccpp-physics - NCAR/main ccpp-physics sync  

Priority:

  • Critical Bugfix: Reason
  • High: Reason
  • Normal

Git Tracking

UFSWM:

  • None

Sub component Pull Requests:

UFSWM Blocking Dependencies:

  • Blocked by #
  • None

Documentation:

  • Documentation update required.
    • Relevant updates are included with this PR.
    • A WM issue has been opened to track the need for a documentation update; a person responsible for submitting the update has been assigned to the issue (link issue).
  • Documentation update NOT required.
    • Explanation: physics-only change

Changes

Regression Test Changes (Please commit test_changes.list):

  • PR Adds New Tests/Baselines.
  • PR Updates/Changes Baselines.
  • No Baseline Changes.

All of the baseline changes are a result of removing two openmp statements in radiation_aerosols.F within the CCPP physics. See https://github.com/ufs-community/ccpp-physics/pull/328/files#diff-17d80e12dfd7aa6ad66670084f0c3e002d18db4c3d7af57df61886c3a1547eaa for the changes leading to the results change. It was also found that the hafs_regional_atm_thompson_gfdlsf_intel test changed the baselines due to one of the physics changes from NRL. The precise code change culprit wasn't pinned down and it wasn't obvious from the original ccpp-physics PR.

Input data Changes:

  • None.
  • PR adds input data.
  • PR changes existing input data.

Library Changes/Upgrades:

  • Required
    • Library names w/versions:
    • Git Stack Issue (JCSDA/spack-stack#)
  • No Updates

Testing Log:

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

@github-project-automation github-project-automation bot moved this to Evaluating in PRs to Process Nov 21, 2025
@gspetro-NOAA gspetro-NOAA added Baseline Updates Current baselines will be updated. UFSATM There are changes to the UFSATM repository. CCPP There are changes to a CCPP repository. labels Nov 21, 2025
@gspetro-NOAA gspetro-NOAA moved this from Evaluating to Waiting for Reviews (subcomponent) in PRs to Process Nov 21, 2025
@gspetro-NOAA gspetro-NOAA moved this from Waiting for Reviews (subcomponent) to Review in PRs to Process Dec 3, 2025
@gspetro-NOAA
Copy link
Collaborator

@grantfirl I tried to clone your repo to run the mpas test on Hercules, and it's giving me an error cloning https://github.com/grantfirl/ufsatm, I think because your repo is still labeled fv3atm, not ufsatm. Could you either update the repo or update the .gitmodules? When I click from your WM repo to UFSATM@3ba0301 I get a 404 Not Found (presumably for the same reason).

@grantfirl
Copy link
Collaborator Author

@grantfirl I tried to clone your repo to run the mpas test on Hercules, and it's giving me an error cloning https://github.com/grantfirl/ufsatm, I think because your repo is still labeled fv3atm, not ufsatm. Could you either update the repo or update the .gitmodules? When I click from your WM repo to UFSATM@3ba0301 I get a 404 Not Found (presumably for the same reason).

OK, I renamed my repo to ufsatm, so it should be OK now. Please let me know. I also updated this PR set to the latest develop.

@gspetro-NOAA
Copy link
Collaborator

Looks good, thanks! :)

@gspetro-NOAA gspetro-NOAA moved this from Review to Schedule in PRs to Process Dec 3, 2025
@gspetro-NOAA
Copy link
Collaborator

@grantfirl Could you sync w/develop? We are ready to begin processing this PR.

@grantfirl
Copy link
Collaborator Author

@grantfirl Could you sync w/develop? We are ready to begin processing this PR.

@gspetro-NOAA Finished syncing with develop.

@gspetro-NOAA gspetro-NOAA added Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked. In Testing The PR that is currently in testing stages labels Dec 17, 2025
@jkbk2004 jkbk2004 added the jenkins-ort run ORT testing label Dec 18, 2025
@epic-cicd-jenkins epic-cicd-jenkins removed the jenkins-ort run ORT testing label Dec 18, 2025
@BrianCurtis-NOAA
Copy link
Collaborator

Acorn done. WCOSS2 due to prod switch means we had to sync over the latest develop- and input-data and that's been taking a while. I'm going to let all the syncing finish overnight and get the baselines created and the full suite run tomorrow.

@BrianCurtis-NOAA
Copy link
Collaborator

@gspetro-NOAA done, finally!

@gspetro-NOAA gspetro-NOAA removed the In Testing The PR that is currently in testing stages label Dec 22, 2025
@jkbk2004
Copy link
Collaborator

@grantfirl new ufsatm hash is NOAA-EMC/ufsatm@3aba288

@gspetro-NOAA gspetro-NOAA merged commit 390936b into ufs-community:develop Dec 22, 2025
9 checks passed
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. CCPP There are changes to a CCPP repository. Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked. UFSATM There are changes to the UFSATM repository.

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

5 participants