Merge branch 'combo_20250625' of https://github.com/grantfirl/ccpp-physics into ufs-dev-PR295

Author: dustinswales

CMakeLists.txt

@@ -196,7 +196,12 @@ target_include_directories(ccpp_physics PUBLIC
 target_link_libraries(ccpp_physics PRIVATE MPI::MPI_Fortran)
 target_link_libraries(ccpp_physics PUBLIC w3emc::w3emc_d
                                           sp::sp_d
-                                          NetCDF::NetCDF_Fortran)
+                                          NetCDF::NetCDF_Fortran
+				             )
+#add FMS for FV3 only
+if(FV3)
+  target_link_libraries(ccpp_physics PUBLIC fms)
+endif()
 
 # Define where to install the library
 install(TARGETS ccpp_physics

physics/CONV/C3/cu_c3_driver.F90

@@ -657,7 +657,9 @@ subroutine cu_c3_driver_run(ntracer,garea,im,km,dt,flag_init,flag_restart,&
      enddo
      do i = its,itf
       if(mconv(i).lt.0.)mconv(i)=0.
-      if((dx(i)<6500.).and.do_mynnedmf.and.(maxMF(i).gt.0.))ierr(i)=555
+      if(do_mynnedmf) then
+        if((dx(i)<6500.).and.(maxMF(i).gt.0.))ierr(i)=555
+      endif
      enddo
 !$acc end kernels
      if (dx(its)<6500.) then

physics/GWD/cires_ugwpv1_oro.F90

@@ -222,7 +222,8 @@ subroutine orogw_v1 (im, km,  imx,   me,  master, dtp, kdt, do_tofd,   &
         dusfc(i)    = 0.0
         dvsfc(i)    = 0.0
         ipt(i) = 0 
-      enddo     
+      enddo
+      zlwb(:) = 0.0
 
 ! ----  for lm and gwd calculation points
 !cires_ugwp_initialize.F90:      real, parameter :: hpmax=2400.0, hpmin=25.0  

physics/GWD/cires_ugwpv1_triggers.F90

@@ -298,7 +298,7 @@ subroutine get_spectra_tau_okw(nw, im, levs,  trig_okw, xlatd, sinlat, coslat, t
         if (dmax >= tlim_okw) kex = kex+1 
         do k=klow+1, ktop
           dtot = abs(trig_okw(i,k))
-          if (dtot >= tlim_fgf ) kex = kex+1 
+          if (dtot >= tlim_okw ) kex = kex+1 
           if ( dtot >  dmax) then
             klev(i) = k
             dmax =  dtot

physics/GWD/ecmwf_ngw.F90

@@ -43,6 +43,9 @@ module ugwpv1_gsldrag
     use cires_ugwpv1_module,   only:  cires_ugwpv1_init, ngwflux_update, calendar_ugwp
     use cires_ugwpv1_module,   only:  knob_ugwp_version, cires_ugwp_dealloc, tamp_mpa
     use cires_ugwpv1_solv2,    only:  cires_ugwpv1_ngw_solv2
+!    use cires_ugwpv1_solv2,     only:  cires_ugwpv1_ngw_solv2, ecmwf_ngw
+     use ecmwf_ngw,             only:  ecmwf_ngw_emc
+
     use cires_ugwpv1_oro,      only:  orogw_v1
 
     use drag_suite,            only:  drag_suite_run, drag_suite_psl
@@ -70,7 +73,8 @@ subroutine ugwpv1_gsldrag_init  (                                          &
                 con_pi, con_rerth, con_p0,                                     &
                 con_g, con_omega,  con_cp, con_rd, con_rv,con_fvirt,           &
                 do_ugwp,do_ugwp_v0, do_ugwp_v0_orog_only, do_gsl_drag_ls_bl,   &
-                do_gsl_drag_ss, do_gsl_drag_tofd, do_ugwp_v1,                  &
+                  do_gsl_drag_ss, do_gsl_drag_tofd, do_ngw_ec, do_ugwp_v1,     &
+!!                do_gsl_drag_ss, do_gsl_drag_tofd, do_ugwp_v1,                  &
                 do_ugwp_v1_orog_only, do_ugwp_v1_w_gsldrag, errmsg, errflg)
 
     use ugwp_common
@@ -94,9 +98,10 @@ subroutine ugwpv1_gsldrag_init  (                                          &
     real(kind=kind_phys), intent (in) :: con_g, con_cp, con_rd, con_rv, con_omega, con_fvirt
     logical,              intent (in) :: do_ugwp
 
-    logical,              intent (in) :: do_ugwp_v0, do_ugwp_v0_orog_only,  &
-                                         do_gsl_drag_ls_bl, do_gsl_drag_ss, &
-                                         do_gsl_drag_tofd, do_ugwp_v1,      &
+    logical,              intent (in) :: do_ugwp_v0, do_ugwp_v0_orog_only,         &
+                                         do_gsl_drag_ls_bl, do_gsl_drag_ss,        &
+!!                                       do_gsl_drag_tofd, do_ugwp_v1,             &
+                                         do_gsl_drag_tofd, do_ugwp_v1, do_ngw_ec,  &
                                          do_ugwp_v1_orog_only,do_ugwp_v1_w_gsldrag
 
     character(len=*), intent (in)  :: fn_nml2
@@ -302,7 +307,7 @@ subroutine ugwpv1_gsldrag_run(me, master, im, levs, ak, bk, ntrac, lonr, dtp,
           fhzero, kdt, ldiag3d, lssav, flag_for_gwd_generic_tend, do_gsl_drag_ls_bl,    &
           do_gsl_drag_ss, do_gsl_drag_tofd,                                             &
           do_gwd_opt_psl, psl_gwd_dx_factor,                                            &
-          do_ugwp_v1, do_ugwp_v1_orog_only,                                             &
+          do_ngw_ec, do_ugwp_v1,  do_ugwp_v1_orog_only,                                 &
           do_ugwp_v1_w_gsldrag, gwd_opt, do_tofd, ldiag_ugwp, ugwp_seq_update,          &
           cdmbgwd, alpha_fd, jdat, nmtvr, hprime, oc, theta, sigma, gamma,              &
           elvmax, clx, oa4, varss,oc1ss,oa4ss,ol4ss, dx,  xlat, xlat_d, sinlat, coslat, &
@@ -356,7 +361,7 @@ subroutine ugwpv1_gsldrag_run(me, master, im, levs, ak, bk, ntrac, lonr, dtp,
 ! flags for choosing combination of GW drag schemes to run
 
     logical,  intent (in) :: do_gsl_drag_ls_bl, do_gsl_drag_ss, do_gsl_drag_tofd
-    logical,  intent (in) :: do_ugwp_v1, do_ugwp_v1_orog_only, do_tofd
+    logical,  intent (in) :: do_ugwp_v1, do_ngw_ec, do_ugwp_v1_orog_only, do_tofd
     logical,  intent (in) :: ldiag_ugwp, ugwp_seq_update
     logical,  intent (in) :: do_ugwp_v1_w_gsldrag                              ! combination of ORO and NGW schemes
 
@@ -698,10 +703,21 @@ subroutine ugwpv1_gsldrag_run(me, master, im, levs, ak, bk, ntrac, lonr, dtp,
        call ngwflux_update(me, master, im, levs, kdt, ddd_ugwp,curdate, &
          tau_amf, xlat_d, sinlat,coslat, rain, tau_ngw)
 
-       call cires_ugwpv1_ngw_solv2(me, master, im,   levs,  kdt, dtp,   &
+       if (do_ngw_ec) then
+
+       call ecmwf_ngw_emc(me, master, im,   levs,  kdt, dtp, dx,        &
+                      tau_ngw, tgrs, ugrs,  vgrs,   q1, prsl, prsi,     &
+                      zmet, zmeti,prslk,   xlat_d, sinlat, coslat,      &
+                      dudt_ngw, dvdt_ngw, dtdt_ngw, kdis_ngw, zngw)
+       else
+
+       call cires_ugwpv1_ngw_solv2(me, master, im, levs, kdt, dtp,      &
                       tau_ngw, tgrs, ugrs,  vgrs,   q1, prsl, prsi,     &
                       zmet, zmeti,prslk,   xlat_d, sinlat, coslat,      &
                       dudt_ngw, dvdt_ngw, dtdt_ngw, kdis_ngw, zngw)
+
+      endif
+
 !
 ! =>  con_g, con_cp, con_rd, con_rv, con_omega,  con_pi, con_fvirt
 !

physics/GWD/ugwpv1_gsldrag.F90

@@ -2,7 +2,7 @@
   name = ugwpv1_gsldrag
   type = scheme
   dependencies = ../hooks/machine.F,drag_suite.F90
-  dependencies = cires_ugwpv1_module.F90,cires_ugwpv1_triggers.F90,cires_ugwpv1_initialize.F90,cires_ugwpv1_solv2.F90
+  dependencies = cires_ugwpv1_module.F90,cires_ugwpv1_triggers.F90,cires_ugwpv1_initialize.F90,cires_ugwpv1_solv2.F90,ecmwf_ngw.F90
   dependencies = cires_ugwpv1_sporo.F90,cires_ugwpv1_oro.F90 
 ########################################################################
 [ccpp-arg-table]
@@ -218,6 +218,13 @@
   dimensions = ()
   type = logical
   intent = in
+[do_ngw_ec]
+  standard_name = flag_for_ngw_ec
+  long_name = flag to activate ecmwf ngwd
+  units = flag
+  dimensions = ()
+  type = logical
+  intent = in
 [do_ugwp_v1]
   standard_name = flag_for_ugwp_version_1
   long_name = flag to activate ver 1 CIRES UGWP
@@ -417,6 +424,13 @@
   type = real
   kind = kind_phys
   intent = in
+[do_ngw_ec]
+  standard_name = flag_for_ngw_ec
+  long_name = flag to activate ecmwf ngwd
+  units = flag
+  dimensions = ()
+  type = logical
+  intent = in
 [do_ugwp_v1]
   standard_name = flag_for_ugwp_version_1
   long_name = flag to activate ver 1 CIRES UGWP

physics/GWD/ugwpv1_gsldrag.meta

@@ -3093,8 +3093,11 @@ subroutine subst(data,imax,jmax,dlon,dlat,ijordr)
               enddo
             enddo
           else
-            do i=1,imax
-              data(imax-i+1,jj) = work(i,j)
+            do j=1,jmax
+              jj = jmax - j + 1
+              do i=1,imax
+                data(imax-i+1,jj) = work(i,j)
+              enddo
             enddo
           endif
         else

physics/Interstitials/UFS_SCM_NEPTUNE/sfcsub.F

@@ -15,7 +15,9 @@ subroutine mfscuq(im,ix,km,kmscu,ntcw,ntrac1,delt,
      &   cnvflg,zl,zm,q1,t1,u1,v1,plyr,pix,
      &   thlx,thvx,thlvx,gdx,thetae,
      &   krad,mrad,radmin,buo,wush,tkemean,vez0fun,xmfd,
-     &   tcdo,qcdo,ucdo,vcdo,xlamdeq,a1)
+     &   tcdo,qcdo,ucdo,vcdo,xlamdeq,a1,
+!The following flag is for SA-3D-TKE (kyf)
+     &   sa3dtke)
 !
       use machine , only : kind_phys
       use funcphys , only : fpvs
@@ -31,6 +33,7 @@ subroutine mfscuq(im,ix,km,kmscu,ntcw,ntrac1,delt,
       integer   krad(im), mrad(im)
 !
       logical cnvflg(im)
+      logical sa3dtke !flag for SA-3D-TKE scheme (kyf)
       real(kind=kind_phys) delt
       real(kind=kind_phys) q1(ix,km,ntrac1),t1(ix,km),
      &                     u1(ix,km),      v1(ix,km),
@@ -427,6 +430,16 @@ subroutine mfscuq(im,ix,km,kmscu,ntcw,ntrac1,delt,
         endif
       enddo
 !
+!> - Set updraft fraction to 0 when using SA-3D-TKE scheme (kyf)
+!! Scale-aware capability is done with pfnl in satmedmfvdifq.F
+!! Zhu et al. (2025)
+!
+      if (sa3dtke) then
+        do i = 1, im
+          sigma(i) = 0.
+        enddo
+      endif
+!
 !> - Compute scale-aware function based on 
 !! Arakawa and Wu (2013) \cite arakawa_and_wu_2013
 !