Merge pull request #2 from climbfuji/constant_xia_update_from_main_20…

…210729

Update "constant" branch with latest changes in authoritative repositories

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+# Description
+
+Provide a clear and concise description of the bug and what behavior you are expecting.
+
+## Steps to Reproduce
+
+Please provide detailed steps for reproducing the issue.
+
+1. step 1
+2. step 2
+3. see the bug...
+
+## Additional Context
+
+Please provide any relevant information about your setup. This is important in case the issue is not reproducible except for under certain conditions.
+
+* Machine
+* Compiler
+* Suite Definition File or Scheme
+* Reference other issues or PRs in other repositories that this is related to, and how they are related.
+
+## Output
+
+Please include any relevant log files, screenshots or other output here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+## Description
+Provide a clear and concise description of the problem to be solved.
+
+## Solution
+Add a clear and concise description of the proposed solution.
+
+## Alternatives (optional)
+If applicable, add a description of any alternative solutions or features you've considered.
+
+## Related to (optional)
+Directly reference any issues or PRs in this or other repositories that this is related to, and describe how they are related.

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

@@ -0,0 +1,22 @@
+## 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>"
+
+## 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>
+
+## 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"
+
+## Contributors (optional): 
+If others have contributed to this work aside from the PR author, list them here
+

physics/GFS_DCNV_generic.F90

@@ -15,32 +15,35 @@ end subroutine GFS_DCNV_generic_pre_finalize
 !! \section arg_table_GFS_DCNV_generic_pre_run Argument Table
 !! \htmlinclude GFS_DCNV_generic_pre_run.html
 !!
-    subroutine GFS_DCNV_generic_pre_run (im, levs, ldiag3d, qdiag3d, do_cnvgwd, cplchm,&
-                                         gu0, gv0, gt0, gq0_water_vapor,               &
-                                         save_u, save_v, save_t, save_qv, dqdti,       &
-                                         errmsg, errflg)
+    subroutine GFS_DCNV_generic_pre_run (im, levs, ldiag3d, qdiag3d, do_cnvgwd, cplchm,  &
+                                         gu0, gv0, gt0, gq0, nsamftrac, ntqv,            &
+                                         save_u, save_v, save_t, save_q, clw,            &
+                                         ntcw,ntiw,ntclamt,ntrw,ntsw,ntrnc,ntsnc,ntgl,   &
+                                         ntgnc, cscnv, satmedmf, trans_trac, ras, ntrac, &
+                                         dtidx, index_of_process_dcnv, errmsg, errflg)
 
       use machine, only: kind_phys
 
       implicit none
 
-      integer, intent(in) :: im, levs
+      integer, intent(in) :: im, levs, nsamftrac, ntqv, index_of_process_dcnv, dtidx(:,:), &
+           ntcw,ntiw,ntclamt,ntrw,ntsw,ntrnc,ntsnc,ntgl,ntrac,ntgnc
       logical, intent(in) :: ldiag3d, qdiag3d, do_cnvgwd, cplchm
-      real(kind=kind_phys), dimension(im,levs), intent(in)    :: gu0
-      real(kind=kind_phys), dimension(im,levs), intent(in)    :: gv0
-      real(kind=kind_phys), dimension(im,levs), intent(in)    :: gt0
-      real(kind=kind_phys), dimension(im,levs), intent(inout) :: gq0_water_vapor
-      real(kind=kind_phys), dimension(im,levs), intent(inout) :: save_u
-      real(kind=kind_phys), dimension(im,levs), intent(inout) :: save_v
-      real(kind=kind_phys), dimension(im,levs), intent(inout) :: save_t
-      real(kind=kind_phys), dimension(im,levs), intent(inout) :: save_qv
-      ! dqdti only allocated if cplchm is .true.
-      real(kind=kind_phys), dimension(:,:),     intent(inout) :: dqdti
+      real(kind=kind_phys), dimension(:,:),   intent(in)    :: gu0
+      real(kind=kind_phys), dimension(:,:),   intent(in)    :: gv0
+      real(kind=kind_phys), dimension(:,:),   intent(in)    :: gt0
+      real(kind=kind_phys), dimension(:,:,:), intent(inout) :: gq0
+      real(kind=kind_phys), dimension(:,:),   intent(inout) :: save_u
+      real(kind=kind_phys), dimension(:,:),   intent(inout) :: save_v
+      real(kind=kind_phys), dimension(:,:),   intent(inout) :: save_t
+      real(kind=kind_phys), dimension(:,:,:), intent(inout) :: save_q
       character(len=*), intent(out) :: errmsg
       integer, intent(out) :: errflg
-
+      logical, intent(in) :: cscnv, satmedmf, trans_trac, ras
       real(kind=kind_phys), parameter :: zero    = 0.0d0
-      integer :: i, k
+      real(kind=kind_phys), dimension(:,:,:), intent(in) :: clw
+
+      integer :: i, k, n, tracers
 
       ! Initialize CCPP error handling variables
       errmsg = ''
