Skip to content

remove Zhao-Carr cloud schemes and merge Xu-Randall cloud fraction calculations in RRTMG and RRTMGP schemes#3042

Merged
gspetro-NOAA merged 15 commits into
ufs-community:developfrom
Qingfu-Liu:Zhao_Carr_cloud
Mar 9, 2026
Merged

remove Zhao-Carr cloud schemes and merge Xu-Randall cloud fraction calculations in RRTMG and RRTMGP schemes#3042
gspetro-NOAA merged 15 commits into
ufs-community:developfrom
Qingfu-Liu:Zhao_Carr_cloud

Conversation

@Qingfu-Liu
Copy link
Copy Markdown
Collaborator

@Qingfu-Liu Qingfu-Liu commented Jan 8, 2026

Commit Queue Requirements:

  • This PR addresses a relevant WM issue (Remove outdated physics schemes and simply Xu-Randal cloud fraction calculations for RRTMG and RRTMGP #3098).
  • 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:

  1. Remove Zhao-Carr cloud schemes which are no longer used in the CCPP physics suites. The new code changes remove cloud calculation for "progcld_zhao_carr" and "progcld_zhao_carr_pdf".
  2. Create a new function cld_frac_XuRandall in the module_radiation_clouds, and replaced the subroutines "cloud_fraction_mass_flx_2", "cloud_fraction_mass_flx_1", and "cloud_fraction_XuRandall" with the new function.
  3. remove the function cld_frac_XuRandall from program GFS_rrtmgp_cloud_mp.F90, and replaced it with the newly created function cld_frac_XuRandall in the module_radiation_clouds.

Commit Message:

* UFSWM - remove Zhao-Carr cloud schemes and merge Xu-Randall cloud fraction calculations in RRTMG and RRTMGP schemes
  * UFSATM - remove Zhao-Carr cloud schemes and combine Xu-Randall cloud fraction calculations
    * ccpp-physics - remove Zhao-Carr cloud schemes and combine Xu-Randall cloud fraction calculations

Priority:

  • Critical Bugfix: Reason
  • High: Reason
  • Normal

Git Tracking

UFSWM:

Sub component Pull Requests:

UFSWM Blocking Dependencies:

  • None

Documentation:

  • Documentation update NOT required.
    • Explanation: Document can be added late after the Zhao-Carr MP removed

Changes

Regression Test Changes (Please commit test_changes.list):

  • No Baseline Changes.

Input data Changes:

  • None.

Library Changes/Upgrades:

  • 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 Jan 8, 2026
@gspetro-NOAA gspetro-NOAA moved this from Evaluating to Draft in PRs to Process Jan 20, 2026
@grantfirl
Copy link
Copy Markdown
Collaborator

@Qingfu-Liu This PR seems to be ready soon, right (as soon as all PRs are updated to the latest develop code and this ufs-weather-model PR is filled out)?

@Qingfu-Liu Qingfu-Liu marked this pull request as ready for review February 18, 2026 20:30
@Qingfu-Liu
Copy link
Copy Markdown
Collaborator Author

@grantfirl I jus updated this PR. If there are any other things for me to do, please let me know. Thanks

@gspetro-NOAA gspetro-NOAA moved this from Draft to Evaluating in PRs to Process Feb 20, 2026
@gspetro-NOAA gspetro-NOAA added the No Baseline Change No Baseline Change label Feb 20, 2026
@gspetro-NOAA
Copy link
Copy Markdown
Collaborator

@Qingfu-Liu Could you finish filling out the PR template, particularly by adding links to dependent PRs in the Sub component Pull Requests section? We also need commit messages for each subcomponent.

@Qingfu-Liu
Copy link
Copy Markdown
Collaborator Author

@gspetro-NOAA tried several times, not sure how to add links to dependent PRs in the Sub component Pull Requests section

@gspetro-NOAA
Copy link
Copy Markdown
Collaborator

@gspetro-NOAA tried several times, not sure how to add links to dependent PRs in the Sub component Pull Requests section

You can copy-paste the links into the PR description. You usually have to click the three dots on the righthand corner, then click Edit, paste in the info, and then click the green "Update comment" button. If you can't make it work tho, you can just paste the info into a comment, and I'll add the info.

@Qingfu-Liu
Copy link
Copy Markdown
Collaborator Author

@gspetro-NOAA Thanks. just made the changes

@gspetro-NOAA gspetro-NOAA added UFSATM There are changes to the UFSATM repository. CCPP There are changes to a CCPP repository. labels Feb 25, 2026
@gspetro-NOAA gspetro-NOAA moved this from Evaluating to Waiting for Reviews (subcomponent) in PRs to Process Feb 25, 2026
@gspetro-NOAA
Copy link
Copy Markdown
Collaborator

@gspetro-NOAA Thanks. just made the changes

Thanks! Could you also add a commit message for each of the components (WM, UFSATM, CCPP) in the section that says "Commit Message." It would be a similar process to edit, but if you're having trouble, you can also just post them here for me to add.

@gspetro-NOAA
Copy link
Copy Markdown
Collaborator

@gspetro-NOAA Thanks. just made the changes

Thanks! Could you also add a commit message for each of the components (WM, UFSATM, CCPP) in the section that says "Commit Message." It would be a similar process to edit, but if you're having trouble, you can also just post them here for me to add.

It would also be good if you could sync w/develop (esp. update the UFSATM hash).

@Qingfu-Liu
Copy link
Copy Markdown
Collaborator Author

@gspetro-NOAA I just add the "Commit Messages" for each of the components (WM, UFSATM, CCPP) in the section. Thank you very much for your review

@gspetro-NOAA
Copy link
Copy Markdown
Collaborator

@Qingfu-Liu Could you please sync your branch w/WM develop? I don't have permissions to do it myself. Your individual branches are mostly up-to-date, but the hashes being used in your WM branch are quite old.

@Qingfu-Liu
Copy link
Copy Markdown
Collaborator Author

@gspetro-NOAA I tried to sync today, but failed. I need to learn how to do it, it may take time. I only able to sync the "ccpp/physics" and "ufsatm"

@gspetro-NOAA
Copy link
Copy Markdown
Collaborator

@gspetro-NOAA I tried to sync today, but failed. I need to learn how to do it, it may take time. I only able to sync the "ccpp/physics" and "ufsatm"

I've done it! It turns out I maybe didn't need the permissions after all bc you had done everything below the UFSATM level. So after cloning the WM, I checked out all the right UFSATM subcomponent hashes:

cd ufs-weather-model/UFSATM
git fetch
git checkout Zhao_Carr_cloud

cd ccpp/physics
git fetch
git checkout Zhao_Carr_cloud
cd ../..

cd fv3/atmos_cubed_sphere 
git fetch origin dev/emc
git checkout origin/dev/emc
cd ../..

cd upp
git fetch
git checkout 7d9597c
cd ../..

git add UFSATM/
git commit -m "update UFSATM hash"
git push origin Zhao_Carr_cloud

Once all of that was done, I pulled in the changes from develop:

git remote add upstream https://github.com/ufs-community/ufs-weather-model.git
git pull upstream develop

Then I resolved any conflicts and added/committed the changes.
Hope this helps for next time! :)

