Update gsl/develop from master 2021/03/31

CODEOWNERS

@@ -3,7 +3,7 @@
 
 # These owners will be the default owners for everything in the repo.
 #*       @defunkt
-*       @DomHeinzeller
+*       @climbfuji @llpcarson @grantfirl @JulieSchramm
 
 # Order is important. The last matching pattern has the most precedence.
 # So if a pull request only touches javascript files, only these owners

physics/GFS_DCNV_generic.F90

@@ -169,10 +169,10 @@ subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, qdiag3d, ras, cs
               dt3dt(i,k) = dt3dt(i,k) + (gt0(i,k)-save_t(i,k)) * frain
               du3dt(i,k) = du3dt(i,k) + (gu0(i,k)-save_u(i,k)) * frain
               dv3dt(i,k) = dv3dt(i,k) + (gv0(i,k)-save_v(i,k)) * frain
-
-!             upd_mf(i,k)  = upd_mf(i,k)  + ud_mf(i,k) * (con_g*frain)
-!             dwn_mf(i,k)  = dwn_mf(i,k)  + dd_mf(i,k) * (con_g*frain)
-!             det_mf(i,k)  = det_mf(i,k)  + dt_mf(i,k) * (con_g*frain)
+              ! convective mass fluxes
+              upd_mf(i,k)  = upd_mf(i,k)  + ud_mf(i,k) * (con_g*frain)
+              dwn_mf(i,k)  = dwn_mf(i,k)  + dd_mf(i,k) * (con_g*frain)
+              det_mf(i,k)  = det_mf(i,k)  + dt_mf(i,k) * (con_g*frain)
             enddo
           enddo
           if(qdiag3d) then

physics/GFS_MP_generic.F90

@@ -89,7 +89,7 @@ subroutine GFS_MP_generic_post_run(im, levs, kdt, nrcm, ncld, nncl, ntcw, ntrac,
         rann, xlat, xlon, gt0, gq0, prsl, prsi, phii, tsfc, ice, snow, graupel, save_t, save_qv, rain0, ice0, snow0,      &
         graupel0, del, rain, domr_diag, domzr_diag, domip_diag, doms_diag, tprcp, srflag, sr, cnvprcp, totprcp, totice,   &
         totsnw, totgrp, cnvprcpb, totprcpb, toticeb, totsnwb, totgrpb, dt3dt, dq3dt, rain_cpl, rainc_cpl, snow_cpl, pwat, &
-        do_sppt, ca_global, dtdtr, dtdtc, drain_cpl, dsnow_cpl, lsm, lsm_ruc, lsm_noahmp, raincprv, rainncprv, iceprv, snowprv,      &
+        drain_cpl, dsnow_cpl, lsm, lsm_ruc, lsm_noahmp, raincprv, rainncprv, iceprv, snowprv,                             &
         graupelprv, draincprv, drainncprv, diceprv, dsnowprv, dgraupelprv, dtp, errmsg, errflg)
 !
       use machine, only: kind_phys
