Skip to content

Commit

Permalink
Merge pull request #1096 from fvitt/aerosol_deposition_fluxes
Browse files Browse the repository at this point in the history
cam6_4_025: Aerosol deposition fluxes
  • Loading branch information
fvitt committed Aug 28, 2024
2 parents 265425a + 1fad549 commit 2f8ec4d
Show file tree
Hide file tree
Showing 8 changed files with 616 additions and 14 deletions.
2 changes: 1 addition & 1 deletion components/cice
116 changes: 114 additions & 2 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,117 @@
===============================================================

Tag name: cam6_4_025
Originator(s): fvitt, tilmes
Date: 28 Aug 2024
One-line Summary: Repartition dust deposition fluxes passed to surface models
Github PR URL: https://github.com/ESCOMP/CAM/pull/1096

Purpose of changes (include the issue number and title text for each relevant GitHub issue):

Repartition the modal dust deposition fluxes into 4 bulk bins for passing to the surface
models. The aerosol fluxes code was refactored in a generalized way which can easily be
expanded for other aerosol representations, such as CARMA, and aerosol species types.

Describe any changes made to build system: N/A

Describe any changes made to the namelist: N/A

List any changes to the defaults for the boundary datasets: N/A

Describe any substantial timing or memory changes: N/A

Code reviewed by: cacraigucar

List all files eliminated: N/A

List all files added and what they do:
A src/chemistry/aerosol/aero_deposition_cam.F90
- aerosol model independent module that uses aerosol abstract interface
to prepare deposition fluxes passed to surface models

List all existing files that have been modified, and describe the changes:
M src/chemistry/aerosol/aerosol_properties_mod.F90
M src/chemistry/aerosol/modal_aerosol_properties_mod.F90
- add interface for calculating generalized bulk fluxes

M src/chemistry/modal_aero/aero_model.F90
- replace use of modal_aero_deposition with generalized aero_deposition_cam

If there were any failures reported from running test_driver.sh on any test
platform, and checkin with these failures has been OK'd by the gatekeeper,
then copy the lines from the td.*.status files for the failed tests to the
appropriate machine below. All failed tests must be justified.

derecho/intel/aux_cam:
PEND ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s
- pre-existing failure due to HEMCO not having reproducible results issues #1018 and #856

FAIL SMS_D_Ln9_P1280x1.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.FHIST.derecho_intel.cam-outfrq9s
FAIL SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s
- pre-existing failures -- need fix in CLM external

