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

Sync develop into main preparing for v2.0.4 #107

Merged
merged 6 commits into from
Feb 18, 2022
Merged

Sync develop into main preparing for v2.0.4 #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2ec5dfa
fix incorrect max calculation
sdrabenh Feb 17, 2022
28743f2
Update CHANGELOG and CMakeLists for 2.0.4 Release
mathomp4 Feb 17, 2022
36e7dc3
Make release version general
mathomp4 Feb 18, 2022
e874cdb
Back to unreleased
mathomp4 Feb 18, 2022
368d8ff
Merge pull request #105 from GEOS-ESM/bugfix/sdrabenh/fix_SU_regression
amdasilva Feb 18, 2022
b4f752f
Version for 2.0.4 release
mathomp4 Feb 18, 2022
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [2.0.4] - 2021-02-18

### Fixed

- Fix for layout regression failure (see Issue #103)

## [2.0.3] - 2021-02-14

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)

project (
GOCART
VERSION 2.0.3
VERSION 2.0.4
LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF

if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
Expand Down
8 changes: 4 additions & 4 deletions Process_Library/GOCART2G_Process.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6704,14 +6704,14 @@ subroutine SU_Wet_Removal ( km, nbins, klid, cdt, kin, grav, airMolWght, delp, f


! Adjust the flux out of the bottom of the layer--remove SO2 here!
DMS = max(DMS,tiny(1.0))
DMS(i,j,k) = max(DMS(i,j,k),tiny(1.0))
Fd(k,nDMS) = Fd(k,nDMS) - DC(nDMS)*pdog(i,j,k)
SO2 = max(SO2,tiny(1.0))
SO2(i,j,k) = max(SO2(i,j,k),tiny(1.0))
Fd(k,nSO2) = Fd(k,nSO2) - DC(nSO2)*pdog(i,j,k)
SO4 = max(SO4,tiny(1.0))
SO4(i,j,k) = max(SO4(i,j,k),tiny(1.0))
Fd(k,nSO4) = Fd(k,nSO4) - DC(nSO4)*pdog(i,j,k)
if (associated(MSA)) then
MSA = max(MSA,tiny(1.0))
MSA(i,j,k) = max(MSA(i,j,k),tiny(1.0))
Fd(k,nMSA) = Fd(k,nMSA) - DC(nMSA)*pdog(i,j,k)
end if
endif
Expand Down