Merge pull request #642 from GEOS-ESM/develop

Sync develop into main
GEOS-ESM · Sep 12, 2022 · b6730bf · b6730bf
2 parents affeb4e + de791ee
commit b6730bf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90
@@ -8504,16 +8504,16 @@ subroutine MOIST_DRIVER(IM,JM,LM, RC)
                END SELECT
 
                SELECT CASE (QNAME(1:13))
-               CASE ('CAphilicCA.bc')
+               CASE ('CA.bcphilic')
                   if(associated(DBC2gDT)) then
                      CMBC2g = CMBC2g + sum(XHO(:,:,:,KK)*DP(:,:,:),dim=3)
                   end if
 !               CASE ('OCp')
-               CASE ('CAphilicCA.oc')
+               CASE ('CA.ocphilic')
                   if(associated(DOC2gDT)) then
                      CMOC2g = CMOC2g + sum(XHO(:,:,:,KK)*DP(:,:,:),dim=3)
                   end if
-               CASE ('CAphilicCA.br')
+               CASE ('CA.brphilic')
                   if(associated(DBRC2gDT)) then
                      CMBRC2g = CMBRC2g + sum(XHO(:,:,:,KK)*DP(:,:,:),dim=3)
                   end if
@@ -9051,16 +9051,16 @@ subroutine MOIST_DRIVER(IM,JM,LM, RC)
                END SELECT
 
                SELECT CASE (QNAME(1:13))
-               CASE ('CAphilicCA.bc')
+               CASE ('CA.bcphilic')
                   if(associated(DBC2gDT)) then
                      DBC2gDT = DBC2gDT + sum(XHO(:,:,:,KK)*DP(:,:,:),dim=3)
                   end if
 !               CASE ('OCp')
-               CASE ('CAphilicCA.oc')
+               CASE ('CA.ocphilic')
                   if(associated(DOC2gDT)) then
                      DOC2gDT = DOC2gDT + sum(XHO(:,:,:,KK)*DP(:,:,:),dim=3)
                   end if
-               CASE ('CAphilicCA.br')
+               CASE ('CA.brphilic')
                   if(associated(DBRC2gDT)) then
                      DBRC2gDT = DBRC2gDT + sum(XHO(:,:,:,KK)*DP(:,:,:),dim=3)
                   end if

diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSturbulence_GridComp/GEOS_TurbulenceGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSturbulence_GridComp/GEOS_TurbulenceGridComp.F90
@@ -4277,14 +4277,15 @@ subroutine REFRESH(IM,JM,LM,RC)
           TKE(:,:,0) = 1e-6
           TKE(:,:,LM) = 1e-6
         else
-          TKE = MAPL_UNDEF
+          TKE = 1e-6 ! https://github.com/GEOS-ESM/GEOSgcm_GridComp/issues/594#issuecomment-1171360993
           do L = 1,LM-1
             TKE(:,:,L) = ( LAMBDADISS * &
             ( -1.*(KH(:,:,L)*MAPL_GRAV/((THV(:,:,L) + THV(:,:,L+1))*0.5) *  ((THV(:,:,L) - THV(:,:,L+1))/(Z(:,:,L) - Z(:,:,L+1)))) +  &
             (KM(:,:,L)*((U(:,:,L) - U(:,:,L+1))/(Z(:,:,L) - Z(:,:,L+1)))*((U(:,:,L) - U(:,:,L+1))/(Z(:,:,L) - Z(:,:,L+1))))  +  &
             (KM(:,:,L)*((V(:,:,L) - V(:,:,L+1))/(Z(:,:,L) - Z(:,:,L+1)))*((V(:,:,L) - V(:,:,L+1))/(Z(:,:,L) - Z(:,:,L+1)))) )) ** 2
             TKE(:,:,L) = TKE(:,:,L) ** (1./3.)
           enddo
+          TKE = max(1e-6, TKE) ! https://github.com/GEOS-ESM/GEOSgcm_GridComp/issues/594#issuecomment-1171360993
 
           ! If not running SHOC, estimate ISOTROPY from KH and TKE,
           ! based on Eq. 7 from Bogenschutz and Krueger (2013).