DIFF ERP_D_Ln9.ne30pg3_ne30pg3_mg17.FLTHIST.derecho_intel.cam-outfrq9s
DIFF ERP_D_Ln9.ne30pg3_ne30pg3_mg17.FLTHIST.derecho_intel.cam-outfrq9s_rrtmgp
DIFF ERP_Ld3.f09_f09_mg17.FWHIST.derecho_intel.cam-reduced_hist1d
DIFF ERP_Ln9.C96_C96_mg17.F2000climo.derecho_intel.cam-outfrq9s_mg3
DIFF ERP_Ln9.f09_f09_mg17.F1850.derecho_intel.cam-outfrq9s
DIFF ERP_Ln9.f09_f09_mg17.F2000climo.derecho_intel.cam-outfrq9s
DIFF ERP_Ln9.f09_f09_mg17.F2010climo.derecho_intel.cam-outfrq9s
DIFF ERP_Ln9.f09_f09_mg17.FHIST_BDRD.derecho_intel.cam-outfrq9s
DIFF ERP_Ln9.f19_f19_mg17.FWsc1850.derecho_intel.cam-outfrq9s
DIFF ERP_Ln9.ne30pg3_ne30pg3_mg17.FCnudged.derecho_intel.cam-outfrq9s
DIFF ERP_Ln9.ne30pg3_ne30pg3_mg17.FW2000climo.derecho_intel.cam-outfrq9s
DIFF ERS_Ld3.f10_f10_mg37.F1850.derecho_intel.cam-outfrq1d_14dec_ghg_cam7
DIFF ERS_Ln9.f09_f09_mg17.FX2000.derecho_intel.cam-outfrq9s
DIFF ERS_Ln9.f19_f19_mg17.FXSD.derecho_intel.cam-outfrq9s
DIFF ERS_Ln9_P288x1.mpasa120_mpasa120.F2000climo.derecho_intel.cam-outfrq9s_mpasa120
DIFF ERS_Ln9_P36x1.mpasa480_mpasa480.F2000climo.derecho_intel.cam-outfrq9s_mpasa480
DIFF SMS_D_Ln9.f09_f09_mg17.FCts2nudged.derecho_intel.cam-outfrq9s_leapday
DIFF SMS_D_Ln9.f09_f09_mg17.FCvbsxHIST.derecho_intel.cam-outfrq9s
DIFF SMS_D_Ln9.f09_f09_mg17.FSD.derecho_intel.cam-outfrq9s
DIFF SMS_D_Ln9.f19_f19_mg17.FWma2000climo.derecho_intel.cam-outfrq9s
DIFF SMS_D_Ln9.f19_f19_mg17.FWma2000climo.derecho_intel.cam-outfrq9s_waccm_ma_mam4
DIFF SMS_D_Ln9.f19_f19_mg17.FXHIST.derecho_intel.cam-outfrq9s_amie
DIFF SMS_D_Ln9.ne16pg3_ne16pg3_mg17.FX2000.derecho_intel.cam-outfrq9s
DIFF SMS_D_Ln9.ne30pg3_ne30pg3_mg17.FCts4MTHIST.derecho_intel.cam-outfrq9s
DIFF SMS_D_Ln9.ne30pg3_ne30pg3_mg17.FMTHIST.derecho_intel.cam-outfrq9s
DIFF SMS_D_Ln9_P1280x1.ne30pg3_ne30pg3_mg17.FCLTHIST.derecho_intel.cam-outfrq9s
DIFF SMS_D_Ln9.T42_T42.FSCAMARM97.derecho_intel.cam-outfrq9s
DIFF SMS_Ld1.f09_f09_mg17.FCHIST_GC.derecho_intel.cam-outfrq1d
DIFF SMS_Ld1.f09_f09_mg17.FW2000climo.derecho_intel.cam-outfrq1d
DIFF SMS_Ld1.ne30pg3_ne30pg3_mg17.FC2010climo.derecho_intel.cam-outfrq1d
DIFF SMS_Lh12.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq3h
DIFF SMS_Lm13.f10_f10_mg37.F2000climo.derecho_intel.cam-outfrq1m
DIFF SMS_Ln9.f09_f09_mg17.F2010climo.derecho_intel.cam-nudging
DIFF SMS_Ln9.f09_f09_mg17.FW1850.derecho_intel.cam-reduced_hist3s
DIFF SMS_Ln9.f19_f19.F2000climo.derecho_intel.cam-silhs
DIFF SMS_Ln9.ne30pg3_ne30pg3_mg17.FW2000climo.derecho_intel.cam-outfrq9s_rrtmgp
- expected baseline failures due to changes in dust deposition fluxes to surface models

derecho/nvhpc/aux_cam:
DIFF ERS_Ln9_G4-a100-openacc.ne30pg3_ne30pg3_mg17.F2000dev.derecho_nvhpc.cam-outfrq9s_mg3_default
- expected baseline failure due to changes in dust deposition fluxes to surface models

izumi/nag/aux_cam:
FAIL DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae
- pre-existing failure - issue #670

izumi/gnu/aux_cam: All PASS

Summarize any changes to answers:
larger than roundoff but same climate

URL for AMWG diagnostics output used to validate new climate:

https://acomstaff.acom.ucar.edu/tilmes/amwg/cam7/f.e23_beta02.FLTHIST_ne30.surf_flux_1995_2004_vs_f.e23_beta02.FLTHIST_ne30.001_1995_2004/website/index.html

The land diagnostics are here:

https://webext.cgd.ucar.edu/FLTHIST/f.e23_beta02.FLTHIST_ne30.surf_flux/lnd/f.e23_beta02.FLTHIST_ne30.surf_flux_1995_2004-f.e23_beta02.FLTHIST_ne30.001_1995_2004/setsIndex.html

===============================================================
===============================================================

Tag name: cam6_4_024
Originator(s): eaton
Date: 27 Aug 2024
Expand Down Expand Up @@ -48,9 +160,9 @@ List all existing files that have been modified, and describe the changes:

bld/build-namelist
. if simple model or aquaplanet remove the settings of
stream_ndep_data_filename and stream_ndep_mesh_filename
stream_ndep_data_filename and stream_ndep_mesh_filename
. modify logic so the add_default call for drydep_srf_file is not made for
simple models or aquaplanet
simple models or aquaplanet

bld/namelist_files/namelist_definition.xml
. remove the variables in the ndep_stream_nml group. Not used.
Expand Down
Loading

0 comments on commit 2f8ec4d

Please sign in to comment.