Merge branch 'ufs/dev' into fix/stc_check

Author: ClaraDraper-NOAA

.gitmodules

@@ -6,3 +6,7 @@
   path = physics/MP/TEMPO/TEMPO
   url = https://github.com/NCAR/TEMPO
   branch = main
+[submodule "physics/SFC_Layer/MYNN/MYNN"]
+  path = physics/SFC_Layer/MYNN/MYNN
+  url = https://github.com/NCAR/MYNN-SFC
+  branch = main

CODEOWNERS

@@ -102,7 +102,7 @@ physics/SFC_Layer/GFDL/gfdl_sfc_layer.*                                      @Zh
 physics/SFC_Layer/GFDL/module_sf_exchcoef.f90                                @ZhanZhang-NOAA                           @grantfirl @rhaesung @Qingfu-Liu @dustinswales
 physics/SFC_Layer/MYJ/myjsfc_wrapper.*                                       @Qingfu-Liu                               @grantfirl @rhaesung @Qingfu-Liu @dustinswales
 physics/SFC_Layer/MYJ/module_SF_JSFC.F90                                     @Qingfu-Liu                               @grantfirl @rhaesung @Qingfu-Liu @dustinswales
-physics/SFC_Layer/MYNN/mynnsfc_wrapper.*                                     @joeolson42                               @grantfirl @rhaesung @Qingfu-Liu @dustinswales
+physics/SFC_Layer/MYNN/MYNN/module_sf_mynnsfc.*                              @joeolson42                               @grantfirl @rhaesung @Qingfu-Liu @dustinswales
 physics/SFC_Layer/MYNN/module_sf_mynn.F90                                    @joeolson42                               @grantfirl @rhaesung @Qingfu-Liu @dustinswales
 physics/SFC_Layer/UFS/date_def.f                                             @XuLi-NOAA                                @grantfirl @rhaesung @Qingfu-Liu @dustinswales
 physics/SFC_Layer/UFS/module_nst*                                            @XuLi-NOAA                                @grantfirl @rhaesung @Qingfu-Liu @dustinswales

physics/CONV/SAMF/samfdeepcnv.f

@@ -85,7 +85,8 @@ subroutine samfdeepcnv_run (im,km,first_time_step,restart,        &
      &    clam,c0s,c1,betal,betas,evef,pgcon,asolfac,cscale,            &
      &    do_ca, ca_closure, ca_entr, ca_trigger, nthresh,ca_deep,      &
      &    rainevap,sigmain,sigmaout,omegain,omegaout,betadcu,betamcu,   &
-     &    betascu,maxMF,do_mynnedmf,sigmab_coldstart,errmsg,errflg)
+     &    betascu,maxMF,do_mynnedmf,sigmab_coldstart,cat_adj_deep,      &
+     &    errmsg,errflg)
 
 !
       use machine , only : kind_phys
