From 5731a9095936f20a99524dbc92a0d37cf1b509ec Mon Sep 17 00:00:00 2001 From: Arlindo da Silva Date: Tue, 30 May 2023 16:48:59 -0400 Subject: [PATCH] ams: In dust and sea-salt, changed dimensions back to `globalCellCountPerDim` since these are needed to determine emission tuning parameters, not to allocate arrays. --- CHANGELOG.md | 8 +++++++- .../DU2G_GridComp/DU2G_GridCompMod.F90 | 7 +++++-- .../SS2G_GridComp/SS2G_GridCompMod.F90 | 12 ++++++------ 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8421e77..40d94fc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,9 +9,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +### Changed + ### Fixed -### Changed +## [sdr_v2.1.2.7] - 2023-05-31 + +### Fixed + +- In dust and sea-salt, changed dimensions back to `globalCellCountPerDim` since these are needed to determine emission tuning parameters, not to allocate arrays. ## [sdr_v2.1.2.6] - 2023-05-06 diff --git a/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90 b/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90 index 5434a119..480ac404 100644 --- a/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90 +++ b/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90 @@ -399,10 +399,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 diff --git a/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridCompMod.F90 b/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridCompMod.F90 index a14effdb..4dc689f2 100644 --- a/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridCompMod.F90 +++ b/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridCompMod.F90 @@ -355,15 +355,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