Skip to content

Merge development into main#379

Open
jimmielin wants to merge 2 commits intomainfrom
development
Open

Merge development into main#379
jimmielin wants to merge 2 commits intomainfrom
development

Conversation

@jimmielin
Copy link
Copy Markdown
Member

Includes #338

For some reason it also included #331 but these are the exact same files. Probably because I squash-merged development into main the last time.

jimmielin and others added 2 commits March 9, 2026 11:10
…x for bulk aerosols (BAM) (#331)

Originator(s): @jimmielin

Most of the code based off from @fvitt; changes had to be made to remove
use of pbuf and use the constituents infrastructure in CAM-SIMA/CCPP
framework to register store prescribed aerosols data (code borrowed from
@peverwhee and @nusbaume)

Companion SIMA PR ESCOMP/CAM-SIMA#441

There will not be a CAM PR to bring these changes back because
`tracer_data` has breaking interface changes (and no longer using pbuf)
that make it infeasible to bring back these schemes into CAM.

Description (include issue title and the keyword ['closes', 'fixes',
'resolves'] and issue number):
- CCPPize CAM `prescribed_ozone` -- closes #323
- CCPPize CAM `prescribed_aero` into `prescribed_aerosols` scheme --
closes #328
- Partially CCPPize CAM `aerodep_flx` into
`prescribed_aerosol_deposition_flux` scheme: only BAM functionality is
fully implemented; MAM functionality depends on conversion of the
aerosol model -- closes #328; future work documented in #329

List all namelist files that were added or changed:
```
A       schemes/chemistry/prescribed_ozone_namelist.xml
A       schemes/chemistry/prescribed_aerosols_namelist.xml
A       schemes/chemistry/prescribed_aerosol_deposition_flux_namelist.xml
```

List all files eliminated and why: N/A

List all files added and what they do:
```
A       schemes/chemistry/prescribed_ozone.F90
A       schemes/chemistry/prescribed_ozone.meta
  - complete CCPPization of prescribed_ozone (#323)

A       schemes/chemistry/prescribed_aerosols.F90
A       schemes/chemistry/prescribed_aerosols.meta
  - complete CCPPization of prescribed_aero (#328)

A       schemes/chemistry/prescribed_aerosol_deposition_flux.F90
A       schemes/chemistry/prescribed_aerosol_deposition_flux.meta
  - CCPPize aerodep_flx for bulk aerosols (BAM) only. (#328) future work #329

A       test/test_suites/suite_tracer_data_test.xml
  - suite for testing tracer_data chemistry and aerosols input test via prescribed ozone, aerosols, and aerosol deposition flux -- BAM configuration
```

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

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?
new chemistry and aerosol schemes

If yes to the above question, describe how this code was validated with
the new/modified features:
new regression test verified b4b with cam using same namelist options
and input files as described in testmod - see CAM-SIMA PR

---------

Co-authored-by: Jesse Nusbaumer <nusbaume@ucar.edu>
Originator(s): @jimmielin

Description (include issue title and the keyword ['closes', 'fixes',
'resolves'] and issue number):
- Add diagnostics (parity with CAM) for gravity wave parameterizations
in CAM-SIMA.

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/sima_diagnostics/gravity_wave_drag_convection_deep_diagnostics.F90
A       schemes/sima_diagnostics/gravity_wave_drag_convection_deep_diagnostics.meta
A       schemes/sima_diagnostics/gravity_wave_drag_frontogenesis_diagnostics.F90
A       schemes/sima_diagnostics/gravity_wave_drag_frontogenesis_diagnostics.meta
A       schemes/sima_diagnostics/gravity_wave_drag_moving_mountain_diagnostics.F90
A       schemes/sima_diagnostics/gravity_wave_drag_moving_mountain_diagnostics.meta
A       schemes/sima_diagnostics/gravity_wave_drag_orographic_diagnostics.F90
A       schemes/sima_diagnostics/gravity_wave_drag_orographic_diagnostics.meta
A       schemes/sima_diagnostics/gravity_wave_drag_ridge_beta_diagnostics.F90
A       schemes/sima_diagnostics/gravity_wave_drag_ridge_beta_diagnostics.meta
  - various diagnostic schemes for various gravity wave drag parameterizations.
```

List all existing files that have been modified, and describe the
changes:
(Helpful git command: `git diff --name-status
development...<your_branch_name>`)
```
M       schemes/gravity_wave_drag/gravity_wave_drag_convection.meta
M       schemes/gravity_wave_drag/gravity_wave_drag_frontogenesis.F90
M       schemes/gravity_wave_drag/gravity_wave_drag_frontogenesis.meta
M       schemes/gravity_wave_drag/gravity_wave_drag_moving_mountain.meta
M       schemes/gravity_wave_drag/gravity_wave_drag_orographic.F90
M       schemes/gravity_wave_drag/gravity_wave_drag_orographic.meta
  - fix issues with temperature tendencies/dry air enthalpy tendency units throughout.
  - fix incorrectly annotated hdepth (m not km) units

M       schemes/sima_diagnostics/gravity_wave_drag_common_diagnostics.F90
M       schemes/sima_diagnostics/gravity_wave_drag_common_diagnostics.meta
  - populate the remaining common gravity wave drag diagnostics (TTGW,UTGW_TOTAL,VTGW_TOTAL,QTGW,CLDLIQTGW,CLDICETGW)

M       suites/suite_cam4.xml
M       suites/suite_cam7.xml
M       test/test_suites/suite_gw_cam4.xml
M       test/test_suites/suite_gw_cam7_se.xml
  - call diagnostic schemes in SDFs
```

List all automated tests that failed, as well as an explanation for why
they weren't fixed:
New baselines will be created in the eventual CAM-SIMA PR

Is this an answer-changing PR? If so, is it a new physics package,
algorithm change, tuning change, etc?
New diagnostic fields
Model "state" is b4b

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 self-assigned this Mar 30, 2026
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