Commit 301a456
Complete CCPPization of BAM/MAM aerosol optics; BAM microp_aero (nucleate_ice; ndrop_bam; inline logic in microp_aero) (ESCOMP#398)
Tag name: atmos_phys0_28_000
Originator(s): @jimmielin
Description:
- Adds aerosol optics schemes for all aerosol models for CAM-SIMA.
- Closes ESCOMP#381 - Adds `microp_aero` schemes for BAM in CAM-SIMA; shared
code with CAM.
- Closes ESCOMP#373 - rebin seasalt
- Partially ESCOMP#360
Companion CAM-SIMA PR: ESCOMP/CAM-SIMA#504
List all namelist files that were added or changed:
```
A schemes/chemistry/aerosol_optics_namelist.xml
A schemes/microp_aero/ccpp/nucleate_ice_ccpp_namelist.xml
A schemes/microp_aero/scale_subgrid_vertical_velocity_namelist.xml
- new scheme namelists
A schemes/microp_aero/ccpp/hetfrz_classnuc_stub_namelist.xml
- stub for use_hetfrz_classnuc flag (stub disables classnuc het freezing).
```
List all files eliminated and why: N/A
List all files added and what they do:
```
A schemes/chemistry/aerosol_optics.F90
A schemes/chemistry/aerosol_optics.meta
A schemes/chemistry/aerosol_optics_namelist.xml
- Aerosol optics scheme. Computes per-band SW/LW aerosol optical properties
(extinction, SSA, asymmetry) from aerosol model instances via the abstract
aerosol interface. Reads water refractive index data in init.
A schemes/sima_diagnostics/aerosol_optics_diagnostics.F90
A schemes/sima_diagnostics/aerosol_optics_diagnostics.meta
- Aerosol optics diagnostics: per-species AOD, burden, SSA, visible AOD, etc.
A schemes/chemistry/aerosol_optics_zero_stub.F90
A schemes/chemistry/aerosol_optics_zero_stub.meta
- Zero stub providing zeroed-out aerosol optical properties for RRTMGP
snapshot testing without the full aerosol optics scheme.
A schemes/chemistry/rebin_seasalt.F90
A schemes/chemistry/rebin_seasalt.meta
- Rebins 4-bin BAM prescribed seasalt (sslt01/02/03/04) to 2-bin
(sslta/ssltc) using constituent mass fractions.
A schemes/microp_aero/ndrop_bam.F90
- Portable layer for bulk aerosol droplet activation (Abdul-Razzak and
Ghan 2000). Computes droplet number tendency and CCN concentrations.
- This is copied from CAM then slightly cleaned up
A schemes/microp_aero/nucleate_ice.F90
- Portable layer for ice nucleation (Liu and Penner 2005, Liu et al. 2007).
Computes ice crystal number from homogeneous and heterogeneous nucleation.
- This is copied from CAM
A schemes/microp_aero/compute_subgrid_vertical_velocity.F90
A schemes/microp_aero/compute_subgrid_vertical_velocity.meta
- Computes subgrid vertical velocity (wsub, wsubi) from TKE or CLUBB WP2.
- Original logic from CAM inlined in microp_aero
A schemes/microp_aero/scale_subgrid_vertical_velocity.F90
A schemes/microp_aero/scale_subgrid_vertical_velocity.meta
A schemes/microp_aero/scale_subgrid_vertical_velocity_namelist.xml
- Applies wsub_scale scaling factor to subgrid vertical velocity.
- Original logic from CAM inlined in microp_aero
A schemes/microp_aero/dust_default_radii.F90
A schemes/microp_aero/dust_default_radii.meta
- Sets default dust effective radii for radiation (dust1-4).
- Original logic from CAM inlined in microp_aero
A schemes/microp_aero/ccpp/ndrop_bam_ccpp.F90
A schemes/microp_aero/ccpp/ndrop_bam_ccpp.meta
- CCPP wrapper for ndrop_bam
A schemes/microp_aero/ccpp/nucleate_ice_ccpp.F90
A schemes/microp_aero/ccpp/nucleate_ice_ccpp.meta
A schemes/microp_aero/ccpp/nucleate_ice_ccpp_namelist.xml
- CCPP wrapper for nucleate_ice, equivalent to nucleate_ice_cam in CAM.
A schemes/microp_aero/ccpp/hetfrz_classnuc_stub.F90
A schemes/microp_aero/ccpp/hetfrz_classnuc_stub.meta
A schemes/microp_aero/ccpp/hetfrz_classnuc_stub_namelist.xml
- Stub for heterogeneous freezing (classnuc). Provides zero tendencies
when use_hetfrz_classnuc is false. For BAM.
A test/test_schemes/initialize_pbuf_aerosols.F90
A test/test_schemes/initialize_pbuf_aerosols.meta
- Test scheme for discovering aerosol number concentration species from
pbuf-style "N:" fields via the abstract aerosol interface.
A test/test_suites/suite_microp_aero_bam.xml
- Test SDF for the microp_aero BAM suite.
A schemes/sima_diagnostics/aerosol_optics_diagnostics.F90
A schemes/sima_diagnostics/aerosol_optics_diagnostics.meta
A schemes/sima_diagnostics/ndrop_bam_diagnostics.F90
A schemes/sima_diagnostics/ndrop_bam_diagnostics.meta
A schemes/sima_diagnostics/nucleate_ice_diagnostics.F90
A schemes/sima_diagnostics/nucleate_ice_diagnostics.meta
A schemes/sima_diagnostics/scale_subgrid_vertical_velocity_diagnostics.F90
A schemes/sima_diagnostics/scale_subgrid_vertical_velocity_diagnostics.meta
- diagnostic schemes
```
List all existing files that have been modified, and describe the
changes:
```
M schemes/rrtmgp/rrtmgp_sw_aerosols.F90
M schemes/rrtmgp/rrtmgp_sw_aerosols.meta
- Replace stub with implementation. Accepts aerosol tau/tau_w/tau_w_g from
aerosol_optics, reorders from RRTMG to RRTMGP SW band ordering, maps CAM
vertical levels to RRTMGP levels, subsets to daytime columns. Computes SSA
and asymmetry parameter from the product fields.
M schemes/rrtmgp/rrtmgp_lw_aerosols.F90
M schemes/rrtmgp/rrtmgp_lw_aerosols.meta
- Replace stub with implementation. Accepts aer_lw_abs from aerosol_optics,
maps CAM vertical levels to RRTMGP levels. No band reorder needed for LW.
M suites/suite_cam4.xml
- Add prescribed aerosol/ozone schemes, rebin_seasalt, aerosol_optics, and
aerosol_optics_diagnostics to CAM4 SDF
- Reorder rrtmgp_pre before aerosol_optics so night column info is available for diagnostics.
M test/test_suites/suite_rrtmgp.xml
- Add aerosol_optics_zero_stub to RRTMGP test suite for snapshot testing to remain bit-for-bit.
```
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?
New physics package
CAM regression tests for shared code
SIMA snapshot tests for microp_aero
Eyeballed the results from aerosol optics and looked reasonable.
If yes to the above question, describe how this code was validated with
the new/modified features:
---------
Co-authored-by: Haipeng Lin <hplin@ucar.edu>
Co-authored-by: Haipeng Lin <hplin+github@ucar.edu>1 parent 2c3c0b5 commit 301a456
42 files changed
Lines changed: 4941 additions & 58 deletions
File tree
- schemes
- chemistry
- microp_aero
- ccpp
- rrtmgp
- sima_diagnostics
- utilities
- vertical_diffusion
- suites
- test
- test_schemes
- test_suites
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
0 commit comments