From 5ef5fed57543d6eae566ed95aa22ac29e1a8307e Mon Sep 17 00:00:00 2001 From: sanAkel Date: Fri, 1 Jul 2022 15:24:15 -0400 Subject: [PATCH 1/2] Suggested _fix_ from @narnold1 seem to fix the debug build. --- .../GEOSturbulence_GridComp/GEOS_TurbulenceGridComp.F90 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSturbulence_GridComp/GEOS_TurbulenceGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSturbulence_GridComp/GEOS_TurbulenceGridComp.F90 index f910cb3e8..8e5d5229b 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSturbulence_GridComp/GEOS_TurbulenceGridComp.F90 +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSturbulence_GridComp/GEOS_TurbulenceGridComp.F90 @@ -4277,7 +4277,7 @@ 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)))) + & @@ -4285,6 +4285,7 @@ subroutine REFRESH(IM,JM,LM,RC) (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). From f167e43aafc8657311221366cd030905a66073f4 Mon Sep 17 00:00:00 2001 From: vbuchard Date: Wed, 24 Aug 2022 09:02:13 -0400 Subject: [PATCH 2/2] vb:updated carbonaceous variable names --- .../GEOSmoist_GridComp/GEOS_MoistGridComp.F90 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90 index 9f3c5a755..3b38e7a59 100644 --- 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