Bring in latest fire_behavior changes

[mkavulich]

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:

The fire_behavior code has had several updates made that need to be brought into the UFS weather model. This includes a new wind interpolation option, OpenMP parallelization, and other improvements. NOAA-EMC/fire_behavior#3 where you can find more details about these changes.

A few lines in driver/UFSDriver.F90 were changed in order for the fire model OpenMP parallelization to work correctly. These are in #ifdef FRONT_FIRE_BEHAVIOR blocks so should not affect any other applications.

Some changes in ufsatm and ccpp-physics are also needed in order to properly use the diagnosed 10m wind for the new fire wind interpolation option. See those PRs for further details; the changes are very small.

Weather model changes and fixes were made by @masih-e

Commit Message:

* UFSWM - Bring in latest fire_behavior changes
  * UFSATM - Add 10m wind option in fire_behavior module
    * ccpp-physics - Add 10m wind option in fire_behavior module
  * fire_behavior - Update with more recent changes from NCAR fork

Priority:

• Normal

Git Tracking

UFSWM:

• Closes Update fire_behavior submodule to bring in latest capabilities #3118

Sub component Pull Requests:

• UFSATM: Adding 10m wind option in fire_behavior module NOAA-EMC/ufsatm#1073
  • ccpp-physics: Adding 10m wind option in fire_behavior module ccpp-physics#363
• fire_behavior: Update with more recent changes from NCAR fork NOAA-EMC/fire_behavior#3

UFSWM Blocking Dependencies:

• None

Documentation:

• Documentation update NOT required.
  • Explanation: fire_behavior maintains its own documentation

---

Changes

Regression Test Changes (Please commit test_changes.list):

• No Baseline Changes.

Regression tests all passed on Orion.

Input data Changes:

• None.

Library Changes/Upgrades:

• No Updates

---

Testing Log:

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

[dpsarmie]

@gspetro-NOAA This is a project PR that can be slotted soon if possible, just fyi. Thanks!

[FernandoAndrade-NOAA]

@mkavulich This PR is next in queue, please go ahead and sync/resolve conflicts. Thank you.

[mkavulich]

It appears I messed up the merge on the first attempt (CMEPS and MOM6 submodules updated incorrectly)...trying again....

[mkavulich]

Okay thatlast merge appears to be correct. Do I need to re-run regression tests now?

[FernandoAndrade-NOAA]

Okay thatlast merge appears to be correct. Do I need to re-run regression tests now?

Could you verify if the hash/sync is correct for your fire branch? I'm seeing some commits from the NOAA-emc emc/develop branch missing from your branch, NCAR/fire_behavior@bb3d2ba and NCAR/fire_behavior@3be9c44

[gspetro-NOAA]

The main issue I'm seeing is that the WM PR does not have the latest hash from the head of the NCAR/fire_behavior NOAA_EMC_openmp_PR branch. The hash included in this WM PR is e3b1364 (from branch NOAA_EMC_openmp_PR), but the head of that branch is at 5af69be (e3b1364 is second oldest commit).

It also looks like those hashes @FernandoAndrade-NOAA mentioned (and a third commit, 05cad17) are in NOAA-EMC/fire_behavior but not in NCAR/fire_behavior main. That said, are they supposed to be? Maybe it's too late, and my brain is fuzzy, but I think the sync'ing is supposed to work the other way, where NOAA-EMC/fire_bahavior brings in changes from NCAR/fire_behavior, but the opposite is not necessarily true. It looks like those hashes may come from changes related to NCO compliance that the NCAR fork doesn't necessarily need. Perhaps @BrianCurtis-NOAA can comment with fresh eyes in the morning, since he authored one of the PRs.

Otherwise, things look fine to me.

• The UFSATM & CCPP commits look correct.
• The top of NCAR/fire-behavior main branch (e5cb182) appears both in this PR branch (NOAA_EMC_openmp_PR, bottom of pg 2 of commits) and in the NOAA-EMC/fire_behavior emc/develop branch, too.

[mkavulich]

@gspetro-NOAA Yes that is my understanding; these were changes (that appear to be two separate commits with identical changes? strange) requested by NCO that we don't necessarily need. This is related to suppressing certain warning messages during DEBUG mode compile and should have no impact on compiled code. I can ensure those are committed back to the NCAR fork (it looks like from the PR discussion they were intended to), but I really don't want to add a third commit with identical changes if I don't have to.

Regarding the source branch, these changes are actually sourced from the NCAR/fire_behavior develop branch; the main branch is lagging behind, though we do plan to update it after this PR with these commits so that the main branch is functionally equivalent to the code in the NOAA-EMC fork.

Let me know what you'd like me to do to move this PR forward.

[gspetro-NOAA]

@mkavulich Thanks for the clarification! It looks like you still need to update the fire_behavior hash in the WM PR to 5af69be "Not including documentation in this PR," but correct me if I'm wrong there. Once you've done that, I think it would be good to run the RTs one more time just to make sure we didn't miss anything.

Otherwise, it seems like everything is up-to-date. I think the two identical hashes likely result from not "squashing and merging" because one is from the top of Brian's PR branch, and the other is the actual commit to fire_behavior.

@BrianCurtis-NOAA Can you address whether those changes should be brought back into NCAR/fire_behavior?

[gspetro-NOAA]

@mkavulich Actually, since these changes are coming in from develop, are you basically cherry-picking them in? I don't see hash 78ac668 from the top of develop in your branch.

[gspetro-NOAA]

Testing has completed successfully on all system. Leaving a note in sub-PRs.

Also, note that this PR increases the number of remarks for the atm_fbh_intel compile on Ursa, Hercules, Orion, and Derecho. This is caused by two additional remark #10448 about the ifort compiler deprecation, which will go away once we move to LLVM compilers with spack-stack 2.x. We should be okay to proceed despite the failing check.

[gspetro-NOAA]

@mkavulich Please revert .gitmodules and update the hashes for this PR:

• UFSATM: 7fa602c
• fire_behavior: 6b2d73f

[mkavulich]

@gspetro-NOAA done! Thanks for your help through this PR process.