Merge pull request #468 from climbfuji/update_dtc_develop_from_master…

…_20200707

Update dtc/develop from master 2020/07/07

CMakeLists.txt

@@ -173,15 +173,17 @@ elseif (${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
                                 ${CMAKE_CURRENT_SOURCE_DIR}/physics/cu_gf_sh.F90
                                 ${CMAKE_CURRENT_SOURCE_DIR}/physics/module_bl_mynn.F90
                                 ${CMAKE_CURRENT_SOURCE_DIR}/physics/module_MYNNPBL_wrapper.F90
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/module_sf_mynn.F90
                                 ${CMAKE_CURRENT_SOURCE_DIR}/physics/module_MYNNSFC_wrapper.F90
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/module_MYNNrad_pre.F90
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/module_MYNNrad_post.F90
                                 ${CMAKE_CURRENT_SOURCE_DIR}/physics/module_mp_thompson_make_number_concentrations.F90
                                 ${CMAKE_CURRENT_SOURCE_DIR}/physics/module_SF_JSFC.F90
                                 ${CMAKE_CURRENT_SOURCE_DIR}/physics/module_BL_MYJPBL.F90
                                 PROPERTIES COMPILE_FLAGS "-r8 -ftz")
 
+    # Reduce optimization for module_sf_mynn.F90 (to avoid an apparent compiler bug with Intel 18 on Hera)
+    SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/physics/module_sf_mynn.F90
+                                PROPERTIES COMPILE_FLAGS "${CMAKE_Fortran_FLAGS_OPT} -O1")
+    list(APPEND SCHEMES_SFX_OPT ${CMAKE_CURRENT_SOURCE_DIR}/physics/module_sf_mynn.F90)
+
     # Replace -xHost or -xCORE-AVX2 with -xCORE-AVX-I for certain files
     set(CMAKE_Fortran_FLAGS_LOPT1 ${CMAKE_Fortran_FLAGS_OPT})
     string(REPLACE "-xHOST" "-xCORE-AVX-I"

physics/GFS_DCNV_generic.F90

@@ -11,23 +11,21 @@ end subroutine GFS_DCNV_generic_pre_init
       subroutine GFS_DCNV_generic_pre_finalize()
       end subroutine GFS_DCNV_generic_pre_finalize
 
-#if 0
 !> \brief Interstitial scheme called prior to any deep convective scheme to save state variables for calculating tendencies after the deep convective scheme is executed
 !! \section arg_table_GFS_DCNV_generic_pre_run Argument Table
 !! \htmlinclude GFS_DCNV_generic_pre_run.html
 !!
-#endif
-    subroutine GFS_DCNV_generic_pre_run (im, levs, ldiag3d, do_cnvgwd, cplchm,       &
-                                         gu0, gv0, gt0, gq0_water_vapor,             &
-                                         save_u, save_v, save_t, save_qv, ca_deep,   &
-                                         dqdti, errmsg, errflg)
+    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)
 
       use machine, only: kind_phys
 
       implicit none
 
       integer, intent(in) :: im, levs
