From 1ea82496ab77abd8246014df9c4e194ee2b52851 Mon Sep 17 00:00:00 2001 From: "yuanjian.z" Date: Fri, 15 Nov 2024 13:51:49 -0600 Subject: [PATCH 1/2] Fix PDOWN definition to lower edge and remove re-evaporation requirement for washout --- GeosCore/convection_mod.F90 | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/GeosCore/convection_mod.F90 b/GeosCore/convection_mod.F90 index 21c94414c..ed4bc5f12 100644 --- a/GeosCore/convection_mod.F90 +++ b/GeosCore/convection_mod.F90 @@ -567,12 +567,12 @@ SUBROUTINE DO_CLOUD_CONVECTION( Input_Opt, & SpcInfo => NULL() ! Species database entry ! PFICU and PFLCU are on level edges - PFICU => State_Met%PFICU (I,J,2:State_Grid%NZ+1) ! Dwnwd flx of conv + PFICU => State_Met%PFICU (I,J,1:State_Grid%NZ) ! Dwnwd flx of conv ! ice precip - ! [kg/m2/s] - PFLCU => State_Met%PFLCU (I,J,2:State_Grid%NZ+1) ! Dwnwd flux of conv + ! [kg/m2/s] [down edge] + PFLCU => State_Met%PFLCU (I,J,1:State_Grid%NZ) ! Dwnwd flux of conv ! liquid precip - ! [kg/m2/s] + ! [kg/m2/s] [down edge] ! # of levels and # of species NLAY = State_Grid%NZ @@ -1100,10 +1100,8 @@ SUBROUTINE DO_CLOUD_CONVECTION( Input_Opt, & ! Check if... ! (1) there is precip coming into box (I,J,K) from (I,J,K+1) - ! (2) there is re-evaporation happening in grid box (I,J,K) - ! (3) there is species to re-evaporate + ! (2) there is species to re-evaporate IF ( PDOWN(K+1) > 0 .and. & - REEVAPCN(K) > 0 .and. & T0_SUM > 0 ) THEN ! Compute F_WASHOUT, the fraction of grid box (I,J,L) From ac3cc507f784a2bb2cb0f512c8c315c92f3c6914 Mon Sep 17 00:00:00 2001 From: "yuanjian.z" Date: Fri, 15 Nov 2024 13:53:12 -0600 Subject: [PATCH 2/2] Update ChangeLog --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17892dda0..95c26e9e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,17 @@ This file documents all notable changes to the GEOS-Chem repository starting in The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] - TBD +### Added + +### Fixed +- Fixed PDOWN definition to lower rather than upper edge + +### Changed + +### Removed +- Removed re-evaporation requirement for washout + ## [14.5.0] - 2024-11-07 ### Added - Added vectors `State_Chm%KPP_AbsTol` and `State_Chm%KPP_RelTol`