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

Fire Coupling FV3ATM and Community Fire Behavior Model #2220

Merged
merged 41 commits into from
Sep 17, 2024

Conversation

danrosen25
Copy link
Collaborator

@danrosen25 danrosen25 commented Apr 1, 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 adds the Community Fire Behavior Model component to the UFS weather model. The additional model is added to a single application 'ATMF' and requires modifications to fv3atm, ccpp/physics, and CMEPS.

This work is co-authored by @masih-e and @pedro-jm

Commit Message:

* UFSWM - The fire_behavior component has been added and a new application created 'ATMF'. This work also includes a new regression test 'cpld_regional_atm_fbh' for testing two-way coupling of the atm component (fv3atm) and fbh component (fire_behavior)
  * CMEPS - CMEPS required modifications to be aligned with the changes to the ccpp physics package
  * FV3 - the fv3 cap has been modified to export atmosphere forcing data to the fire component when 'cpl_fire' is set to true. It will also import new fields for physics.
    * ccpp-physics - the ccpp physics package has been modified to add heat fluxes, upward specific humidity flux, and a smoke tracer from the fire component.

Priority:

  • Normal

Git Tracking

UFSWM:

Sub component Pull Requests:

UFSWM Blocking Dependencies:

  • None

Changes

Regression Test Changes (Please commit test_changes.list):

  • PR Adds New Tests/Baselines: 'cpld_regional_atm_fbh'. Baseline data has yet to be created as some of the work on the fire_behavior component is in progress.
  • No Changes to Existing Tests

Input data Changes:

  • New input data for fire coupling. FIRE_BEHAVIOR_input_data and FV3_fire_input_data. These folder have been added to the input data and tested on derecho.

Library Changes/Upgrades:

  • No Updates

Testing Log:

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

masih-e and others added 21 commits March 28, 2023 11:56
* added smoke_fire to fd_nems
* added smoke connectors to FV3 and fire_behavior
* merge upstream for FV3
* update fire_behavior component

Co-authored-by: Masih Eghdami <[email protected]>
* new test cpld_regional_atm_fbh
* new ufs.configure template cpld_atm_fbh
* new namelist.fire template (fire_behavior config)
* new model_configure template for fire
* new input.nml for regional fire
* new diag_table, field_table, data_table for fire
* new input configure script for regional_fire_run
* fixed coupling flags to write fire exports
* export: 2-m temp and q, surface pressure and rain
* minor fixes in RT for fire

Co-authored-by: Dan Rosen <[email protected]>
* merged CMEPS@2d837b1 for ufs_fire_cpl
* fixes failure in cpld_2threads_p8_intel
@grantfirl
Copy link
Collaborator

@danrosen25 Is the commit hash for the fire_behavior submodule in this PR correct? I noticed that the latest commit in develop is now 65b3ab81a3fc4f24ce1965bdf61b520b5281cdbf.

@grantfirl
Copy link
Collaborator

@danrosen25 Is the commit hash for the fire_behavior submodule in this PR correct? I noticed that the latest commit in develop is now 65b3ab81a3fc4f24ce1965bdf61b520b5281cdbf.

I did just kick off UFS pretest RTs using that commit, so please let me know if I should switch back to the older one that is referenced here in the PR.

@masih-e
Copy link

masih-e commented Aug 20, 2024

We tested the 05cad173feeb598431e3ef5f17c2df6562c8d101 commit for this PR. The later developments may not be ready for FV3. @pedro-jm

@grantfirl
Copy link
Collaborator

OK, thanks. I ran into some issues during testing related to the PR branches of fv3atm and ccpp-physics being out-of-date a bit, so I've made some changes in fv3atm in order to merge in the latest develop there and bring in the latest develop to the ccpp/physics branch. If they test OK, I'll submit PRs into the existing PR branches for you guys to review/approve that should be ready for the merge queue.

@grantfirl
Copy link
Collaborator

grantfirl commented Aug 22, 2024

OK, thanks. I ran into some issues during testing related to the PR branches of fv3atm and ccpp-physics being out-of-date a bit, so I've made some changes in fv3atm in order to merge in the latest develop there and bring in the latest develop to the ccpp/physics branch. If they test OK, I'll submit PRs into the existing PR branches for you guys to review/approve that should be ready for the merge queue.

