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.

Sign up for GitHub

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

Develop #242

Merged
merged 2 commits into from
May 30, 2023
+18 −8
Merged

Develop #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08485f8
ams: In dust and sea-salt, changed dimensions back to `globalCellCoun…
amdasilva May 30, 2023
41ab18a
Merge pull request #241 from GEOS-ESM/feature/adasilva/dust-ss-fix
amdasilva May 30, 2023
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

## [v2.2.1] - 2023-05-30

### Fixed

- In dust and sea-salt, changed dimensions back to `globalCellCountPerDim` since these are needed to determine emission tuning parameters, not to allocate arrays.


## [v2.2.0] - 2023-05-18

### Fixed
Expand Down
7 changes: 5 additions & 2 deletions ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,10 +409,13 @@ subroutine Initialize (GC, import, export, clock, RC)
VERIFY_(STATUS)
self => wrap%ptr

call MAPL_GridGet (grid, localCellCountPerDim=dims, __RC__ )
! Global dimensions are needed here for choosing tuning parameters
! ----------------------------------------------------------------
call MAPL_GridGet (grid, globalCellCountPerDim=dims, __RC__ )

! Dust emission tuning coefficient [kg s2 m-5]. NOT bin specific.
! ---------------------------------------------------------------
! TO DO: find a more robust way to implement resolution dependent tuning
! ----------------------------------------------------------------------
self%Ch_DU = Chem_UtilResVal(dims(1), dims(2), self%Ch_DU_res(:), __RC__)
self%Ch_DU = self%Ch_DU * 1.0e-9

Expand Down
12 changes: 6 additions & 6 deletions ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridCompMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,15 +367,15 @@ subroutine Initialize (GC, IMPORT, EXPORT, CLOCK, RC)
VERIFY_(STATUS)
self => wrap%ptr

! Get dimensions
! ---------------
call MAPL_GridGet (grid, localCellCountPerDim=dims, __RC__ )
! Global dimensions are needed here for choosing tuning parameters
! ----------------------------------------------------------------
call MAPL_GridGet (grid, globalCellCountPerDim=dims, __RC__ )
km = dims(3)
self%km = km

! Scaling factor to multiply calculated
! emissions by. Applies to all size bins.
! ----------------------------------------
! Scaling factor to multiply calculated emissions by. Applies to all size bins.
! TO DO: find a more robust way to implement resolution dependent tuning
! -------------------------------------------------------------------------------
self%emission_scale = Chem_UtilResVal(dims(1), dims(2), self%emission_scale_res(:), __RC__)

! Get DTs
Expand Down