@Qingfu-Liu
Copy link
Copy Markdown
Collaborator Author

@gspetro-NOAA Really great. I tried it again, still can't sync. Thank you very much for sync the branch w/WM develop

@gspetro-NOAA gspetro-NOAA moved this from Waiting for Reviews (subcomponent) to Review in PRs to Process Feb 26, 2026
@gspetro-NOAA gspetro-NOAA moved this from Review to Waiting for Reviews (subcomponent) in PRs to Process Feb 26, 2026
@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 Mar 4, 2026
@Qingfu-Liu
Copy link
Copy Markdown
Collaborator Author

@grantfirl Thank you very much for the help. I do have trouble to sync this with the develop for the ufs-weather-model. I guess my local branch is too far behind

 on-behalf-of @ufs-community <ecc.platform@noaa.gov>
@gspetro-NOAA
Copy link
Copy Markdown
Collaborator

@jkbk2004 There's an increase in remarks on Derecho (tho a decrease in some warnings!). Can you check to see the cause?

@gspetro-NOAA
Copy link
Copy Markdown
Collaborator

@jkbk2004 There's an increase in remarks on Derecho (tho a decrease in some warnings!). Can you check to see the cause?

Remarks seem to be remark #7713: This statement function has not been used. Since it's only being raised on one platform and only requires a tiny extra bit of memory, we will leave things as-is.

Testing has completed successfully. Beginning the merge process.

@gspetro-NOAA gspetro-NOAA removed the In Testing The PR that is currently in testing stages label Mar 6, 2026
@gspetro-NOAA gspetro-NOAA merged commit d602da6 into ufs-community:develop Mar 9, 2026
8 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CCPP There are changes to a CCPP repository. No Baseline Change No Baseline Change 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.

Remove outdated physics schemes and simply Xu-Randal cloud fraction calculations for RRTMG and RRTMGP

8 participants