@@ -63,15 +66,26 @@ subroutine GFS_DCNV_generic_pre_run (im, levs, ldiag3d, qdiag3d, do_cnvgwd, cplc
       endif
 
       if ((ldiag3d.and.qdiag3d) .or. cplchm) then
-        do k=1,levs
-          do i=1,im
-            save_qv(i,k) = gq0_water_vapor(i,k)
-          enddo
-        enddo
-      endif
-
-      if (cplchm) then
-        dqdti = zero
+         if (cscnv .or. satmedmf .or. trans_trac .or. ras) then
+            tracers = 2
+            do n=2,ntrac
+               if ( n /= ntcw  .and. n /= ntiw  .and. n /= ntclamt .and. &
+                    n /= ntrw  .and. n /= ntsw  .and. n /= ntrnc   .and. &
+                    n /= ntsnc .and. n /= ntgl  .and. n /= ntgnc) then
+                  tracers = tracers + 1
+                  if(dtidx(100+n,index_of_process_dcnv)>0) then
+                     save_q(:,:,n) = clw(:,:,tracers)
+                  endif
+               endif
+            enddo
+         else
+            do n=2,ntrac
+               if(dtidx(100+n,index_of_process_dcnv)>0) then
+                  save_q(:,:,n) = gq0(:,:,n)
+               endif
+            enddo
+         endif ! end if_ras or cfscnv or samf
+         save_q(:,:,ntqv) = gq0(:,:,ntqv)
       endif
 
     end subroutine GFS_DCNV_generic_pre_run
@@ -91,44 +105,51 @@ end subroutine GFS_DCNV_generic_post_finalize
 !> \section arg_table_GFS_DCNV_generic_post_run Argument Table
 !! \htmlinclude GFS_DCNV_generic_post_run.html
 !!
-    subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, qdiag3d, ras, cscnv, &
-      frain, rain1, dtf, cld1d, save_u, save_v, save_t, save_qv, gu0, gv0, gt0,          &
-      gq0_water_vapor, ud_mf, dd_mf, dt_mf, con_g, npdf3d, num_p3d, ncnvcld3d,           &
-      rainc, cldwrk, dt3dt, dq3dt, du3dt, dv3dt, upd_mf, dwn_mf, det_mf,                 &
-      cnvw, cnvc, cnvw_phy_f3d, cnvc_phy_f3d, flag_for_dcnv_generic_tend, errmsg, errflg)
+    subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, qdiag3d, ras, &
+      cscnv, frain, rain1, dtf, cld1d, save_u, save_v, save_t, gu0, gv0, gt0,     &
+      ud_mf, dd_mf, dt_mf, con_g, npdf3d, num_p3d, ncnvcld3d, nsamftrac,          &
+      rainc, cldwrk, upd_mf, dwn_mf, det_mf, dtend, dtidx, index_of_process_dcnv, &
+      index_of_temperature, index_of_x_wind, index_of_y_wind, ntqv, gq0, save_q,  &
+      cnvw, cnvc, cnvw_phy_f3d, cnvc_phy_f3d, flag_for_dcnv_generic_tend,         &
+      ntcw,ntiw,ntclamt,ntrw,ntsw,ntrnc,ntsnc,ntgl,ntgnc, ntrac,clw,              &
+      satmedmf, trans_trac, errmsg, errflg)
 
 
       use machine,               only: kind_phys
 
       implicit none
 
-      integer, intent(in) :: im, levs
+      integer, intent(in) :: im, levs, nsamftrac
       logical, intent(in) :: lssav, ldiag3d, qdiag3d, ras, cscnv
       logical, intent(in) :: flag_for_dcnv_generic_tend
 
       real(kind=kind_phys), intent(in) :: frain, dtf
-      real(kind=kind_phys), dimension(im), intent(in) :: rain1, cld1d
-      real(kind=kind_phys), dimension(im,levs), intent(in) :: save_u, save_v, save_t, save_qv
-      real(kind=kind_phys), dimension(im,levs), intent(in) :: gu0, gv0, gt0, gq0_water_vapor
-      real(kind=kind_phys), dimension(im,levs), intent(in) :: ud_mf, dd_mf, dt_mf
+      real(kind=kind_phys), dimension(:),     intent(in) :: rain1, cld1d
+      real(kind=kind_phys), dimension(:,:),   intent(in) :: save_u, save_v, save_t
+      real(kind=kind_phys), dimension(:,:),   intent(in) :: gu0, gv0, gt0
+      real(kind=kind_phys), dimension(:,:,:), intent(in) :: gq0, save_q
+      real(kind=kind_phys), dimension(:,:),   intent(in) :: ud_mf, dd_mf, dt_mf
       real(kind=kind_phys), intent(in) :: con_g
       integer, intent(in) :: npdf3d, num_p3d, ncnvcld3d
