Merge branch 'ufs/dev' into feature/tendency_cleanup

Author: grantfirl

.gitmodules

@@ -2,3 +2,7 @@
   path = physics/Radiation/RRTMGP/rte-rrtmgp
   url = https://github.com/earth-system-radiation/rte-rrtmgp
   branch = main
+[submodule "physics/MP/TEMPO/TEMPO"]
+  path = physics/MP/TEMPO/TEMPO
+  url = https://github.com/NCAR/TEMPO
+  branch = main

CMakeLists.txt

@@ -197,7 +197,11 @@ target_link_libraries(ccpp_physics PRIVATE MPI::MPI_Fortran)
 target_link_libraries(ccpp_physics PUBLIC w3emc::w3emc_d
                                           sp::sp_d
                                           NetCDF::NetCDF_Fortran
-                                          fms)
+				             )
+#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

CODEOWNERS

@@ -36,8 +36,10 @@ physics/GWD/ugwpv1_gsldrag_post.*                                            @md
 physics/GWD/unified_ugwp*                                                    @mdtoyNOAA                                @grantfirl @rhaesung @Qingfu-Liu @dustinswales
 physics/MP/Ferrier_Aligo/module_MP_FER_HIRES.*                               @ericaligo-NOAA                           @grantfirl @rhaesung @Qingfu-Liu @dustinswales
 physics/MP/Ferrier_Aligo/mp_fer_hires.*                                      @ericaligo-NOAA                           @grantfirl @rhaesung @Qingfu-Liu @dustinswales
-physics/MP/GFDL/gfdl_cloud_microphys.*                                       @RuiyuSun                                 @grantfirl @rhaesung @Qingfu-Liu @dustinswales
-physics/MP/GFDL/module_gfdl_cloud_microphys.*                                @RuiyuSun                                 @grantfirl @rhaesung @Qingfu-Liu @dustinswales
+physics/MP/GFDL/v1_2019/gfdl_cloud_microphys.*                               @RuiyuSun                                 @grantfirl @rhaesung @Qingfu-Liu @dustinswales
+physics/MP/GFDL/v1_2019/gfdl_cloud_microphys_mod.*                           @RuiyuSun                                 @grantfirl @rhaesung @Qingfu-Liu @dustinswales
+physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3.*                            @RuiyuSun                                 @grantfirl @rhaesung @Qingfu-Liu @dustinswales
+physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3_mod.*                        @RuiyuSun                                 @grantfirl @rhaesung @Qingfu-Liu @dustinswales
 physics/MP/GFDL/fv_sat_adj.*                                                 @RuiyuSun                                 @grantfirl @rhaesung @Qingfu-Liu @dustinswales
 physics/MP/GFDL/multi_gases.F90                                              @RuiyuSun                                 @grantfirl @rhaesung @Qingfu-Liu @dustinswales
 physics/MP/Morrison_Gettelman/aer_cloud.F                                    @AnningCheng-NOAA @andrewgettelman        @grantfirl @rhaesung @Qingfu-Liu @dustinswales

physics/CONV/C3/cu_c3_driver.F90

@@ -668,7 +668,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