Skip to content

test merge dev into main - #2

Open
jimmielin wants to merge 3 commits into
mainfrom
development
Open

test merge dev into main#2
jimmielin wants to merge 3 commits into
mainfrom
development

Conversation

@jimmielin

Copy link
Copy Markdown
Owner

No description provided.

hplin-ucar and others added 2 commits May 14, 2026 08:15
Originator(s): @mwaxmonsky (very lightly edited by @jimmielin)

Description (include issue title and the keyword ['closes', 'fixes',
'resolves'] and issue number):
- refactor and cleanup of Holtslag-Boville PBL scheme.

List all namelist files that were added or changed: N/A

List all files eliminated and why: N/A

List all files added and what they do: N/A

List all existing files that have been modified, and describe the
changes:
(Helpful git command: `git diff --name-status
development...<your_branch_name>`)
```
M       phys_utils/atmos_phys_pbl_utils.F90
  - moved minimum kvf limiter to HB logic instead of in common PBL utils code.

M       schemes/holtslag_boville/holtslag_boville_diff.F90
  - various refactoring and cleanup of HB PBL scheme into pure elemental functions.
```

List all automated tests that failed, as well as an explanation for why
they weren't fixed: None (B4B)

Is this an answer-changing PR? If so, is it a new physics package,
algorithm change, tuning change, etc?
B4B as tested in CAM against 64_137

If yes to the above question, describe how this code was validated with
the new/modified features:
)

Originator(s): @jimmielin

Description (include issue title and the keyword ['closes', 'fixes',
'resolves'] and issue number):
- implements energy checker support for ZM deep convection - closes
ESCOMP#192

List all namelist files that were added or changed: N/A

List all files eliminated and why: N/A

List all files added and what they do:
```
A       schemes/zhang_mcfarlane/zm_prepare_flux_for_check_energy.F90
A       schemes/zhang_mcfarlane/zm_prepare_flux_for_check_energy.meta
  - new interstitial scheme to combine liquid and ice fluxes from ZM for energy checker
```

List all existing files that have been modified, and describe the
changes:
(Helpful git command: `git diff --name-status
development...<your_branch_name>`)
```
M       suites/suite_cam4.xml
M       suites/suite_cam7.xml
  - add calls to new interstitial scheme and energy checker in CAM4 and CAM7 suite
```

List all automated tests that failed, as well as an explanation for why
they weren't fixed: N/A

Is this an answer-changing PR? If so, is it a new physics package,
algorithm change, tuning change, etc?
B4B but new functionality - energy checker now runs and checks fluxes
from ZM.

If yes to the above question, describe how this code was validated with
the new/modified features:

---------

Co-authored-by: Jesse Nusbaumer <nusbaume@ucar.edu>
@jimmielin
jimmielin force-pushed the development branch 2 times, most recently from bd85392 to 5767c92 Compare June 1, 2026 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants