Aerosol surface area densities refactor#1628
Open
fvitt wants to merge 18 commits into
Open
Conversation
draft to separate out strat restore strato_sad b4b behavior - spec beyond sulfate also incl. same as trop list.
modified: src/chemistry/aerosol/aerosol_state_mod.F90 modified: src/chemistry/aerosol/bulk_aerosol_state_mod.F90 modified: src/chemistry/aerosol/carma_aerosol_state_mod.F90 modified: src/chemistry/aerosol/modal_aerosol_state_mod.F90 modified: src/chemistry/bulk_aero/aero_model.F90 modified: src/chemistry/carma_aero/aero_model.F90 modified: src/chemistry/modal_aero/aero_model.F90
modified: src/chemistry/aerosol/modal_aerosol_state_mod.F90
modified: src/chemistry/bulk_aero/aero_model.F90 modified: src/chemistry/carma_aero/aero_model.F90 modified: src/chemistry/modal_aero/aero_model.F90 modified: src/chemistry/mozart/mo_gas_phase_chemdr.F90 modified: src/chemistry/mozart/mo_usrrxt.F90
modified: src/physics/carma/cam/carma_intr.F90
modified: src/chemistry/aerosol/aerosol_state_mod.F90 modified: src/chemistry/aerosol/bulk_aerosol_state_mod.F90 modified: src/chemistry/aerosol/carma_aerosol_state_mod.F90 modified: src/chemistry/aerosol/modal_aerosol_state_mod.F90 modified: src/chemistry/bulk_aero/aero_model.F90 modified: src/chemistry/carma_aero/aero_model.F90 modified: src/chemistry/modal_aero/aero_model.F90
modified: src/chemistry/aerosol/carma_aerosol_state_mod.F90
modified: src/chemistry/aerosol/aerosol_spec_utils.F90 modified: src/chemistry/aerosol/aerosol_state_mod.F90 modified: src/chemistry/aerosol/bulk_aerosol_state_mod.F90 modified: src/chemistry/aerosol/carma_aerosol_state_mod.F90 modified: src/chemistry/aerosol/modal_aerosol_state_mod.F90
modified: src/physics/carma/cam/carma_intr.F90
modified: src/chemistry/aerosol/bulk_aerosol_state_mod.F90
jimmielin
reviewed
Jul 22, 2026
jimmielin
left a comment
jimmielin
left a comment
Collaborator
There was a problem hiding this comment.
Thanks @fvitt. I had some suggested changes for performance, and a couple of comments. The GitHub suggested changes seems to not diff individually and just shows the changes as a block, but I am happy to make this into a PR if it's cleaner to see.
Comment on lines
+600
to
+601
| sfc = 0.0_r8 | ||
| dm_aer = 0.0_r8 |
Collaborator
There was a problem hiding this comment.
sfc and dm_aer are optional (although they're always passed in now) - perhaps we should make them required here? Or add a guard to exit when not present.
I am leaning towards required (although this would change the interface), since most of the computations below assume sfc and dm_aer are present.
| integer,allocatable :: index_tot_mass(:,:) | ||
| integer,allocatable :: index_chm_mass(:,:) | ||
| integer,allocatable :: index_ssa_mass(:,:) | ||
| integer,allocatable :: index_strat_mass(:,:) |
Collaborator
There was a problem hiding this comment.
This appears to be unused now that sad_strat_spec_types is used directly to call %surf_area_dens so it could be removed
Comment on lines
+542
to
+543
| allocate(index_strat_mass(nmodes,nspec_max)) | ||
| index_strat_mass = -1 |
Comment on lines
+559
to
+561
| if (spec_type_in_list(spec_type, sad_strat_spec_types)) then | ||
| index_strat_mass(n,l) = get_spc_ndx(spec_name) | ||
| end if |
Collaborator
There was a problem hiding this comment.
This could be removed since it's not used anymore in the abstract interface call to %surf_area_dens
| add_default($nl, 'sad_strat_spec_types', | ||
| 'val'=>"'sulfate','s-organic','p-organic','black-c','ammonium'"); | ||
| } | ||
|
|
Collaborator
There was a problem hiding this comment.
Does bulk need a namelist default for sad_chem_spec_types, etc. like MAM and CARMA does?
if ($aer_model eq 'bam') {
add_default($nl, 'sad_chem_spec_types',
'val'=>"'sulfate','black-c','p-organic'");
}
Comment on lines
+868
to
+880
| do i = 1,ncol | ||
| do k = beglev(i), endlev(i) | ||
| rho_air = pmid(i,k)/(temp(i,k)*287.04_r8) | ||
| do l=1,aero_props%nbins() | ||
| ! | ||
| ! compute a mass weighting of the number | ||
| ! | ||
| tot_mass = 0._r8 | ||
| chm_mass = 0._r8 | ||
|
|
||
| ! ignore primary carbon mode | ||
| call rad_aer_get_info(self%list_idx_, l, mode_type=modetype) | ||
| if ( trim(modetype) /= 'primary_carbon') then ! ignore the primary_carbon mode |
Collaborator
There was a problem hiding this comment.
This is doing the rad_aer_get_info and species lookup inside the i, k loop. Maybe if the loop ordering was changed to l then the checks, then over i, k it would be faster. I will draft a fix for your consideration.
Co-authored-by: Haipeng Lin <myself@jimmielin.me>
Co-authored-by: Haipeng Lin <myself@jimmielin.me>
Co-authored-by: Haipeng Lin <myself@jimmielin.me>
Co-authored-by: Haipeng Lin <myself@jimmielin.me>
modified: src/chemistry/aerosol/modal_aerosol_state_mod.F90 modified: src/chemistry/modal_aero/aero_model.F90
modified: bld/build-namelist modified: src/chemistry/aerosol/bulk_aerosol_state_mod.F90
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #1625
Mostly bit-for-bit. Answer changes only in prognostic bulk aerosol configurations (FMOZ). Otherwise, MAM and CARMA are bit-for-bit unchanged.