Add fire coupling into ccpp physics including heat flux, upward specific humidity flux, and smoke tracer #193
Conversation
|
@danrosen25 Any updates on this draft PR? |
|
@grantfirl |
@danrosen25 No, unfortunately, they need to pass all of them. Be sure to turn ecflow on and they should run faster. E.g. set |
|
@danrosen25 Just checking in to see what the status of this PR is, let me know if there's anything I can do to help things along. |
|
Hi, following up with the status of this PR. Please let me know if there is anything I can help with to move things along. |
|
@mkavulich @masih-e |
|
Dan, the problem seems to be because the fork was created from
https://github.com/NCAR/ccpp-physics, but the PR was opened to
https://github.com/ufs-community/ccpp-physics/. These repositories are
synced up regularly but they are not identical, and their histories are not
necessarily consistent, which is why we're seeing these odd diffs.
If you'd like me to rebase the changes from the old branch (from the NCAR
org) onto the ufs-dev branch in the ufs-community org I can do that, just
let me know. I have a bit of experience dealing with these two repos.
Michael Kavulich, Jr.
Associate Scientist, National Center for Atmospheric Research (NCAR)
Joint Numerical Testbed (JNT), Research Applications Laboratory (RAL)
***@***.*** ***@***.***>*
…On Tue, Jul 9, 2024 at 10:01 AM Daniel Rosen ***@***.***> wrote:
@mkavulich <https://github.com/mkavulich> @masih-e
<https://github.com/masih-e>
Although the tests passed after the recent sync the "Files Changed" Look
wrong. We only touched a few files. I think we'll need to sync using a
squash or rebase onto the ufs/dev branch.
—
Reply to this email directly, view it on GitHub
<#193 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/ADA56AVD64NGFPGAHJSJFE3ZLQCNTAVCNFSM6AAAAABFR6EGB2VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDEMJYGA4DOMZVGU>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
|
Michael, would you be able to help with fixing the changes? Please let me know if I can help. The files that we changed are the following: Thank you both for helping this moving forward |
* added hflx_fire and evap_fire to GFS_surface_composite_post * added cpl_fire flag
* added fsmoke tracer * added surface emissions to fsmoke in rrfs_smoke_wrapper
|
@masih-e @danrosen25 Sorry it took so long to get to this, I cherry-picked the appropriate commits and resolved the differences on my branch here: https://github.com/ufs-community/ccpp-physics/compare/ufs/dev...mkavulich:ccpp-physics:feature/ufs_fire_cpl_rebase?expand=1 Apparenly I don't have permission to push to the esmf-org/ccpp-physics repository, so if those changes are correct one of you will have to force-push that branch to this one. Or just open a new PR from a different branch if that's more desirable. |
|
Hi Michael,
Thank you for doing this. It looks good to me. Should we do the RT again?
Masih
…On Fri, Jul 12, 2024 at 4:07 PM Michael Kavulich ***@***.***> wrote:
@masih-e <https://github.com/masih-e> @danrosen25
<https://github.com/danrosen25> Sorry it took so long to get to this, I
cherry-picked the appropriate commits and resolved the differences on my
branch here:
https://github.com/ufs-community/ccpp-physics/compare/ufs/dev...mkavulich:ccpp-physics:feature/ufs_fire_cpl_rebase?expand=1
Apparenly I don't have permission to push to the esmf-org/ccpp-physics
repository, so if those changes are correct one of you will have to
force-push that branch to this one. Or just open a new PR from a different
branch if that's more desirable.
—
Reply to this email directly, view it on GitHub
<#193 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AHFC3YSCGH7ZXCRTTQ3ANWLZMBHTBAVCNFSM6AAAAABFR6EGB2VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDEMRWGQYTMOBUGM>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
|
Let's bring this into the existing pull request branch if it's passing the
tests.
https://github.com/esmf-org/ccpp-physics/tree/feature/ufs_fire_cpl
…On Mon, Jul 15, 2024 at 10:20 AM Masih ***@***.***> wrote:
Hi Michael,
Thank you for doing this. It looks good to me. Should we do the RT again?
Masih
On Fri, Jul 12, 2024 at 4:07 PM Michael Kavulich ***@***.***>
wrote:
> @masih-e <https://github.com/masih-e> @danrosen25
> <https://github.com/danrosen25> Sorry it took so long to get to this, I
> cherry-picked the appropriate commits and resolved the differences on my
> branch here:
>
https://github.com/ufs-community/ccpp-physics/compare/ufs/dev...mkavulich:ccpp-physics:feature/ufs_fire_cpl_rebase?expand=1
>
> Apparenly I don't have permission to push to the esmf-org/ccpp-physics
> repository, so if those changes are correct one of you will have to
> force-push that branch to this one. Or just open a new PR from a
different
> branch if that's more desirable.
>
> —
> Reply to this email directly, view it on GitHub
> <
#193 (comment)>,
> or unsubscribe
> <
https://github.com/notifications/unsubscribe-auth/AHFC3YSCGH7ZXCRTTQ3ANWLZMBHTBAVCNFSM6AAAAABFR6EGB2VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDEMRWGQYTMOBUGM>
> .
> You are receiving this because you were mentioned.Message ID:
> ***@***.***>
>
—
Reply to this email directly, view it on GitHub
<#193 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/ACJPO74TAWULDA47Q2CIWDLZMPZFBAVCNFSM6AAAAABFR6EGB2VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDEMRYHA4TOOJUGM>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
I think we should re-run the RTs just to be sure, if that's the last step before opening these PRs for review. Be sure to incorporate this change before running the RTs, since there are some known failures before this point: ufs-community/ufs-weather-model#2362 If you would like help with the RTs just let me know |
masih-e
force-pushed
the
feature/ufs_fire_cpl
branch
from
fad3fa4
to
8c89db5
Compare
danrosen25
requested review from
grantfirl,
Qingfu-Liu,
dustinswales and
haiqinli
as code owners
|
@grantfirl @Qingfu-Liu @dustinswales @haiqinli @mkavulich |
|
@danrosen25 I and Ravan will review it together, and this may take some time. Thanks. |
There was a problem hiding this comment.
@danrosen25 This looks great to me from a CCPP point of view. Thanks!
|
@danrosen25 Have the UFS RTs been run with the latest code for this PR? I'm not seeing any logs with https://github.com/ufs-community/ufs-weather-model/pull/2220/files#diff-57a1b7bb92156b1f8a3167f0ba4d34cf3d320188729bd54157b38b1f31a5d2e2. Please let us know if you'd like us to run them with all of your latest PR code from UFS WM on downward. |
|
@grantfirl I didn't check logs into the PR for ufs-weather-model. @masih-e and I individually ran the tests. @masih-e ran them in full but I ran them found a bug, fixed it and then finished the remaining. Can you run the regression tests for verification? |
@danrosen25 Yes, will do. Assuming success, this PR may be scheduled for merging in the next 2 weeks. I'll let you know. |
|
@danrosen25 Please review/merge in esmf-org#1. This updates your PR branch to the latest ufs/dev so that this can be tested by UFS code managers. |
|
@jkbk2004 @grantfirl |
|
@grantfirl testing is complete on WM PR-2220, and we're ready to merge this PR. |
Add heat flux from fire, upward specific humidity flux from fire and the smoke tracer from fire into the ccpp physics package. Use the cpl_fire flag to enable coupling these values.
cpl_fire
hflx_fire
evap_fire
smoke_fire
Co-author: @masih-e
Resolves Issue #192
Testing
One of each compile line in the rt.conf tests was successfully executed on derecho. A new regression test for coupling atm and fire behavior (fbh) was added to rt.conf https://github.com/esmf-org/ufs-weather-model/tree/feature/ufs_fire_cpl
This is a draft pull request until the physics coupling for the community fire behavior model and ccpp physics is complete.