-      logical, intent(in) :: ldiag3d, do_cnvgwd, cplchm
+      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
@@ -36,7 +34,6 @@ subroutine GFS_DCNV_generic_pre_run (im, levs, ldiag3d, do_cnvgwd, cplchm,
       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
-      real(kind=kind_phys), dimension(im),      intent(in)    :: ca_deep
       ! dqdti only allocated if cplchm is .true.
       real(kind=kind_phys), dimension(:,:),     intent(inout) :: dqdti
       character(len=*), intent(out) :: errmsg
@@ -65,7 +62,7 @@ subroutine GFS_DCNV_generic_pre_run (im, levs, ldiag3d, do_cnvgwd, cplchm,
         enddo
       endif
 
-      if (ldiag3d .or. cplchm) then
+      if ((ldiag3d.and.qdiag3d) .or. cplchm) then
         do k=1,levs
           do i=1,im
             save_qv(i,k) = gq0_water_vapor(i,k)
@@ -94,19 +91,20 @@ 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, 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,                                                        &
-      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, 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)
+
 
       use machine,               only: kind_phys
 
       implicit none
 
       integer, intent(in) :: im, levs
-      logical, intent(in) :: lssav, ldiag3d, ras, cscnv
+      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
@@ -165,11 +163,10 @@ subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, ras, cscnv,
           cldwrk (i)  = cldwrk (i)  + cld1d(i) * dtf
         enddo
 
-        if (ldiag3d) then
+        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
-!             dq3dt(i,k) = dq3dt(i,k) + (gq0_water_vapor(i,k)-save_qv(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
 
@@ -178,6 +175,13 @@ subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, ras, cscnv,
 !             det_mf(i,k)  = det_mf(i,k)  + dt_mf(i,k) * (con_g*frain)
             enddo
           enddo
+          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
+          endif
         endif ! if (ldiag3d)
 
       endif ! if (lssav)

physics/GFS_DCNV_generic.meta

@@ -25,6 +25,14 @@
   type = logical
   intent = in
   optional = F
+[qdiag3d]
+  standard_name = flag_tracer_diagnostics_3D
+  long_name = flag for 3d tracer diagnostic fields
+  units = flag
+  dimensions = ()
+  type = logical
+  intent = in
+  optional = F
 [do_cnvgwd]
   standard_name = flag_for_convective_gravity_wave_drag
   long_name = flag for convective gravity wave drag (gwd)
@@ -113,15 +121,6 @@
   kind = kind_phys
   intent = inout
   optional = F
-[ca_deep]
-  standard_name = fraction_of_cellular_automata_for_deep_convection
-  long_name = fraction of cellular automata for deep convection
-  units = frac
-  dimensions = (horizontal_dimension)
-  type = real
-  kind = kind_phys
-  intent = in
-  optional = F
 [dqdti]
   standard_name = instantaneous_water_vapor_specific_humidity_tendency_due_to_convection
   long_name = instantaneous moisture tendency due to convection
@@ -185,6 +184,14 @@
   type = logical
   intent = in
   optional = F
+[qdiag3d]
+  standard_name = flag_tracer_diagnostics_3D
+  long_name = flag for 3d tracer diagnostic fields
+  units = flag
+  dimensions = ()
+  type = logical
+  intent = in
+  optional = F
 [ras]
   standard_name = flag_for_ras_deep_convection
   long_name = flag for ras convection scheme
@@ -486,6 +493,13 @@
   kind = kind_phys
   intent = inout
   optional = F
+[flag_for_dcnv_generic_tend]
+  standard_name = flag_for_generic_deep_convection_tendency
+  long_name = true if GFS_DCNV_generic should calculate tendencies
+  units = flag
+  dimensions = ()
+  type = logical
+  intent = in
 [errmsg]
   standard_name = ccpp_error_message
   long_name = error message for error handling in CCPP

physics/GFS_GWD_generic.F90

@@ -18,8 +18,10 @@ end subroutine GFS_GWD_generic_pre_init
       subroutine GFS_GWD_generic_pre_run(                               &
      &           im, levs, nmtvr, mntvar,                               &
      &           oc, oa4, clx, theta,                                   &
+     &           varss, ocss, oa4ss, clxss,                             &
      &           sigma, gamma, elvmax, lssav, ldiag3d,                  &
-     &           dtdt, dt3dt, dtf, errmsg, errflg)
+     &           dudt, dvdt, dtdt, du3dt, dv3dt, dt3dt, dtf,            &
+     &           flag_for_gwd_generic_tend, errmsg, errflg)
 
       use machine, only : kind_phys
       implicit none
@@ -29,12 +31,13 @@ subroutine GFS_GWD_generic_pre_run(                               &
 
       real(kind=kind_phys), intent(out) ::                              &
      &  oc(im), oa4(im,4), clx(im,4),                                   &
+     &  varss(:), ocss(:), oa4ss(:,:), clxss(:,:),                      &
      &  theta(im), sigma(im), gamma(im), elvmax(im)
 
-      logical, intent(in) :: lssav, ldiag3d
-      real(kind=kind_phys), intent(in) :: dtdt(im,levs)
+      logical, intent(in) :: lssav, ldiag3d, flag_for_gwd_generic_tend
+      real(kind=kind_phys), intent(in) :: dtdt(im,levs), dudt(im,levs), dvdt(im,levs)
       ! dt3dt only allocated only if ldiag3d is .true.
-      real(kind=kind_phys), intent(inout) :: dt3dt(:,:)
+      real(kind=kind_phys), intent(inout) :: dt3dt(:,:), du3dt(:,:), dv3dt(:,:)
       real(kind=kind_phys), intent(in) :: dtf
 
       character(len=*), intent(out) :: errmsg
@@ -80,6 +83,26 @@ subroutine GFS_GWD_generic_pre_run(                               &
         clx(:,2)  = 0.0
         clx(:,3)  = 0.0
         clx(:,4)  = 0.0
+      elseif (nmtvr == 24) then   ! GSD_drag_suite
+        oc(:)       = mntvar(:,2)
+        oa4(:,1)    = mntvar(:,3)
+        oa4(:,2)    = mntvar(:,4)
+        oa4(:,3)    = mntvar(:,5)
+        oa4(:,4)    = mntvar(:,6)
+        clx(:,1)    = mntvar(:,7)
+        clx(:,2)    = mntvar(:,8)
+        clx(:,3)    = mntvar(:,9)
+        clx(:,4)    = mntvar(:,10)
+        varss(:)    = mntvar(:,15)
+        ocss(:)     = mntvar(:,16)
+        oa4ss(:,1)  = mntvar(:,17)
+        oa4ss(:,2)  = mntvar(:,18)
+        oa4ss(:,3)  = mntvar(:,19)
+        oa4ss(:,4)  = mntvar(:,20)
+        clxss(:,1)  = mntvar(:,21)
+        clxss(:,2)  = mntvar(:,22)
+        clxss(:,3)  = mntvar(:,23)
+        clxss(:,4)  = mntvar(:,24)
       else
         oc     = 0
         oa4    = 0
@@ -91,10 +114,12 @@ subroutine GFS_GWD_generic_pre_run(                               &
       endif   ! end if_nmtvr
 
       if (lssav) then
-        if (ldiag3d) then
+        if (ldiag3d .and. flag_for_gwd_generic_tend) then
           do k=1,levs
             do i=1,im
               dt3dt(i,k) = dt3dt(i,k) - dtdt(i,k)*dtf
+              du3dt(i,k) = du3dt(i,k) - dudt(i,k)*dtf
+              dv3dt(i,k) = dv3dt(i,k) - dvdt(i,k)*dtf
             enddo
           enddo
         endif
@@ -125,12 +150,12 @@ end subroutine GFS_GWD_generic_post_init
 !!  \section detailed Detailed Algorithm
 !!  @{
       subroutine GFS_GWD_generic_post_run(lssav, ldiag3d, dtf, dusfcg, dvsfcg, dudt, dvdt, dtdt,          &
-      &  dugwd, dvgwd, du3dt, dv3dt, dt3dt, errmsg, errflg)
+      &  dugwd, dvgwd, du3dt, dv3dt, dt3dt, flag_for_gwd_generic_tend, errmsg, errflg)
 
       use machine, only : kind_phys
       implicit none
 
-      logical, intent(in) :: lssav, ldiag3d
+      logical, intent(in) :: lssav, ldiag3d, flag_for_gwd_generic_tend
 
       real(kind=kind_phys), intent(in) :: dusfcg(:), dvsfcg(:)
       real(kind=kind_phys), intent(in) :: dudt(:,:), dvdt(:,:), dtdt(:,:)
@@ -150,7 +175,7 @@ subroutine GFS_GWD_generic_post_run(lssav, ldiag3d, dtf, dusfcg, dvsfcg, dudt, d
         dugwd(:) = dugwd(:) + dusfcg(:)*dtf
         dvgwd(:) = dvgwd(:) + dvsfcg(:)*dtf
 
-        if (ldiag3d) then
+        if (ldiag3d .and. flag_for_gwd_generic_tend) then
           du3dt(:,:) = du3dt(:,:) + dudt(:,:) * dtf
           dv3dt(:,:) = dv3dt(:,:) + dvdt(:,:) * dtf
           dt3dt(:,:) = dt3dt(:,:) + dtdt(:,:) * dtf

physics/GFS_GWD_generic.meta

@@ -66,6 +66,42 @@
   kind = kind_phys
   intent = out
   optional = F
+[varss]
+  standard_name = standard_deviation_of_subgrid_orography_small_scale
+  long_name = standard deviation of subgrid orography small scale
+  units = m
+  dimensions = (horizontal_dimension)
+  type = real
+  kind = kind_phys
+  intent = in
+  optional = F
+[ocss]
+  standard_name = convexity_of_subgrid_orography_small_scale
+  long_name = convexity of subgrid orography small scale
+  units = none
+  dimensions = (horizontal_dimension)
+  type = real
+  kind = kind_phys
+  intent = out
+  optional = F
+[oa4ss]
+  standard_name = asymmetry_of_subgrid_orography_small_scale
+  long_name = asymmetry of subgrid orography small scale
+  units = none
+  dimensions = (horizontal_dimension,4)
+  type = real
+  kind = kind_phys
+  intent = out
+  optional = F
+[clxss]
+  standard_name = fraction_of_grid_box_with_subgrid_orography_higher_than_critical_height_small_scale
+  long_name = horizontal fraction of grid box covered by subgrid orography higher than critical height small scale
+  units = frac
+  dimensions = (horizontal_dimension,4)
+  type = real
+  kind = kind_phys
+  intent = out
+  optional = F
 [theta]
   standard_name = angle_from_east_of_maximum_subgrid_orographic_variations
   long_name = angle with_respect to east of maximum subgrid orographic variations
@@ -118,6 +154,22 @@
   type = logical
   intent = in
   optional = F
+[dudt]
+  standard_name = tendency_of_x_wind_due_to_model_physics
+  long_name = zonal wind tendency due to model physics
+  units = m s-2
+  dimensions = (horizontal_dimension,vertical_dimension)
+  type = real
+  kind = kind_phys
+  intent = inout
+[dvdt]
+  standard_name = tendency_of_y_wind_due_to_model_physics
+  long_name = meridional wind tendency due to model physics
+  units = m s-2
+  dimensions = (horizontal_dimension,vertical_dimension)
+  type = real
+  kind = kind_phys
+  intent = inout
 [dtdt]
   standard_name = tendency_of_air_temperature_due_to_model_physics
   long_name = updated tendency of the temperature
@@ -127,6 +179,22 @@
   kind = kind_phys
   intent = in
   optional = F
+[du3dt]
+  standard_name = cumulative_change_in_x_wind_due_to_orographic_gravity_wave_drag
+  long_name = cumulative change in x wind due to orographic gravity wave drag
+  units = m s-1
+  dimensions = (horizontal_dimension,vertical_dimension)
+  type = real
+  kind = kind_phys
+  intent = inout
+[dv3dt]
+  standard_name = cumulative_change_in_y_wind_due_to_orographic_gravity_wave_drag
+  long_name = cumulative change in y wind due to orographic gravity wave drag
+  units = m s-1
+  dimensions = (horizontal_dimension,vertical_dimension)
+  type = real
+  kind = kind_phys
+  intent = inout
 [dt3dt]
   standard_name = cumulative_change_in_temperature_due_to_orographic_gravity_wave_drag
   long_name = cumulative change in temperature due to orographic gravity wave drag
@@ -145,6 +213,13 @@
   kind = kind_phys
   intent = in
   optional = F
+[flag_for_gwd_generic_tend]
+  standard_name = flag_for_generic_gravity_wave_drag_tendency
+  long_name = true if GFS_GWD_generic should calculate tendencies
+  units = flag
+  dimensions = ()
+  type = logical
+  intent = in
 [errmsg]
   standard_name = ccpp_error_message
   long_name = error message for error handling in CCPP
@@ -287,6 +362,12 @@
   kind = kind_phys
   intent = inout
   optional = F
+[flag_for_gwd_generic_tend]
+  standard_name = flag_for_generic_gravity_wave_drag_tendency
+  long_name = true if GFS_GWD_generic should calculate tendencies
+  units = flag
+  dimensions = ()
+  type = logical
 [errmsg]
   standard_name = ccpp_error_message
   long_name = error message for error handling in CCPP