+      logical, intent(in) :: satmedmf, trans_trac
 
-      real(kind=kind_phys), dimension(im), intent(inout) :: rainc, cldwrk
-      ! dt3dt, dq3dt, du3dt, dv3dt upd_mf, dwn_mf, det_mf only allocated if ldiag3d == .true.
-      real(kind=kind_phys), dimension(:,:), intent(inout) :: dt3dt, dq3dt, du3dt, dv3dt
+      real(kind=kind_phys), dimension(:),   intent(inout) :: rainc, cldwrk
       real(kind=kind_phys), dimension(:,:), intent(inout) :: upd_mf, dwn_mf, det_mf
-      real(kind=kind_phys), dimension(im,levs), intent(inout) :: cnvw, cnvc
-      ! The following arrays may not be allocated, depending on certain flags and microphysics schemes.
-      ! Since Intel 15 crashes when passing unallocated arrays to arrays defined with explicit shape,
-      ! use assumed-shape arrays. Note that Intel 18 and GNU 6.2.0-8.1.0 tolerate explicit-shape arrays
-      ! as long as these do not get used when not allocated (it is still invalid Fortran code, though).
+      real(kind=kind_phys), dimension(:,:), intent(inout) :: cnvw, cnvc
+
+      real(kind=kind_phys), dimension(:,:,:), intent(inout) :: dtend
+      integer, intent(in) :: dtidx(:,:), index_of_process_dcnv, index_of_temperature, &
+           index_of_x_wind, index_of_y_wind, ntqv
+      integer, intent(in) :: ntcw,ntiw,ntclamt,ntrw,ntsw,ntrnc,ntsnc,ntgl,ntrac,ntgnc
+      real(kind=kind_phys), dimension(:,:,:), intent(in) :: clw
+
+
       real(kind=kind_phys), dimension(:,:), intent(inout) :: cnvw_phy_f3d, cnvc_phy_f3d
 
       character(len=*), intent(out) :: errmsg
       integer, intent(out) :: errflg
 
-      integer :: i, k
+      integer :: i, k, n, idtend, tracers
 
       ! Initialize CCPP error handling variables
       errmsg = ''
@@ -164,23 +185,56 @@ subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, qdiag3d, ras, cs
         enddo
 
         if (ldiag3d .and. flag_for_dcnv_generic_tend) then
-          do k=1,levs
-            do i=1,im
-              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
+          idtend=dtidx(index_of_temperature,index_of_process_dcnv)
+          if(idtend>=1) then
+            dtend(:,:,idtend) = dtend(:,:,idtend) + (gt0-save_t)*frain
+          endif
+
+          idtend=dtidx(index_of_x_wind,index_of_process_dcnv)
+          if(idtend>=1) then
+            dtend(:,:,idtend) = dtend(:,:,idtend) + (gu0-save_u)*frain
+          endif
 
-!             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)
+          idtend=dtidx(index_of_y_wind,index_of_process_dcnv)
+          if(idtend>=1) then
+            dtend(:,:,idtend) = dtend(:,:,idtend) + (gv0-save_v)*frain
+          endif
+
+          if (cscnv .or. satmedmf .or. trans_trac .or. ras) then
+             tracers = 2
+             do n=2,ntrac
+                if ( n /= ntcw  .and. n /= ntiw  .and. n /= ntclamt .and. &
+                     n /= ntrw  .and. n /= ntsw  .and. n /= ntrnc   .and. &
+                     n /= ntsnc .and. n /= ntgl  .and. n /= ntgnc) then
+                   tracers = tracers + 1
+                   idtend = dtidx(100+n,index_of_process_dcnv)
+                   if(idtend>0) then
+                      dtend(:,:,idtend) = dtend(:,:,idtend) + clw(:,:,tracers)-save_q(:,:,n) * frain
+                   endif
+                endif
+             enddo
+          else
+            do n=2,ntrac
+               idtend = dtidx(100+n,index_of_process_dcnv)
+               if(idtend>0) then
+                  dtend(:,:,idtend) = dtend(:,:,idtend) + (gq0(:,:,n)-save_q(:,:,n))*frain
+               endif
             enddo
-          enddo
+          endif
+          idtend = dtidx(100+ntqv, index_of_process_dcnv)
+          if(idtend>=1) then
+             dtend(:,:,idtend) = dtend(:,:,idtend) + (gq0(:,:,ntqv) - save_q(:,:,ntqv)) * frain
+          endif
+
+          ! convective mass fluxes
           if(qdiag3d) then
-             do k=1,levs
-                do i=1,im
-                   dq3dt(i,k) = dq3dt(i,k) + (gq0_water_vapor(i,k)-save_qv(i,k)) * frain
-                enddo
-             enddo
+            do k=1,levs
+              do i=1,im
+                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
           endif
         endif ! if (ldiag3d)