Merge branch 'ufs/dev' into feature/tendency_cleanup

Author: grantfirl

.github/workflows/ci_fv3_ccpp_prebuild.yml

@@ -54,4 +54,4 @@ jobs:
       run: |
         cd /home/runner/work/ccpp-physics/ccpp-physics/fv3atm/ccpp/
         mkdir -p /home/runner/work/ccpp-physics/ccpp-physics/fv3atm/bin/ccpp/physics/physics/
-        ./framework/scripts/ccpp_prebuild.py --config config/ccpp_prebuild_config.py
+        ./framework/scripts/ccpp_prebuild.py --config config/ccpp_prebuild_config_fv3.py

CMakeLists.txt

@@ -199,7 +199,7 @@ target_link_libraries(ccpp_physics PUBLIC w3emc::w3emc_d
                                           NetCDF::NetCDF_Fortran
 				             )
 #add FMS for FV3 only
-if(FV3)
+if(FV3 OR MPAS)
   target_link_libraries(ccpp_physics PUBLIC fms)
 endif()
 

physics/CONV/SAMF/samfdeepcnv.f

@@ -82,7 +82,7 @@ subroutine samfdeepcnv_run (im,km,nn,first_time_step,restart,     &
      &    islimsk,garea,dot,ncloud,hpbl,ud_mf,dd_mf,dt_mf,cnvw,cnvc,    &
      &    QLCN, QICN, w_upi, cf_upi, CNV_MFD,                           &
      &    CNV_DQLDT,CLCN,CNV_FICE,CNV_NDROP,CNV_NICE,mp_phys,mp_phys_mg,&
-     &    clam,c0s,c1,betal,betas,evef,pgcon,asolfac,                   &
+     &    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)
@@ -97,7 +97,7 @@ subroutine samfdeepcnv_run (im,km,nn,first_time_step,restart,     &
       integer, intent(in)  :: islimsk(:)
       real(kind=kind_phys), intent(in) :: cliq, cp, cvap, eps, epsm1,   &
      &   fv, grav, hvap, rd, rv, t0c
-      real(kind=kind_phys), intent(in) ::  delt
+      real(kind=kind_phys), intent(in) ::  delt, cscale
       real(kind=kind_phys), intent(in) :: psp(:), delp(:,:),            &
      &   prslp(:,:),  garea(:), hpbl(:), dot(:,:), phil(:,:) 
       real(kind=kind_phys), dimension(:), intent(in) :: fscav
@@ -217,7 +217,7 @@ subroutine samfdeepcnv_run (im,km,nn,first_time_step,restart,     &
 !  parameters for prognostic sigma closure                                                                                                                                                      
       real(kind=kind_phys) omega_u(im,km),zdqca(im,km),tmfq(im,km),
      &     omegac(im),zeta(im,km),dbyo1(im,km),sigmab(im),qadv(im,km),
-     &     sigmaoutx(im),tentr(im,km)
+     &     tentr(im,km)
       real(kind=kind_phys) gravinv,invdelt,sigmind,sigminm,sigmins
       parameter(sigmind=0.01,sigmins=0.03,sigminm=0.01)
       logical flag_shallow, flag_mid
@@ -2553,10 +2553,10 @@ subroutine samfdeepcnv_run (im,km,nn,first_time_step,restart,     &
 c
 c------- final changed variable per unit mass flux
 c
-!> - If grid size is less than a threshold value (dxcrtas: currently 8km if progsigma is not used and 30km if progsigma is used), the quasi-equilibrium assumption of Arakawa-Schubert is not used any longer.
+!> - If grid size is less than a threshold value (dxcrtas: currently 8km if progsigma is not used), or progsigma = true, the quasi-equilibrium assumption of Arakawa-Schubert is not used any longer.
 !
       if(progsigma)then
-         dxcrtas=30.e3
+         dxcrtas=500.e3
          dxcrtuf=10.e3
       else
          dxcrtas=8.e3
@@ -3486,24 +3486,16 @@ subroutine samfdeepcnv_run (im,km,nn,first_time_step,restart,     &
         endif
       enddo
 c
-!
-      if(progsigma)then
-         do i = 1, im
-            sigmaoutx(i)=max(sigmaout(i,1),0.0)
-            sigmaoutx(i)=min(sigmaoutx(i),1.0)
-         enddo
-      endif
-c
 !> - Calculate convective cloud water.
       do k = 1, km
          do i = 1, im
             if (cnvflg(i) .and. rn(i) > 0.) then
                if (k >= kbcon(i) .and. k < ktcon(i)) then
                   cnvw(i,k) = cnvwt(i,k) * xmb(i) * dt2
                   if(progsigma)then
-                     cnvw(i,k) = cnvw(i,k) * sigmaoutx(i)
+                     cnvw(i,k) = cnvw(i,k) * cscale 
                   else
-                     cnvw(i,k) = cnvw(i,k) * sigmagfm(i)
+                     cnvw(i,k) = cnvw(i,k) * cscale
                   endif
                endif
             endif

physics/CONV/SAMF/samfdeepcnv.meta

@@ -195,6 +195,14 @@
   type = real
   kind = kind_phys
   intent = in
+[cscale]
+  standard_name = multiplicative_tuning_parameter_for_convective_cloud_water
+  long_name = multiplicative tuning parameter for convective cloud_water
+  units = none
+  dimensions = ()
+  type = real
+  kind = kind_phys
+  intent = in
 [delt]
   standard_name = timestep_for_physics
   long_name = physics time step
@@ -519,7 +527,7 @@
 [omegain]
   standard_name = prognostic_updraft_velocity_in_convection
   long_name = convective updraft velocity
-  units = frac
+  units = Pa s-1
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys
@@ -528,7 +536,7 @@
 [omegaout]
   standard_name = updraft_velocity_updated_by_physics
   long_name = convective updraft velocity updated by physics
-  units = frac
+  units = Pa s-1
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys

physics/CONV/SAMF/samfshalcnv.f

@@ -55,8 +55,8 @@ subroutine samfshalcnv_run(im,km,nn,itc,ntc,cliq,cp,cvap,            &
      &     t0c,delt,ntk,ntr,delp,first_time_step,restart,               & 
      &     tmf,qmicro,progsigma,progomega,                              &
      &     prslp,psp,phil,tkeh,qtr,dqtr,prevsq,q,q1,t1,u1,v1,fscav,     &
-     &     rn,kbot,ktop,kcnv,islimsk,garea, ten_t, ten_u, ten_v, ten_q, &
-     &     dot,ncloud,hpbl,ud_mf,dt_mf,cnvw,cnvc,                       &
+     &     rn,kbot,ktop,kcnv,islimsk,garea,cscale,ten_t, ten_u, ten_v,  &
+     &     ten_q, 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)
@@ -71,7 +71,7 @@ subroutine samfshalcnv_run(im,km,nn,itc,ntc,cliq,cp,cvap,            &
       real(kind=kind_phys), intent(in) :: cliq, cp, cvap,               &
      &   eps, epsm1, fv, grav, hvap, rd, rv, t0c, betascu, betadcu,     &
      &   betamcu
-      real(kind=kind_phys), intent(in) ::  delt
+      real(kind=kind_phys), intent(in) ::  delt, cscale
       real(kind=kind_phys), intent(in) :: psp(:), delp(:,:),            &
      &   prslp(:,:), garea(:), hpbl(:), dot(:,:), phil(:,:),            &
      &   tmf(:,:,:), q(:,:)
@@ -170,7 +170,7 @@ subroutine samfshalcnv_run(im,km,nn,itc,ntc,cliq,cp,cvap,            &
 !  parameters for prognostic sigma closure
       real(kind=kind_phys) omega_u(im,km),zdqca(im,km),tmfq(im,km),
      &                     omegac(im),zeta(im,km),dbyo1(im,km),
-     &                     sigmab(im),qadv(im,km),sigmaoutx(im)
+     &                     sigmab(im),qadv(im,km)
       real(kind=kind_phys) gravinv,dxcrtas,invdelt,sigmind,sigmins,
      &                     sigminm
       logical flag_shallow,flag_mid
@@ -207,7 +207,7 @@ subroutine samfshalcnv_run(im,km,nn,itc,ntc,cliq,cp,cvap,            &
       parameter(betaw=.03,dxcrtc0=9.e3)
       parameter(h1=0.33333333)
 !  progsigma
-      parameter(dxcrtas=30.e3,sigmind=0.01,sigmins=0.03,sigminm=0.01)
+      parameter(dxcrtas=500.e3,sigmind=0.01,sigmins=0.03,sigminm=0.01)
 c  local variables and arrays
       real(kind=kind_phys) pfld(im,km),    to(im,km),     qo(im,km),
      &                     uo(im,km),      vo(im,km),     qeso(im,km),
@@ -2464,23 +2464,16 @@ subroutine samfshalcnv_run(im,km,nn,itc,ntc,cliq,cp,cvap,            &
         endif
       enddo
 c
-      if(progsigma)then
-         do i = 1, im
-            sigmaoutx(i)=max(sigmaout(i,1),0.0)
-            sigmaoutx(i)=min(sigmaoutx(i),1.0)
-         enddo
-      endif
-      
 c     convective cloud water
       do k = 1, km
          do i = 1, im
             if (cnvflg(i)) then
                if (k >= kbcon(i) .and. k < ktcon(i)) then
                   cnvw(i,k) = cnvwt(i,k) * xmb(i) * dt2
                   if (progsigma) then
-                     cnvw(i,k) = cnvw(i,k) * sigmaoutx(i)
+                     cnvw(i,k) = cnvw(i,k) * cscale
                   else
-                     cnvw(i,k) = cnvw(i,k) * sigmagfm(i)
+                     cnvw(i,k) = cnvw(i,k) * cscale
                   endif
                endif
             endif

physics/CONV/SAMF/samfshalcnv.meta

@@ -195,6 +195,14 @@
   type = real
   kind = kind_phys
   intent = in
+[cscale]
+  standard_name = multiplicative_tuning_parameter_for_convective_cloud_water
+  long_name = multiplicative tuning parameter for convective cloud water
+  units = none
+  dimensions = ()
+  type = real
+  kind = kind_phys
+  intent = in
 [delt]
   standard_name = timestep_for_physics
   long_name = physics time step
@@ -551,7 +559,7 @@
 [omegain]
   standard_name = prognostic_updraft_velocity_in_convection
   long_name = convective updraft velocity
-  units = frac
+  units = Pa s-1
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys
@@ -560,7 +568,7 @@
 [omegaout]
   standard_name = updraft_velocity_updated_by_physics
   long_name = convective updraft velocity updated by physics
-  units = frac
+  units = Pa s-1
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys

physics/Interstitials/UFS_SCM_NEPTUNE/GFS_photochemistry.F90

@@ -47,7 +47,7 @@ end subroutine GFS_photochemistry_init
 ! #########################################################################################
   subroutine GFS_photochemistry_run (dtp, ntqv, ntoz, im, levs, ozphys, oz_phys_2015, oz_phys_2006, con_1ovg,   &
        prsl, dp, ozpl, h2o_phys, h2ophys, h2opl, gq0, gt0, ten_q, ten_u, ten_v, ten_t, do3_dt_prd, do3_dt_ozmx, &
-       do3_dt_temp, do3_dt_ohoz, errmsg, errflg)
+       do3_dt_temp, do3_dt_ohoz, dqv_dt_prd, dqv_dt_qvmx, errmsg, errflg)
 
     ! Inputs
     real(kind=kind_phys), intent(in) :: &
@@ -81,7 +81,9 @@ subroutine GFS_photochemistry_run (dtp, ntqv, ntoz, im, levs, ozphys, oz_phys_20
          do3_dt_prd,   & ! Physics tendency: production and loss effect
          do3_dt_ozmx,  & ! Physics tendency: ozone mixing ratio effect
          do3_dt_temp,  & ! Physics tendency: temperature effect
-         do3_dt_ohoz     ! Physics tendency: overhead ozone effect
+         do3_dt_ohoz,  & ! Physics tendency: overhead ozone effect
+         dqv_dt_prd,   & ! Physics tendency: Climatological net production effect
+         dqv_dt_qvmx     ! Physics tendency: specific humidity effect
 
     ! Outputs
     real(kind=kind_phys), intent(out), dimension(:,:) :: &
@@ -132,7 +134,7 @@ subroutine GFS_photochemistry_run (dtp, ntqv, ntoz, im, levs, ozphys, oz_phys_20
     if (h2o_phys) then
        init_h2o0 = gq0(:,:,ntqv)
        h2o0 = init_h2o0
-       call h2ophys%run(dtp, prsl, h2opl, h2o0)
+       call h2ophys%run(dtp, prsl, h2opl, h2o0, dqv_dt_prd, dqv_dt_qvmx)
        do i=1, im
          do k=1, levs
            ten_q(i,k,ntqv) = (h2o0(i,k) - init_h2o0(i,k))/dtp

physics/Interstitials/UFS_SCM_NEPTUNE/GFS_photochemistry.meta

@@ -245,6 +245,24 @@
   kind = kind_phys
   intent = inout
   optional = True
+[dqv_dt_prd]
+  standard_name = water_vapor_tendency_due_to_production_and_loss_rate
+  long_name = water_vapor tendency due to production and loss rate
+  units = kg kg-1 s-1
+  dimensions = (horizontal_loop_extent,vertical_layer_dimension)
+  type = real
+  kind = kind_phys
+  intent = inout
+  optional = True
+[dqv_dt_qvmx]
+  standard_name = water_vapor_tendency_due_to_water_vapor_mixing_ratio
+  long_name = water_vapor tendency due to water_vapor mixing ratio
+  units = kg kg-1 s-1
+  dimensions = (horizontal_loop_extent,vertical_layer_dimension)
+  type = real
+  kind = kind_phys
+  intent = inout
+  optional = True
 [errmsg]
   standard_name = ccpp_error_message
   long_name = error message for error handling in CCPP