From 2ec5dfadd008e82696178751f7b720e15e689e99 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Thu, 17 Feb 2022 15:20:51 -0500 Subject: [PATCH 1/5] fix incorrect max calculation --- Process_Library/GOCART2G_Process.F90 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Process_Library/GOCART2G_Process.F90 b/Process_Library/GOCART2G_Process.F90 index 9c95f69b..fb10dc2b 100644 --- a/Process_Library/GOCART2G_Process.F90 +++ b/Process_Library/GOCART2G_Process.F90 @@ -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 From 28743f29a979bdd01d9faf2219ed88ce96615dc3 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 17 Feb 2022 15:55:14 -0500 Subject: [PATCH 2/5] Update CHANGELOG and CMakeLists for 2.0.4 Release --- CHANGELOG.md | 6 ++++++ CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d0a3a09..f65cba46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 27903f75..f083999d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}") From 36e7dc3cd463e2509913eda44f3fad20cf525443 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 18 Feb 2022 12:29:36 -0500 Subject: [PATCH 3/5] Make release version general --- CHANGELOG.md | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f65cba46..b682e945 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [2.0.4] - 2021-02-18 +## [2.X.Y] - 2021-02-DD ### Fixed diff --git a/CMakeLists.txt b/CMakeLists.txt index f083999d..27903f75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW) project ( GOCART - VERSION 2.0.4 + VERSION 2.0.3 LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}") From e874cdb7c9e5804b245ab6247bc2de805f51bcee Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 18 Feb 2022 12:30:21 -0500 Subject: [PATCH 4/5] Back to unreleased --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b682e945..43161bda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [2.X.Y] - 2021-02-DD - ### Fixed - Fix for layout regression failure (see Issue #103) From b4f752f81d601fb6c2ed8fe131301d47b2a1bdee Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 18 Feb 2022 14:31:26 -0500 Subject: [PATCH 5/5] Version for 2.0.4 release --- CHANGELOG.md | 2 ++ CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43161bda..f65cba46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ 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) diff --git a/CMakeLists.txt b/CMakeLists.txt index 27903f75..f083999d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}")