Skip to content

Conversation

jimmielin
Copy link
Member

Tag name (The PR title should also include the tag name): atmos_phys0_18_000
Originator(s): @jimmielin @nusbaume

List all development PR numbers included in this PR and the title of each:

List all automated tests that failed, as well as an explanation for why they weren't fixed:
All B4B in CAM verified via Izumi/Nag Izumi/GNU (previously via Derecho/Intel)
B4B in SIMA with HB testcase see ESCOMP/CAM-SIMA#410

nusbaume and others added 2 commits September 24, 2025 21:07
Originator(s): nusbaume

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

Adds a new Github Action that downloads and runs git-fleximod to ensure
that the `.gitmodules` file is correct and matches the actual git
submodules that are present in the repository.

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       .github/workflows/fleximod_test.yaml
  - Add new git-fleximod externals-checking Github Action workflow.

List all existing files that have been modified, and describe the
changes:
(Helpful git command: `git diff --name-status
development...<your_branch_name>`)

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

Is this an answer-changing PR? If so, is it a new physics package,
algorithm change, tuning change, etc? No, no scientific source code was
modified.

If yes to the above question, describe how this code was validated with
the new/modified features:
…usion solver (#270)

Companion PRs: ESCOMP/CAM#1361 and
ESCOMP/CAM-SIMA#410

Originator(s): @jimmielin

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

* Partial cleanup and refactoring of HB PBL scheme for CCPPization.
* Completes #239. Moves HB (`hb_diff.F90`) both `compute_hb_diff` and
`compute_hb_free_atm_diff` to atmospheric_physics
`holtslag_boville.F90`.
* Interstitials necessary for inputs into HB in
`holtslag_boville_interstitials.F90`.
* (is there an issue for diffusion solver?) Moves vertical diffusion
solver (`compute_vdiff`) without molecular diffusion (i.e., not WACCM-X)
into CCPPized schemes in `diffusion_solver.F90`.
* Creates stub (zeroed outputs) interstitial schemes for Turbulent
Mountain Stress (TMS) and Beljaars orographic surface drag and other
code for WACCM (e.g., UBC; use of composition-dependent rair) in
`diffusion_stubs.F90` -- schemes in this file will eventually be moved
to their corresponding schemes, e.g., tms, beljaars, ubc, ... when they
are fully CCPPized.

List all namelist files that were added or changed:
```
A       schemes/holtslag_boville/holtslag_boville_diff_options_namelist.xml
A       schemes/vertical_diffusion/vertical_diffusion_options_namelist.xml
  - separate "namelist" scheme for HB.
  - separate "namelist" scheme for diffusion solver.
```

List all files eliminated and why: N/A

List all files added and what they do:
```
A       to_be_ccppized/coords_1d.meta
  - metadata file for coords1d DDT.

A       to_be_ccppized/vdiff_lu_solver.F90
  - LU solver for diffusion_solver.F90, moved from CAM

A       schemes/holtslag_boville/holtslag_boville_diff.F90
A       schemes/holtslag_boville/holtslag_boville_diff.meta
A       schemes/holtslag_boville/holtslag_boville_diff_options.F90
A       schemes/holtslag_boville/holtslag_boville_diff_options.meta
  - CCPPized Holtslag-Boville boundary layer scheme (originally hb_diff.F90)

A       schemes/holtslag_boville/holtslag_boville_diff_interstitials.F90
A       schemes/holtslag_boville/holtslag_boville_diff_interstitials.meta
  - CCPPized interstitial schemes supporting inputs into HB.

A       schemes/vertical_diffusion/diffusion_solver.F90
A       schemes/vertical_diffusion/diffusion_solver.meta
A       schemes/vertical_diffusion/vertical_diffusion_options.F90
A       schemes/vertical_diffusion/vertical_diffusion_options.meta
  - CCPPized vertical diffusion solver without support for molecular diffusion
    (originally diffusion_solver.F90 in CAM)

A       schemes/vertical_diffusion/diffusion_stubs.F90
A       schemes/vertical_diffusion/diffusion_stubs.meta
  - CCPPized stub for UBC (upper boundary conditions)
  - CCPPized stub for TMS (Turbulent Mountain Stress) surface orographic drag.
  - CCPPized stub for Beljaars surface orographic drag.
  - CCPPized stub for WACCM to use composition-dependent rair in vertical diffusion.


A       schemes/vertical_diffusion/vertical_diffusion_sponge_layer.F90
A       schemes/vertical_diffusion/vertical_diffusion_sponge_layer.meta
  - CCPPized interstitial for sponge layer kvm
    (originally in vertical_diffusion_tend)

A       test/test_suites/suite_vdiff_holtslag_boville.xml
  - draft SDF for vertical diffusion using HB PBL scheme.
```

List all existing files that have been modified, and describe the
changes:
(Helpful git command: `git diff --name-status
development...<your_branch_name>`)
```
M       to_be_ccppized/coords_1d.F90
  - make coords1d lowercase to workaround upstream framework limitation
```

List all automated tests that failed, as well as an explanation for why
they weren't fixed:
- CAM-SIMA will not build without removing
`to_be_ccppized/nlte_fomichev.F90` due to dependency on CAM-only module
`chem_surfvals`

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

If yes to the above question, describe how this code was validated with
the new/modified features:
* CAM regression tests: bit-for-bit unchanged as of cam6_4_107; compared
against Derecho Intel only, Izumi tests will be ran before merging.
* CAM-SIMA regression tests using new tests defined in
ESCOMP/CAM-SIMA#410
bit-for-bit unchanged, except for Derecho GNU physics tests:
- new baselines in hb_vdiff derecho gnu test (new test)
- updated baselines in rk_stratiform test due to change in snapshots
necessary due to CAM pbuf field change.
and updated baselines in CAM4 tests due to adding HB PBL and vertical
diffusion solver.

---------

Co-authored-by: Jesse Nusbaumer <[email protected]>
@jimmielin jimmielin self-assigned this Sep 26, 2025
@jimmielin jimmielin requested a review from nusbaume September 26, 2025 17:40
@jimmielin jimmielin changed the title atmos_phys0_18_000: Complete CCPPization of HB scheme atmos_phys0_18_000: Complete CCPPization of HB scheme; fleximod test for atmos_phys Sep 26, 2025
Copy link
Collaborator

@nusbaume nusbaume left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @jimmielin!

@jimmielin jimmielin merged commit 9ecb80f into main Sep 26, 2025
9 checks passed
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