Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add features from Hunga work #24

Merged
merged 2 commits into from
Dec 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
### Fixed
### Added

- Added features required for the 2024 Hunga experiments, including treatment of SO4v, lbssad_opt 5 (for CARMA), and using sulfate surface area density and effective radius from the AERO state

### Changed

- Update GitHub actions to use v4
Expand Down
6 changes: 4 additions & 2 deletions GMI_GridComp/GMI_GridCompMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ SUBROUTINE GMI_GridCompInitialize(gcGMI, bgg, bxx, impChem, expChem, nymd, nhms,

CALL GmiEmiss_initSurfEmissBundle (gcGMI%gcEmiss, bgg, expChem, __RC__)

gcGMI%gcThermalRC%so4v_saexist = gcGMI%gcPhot%so4v_saexist

RETURN

END SUBROUTINE GMI_GridCompInitialize
Expand Down Expand Up @@ -301,7 +303,7 @@ SUBROUTINE GMI_GridCompRun2(gcGMI, bgg, bxx, impChem, expChem, nymd, nhms, tdt,

CALL GmiPhotolysis_GridCompRun(gcGMI%gcPhot, bgg, bxx, impChem, expChem, nymd, nhms, cdt, __RC__)

CALL GmiThermalRC_GridCompRun (gcGMI%gcThermalRC, bgg, bxx, impChem, expChem, nymd, nhms, cdt, __RC__)
CALL GmiThermalRC_GridCompRun (gcGMI%gcThermalRC, bgg, bxx, impChem, expChem, nymd, nhms, cdt, gcGMI%gcSAD, __RC__)

CALL GmiChemistry_GridCompRun (gcGMI%gcChem, bgg, bxx, impChem, expChem, nymd, nhms, cdt, __RC__)

Expand Down Expand Up @@ -387,7 +389,7 @@ SUBROUTINE GMI_GridCompRunOrig(gc, gcGMI, bgg, bxx, impChem, expChem, nymd, nhms

CALL GmiForcingBC_GridCompRun (gcGMI%gcFBC, bgg, bxx, impChem, expChem, nymd, nhms, cdt, __RC__)

CALL GmiThermalRC_GridCompRun (gcGMI%gcThermalRC, bgg, bxx, impChem, expChem, nymd, nhms, cdt, __RC__)
CALL GmiThermalRC_GridCompRun (gcGMI%gcThermalRC, bgg, bxx, impChem, expChem, nymd, nhms, cdt, gcGMI%gcSAD, __RC__)

CALL GmiChemistry_GridCompRun (gcGMI%gcChem, bgg, bxx, impChem, expChem, nymd, nhms, cdt, __RC__)

Expand Down
4 changes: 2 additions & 2 deletions GMI_GridComp/GmiChem_GridCompClassMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -945,8 +945,8 @@ SUBROUTINE GmiChemistry_GridCompRun ( self, bgg, bxx, impChem, expChem, nymd, nh
gmiQQK, gmiQJ, gmiQQJ, surfEmissForChem, self%pr_diag, &
self%do_ftiming, self%do_qqjk_inchem, self%pr_qqjk, &
self%do_semiss_inchem, self%pr_smv2, self%pr_nc_period, &
rootProc, self%metdata_name_org, &
self%metdata_name_model, tdt)
i1, i2, j1, j2, 1, km, &
rootProc, self%metdata_name_org, self%metdata_name_model, tdt)

! Return species concentrations to the chemistry bundle
! -----------------------------------------------------
Expand Down
222 changes: 142 additions & 80 deletions GMI_GridComp/GmiChemistry/AerosolDust/GmiAerDustODSA_mod.F90

Large diffs are not rendered by default.

Loading
Loading