check for flag_for_generic_tendency_due_to_gravity_wave_drag before computing diagnostic tendencies in drag_suite

Author: grantfirl

physics/GWD/drag_suite.F90

@@ -217,6 +217,7 @@ subroutine drag_suite_run(                                           &
      &           g, cp, rd, rv, fv, pi, imx, cdmbgwd, alpha_fd,         &
      &           me, master, lprnt, ipr, rdxzb, dx, gwd_opt,            &
      &           do_gsl_drag_ls_bl, do_gsl_drag_ss, do_gsl_drag_tofd,   &
+     &           flag_for_gwd_generic_tend,                             &
      &           dtend, dtidx, index_of_process_orographic_gwd,         &
      &           index_of_temperature, index_of_x_wind,                 &
      &           index_of_y_wind, ldiag3d, ldiag_ugwp, ugwp_seq_update, & 
@@ -325,7 +326,7 @@ subroutine drag_suite_run(                                           &
    real(kind=kind_phys), intent(in) :: deltim, G, CP, RD, RV,    &
      &                                 cdmbgwd(:), alpha_fd
    real(kind=kind_phys), intent(inout), optional :: dtend(:,:,:)
-   logical, intent(in) :: ldiag3d
+   logical, intent(in) :: ldiag3d, flag_for_gwd_generic_tend
    integer, intent(in) :: dtidx(:,:), index_of_temperature,      &
      &  index_of_process_orographic_gwd, index_of_x_wind, index_of_y_wind
 
@@ -542,7 +543,7 @@ subroutine drag_suite_run(                                           &
    dtdt(:,:)  = 0.
    dqdt(:,:,:)= 0.
 
-   if(ldiag3d) then
+   if(ldiag3d .and. .not. flag_for_gwd_generic_tend) then
       udtend = dtidx(index_of_x_wind,index_of_process_orographic_gwd)
       vdtend = dtidx(index_of_y_wind,index_of_process_orographic_gwd)
       Tdtend = dtidx(index_of_temperature,index_of_process_orographic_gwd)
@@ -1433,7 +1434,7 @@ subroutine drag_suite_psl(                                           &
      &           g, cp, rd, rv, fv, pi, imx, cdmbgwd, alpha_fd,         &
      &           me, master, lprnt, ipr, rdxzb, dx, gwd_opt,            &
      &           do_gsl_drag_ls_bl, do_gsl_drag_ss, do_gsl_drag_tofd,   &
-     &           psl_gwd_dx_factor,                                     &
+     &           psl_gwd_dx_factor, flag_for_gwd_generic_tend,          &
      &           dtend, dtidx, index_of_process_orographic_gwd,         &
      &           index_of_temperature, index_of_x_wind,                 &
      &           index_of_y_wind, ldiag3d, ldiag_ugwp, ugwp_seq_update, &
@@ -1543,7 +1544,7 @@ subroutine drag_suite_psl(                                           &
    real(kind=kind_phys), intent(in) :: deltim, G, CP, RD, RV,    &
      &                                 cdmbgwd(:), alpha_fd
    real(kind=kind_phys), intent(inout), optional :: dtend(:,:,:)
-   logical, intent(in) :: ldiag3d
+   logical, intent(in) :: ldiag3d, flag_for_gwd_generic_tend
    integer, intent(in) :: dtidx(:,:), index_of_temperature,      &
      &  index_of_process_orographic_gwd, index_of_x_wind, index_of_y_wind
 
@@ -1768,7 +1769,7 @@ subroutine drag_suite_psl(                                           &
    dvdt(:,:)  = 0.
    dtdt(:,:)  = 0.
 
-   if(ldiag3d) then
+   if(ldiag3d .and. .not. flag_for_gwd_generic_tend) then
       udtend = dtidx(index_of_x_wind,index_of_process_orographic_gwd)
       vdtend = dtidx(index_of_y_wind,index_of_process_orographic_gwd)
       Tdtend = dtidx(index_of_temperature,index_of_process_orographic_gwd)

physics/GWD/drag_suite.meta

@@ -605,6 +605,13 @@
   dimensions = ()
   type = logical
   intent = in
+[flag_for_gwd_generic_tend]
+  standard_name = flag_for_generic_tendency_due_to_gravity_wave_drag
+  long_name = true if GFS_GWD_generic should calculate tendencies
+  units = flag
+  dimensions = ()
+  type = logical
+  intent = in
 [dtend]
   standard_name = cumulative_change_of_state_variables
   long_name = diagnostic tendencies for state variables

physics/GWD/ugwpv1_gsldrag.F90

@@ -563,7 +563,7 @@ subroutine ugwpv1_gsldrag_run(me, master, im, levs, ak, bk, ntrac, lonr, dtp,
                  cdmbgwd(1:2),alpha_fd,me,master,                    &
                  lprnt,ipr,rdxzb,dx,gwd_opt,  &
                  do_gsl_drag_ls_bl,do_gsl_drag_ss,do_gsl_drag_tofd,  &
-                 psl_gwd_dx_factor,                                  &
+                 psl_gwd_dx_factor, flag_for_gwd_generic_tend,       &
                  dtend, dtidx, index_of_process_orographic_gwd,      &
                  index_of_temperature, index_of_x_wind,              &
                  index_of_y_wind, ldiag3d, ldiag_ugwp,               &

physics/GWD/unified_ugwp.F90

@@ -521,7 +521,7 @@ subroutine unified_ugwp_run(me, master, im, levs, ak,bk, ntrac, dtp, kdt,
                  cdmbgwd,alpha_fd,me,master,                         &
                  lprnt,ipr,rdxzb,dx,gwd_opt,                         &
                  do_gsl_drag_ls_bl,do_gsl_drag_ss,do_gsl_drag_tofd,  &
-                 psl_gwd_dx_factor,                                  &
+                 psl_gwd_dx_factor, flag_for_gwd_generic_tend,       &
                  dtend, dtidx, index_of_process_orographic_gwd,      &
                  index_of_temperature, index_of_x_wind,              &
                  index_of_y_wind, ldiag3d, ldiag_ugwp,               &