Combination CCPP-related PR for ozone diagnostics, metadata intent bugfixes, sfcsub.F landmask bugfix, and canopy resistance output

[grantfirl]

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 contains ccpp-physics changes to fix bugs:

• metadata intents: Fix incorrect intents. ccpp-physics#201
• sfcsub.F landmask: sfcsub.F - Fix the setting of model landmask when interpolating GLDAS data ccpp-physics#202

and for more diagnostic output:

• ozone diagnostics change: Make ozone photochem diagnostics match parametrization terms ccpp-physics#196
• canopy resistance added: Canopy resistance (rca) in Noah-MP for AQM. ccpp-physics#204

All of the above PRs were combined into one:

• Combination PR for ozone diagnostics, metadata intent bugfixes, sfcsub.F landmask bugfix, and canopy resistance output ccpp-physics#205

Replaces: #2253

Commit Message:

* UFSWM, CMEPS, FV3/ccpp_physics - CCPP Physics bugfixes for metadata intents and sfcsub.f landmask and output changes for ozone diagnostics and canopy resistance

Priority:

• Normal

Git Tracking

UFSWM:

Sub component Pull Requests:

• CMEPS: Bugfix: update data type for use_2m_diagnostics_calculated_by_lake_model NOAA-EMC/CMEPS#119 (metadata only)
• FV3: Combination CCPP-related PR for ozone diagnostics, metadata intent bugfixes, sfcsub.F landmask bugfix, and canopy resistance output NOAA-EMC/fv3atm#831
  • ccpp-physics: Combination PR for ozone diagnostics, metadata intent bugfixes, sfcsub.F landmask bugfix, and canopy resistance output ccpp-physics#205

UFSWM Blocking Dependencies:

• None

---

Changes

Regression Test Changes (Please commit test_changes.list):

• PR Updates/Changes Baselines.

The changes to the ozone production/loss and mixing diagnostics will cause result changes for tests that output these terms. Any tests that use diag_additional_control_dtend or diag_additional_rap_dtend will be affected. See the test_changes.list file for specific tests.

Input data Changes:

• None.

Library Changes/Upgrades:

• No Updates

---

Testing Log:

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

[grantfirl]

@jkbk2004 Apologies for the delay on this one. We ran into some RT failures related to NOAHMP as a component land model that we needed to fix. We're all good to go now.

[jkbk2004]

@jkbk2004 Apologies for the delay on this one. We ran into some RT failures related to NOAHMP as a component land model that we needed to fix. We're all good to go now.

@grantfirl sounds good!

[jkbk2004]

@grantfirl Can you sync up branches? We like to commit this pr today.

[grantfirl]

@grantfirl Can you sync up branches? We like to commit this pr today.

@jkbk2004 Finished

[BrianCurtis-NOAA]

Waiting on labels and a new bl_date I believe.

[BrianCurtis-NOAA]

There's still a review needed in ufs-community/ccpp-physics#205

[grantfirl]

There's still a review needed in ufs-community/ccpp-physics#205

@BrianCurtis-NOAA We only need 1 for ccpp/physics PRs going into ufs/dev, so we should be good to go. However, this PR was assembled from 4 smaller PRs that were all reviewed and approved independently. I've reviewed the independent PRs, but cannot review my own combination.

[BrianCurtis-NOAA]

There's still a review needed in ufs-community/ccpp-physics#205

@BrianCurtis-NOAA We only need 1 for ccpp/physics PRs going into ufs/dev, so we should be good to go. However, this PR was assembled from 4 smaller PRs that were all reviewed and approved independently. I've reviewed the independent PRs, but cannot review my own combination.

There's still a review needed in ufs-community/ccpp-physics#205

@BrianCurtis-NOAA We only need 1 for ccpp/physics PRs going into ufs/dev, so we should be good to go. However, this PR was assembled from 4 smaller PRs that were all reviewed and approved independently. I've reviewed the independent PRs, but cannot review my own combination.

I agree, 1 is fine, but it seems there are revisions that are not from keeping up-to-date with auth repo (past the previous code review), and I would prefer all code is reviewed if possible prior to testing.

[grantfirl]

There's still a review needed in ufs-community/ccpp-physics#205

@BrianCurtis-NOAA We only need 1 for ccpp/physics PRs going into ufs/dev, so we should be good to go. However, this PR was assembled from 4 smaller PRs that were all reviewed and approved independently. I've reviewed the independent PRs, but cannot review my own combination.

There's still a review needed in ufs-community/ccpp-physics#205

@BrianCurtis-NOAA We only need 1 for ccpp/physics PRs going into ufs/dev, so we should be good to go. However, this PR was assembled from 4 smaller PRs that were all reviewed and approved independently. I've reviewed the independent PRs, but cannot review my own combination.

I agree, 1 is fine, but it seems there are revisions that are not from keeping up-to-date with auth repo (past the previous code review), and I would prefer all code is reviewed if possible prior to testing.

Understood, and you're correct. I'll request re-review.

[grantfirl]

There's still a review needed in ufs-community/ccpp-physics#205

@BrianCurtis-NOAA We only need 1 for ccpp/physics PRs going into ufs/dev, so we should be good to go. However, this PR was assembled from 4 smaller PRs that were all reviewed and approved independently. I've reviewed the independent PRs, but cannot review my own combination.

There's still a review needed in ufs-community/ccpp-physics#205

@BrianCurtis-NOAA We only need 1 for ccpp/physics PRs going into ufs/dev, so we should be good to go. However, this PR was assembled from 4 smaller PRs that were all reviewed and approved independently. I've reviewed the independent PRs, but cannot review my own combination.

I agree, 1 is fine, but it seems there are revisions that are not from keeping up-to-date with auth repo (past the previous code review), and I would prefer all code is reviewed if possible prior to testing.

@BrianCurtis-NOAA Approval for ufs-community/ccpp-physics#205 has been achieved.

[zach1221]

Testing is now complete. We can move to begin the merge process starting with ccpp-physics.

[zach1221]

@grantfirl fv3atm and noah-mp are merged. Please update submodule hashes and .gitmodule urls.
NOAA-EMC/fv3atm@10271c9
NOAA-EMC/noahmp@ec38ea3

[grantfirl]

• Bugfix: update data type for use_2m_diagnostics_calculated_by_lake_model Bugfix: update data type for use_2m_diagnostics_calculated_by_lake_model NOAA-EMC/CMEPS#119

Sure, although we still need NOAA-EMC/CMEPS#119 to be merged, right?

[zach1221]

• Bugfix: update data type for use_2m_diagnostics_calculated_by_lake_model Bugfix: update data type for use_2m_diagnostics_calculated_by_lake_model NOAA-EMC/CMEPS#119

Sure, although we still need NOAA-EMC/CMEPS#119 to be merged, right?

Correct. We've requested it. Feel free to wait for that one to be merged, so you can do them all at once.

[BrianCurtis-NOAA]

@grantfirl @zach1221 CMEPS has been merged: NOAA-EMC/CMEPS@2d837b1

[grantfirl]

@BrianCurtis-NOAA @zach1221 This is ready to go.

[BrianCurtis-NOAA]

I've cleaned up the description/commit message a bit.