Merge pull request #107 from GEOS-ESM/develop

Sync develop into main preparing for v2.0.4

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

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}")

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