Merge pull request #885 from GEOS-ESM/develop

Sync develop into main

Author: mathomp4

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOS_PhysicsGridComp.F90

@@ -1046,12 +1046,13 @@ subroutine SetServices ( GC, RC )
                                                         RC=STATUS  )
     VERIFY_(STATUS)
 
-    call MAPL_AddConnectivity ( GC,                                &
-         SHORT_NAME  = (/'QV    ','QLTOT ','QITOT ','QCTOT ',      &
-                         'WTHV2 ','WQT_DC'                   /),   &
-         DST_ID      = TURBL,                                      &
-         SRC_ID      = MOIST,                                      &
-                                                        RC=STATUS  )
+    call MAPL_AddConnectivity ( GC,                   &
+         SHORT_NAME  = [character(len=6) ::           &
+                         'QV','QLTOT','QITOT','FCLD', &
+                         'WTHV2','WQT_DC'],           &
+         DST_ID      = TURBL,                         &
+         SRC_ID      = MOIST,                         &
+                                           RC=STATUS  )
      VERIFY_(STATUS)
 
      call MAPL_AddConnectivity ( GC,                               &
@@ -1179,11 +1180,11 @@ subroutine SetServices ( GC, RC )
 
 ! Imports for GWD
 !----------------
-    call MAPL_AddConnectivity ( GC,                                    &
-         SHORT_NAME  = [character(len=7):: 'Q', 'DTDT_DC', 'DTDT_SC'], &
-         DST_ID      = GWD,                                            &
-         SRC_ID      = MOIST,                                          &
-                                                        RC=STATUS      )
+    call MAPL_AddConnectivity ( GC,                                      &
+         SHORT_NAME  = [character(len=7) :: 'Q', 'DTDT_DC', 'CNV_FRC' ], &
+         DST_ID      = GWD,                                              &
+         SRC_ID      = MOIST,                                            &
+                                                        RC=STATUS        )
     VERIFY_(STATUS)
     call MAPL_AddConnectivity ( GC,                                      &
          SRC_NAME    = 'DQIDT_micro',                                    &
@@ -1212,7 +1213,8 @@ subroutine SetServices ( GC, RC )
                          'REV_LS  ',  'REV_AN  ', 'REV_CN  ', 'TPREC   ', &
                          'Q       ',  'DQDT    ', 'DQRL    ', 'DQRC    ', &
                          'CNV_MFC ',  'CNV_MFD ', 'CNV_CVW ', 'CNV_FRC ', &
-                         'LFR_GCC ',  'RH2     ', 'CN_PRCP ' /),          &
+                         'LFR_GCC ',  'RH2     ', 'CN_PRCP ',             &
+                         'BYNCY   ',  'CAPE    ', 'INHB    ' /),          &
         DST_ID      = CHEM,                                               &
         SRC_ID      = MOIST,                                              &
                                                        RC=STATUS  )

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/GEOS_GwdGridComp.F90

@@ -881,7 +881,7 @@ end subroutine energy_fixer
 
 subroutine energy_momentum_adjust(ncol, pver, band, pint, delp, u, v, dt, c, tau, &
                                effgw, t, ubm, ubi, xv, yv, utgw, vtgw, ttgw, &
-                               tend_level, tndmax_in)
+                               tend_level, tndmax_in, pint_adj)
 
   integer, intent(in) :: ncol, pver
   ! Wavelengths.
@@ -913,6 +913,8 @@ subroutine energy_momentum_adjust(ncol, pver, band, pint, delp, u, v, dt, c, tau
   real, intent(inout) :: utgw(ncol,pver)
   real, intent(inout) :: vtgw(ncol,pver)
   real, intent(inout) :: ttgw(ncol,pver)
+  ! Pressure level efficiency adjustment
+  real, intent(in), optional :: pint_adj(ncol,pver+1)
 
   real :: taucd(ncol,pver+1,4)
   real :: um_flux(ncol), vm_flux(ncol)
@@ -938,16 +940,25 @@ subroutine energy_momentum_adjust(ncol, pver, band, pint, delp, u, v, dt, c, tau
    !---------------------------------------------------------------------------------------
    ! Apply efficiency factor and tendency limiter to prevent unrealistically strong forcing
    !---------------------------------------------------------------------------------------
+    ! efficiency factor and optional pressure adjustment
+    do k = ktop, pver
+                              utfac = 1.0 
+       if (present(pint_adj)) utfac = pint_adj(i,k) 
+       utgw(i,k) = utgw(i,k)*effgw(i)*utfac
+       vtgw(i,k) = vtgw(i,k)*effgw(i)*utfac
+       ttgw(i,k) = ttgw(i,k)*effgw(i)*utfac
+    end do
+    ! tendency limiter
     uhtmax = 0.0
-    utfac  = 1.0
     do k = ktop, pver
        uhtmax = max(sqrt(utgw(i,k)**2 + vtgw(i,k)**2), uhtmax)
     end do
+                         utfac  = 1.0
     if (uhtmax > tndmax) utfac = tndmax/uhtmax
     do k = ktop, pver
-       utgw(i,k) = utgw(i,k)*effgw(i)*utfac
-       vtgw(i,k) = vtgw(i,k)*effgw(i)*utfac
-       ttgw(i,k) = ttgw(i,k)*effgw(i)*utfac
+       utgw(i,k) = utgw(i,k)*utfac
+       vtgw(i,k) = vtgw(i,k)*utfac
+       ttgw(i,k) = ttgw(i,k)*utfac
     end do
   end do  ! i=1,ncol