Skip to content

Complete CCPPization of UW shallow convection scheme (uwshcu)#408

Open
jimmielin wants to merge 1 commit into
ESCOMP:mainfrom
jimmielin:hplin/uwshcu
Open

Complete CCPPization of UW shallow convection scheme (uwshcu)#408
jimmielin wants to merge 1 commit into
ESCOMP:mainfrom
jimmielin:hplin/uwshcu

Conversation

@jimmielin

@jimmielin jimmielin commented Jun 4, 2026

Copy link
Copy Markdown
Collaborator

Tag name (The PR title should also include the tag name):
Originator(s): @jimmielin
Assisted-by: claude-opus:4.6[1m]

Description (include issue title and the keyword ['closes', 'fixes', 'resolves'] and issue number):

  • Closes Convert UW shallow convection (uwshcu) #365 - CCPPizes UW shallow convection scheme (uwshcu)
  • Adds clamp_number_concentrations utility scheme to replicate CAM physics_types.F90 behavior that clamps num* constituents to [1e-12, 1e10] range.
  • Refactors convect_shallow_diagnostics_after_convective_evaporation into its own scheme file (previously inlined in convect_shallow_diagnostics) to accommodate the fact that UW does not use ZM convective evaporation.
  • Removes unused arguments from compute_cloud_fraction and rk_stratiform (cleanup)

List all namelist files that were added or changed:

A       schemes/uw_shallow/uw_convect_shallow_namelist.xml
  - namelist parameters for UW shallow convection

List all files eliminated and why: N/A

List all files added and what they do:

A       schemes/uw_shallow/uw_convect_shallow.F90
A       schemes/uw_shallow/uw_convect_shallow.meta
A       schemes/uw_shallow/uw_convect_shallow_namelist.xml
  - CCPPized UW shallow convection scheme.

A       schemes/sima_diagnostics/uw_convect_shallow_diagnostics.F90
A       schemes/sima_diagnostics/uw_convect_shallow_diagnostics.meta
  - diagnostics for UW shallow convection.

A       schemes/sima_diagnostics/convect_shallow_diagnostics_after_convective_evaporation.F90
A       schemes/sima_diagnostics/convect_shallow_diagnostics_after_convective_evaporation.meta
  - refactored out of convect_shallow_diagnostics into its own scheme file
    (Hack shallow-specific diagnostics after zm_conv_evap)

A       schemes/utilities/clamp_number_concentrations.F90
A       schemes/utilities/clamp_number_concentrations.meta
  - utility scheme to clamp number concentration constituents to [1e-12, 1e10]
    after apply_constituent_tendencies, replicating CAM physics_types.F90 behavior

A       test/test_suites/suite_convect_shallow_uw.xml
  - test SDF for UW shallow convection

List all existing files that have been modified, and describe the changes:

M       schemes/cloud_fraction/compute_cloud_fraction.F90
M       schemes/cloud_fraction/compute_cloud_fraction.meta
  - cleanup unused arguments, unused local variables

M       schemes/hack_shallow/hack_convect_shallow.F90
  - cleanup

M       schemes/rasch_kristjansson/rk_stratiform.F90
M       schemes/rasch_kristjansson/rk_stratiform.meta
  - cleanup

M       schemes/sima_diagnostics/convect_shallow_diagnostics.F90
M       schemes/sima_diagnostics/convect_shallow_diagnostics.meta
  - move convect_shallow_diagnostics_after_convective_evaporation to standalone file.

M       suites/suite_cam5.xml
  - add UW shallow convection scheme to CAM5 suite.

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

Is this an answer-changing PR? If so, is it a new physics package, algorithm change, tuning change, etc?

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

This is a combination of 13 commits and dropped 1 commits.

Initial commit. Move to atmos_phys: uw_shallow

Build fixes for CAM

Continue work on meta

Tentative draft for meta

draft diags

Add convect_shallow_uw draft scheme

(wrong diag scheme name)

add nl file

Disable check_energy for now since snapshot runs have issues (same as ZM)

Add clamp_number_concentrations utility scheme.

Give up on using tendencies for the number concentration clamp

Various cleanup (req CAM changes)

Address review comments from code review agent (claude-opus-4.6)

Update CAM5 and test SDF for UW shallow

Update diagnostics
@jimmielin jimmielin self-assigned this Jun 4, 2026
@jimmielin jimmielin added the enhancement New feature or request label Jun 4, 2026
@jimmielin jimmielin requested a review from nusbaume June 5, 2026 16:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

Status: No status

Development

Successfully merging this pull request may close these issues.

Convert UW shallow convection (uwshcu)

2 participants