@masih-e @danrosen25

OK, regression testing was successful after pulling in the latest develop branches and applying some updated code changes to your existing changes in atmos_model.F90. I used the 05cad173feeb598431e3ef5f17c2df6562c8d101 commit of the fire_behavior submodule. I'm submitting PRs into all of your PR branches. We'll need to merge from the bottom up, starting from the ccpp/physics one.

@BrianCurtis-NOAA
Copy link
Collaborator

Acorn Logs are at: /scratch1/NCEPDEV/stmp2/Brian.Curtis/RegressionTests_acorn.log on Hera

@grantfirl
Copy link
Collaborator

WCOSS2 Logs are at: /scratch1/NCEPDEV/stmp2/Brian.Curtis/RegressionTests_wcoss2.log on Hera. Is this accessible to you @grantfirl ?

Thanks. This has been committed and pushed.

@FernandoAndrade-NOAA
Copy link
Collaborator

I will need to be added as well in order to push hera, gaea, and jet RT logs @danrosen25

@danrosen25
Copy link
Collaborator Author

@FernandoAndrade-NOAA, Added but I'll have to add you to the branch protections after you accept.

@FernandoAndrade-NOAA
Copy link
Collaborator

@FernandoAndrade-NOAA, Added but I'll have to add you to the branch protections after you accept.

Accepted, thank you

@zach1221
Copy link
Collaborator

Derecho is still down, so I think we should skip and begin the merging process.

@zach1221
Copy link
Collaborator

@danrosen25 FV3atm and CMEPS subcomponent PRs have been merged. Please revert the change in .gitmodule urls and update the submodule hashes.
FV3atm hash: NOAA-EMC/fv3atm@a936459
CMEPS hash: NOAA-EMC/CMEPS@dc977bc

@grantfirl
Copy link
Collaborator

@danrosen25 FV3atm and CMEPS subcomponent PRs have been merged. Please revert the change in .gitmodule urls and update the submodule hashes. FV3atm hash: NOAA-EMC/fv3atm@a936459 CMEPS hash: NOAA-EMC/CMEPS@dc977bc

@danrosen25 @zach1221 Finished.

@BrianCurtis-NOAA
Copy link
Collaborator

@grantfirl Were we staying away from the top of the develop branch for fire behavior? I notice the hashes are not the same.

@grantfirl
Copy link
Collaborator

grantfirl commented Sep 17, 2024

@grantfirl Were we staying away from the top of the develop branch for fire behavior? I notice the hashes are not the same.

@BrianCurtis-NOAA Yes. I asked the same question when I updated this code to the top of the develop branches. See comments in this PR upthread: #2220 (comment)

@BrianCurtis-NOAA
Copy link
Collaborator

@grantfirl Were we staying away from the top of the develop branch for fire behavior? I notice the hashes are not the same.

@BrianCurtis-NOAA Yes. I asked the same question when I updated this code to the top of the develop branches. See comments in this PR upthread: #2220 (comment)

Thanks Grant!

@zach1221 zach1221 merged commit 25ee7f6 into ufs-community:develop Sep 17, 2024
3 checks passed
@danrosen25
Copy link
Collaborator Author

@zach1221 @grantfirl @jkbk2004
So it's technically the wrong repository for fire behavior. It's still going to work but it currently points to the NCAR (upstream) instead of the NOAA-EMC fork.

url = https://github.com/NCAR/fire_behavior

I should have pointed this out.

@jkbk2004
Copy link
Collaborator

@danrosen25 Is this https://github.com/NOAA-EMC/fire_behavior the one to be used?

@danrosen25
Copy link
Collaborator Author

@danrosen25 Is this https://github.com/NOAA-EMC/fire_behavior the one to be used?

Yes, the identical revision being used was forked into the repo:
NOAA-EMC/fire_behavior@05cad17

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
New Baselines New baselines will be added to project. New Input Data Req'd This PR requires new data to be sync across platforms Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fire Behavior Modeling
7 participants