Merge branch 'ufs/dev' into feature/gfdlmpv3

Author: grantfirl

…EQUEST_TEMPLATE/pull_request_template.md .github/pull_request_template.md.github/PULL_REQUEST_TEMPLATE/pull_request_template.md renamed to .github/pull_request_template.md .github/PULL_REQUEST_TEMPLATE/pull_request_template.md renamed to .github/pull_request_template.md

@@ -1,22 +1,21 @@
-## Description of Changes: 
+## Description of Changes:
 One or more paragraphs describing the problem, solution, and required changes.
 
-## Tests Conducted: 
-Explicitly state what tests were run on these changes, or if any are still pending (for README or other text-only changes, just put "None required". Make note of the compilers used, the platform/machine, and other relevant details as necessary. For more complicated changes, or those resulting in scientific changes, please be explicit!  
-**OR** Add any links to tests conducted. For example, "See ufs-community/ufs-weather-model/pull/<pr_number>"
+## Tests Conducted:
+Explicitly state what tests were run on these changes, or if any are still pending (for README or other text-only changes, just put "None required". Make note of the compilers used, the platform/machine, and other relevant details as necessary. For more complicated changes, or those resulting in scientific changes, please be explicit!
+**OR** Add any links to tests conducted. For example, "See ufs-community/ufs-weather-model#<pr_number>"
 
 ## Dependencies:
 Add any links to parent PRs (e.g. SCM and/or UFS PRs) or submodules (e.g. rte-rrtmgp). For example:
-- NCAR/ccpp-framework/pull/<pr_number>
-- NOAA-EMC/fv3atm/pull/<pr_number>
-- ufs-community/ufs-weather-model/pull/<pr_number>
+- NCAR/ccpp-framework#<pr_number>
+- NOAA-EMC/fv3atm#<pr_number>
+- ufs-community/ufs-weather-model/#<pr_number>
 
 ## Documentation:
 Does this PR add new capabilities that need to be documented or require modifications to the existing documentation?  If so, brief supporting material can be provided here. Contact the CODEOWNERS if your PR requires extensive updates to the documentation.  See https://github.com/NCAR/ccpp-doc for Technical Documentation or https://dtcenter.org/community-code/common-community-physics-package-ccpp/documentation for the latest Scientific Documentation.
 
-## Issue (optional): 
-If this PR is resolving or referencing one or more issues, in this repository or elewhere, list them here. For example, "Fixes issue mentioned in #123" or "Related to bug in https://github.com/NCAR/other_repository/pull/63"
+## Issue (optional):
+If this PR is resolving or referencing one or more issues, in this repository or elewhere, list them here. For example, "Fixes issue mentioned in #123" or "Related to bug in NCAR/other_repository#123"
 
-## Contributors (optional): 
+## Contributors (optional):
 If others have contributed to this work aside from the PR author, list them here
-

.github/workflows/basic_checks.yml

@@ -4,6 +4,7 @@ on: [push, pull_request]
 
 jobs:
   build:
+    if: github.repository == 'NCAR/ccpp-physics' || github.repository == 'ufs-community/ccpp-physics'
 
     runs-on: macos-latest
 

.github/workflows/ci_fv3_ccpp_prebuild.yml

@@ -4,9 +4,10 @@ on: [push, pull_request]
 
 jobs:
   ccpp-prebuild-FV3:
+    if: github.repository == 'NCAR/ccpp-physics' || github.repository == 'ufs-community/ccpp-physics'
 
     # The type of runner that the job will run on
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
     - name: Checkout current ccpp-physics code
@@ -38,11 +39,11 @@ jobs:
         git remote add remote_local $GIT_REMOTE_URL
         git fetch remote_local $GIT_REMOTE_BRANCH
         git checkout remote_local/$GIT_REMOTE_BRANCH
-    
-    - name: Set up Python 3.8.5
+
+    - name: Set up Python 3.10.13
       uses: actions/setup-python@v3
       with:
-        python-version: 3.8.5
+        python-version: 3.10.13
 
     - name: Add conda to system path
       run: |
@@ -53,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.py

.github/workflows/ci_scm_ccpp_prebuild.yml

@@ -4,9 +4,10 @@ on: [push, pull_request]
 
 jobs:
   ccpp-prebuild-SCM:
+    if: github.repository == 'NCAR/ccpp-physics' || github.repository == 'ufs-community/ccpp-physics'
 
     # The type of runner that the job will run on
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
 
@@ -42,11 +43,11 @@ jobs:
         git remote add remote_local $GIT_REMOTE_URL
         git fetch remote_local $GIT_REMOTE_BRANCH
         git checkout remote_local/$GIT_REMOTE_BRANCH
-    
-    - name: Set up Python 3.8.5
+
+    - name: Set up Python 3.10.13
       uses: actions/setup-python@v3
       with:
-        python-version: 3.8.5
+        python-version: 3.10.13
 
     - name: Add conda to system path
       run: |
@@ -58,4 +59,4 @@ jobs:
         cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/
         git status
         mkdir -p /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/scm/bin/ccpp/physics/physics/
-        ./ccpp/framework/scripts/ccpp_prebuild.py --config ccpp/config/ccpp_prebuild_config.py
+        ./ccpp/framework/scripts/ccpp_prebuild.py --config ccpp/config/ccpp_prebuild_config.py

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

CODEOWNERS

@@ -36,7 +36,6 @@ 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_parse_tracers.F90                                                                                 @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/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/CONV/Grell_Freitas/cu_gf_deep.F90

@@ -5496,7 +5496,7 @@ subroutine get_partition_liq_ice(ierr,tn,po_cup, p_liq_ice,melting_layer
                                    ,itf,ktf,its,ite, kts,kte, cumulus          )
      implicit none
      character *(*), intent (in)                          :: cumulus
-     integer  ,intent (in   )	                          :: itf,ktf, its,ite, kts,kte
+     integer  ,intent (in   )                             :: itf,ktf, its,ite, kts,kte
      real(kind=kind_phys),     intent (in   ), dimension(its:ite,kts:kte) :: tn,po_cup
      real(kind=kind_phys),     intent (inout), dimension(its:ite,kts:kte) :: p_liq_ice,melting_layer
 !$acc declare copyin(tn,po_cup) copy(p_liq_ice,melting_layer)

physics/GWD/cires_tauamf_data.F90

@@ -36,7 +36,7 @@ subroutine read_tau_amf(me, master, errmsg, errflg)
        if(iernc.ne.0) then         
           write(errmsg,'(*(a))') "read_tau_amf: cannot open file_limb_tab data-file ",  &
                                     trim(ugwp_taufile)
-	    print *, 'cannot open ugwp-v1 tau-file=',trim(ugwp_taufile)			    
+          print *, 'cannot open ugwp-v1 tau-file=',trim(ugwp_taufile)
           errflg = 1
           return
         else
@@ -51,26 +51,26 @@ subroutine read_tau_amf(me, master, errmsg, errflg)
        status = nf90_inquire_dimension(ncid, DimID,  len =ntau_d2t )
 
            if (me == master)  print *, ntau_d1y, ntau_d2t, ' dimd of tau_ngw ugwp-v1 '
-	   if (ntau_d2t .le. 0 .or. ntau_d1y .le. 0) then 
-	       print *, 'ugwp-v1 tau-file=',    trim(ugwp_taufile)	   
-	       print *, '  ugwp-v1: ', 'ntau_d2t=',ntau_d2t, 'ntau_d2t=',ntau_d1y
-	       stop
-	   endif
+           if (ntau_d2t .le. 0 .or. ntau_d1y .le. 0) then 
+               print *, 'ugwp-v1 tau-file=',    trim(ugwp_taufile)
+               print *, '  ugwp-v1: ', 'ntau_d2t=',ntau_d2t, 'ntau_d2t=',ntau_d1y
+               stop
+           endif
 
         if (.not.allocated(ugwp_taulat))  allocate (ugwp_taulat(ntau_d1y ))
         if (.not.allocated(days_limb))    allocate (days_limb(ntau_d2t))
-        if (.not.allocated(tau_limb))     allocate (tau_limb(ntau_d1y, ntau_d2t ))   	   
+        if (.not.allocated(tau_limb))     allocate (tau_limb(ntau_d1y, ntau_d2t ))
 
-	iernc=nf90_inq_varid( ncid, 'DAYS', vid )
+        iernc=nf90_inq_varid( ncid, 'DAYS', vid )
         iernc= nf90_get_var( ncid, vid, days_limb)
-	iernc=nf90_inq_varid( ncid, 'LATS', vid )
+        iernc=nf90_inq_varid( ncid, 'LATS', vid )
         iernc= nf90_get_var( ncid, vid, ugwp_taulat)
-	iernc=nf90_inq_varid( ncid, 'ABSMF', vid )
+        iernc=nf90_inq_varid( ncid, 'ABSMF', vid )
         iernc= nf90_get_var( ncid, vid, tau_limb)
 
-	iernc=nf90_close(ncid)
+        iernc=nf90_close(ncid)
 
-	endif    
+        endif
 
   end  subroutine read_tau_amf  
 
@@ -102,22 +102,22 @@ subroutine cires_indx_ugwp (npts, me, master, dlat,j1_tau,j2_tau, w1_j1tau, w2_j
 
 
         j2_tau(j) = min(j2_tau(j),ntau_d1y)
-        j1_tau(j) = max(j2_tau(j)-1,1)	
+        j1_tau(j) = max(j2_tau(j)-1,1)
 
         if (j1_tau(j) /= j2_tau(j) ) then
           w2_j2tau(j) = (dlat(j)  - ugwp_taulat(j1_tau(j))) &
-                 / (ugwp_taulat(j2_tau(j))-ugwp_taulat(j1_tau(j)))       	 
+                 / (ugwp_taulat(j2_tau(j))-ugwp_taulat(j1_tau(j)))
         else
           w2_j2tau(j) = 1.0
         endif
-          w1_j1tau(j) = 1.0 -	w2_j2tau(j)	
+          w1_j1tau(j) = 1.0 - w2_j2tau(j)
       enddo
       return
     end subroutine cires_indx_ugwp   
 
 !>
     subroutine tau_amf_interp(me, master, im, idate, fhour, j1_tau,j2_tau, ddy_j1, ddy_j2, tau_ddd)    
-    use machine, only: kind_phys	           
+    use machine, only: kind_phys
     implicit none
 
 !input    
@@ -141,38 +141,38 @@ subroutine tau_amf_interp(me, master, im, idate, fhour, j1_tau,j2_tau, ddy_j1, d
 
             it1 = 2
          do iday=1, ntau_d2t
-	    if (fddd .lt. days_limb(iday) ) then
-	    it2 = iday
-	    exit
-	    endif
-	 enddo
+            if (fddd .lt. days_limb(iday) ) then
+            it2 = iday
+            exit
+            endif
+         enddo
 
-	 it2 = min(it2,ntau_d2t)	 
-	 it1 = max(it2-1,1)
-	 if (it2 > ntau_d2t ) then
-	  print *, ' Error in time-interpolation for tau_amf_interp '	 
-	  print *, ' it1, it2, ntau_d2t ', it1, it2, ntau_d2t
-	  print *, ' Error in time-interpolation see cires_tauamf_data.F90 '	  
-	  stop
-	 endif
+         it2 = min(it2,ntau_d2t)
+         it1 = max(it2-1,1)
+         if (it2 > ntau_d2t ) then
+          print *, ' Error in time-interpolation for tau_amf_interp '
+          print *, ' it1, it2, ntau_d2t ', it1, it2, ntau_d2t
+          print *, ' Error in time-interpolation see cires_tauamf_data.F90 '
+          stop
+         endif
 
-	 w2 = (fddd-days_limb(it1))/(days_limb(it2)-days_limb(it1))
-	 w1 = 1.0-w2     
+         w2 = (fddd-days_limb(it1))/(days_limb(it2)-days_limb(it1))
+         w1 = 1.0-w2     
 
-      do i=1, im	 
-	 j1 = j1_tau(i)
-	 j2 = j2_tau(i)
-	 tx1 = tau_limb(j1, it1)*ddy_j1(i)+tau_limb(j2, it1)*ddy_j2(i)
-	 tx2 = tau_limb(j1, it2)*ddy_j1(i)+tau_limb(j2, it2)*ddy_j2(i)	 
-	 tau_ddd(i) =  tx1*w1 + w2*tx2
+      do i=1, im
+         j1 = j1_tau(i)
+         j2 = j2_tau(i)
+         tx1 = tau_limb(j1, it1)*ddy_j1(i)+tau_limb(j2, it1)*ddy_j2(i)
+         tx2 = tau_limb(j1, it2)*ddy_j1(i)+tau_limb(j2, it2)*ddy_j2(i)
+         tau_ddd(i) =  tx1*w1 + w2*tx2
       enddo
 
     end subroutine tau_amf_interp  
 
 !>
     subroutine gfs_idate_calendar(idate, fhour, ddd, fddd) 
 
-    use machine, only: kind_phys    		 
+    use machine, only: kind_phys
     implicit none  
 ! input     
     integer, intent(in)                 :: idate(4)

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