@@ -119,9 +119,6 @@ subroutine GFS_MP_generic_post_run(im, levs, kdt, nrcm, ncld, nncl, ntcw, ntrac,
       real(kind=kind_phys), dimension(:,:),     intent(inout) :: dq3dt ! only if ldiag3d and qdiag3d
 
       ! Stochastic physics / surface perturbations
-      logical, intent(in) :: do_sppt, ca_global
-      real(kind=kind_phys), dimension(im,levs), intent(inout) :: dtdtr
-      real(kind=kind_phys), dimension(im,levs), intent(in)    :: dtdtc
       real(kind=kind_phys), dimension(im),      intent(inout) :: drain_cpl
       real(kind=kind_phys), dimension(im),      intent(inout) :: dsnow_cpl
 
@@ -391,11 +388,6 @@ subroutine GFS_MP_generic_post_run(im, levs, kdt, nrcm, ncld, nncl, ntcw, ntrac,
         pwat(i) = pwat(i) * onebg
       enddo
 
-      ! Stochastic physics / surface perturbations
-      if (do_sppt .or. ca_global) then
-!--- radiation heating rate
-        dtdtr(1:im,:) = dtdtr(1:im,:) + dtdtc(1:im,:)*dtf
-      endif
 
       end subroutine GFS_MP_generic_post_run
 !> @}

physics/GFS_MP_generic.meta

@@ -728,40 +728,6 @@
   kind = kind_phys
   intent = inout
   optional = F
-[do_sppt]
-  standard_name = flag_for_stochastic_physics_perturbations
-  long_name = flag for stochastic physics perturbations
-  units = flag
-  dimensions = ()
-  type = logical
-  intent = in
-  optional = F
-[ca_global]
-  standard_name = flag_for_global_cellular_automata
-  long_name = switch for global ca
-  units = flag
-  dimensions = ()
-  type = logical
-  intent = in
-  optional = F
-[dtdtr]
-  standard_name = tendency_of_air_temperature_due_to_radiative_heating_on_physics_time_step
-  long_name = temp. change due to radiative heating per time step
-  units = K
-  dimensions = (horizontal_loop_extent,vertical_dimension)
-  type = real
-  kind = kind_phys
-  intent = inout
-  optional = F
-[dtdtc]
-  standard_name = tendency_of_air_temperature_due_to_radiative_heating_assuming_clear_sky
-  long_name = clear sky radiative (shortwave + longwave) heating rate at current time
-  units = K s-1
-  dimensions = (horizontal_loop_extent,vertical_dimension)
-  type = real
-  kind = kind_phys
-  intent = in
-  optional = F
 [drain_cpl]
   standard_name = tendency_of_lwe_thickness_of_precipitation_amount_for_coupling
   long_name = change in rain_cpl (coupling_type)

physics/GFS_debug.F90

@@ -535,7 +535,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
                      call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Tbd%acvt'            , Tbd%acvt)
                      call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Tbd%hpbl'            , Tbd%hpbl)
                      if (Model%do_sppt) then
-                       call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Tbd%dtdtr'         , Tbd%dtdtr)
+                       call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Tbd%dtdtnp'        , Tbd%dtdtnp)
                        call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Tbd%dtotprcp'      , Tbd%dtotprcp)
                        call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Tbd%dcnvprcp'      , Tbd%dcnvprcp)
                      end if

physics/GFS_phys_time_vary.fv3.F90

@@ -22,7 +22,7 @@ module GFS_phys_time_vary
       use h2ointerp, only : read_h2odata, setindxh2o, h2ointerpol
 
       use aerclm_def, only : aerin, aer_pres, ntrcaer, ntrcaerm
-      use aerinterp,  only : read_aerdata, setindxaer, aerinterpol
+      use aerinterp,  only : read_aerdata, setindxaer, aerinterpol, read_aerdataf
 
       use iccn_def,   only : ciplin, ccnin, ci_pres
       use iccninterp, only : read_cidata, setindxci, ciinterpol
@@ -166,7 +166,7 @@ subroutine GFS_phys_time_vary_init (
          integer,              intent(out)   :: errflg
 
          ! Local variables
-         integer :: i, j, ix, vegtyp
+         integer :: i, j, ix, vegtyp, iamin, iamax, jamin, jamax
          real(kind_phys) :: rsnow
 
          !--- Noah MP
@@ -182,12 +182,17 @@ subroutine GFS_phys_time_vary_init (
          errflg = 0
 
          if (is_initialized) return
+         iamin=999
+         iamax=-999
+         jamin=999
+         jamax=-999
 
 !$OMP parallel num_threads(nthrds) default(none)                                    &
 !$OMP          shared (me,master,ntoz,h2o_phys,im,nx,ny,idate)                      &
 !$OMP          shared (xlat_d,xlon_d,imap,jmap,errmsg,errflg)                       &
 !$OMP          shared (levozp,oz_coeff,oz_pres,ozpl)                                &
 !$OMP          shared (levh2o,h2o_coeff,h2o_pres,h2opl)                             &
+!$OMP          shared (iamin, iamax, jamin, jamax)                                  &
 !$OMP          shared (iaerclm,ntrcaer,aer_nm,iflip,iccn)                           &
 !$OMP          shared (jindx1_o3,jindx2_o3,ddy_o3,jindx1_h,jindx2_h,ddy_h)          &
 !$OMP          shared (jindx1_aer,jindx2_aer,ddy_aer,iindx1_aer,iindx2_aer,ddx_aer) &
@@ -300,16 +305,20 @@ subroutine GFS_phys_time_vary_init (
            call setindxh2o (im, xlat_d, jindx1_h, jindx2_h, ddy_h)
          endif
 
-!$OMP section
 !> - Call setindxaer() to initialize aerosols data
+!$OMP section
          if (iaerclm) then
            call setindxaer (im, xlat_d, jindx1_aer,          &
                             jindx2_aer, ddy_aer, xlon_d,     &
                             iindx1_aer, iindx2_aer, ddx_aer, &
                             me, master)
+           iamin=min(minval(iindx1_aer), iamin)
+           iamax=max(maxval(iindx2_aer), iamax)
+           jamin=min(minval(jindx1_aer), jamin)
+           jamax=max(maxval(jindx2_aer), jamax)
          endif
-
 !$OMP section
+
 !> - Call setindxci() to initialize IN and CCN data
          if (iccn == 1) then
            call setindxci (im, xlat_d, jindx1_ci,      &
@@ -367,6 +376,10 @@ subroutine GFS_phys_time_vary_init (
 !$OMP end sections
 
 !$OMP end parallel
+         if (iaerclm) then
+           call read_aerdataf (iamin, iamax, jamin, jamax, me,master,iflip,            &
+                              idate,errmsg,errflg)
+         endif
 
          if (lsm == lsm_noahmp) then
            if (all(tvxy < zero)) then
@@ -433,9 +446,6 @@ subroutine GFS_phys_time_vary_init (
 
                  eahxy(ix)    = 2000.0_kind_phys
 
-!                 eahxy = psfc*qv/(0.622+qv); qv is mixing ratio, converted from sepcific
-!                 humidity specific humidity /(1.0 - specific humidity)
-
                  cmxy(ix)     = zero
                  chxy(ix)     = zero
                  fwetxy(ix)   = zero
@@ -804,10 +814,10 @@ subroutine GFS_phys_time_vary_timestep_init (
 
 !> - Call ciinterpol() to make IN and CCN data interpolation
          if (iccn == 1) then
-           call ciinterpol (me, im, idate, fhour,    &
-                            jindx1_ci, jindx2_ci,    &
-                            ddy_ci, iindx1_ci,       &
-                            iindx2_ci, ddx_ci,       &
+           call ciinterpol (me, im, idate, fhour,     &
+                            jindx1_ci, jindx2_ci,     &
+                            ddy_ci, iindx1_ci,        &
+                            iindx2_ci, ddx_ci,        &
                             levs, prsl, in_nm, ccn_nm)
          endif