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

Fixed PDOWN definition and re-evaporation requirement for washout #2573

Open
wants to merge 2 commits into
base: dev/14.6.0
Choose a base branch
from
Open

Fixed PDOWN definition and re-evaporation requirement for washout #2573

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
1ea8249
Fix PDOWN definition to lower edge and remove re-evaporation requirem…
yuanjianz Nov 15, 2024
ac3cc50
Update ChangeLog
yuanjianz Nov 15, 2024
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
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
12 changes: 5 additions & 7 deletions GeosCore/convection_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down