@@ -137,6 +138,7 @@ subroutine samfdeepcnv_run (im,km,first_time_step,restart,        &
       real(kind=kind_phys), intent(in) :: clam,  c0s,  c1,              &
      &                     betal,   betas,   asolfac,                   &
      &                     evef,  pgcon
+      real(kind_phys), intent(in) :: cat_adj_deep
       character(len=*), intent(out) :: errmsg
       integer,          intent(out) :: errflg
 !
@@ -2952,7 +2954,7 @@ subroutine samfdeepcnv_run (im,km,first_time_step,restart,        &
            umean(i) = max(umean(i), 1.)
            tauadv = gdx(i) / umean(i)
            advfac(i) = tauadv / dtconv(i)
-           advfac(i) = min(advfac(i), 1.)
+           advfac(i) = min(cat_adj_deep*advfac(i), 1.)
         endif
       enddo
 

physics/CONV/SAMF/samfdeepcnv.meta

@@ -762,6 +762,14 @@
   type = real
   kind = kind_phys
   intent = out
+[cat_adj_deep]
+  standard_name = adjustment_for_convective_advection_time_for_deep
+  long_name = adjustment for convective advection time for deep
+  units = none
+  dimensions = ()
+  type = real
+  kind = kind_phys
+  intent = in
 [errmsg]
   standard_name = ccpp_error_message
   long_name = error message for error handling in CCPP

physics/CONV/SAMF/samfshalcnv.f

@@ -59,7 +59,7 @@ subroutine samfshalcnv_run(im,km,itc,ntc,cliq,cp,cvap,            &
      &     dot,ncloud,hpbl,ud_mf,dt_mf,cnvw,cnvc,                       &
      &     clam,c0s,c1,evef,pgcon,asolfac,hwrf_samfshal,                & 
      &     sigmain,sigmaout,omegain,omegaout,betadcu,betamcu,betascu,   &
-     &     errmsg,errflg)
+     &     cat_adj_shal,errmsg,errflg)
 !
       use machine , only : kind_phys
       use funcphys , only : fpvs
@@ -98,8 +98,10 @@ subroutine samfshalcnv_run(im,km,itc,ntc,cliq,cp,cvap,            &
      &                     asolfac, evef, pgcon
       logical,          intent(in)  :: hwrf_samfshal,first_time_step,   &
      &     restart,progsigma,progomega
+      real(kind_phys), intent(in) :: cat_adj_shal
       character(len=*), intent(out) :: errmsg
       integer,          intent(out) :: errflg
+
 !
 !  local variables
       integer              i,j,indx, k, kk, km1, n
@@ -1992,7 +1994,7 @@ subroutine samfshalcnv_run(im,km,itc,ntc,cliq,cp,cvap,            &
            umean(i) = max(umean(i), 1.)
            tauadv = gdx(i) / umean(i)
            advfac(i) = tauadv / dtconv(i)
-           advfac(i) = min(advfac(i), 1.)
+           advfac(i) = min(cat_adj_shal*advfac(i), 1.)
         endif
       enddo
 c

physics/CONV/SAMF/samfshalcnv.meta

@@ -550,6 +550,14 @@
   dimensions = ()
   type = real
   intent = in
+[cat_adj_shal]
+  standard_name = adjustment_for_convective_advection_time_for_shallow
+  long_name = adjustment for convective advection time for shallow
+  units = none
+  dimensions = ()
+  type = real
+  kind = kind_phys
+  intent = in
 [errmsg]
   standard_name = ccpp_error_message
   long_name = error message for error handling in CCPP

physics/GWD/drag_suite.F90

@@ -1119,8 +1119,8 @@ subroutine drag_suite_run(                                           &
             ! wind direction (similar to above)
             dtfac_meso = 1.0
             if (prsl(i,k).le.plolevmeso) then
-               if (taud_ms(i,k).ne.0.)                                  &
-                  dtfac_meso = min(dtfac_meso,facmeso*abs(velco(i,k)    &
+               if (taud_ms(i,k).ne.0.)                                          &
+                  dtfac_meso = min(dtfac_meso,facmeso*abs(velco(i,min(k,km-1))  &
                      /(deltim*rcs*taud_ms(i,k))))
             end if
 
@@ -1674,10 +1674,9 @@ subroutine drag_suite_psl(                                           &
    real(kind=kind_phys), parameter       ::  hmt_min = 50.
    real(kind=kind_phys), parameter       ::  oc_min  = 1.0
    real(kind=kind_phys), parameter       ::  oc_max  = 10.0
-! 7.5 mb -- 33 km ... 0.01 kgm-3 reduce gwd drag above cutoff level
-   real(kind=kind_phys), parameter       ::  pcutoff  = 7.5e2  
-! 0.76 mb -- 50 km ...0.001 kgm-3  --- 0.1 mb 65 km 0.0001 kgm-3
-   real(kind=kind_phys), parameter       ::  pcutoff_den  = 0.01  !  
+   real(kind=kind_phys), parameter       ::  sgmalolev  = 0.5  ! max sigma lvl for dtfac
+   real(kind=kind_phys), parameter       ::  plolevmeso = 70.0 ! pres lvl for mesosphere OGWD reduction (Pa)
+   real(kind=kind_phys), parameter       ::  facmeso    = 0.5  ! fractional velocity reduction for OGWD
 
    integer,parameter    ::  kpblmin = 2
 
@@ -1691,8 +1690,7 @@ subroutine drag_suite_psl(                                           &
                             rcsks,wdir,ti,rdz,tem2,dw2,shr2,      &
                             bvf2,rdelks,wtkbj,tem,gfobnv,hd,fro,  &
                             rim,temc,tem1,efact,temv,dtaux,dtauy, &
-                            dtauxb,dtauyb,eng0,eng1
-   real(kind=kind_phys) ::  denfac
+                            dtauxb,dtauyb,eng0,eng1,dtfac_meso
 !
    logical              ::  ldrag(im),icrilv(im),                 &
                             flag(im)
@@ -1706,7 +1704,7 @@ subroutine drag_suite_psl(                                           &
                             rulow(im),bnv(im),                    &
                             oa(im),ol(im),oc(im),                 &
                             oass(im),olss(im),                    &
-                            roll(im),dtfac(im,km),                   &
+                            roll(im),dtfac(im),                   &
                             brvf(im),xlinv(im),                   &
                             delks(im),delks1(im),                 &
                             bnv2(im,km),usqj(im,km),              &
@@ -1776,7 +1774,6 @@ subroutine drag_suite_psl(                                           &
    fdir   = mdir / (2.0*pi)
    invgrcs = 1._kind_phys/g*rcs
    kpblmax = km / 2 ! maximum pbl height : # of vertical levels / 2
-   denfac = 1.0
 
    do i=1,im
       if (slmsk(i)==1. .or. slmsk(i)==2.) then !sea/land/ice mask (=0/1/2) in FV3
@@ -1861,6 +1858,7 @@ subroutine drag_suite_psl(                                           &
      oass(i)       = 0.0
      olss(i)       = 0.0
      ulow (i)      = 0.0
+     dtfac(i)      = 1.0
      rstoch(i)     = 0.0
      ldrag(i)      = .false.
      icrilv(i)     = .false.
@@ -1877,7 +1875,6 @@ subroutine drag_suite_psl(                                           &
        taud_bl(i,k) = 0.0
        dtaux2d(i,k) = 0.0
        dtauy2d(i,k) = 0.0
-       dtfac(i,k)   = 1.0
      enddo
    enddo
 !
@@ -2536,30 +2533,38 @@ subroutine drag_suite_psl(                                           &
             taud_bl(i,klcap) = taud_bl(i,klcap) * factop
          enddo
 !
-!  if the gravity wave drag would force a critical line
-!  in the lower ksmm1 layers during the next deltim timestep,
-!  then only apply drag until that critical line is reached.
+!  if the gravity wave drag + blocking would force a critical line
+!  in the layers below pressure-based 'sigma' level = sgmalolev during the next deltim
+!  timestep, then only apply drag until that critical line is reached, i.e.,
+!  reduce drag to limit resulting wind components to zero
+!  Note: 'sigma' = prsi(k)/prsi(k=1), where prsi(k=1) is the surface pressure
 !
          do k = kts,kpblmax-1
-           if ((taud_ls(i,k)+taud_bl(i,k)).ne.0.)                  then
-               dtfac(i,k) = min(dtfac(i,k),abs(velco(i,k)                 &
-                       /(deltim*rcs*(taud_ls(i,k)+taud_bl(i,k)))))
-           endif
-         enddo
-! apply limiter to mesosphere drag, reduce the drag by density factor 10-3
-! prevent wind reversal...
-!
-         do k = kpblmax,km-1
-           if ((taud_ls(i,k)+taud_bl(i,k)).ne.0..and.prsl(i,k).le.pcutoff) then
-               denfac = min(ro(i,k)/pcutoff_den,1.)
-               dtfac(i,k) = min(dtfac(i,k),denfac*abs(velco(i,k)          &
+            if (prsi(i,k).ge.sgmalolev*prsi(i,1)) then 
+               if ((taud_ls(i,k)+taud_bl(i,k)).ne.0.)                   &
+                  dtfac(i) = min(dtfac(i),abs(velco(i,k)                &
                        /(deltim*rcs*(taud_ls(i,k)+taud_bl(i,k)))))
-           endif
+            else
+               exit
+            endif
          enddo
 !
          do k = kts,km
-            taud_ls(i,k)  = taud_ls(i,k)*dtfac(i,k)* ls_taper(i) *(1.-rstoch(i))
-            taud_bl(i,k)  = taud_bl(i,k)*dtfac(i,k)* ls_taper(i) *(1.-rstoch(i))
+
+            ! Check if well into mesosphere -- if so, perform similar reduction of
+            ! velocity tendency due to mesoscale GWD to prevent sudden reversal of
+            ! wind direction (similar to above)
+            dtfac_meso = 1.0
+            if (prsl(i,k).le.plolevmeso) then 
+               if (taud_ls(i,k).ne.0.)                                          &
+                  dtfac_meso = min(dtfac_meso,facmeso*abs(velco(i,min(k,km-1))  &
+                     /(deltim*rcs*taud_ls(i,k))))
+            end if
+
+            taud_ls(i,k)  = taud_ls(i,k)*dtfac(i)*dtfac_meso*           &    
+                               ls_taper(i) *(1.-rstoch(i))
+            taud_bl(i,k)  = taud_bl(i,k)*dtfac(i)* ls_taper(i) *(1.-rstoch(i))
+
             dtaux  = taud_ls(i,k) * xn(i)
             dtauy  = taud_ls(i,k) * yn(i)
             dtauxb = taud_bl(i,k) * xn(i)

physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_post.F90

@@ -23,8 +23,8 @@ module GFS_surface_composites_post
 !! \htmlinclude GFS_surface_composites_post_run.html
 !!
    subroutine GFS_surface_composites_post_run (                                                                                   &
-      im, kice, km, rd, rvrdm1, cplflx, cplwav2atm, cpl_fire, frac_grid, flag_cice, thsfc_loc, islmsk, dry, wet, icy, wind, t1, q1, prsl1,  &
-      landfrac, lakefrac, oceanfrac, zorl, zorlo, zorll, zorli, garea, frac_ice,                                                  &
+      im, kice, km, rd, rvrdm1, cplflx, cplwav2atm, cpl_fire, frac_grid, flag_cice, thsfc_loc, islmsk, dry, wet, icy,             &
+      use_cdeps_data, mask_dat, wind, t1, q1, prsl1, landfrac, lakefrac, oceanfrac, zorl, zorlo, zorll, zorli, garea, frac_ice,   &
       cd, cd_wat, cd_lnd, cd_ice, cdq, cdq_wat, cdq_lnd, cdq_ice, rb, rb_wat, rb_lnd, rb_ice, stress, stress_wat, stress_lnd,     &
       stress_ice, ffmm, ffmm_wat, ffmm_lnd, ffmm_ice, ffhh, ffhh_wat, ffhh_lnd, ffhh_ice, uustar, uustar_wat, uustar_lnd,         &
       uustar_ice, fm10, fm10_wat, fm10_lnd, fm10_ice, fh2, fh2_wat, fh2_lnd, fh2_ice, tsurf_wat, tsurf_lnd, tsurf_ice,            &
@@ -39,7 +39,7 @@ subroutine GFS_surface_composites_post_run (
 
       integer,                              intent(in) :: im, kice, km, lkm, iopt_lake, iopt_lake_clm
       logical,                              intent(in) :: cplflx, frac_grid, cplwav2atm, frac_ice, cpl_fire
-      logical,                              intent(in) :: lheatstrg
+      logical,                              intent(in) :: lheatstrg, use_cdeps_data
       logical, dimension(:),                intent(in) :: flag_cice, dry, icy
       logical, dimension(:),                intent(in) :: wet
       integer, dimension(:),                intent(in) :: islmsk, use_lake_model
@@ -51,7 +51,7 @@ subroutine GFS_surface_composites_post_run (
         snowd_lnd, snowd_ice, tprcp_wat, tprcp_lnd, tprcp_ice, evap_wat, evap_lnd, evap_ice, hflx_wat, hflx_lnd,                &
         hflx_ice, qss_wat, qss_lnd, qss_ice, tsfc_wat, zorlo, zorll, zorli, garea
 
-      real(kind=kind_phys), dimension(:),   intent(in), optional :: hflx_fire, evap_fire
+      real(kind=kind_phys), dimension(:),   intent(in), optional :: hflx_fire, evap_fire, mask_dat
       real(kind=kind_phys), dimension(:),   intent(inout) :: zorl, cd, cdq, rb, stress, ffmm, ffhh, uustar, fm10,               &
         fh2, cmm, chh, gflx, ep1d, weasd, snowd, tprcp, evap, hflx, qss, tsfc, tsfco, tsfcl, tisfc
 
@@ -240,7 +240,14 @@ subroutine GFS_surface_composites_post_run (
           if (icy(i)) then
             !tisfc(i) = tisfc(i)           ! over lake or ocean ice when uncoupled
           elseif (wet(i)) then
-            tisfc(i) = tsfc_wat(i)       ! over lake or ocean when uncoupled
+            !don't overwrite surface skin temperature over ice when using CDEPS inline over the mask
+            if (use_cdeps_data) then
+              if (mask_dat(i) <= 0.0) then
+                tisfc(i) = tsfc_wat(i)       ! over lake or ocean when uncoupled
+              endif
+            else
+              tisfc(i) = tsfc_wat(i)       ! over lake or ocean when uncoupled
+            endif
           else
             tisfc(i) = tsfcl(i)       ! over land
           endif
@@ -256,9 +263,18 @@ subroutine GFS_surface_composites_post_run (
 !             tisfc(i) = tsfc(i)
 !           endif
 !         endif
+          
           if (.not. icy(i)) then
-            hice(i)  = zero
-            cice(i)  = zero
+            !don't overwrite sea ice thickness/fraction when using CDEPS inline over the mask
+            if (use_cdeps_data) then
+              if (mask_dat(i) <= 0.0) then
+                hice(i)  = zero
+                cice(i)  = zero
+              endif
+            else
+              hice(i)  = zero
+              cice(i)  = zero
+            endif
           endif
         enddo
 
@@ -339,7 +355,14 @@ subroutine composite_wet
             tsfco(i)  = tsfc_wat(i) ! over lake (and ocean when uncoupled)
             tsfc(i)   = tsfco(i)
             tsfcl(i)  = tsfc(i)
-            tisfc(i)  = tsfc(i)
+            !don't overwrite surface skin temperature over ice when using CDEPS inline over the mask
+            if (use_cdeps_data) then
+              if (mask_dat(i) <= 0.0) then
+                tisfc(i)  = tsfc(i)
+              endif
+            else
+              tisfc(i)  = tsfc(i)
+            endif
             cmm(i)    = cmm_wat(i)
             chh(i)    = chh_wat(i)
             gflx(i)   = gflx_wat(i)
@@ -349,8 +372,16 @@ subroutine composite_wet
             evap(i)   = evap_wat(i)
             hflx(i)   = hflx_wat(i)
             qss(i)    = qss_wat(i)
-            hice(i)   = zero
-            cice(i)   = zero
+            !don't overwrite sea ice thickness/fraction when using CDEPS inline over the mask
+            if (use_cdeps_data) then
+              if (mask_dat(i) <= 0.0) then
+                hice(i)  = zero
+                cice(i)  = zero
+              endif
+            else
+              hice(i)  = zero
+              cice(i)  = zero
+            endif
      end subroutine composite_wet
 
      subroutine composite_icy(is_clm)

physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_post.meta

@@ -144,6 +144,22 @@
   dimensions = (horizontal_loop_extent)
   type = logical
   intent = in
+[use_cdeps_data]
+  standard_name = do_cdeps_inline
+  long_name = flag for using data provided by CDEPS inline (default false)
+  units = flag
+  dimensions = ()
+  type = logical
+  intent = in
+[mask_dat]
+  standard_name = land_sea_mask_from_data
+  long_name = landmask
+  units = flag
+  dimensions = (horizontal_loop_extent)
+  type = real
+  kind = kind_phys
+  intent = in
+  optional = True
 [wind]
   standard_name = wind_speed_at_lowest_model_layer
   long_name = wind speed at lowest model level