SOme more changes from RTs

physics/CONV/C3/cu_c3_deep.F90

@@ -167,7 +167,7 @@ subroutine cu_c3_deep_run(        &
      real(kind=kind_phys),  dimension (its:)                   &
         ,intent (in  )                   ::  rand_mom,rand_vmas
 !$acc declare copyin(rand_clos,rand_mom,rand_vmas)
-     real(kind=kind_phys), intent(in), dimension (its:) :: ca_deep(:)
+     real(kind=kind_phys), intent(in), dimension (its:), optional :: ca_deep(:)
      integer, intent(in) :: do_capsuppress
      real(kind=kind_phys), intent(in), dimension(:) :: cap_suppress_j
 !$acc declare create(cap_suppress_j)
@@ -190,7 +190,7 @@ subroutine cu_c3_deep_run(        &
         ,intent (in  )                      ::                         &
         tmf
      real(kind=kind_phys),    dimension (its:,kts:)                              &
-        ,intent (in  )                      ::                         &
+        ,intent (in  ), optional                      ::                         &
         qmicro, sigmain, forceqv_spechum
      real(kind=kind_phys),    dimension (its:)                                      &
         ,intent (inout  )                   ::                         &
@@ -226,7 +226,7 @@ subroutine cu_c3_deep_run(        &
          q,qo,zuo,zdo,zdm
 !$acc declare sigmaout                                                                                                                                                      
      real(kind=kind_phys),    dimension (its:,kts:)                              &
-        ,intent (out)                     ::                           &
+        ,intent (out), optional                     ::                           &
          sigmaout
      real(kind=kind_phys), dimension (its:)                                         &
         ,intent (in   )                   ::                           &

physics/CONV/C3/cu_c3_driver.F90

@@ -121,7 +121,7 @@ subroutine cu_c3_driver_run(ntracer,garea,im,km,dt,flag_init,flag_restart,&
    real(kind=kind_phys),  dimension( : , : ), intent(in    ) :: w,phil,delp
    real(kind=kind_phys), dimension ( : , : ), intent(in    ) :: sigmain,qmicro
    real(kind=kind_phys),  dimension( : , : ), intent(inout ) :: t,us,vs
-   real(kind=kind_phys),  dimension( : , : ), intent(inout ) :: qci_conv
+   real(kind=kind_phys),  dimension( : , : ), intent(inout ), optional :: qci_conv
    real(kind=kind_phys),  dimension( : , : ), intent(out   ) :: cnvw_moist,cnvc
    real(kind=kind_phys), dimension ( : , : ), intent(out   ) :: sigmaout
    real(kind=kind_phys),  dimension( : , : ), intent(inout ) :: cliw, clcw
@@ -141,7 +141,7 @@ subroutine cu_c3_driver_run(ntracer,garea,im,km,dt,flag_init,flag_restart,&
    integer, dimension (:), intent(out) :: hbot,htop,kcnv
    integer, dimension (:), intent(in)  :: xland
    real(kind=kind_phys),    dimension (:), intent(in) :: pbl
-   real(kind=kind_phys),    dimension (:), intent(in) :: maxMF
+   real(kind=kind_phys),    dimension (:), intent(in), optional :: maxMF
 !$acc declare copyout(hbot,htop,kcnv)
 !$acc declare copyin(xland,pbl)
    integer, dimension (im) :: tropics
@@ -159,7 +159,7 @@ subroutine cu_c3_driver_run(ntracer,garea,im,km,dt,flag_init,flag_restart,&
    ! Specific humidity from FV3
    real(kind=kind_phys), dimension (:,:), intent(in) :: qv2di_spechum
    real(kind=kind_phys), dimension (:,:), intent(inout) :: qv_spechum
-   real(kind=kind_phys), dimension (:), intent(inout) :: aod_gf
+   real(kind=kind_phys), dimension (:), intent(inout), optional :: aod_gf
 !$acc declare copyin(qv2di_spechum) copy(qv_spechum,aod_gf)
    ! Local water vapor mixing ratios and cloud water mixing ratios
    real(kind=kind_phys), dimension (im,km) :: qv2di, qv, forceqv, cnvw

physics/CONV/C3/cu_c3_driver.meta

@@ -438,6 +438,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = True
 [cliw]
   standard_name = ice_water_mixing_ratio_convective_transport_tracer
   long_name = ratio of mass of ice water to mass of dry air plus vapor (without condensates) in the convectively transported tracer array
@@ -617,6 +618,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = True
 [fhour]
   standard_name = forecast_time
   long_name = current forecast time
@@ -686,6 +688,7 @@
   type = real
   kind = kind_phys
   intent = out
+  optional = True
 [maxMF]
   standard_name = maximum_mass_flux
   long_name = maximum mass flux within a column

physics/CONV/C3/cu_c3_sh.F90

@@ -104,7 +104,7 @@ subroutine cu_c3_sh_run (                                            &
         ,intent (in  )                      ::                         &
         tmf
      real(kind=kind_phys),    dimension (its:,kts:)                              &
-        ,intent (in  )                      ::                         &
+        ,intent (in  ), optional                      ::                         &
         qmicro, sigmain, forceqv_spechum
 
      real(kind=kind_phys),    dimension (its:)                                      &
@@ -139,7 +139,7 @@ subroutine cu_c3_sh_run (                                            &
         dtime,tcrit,fv,r_d,betascu,betamcu,betadcu
 !$acc declare sigmaout
      real(kind=kind_phys),    dimension (its:,kts:)                              &
-        ,intent (out)                     ::                           &
+        ,intent (out), optional                     ::                           &
         sigmaout
 
 

physics/CONV/Grell_Freitas/cu_gf_deep.F90

@@ -158,7 +158,7 @@ subroutine cu_gf_deep_run(        &
 !$acc declare copyin(rand_clos,rand_mom,rand_vmas)
 
      integer, intent(in) :: do_capsuppress
-     real(kind=kind_phys), intent(in), dimension(:) :: cap_suppress_j
+     real(kind=kind_phys), intent(in), dimension(:), optional :: cap_suppress_j
 !$acc declare create(cap_suppress_j)
   !
   ! 
@@ -221,7 +221,7 @@ subroutine cu_gf_deep_run(        &
         chem3d
      logical, intent (in) :: do_smoke_transport
      real(kind=kind_phys), dimension (:,:)                             &
-         , intent (out) :: wetdpc_deep
+         , intent (out), optional :: wetdpc_deep
      real(kind=kind_phys), intent (in) :: fscav(:)
 !$acc declare copy(chem3d) copyout(wetdpc_deep) copyin(fscav)
 
@@ -376,7 +376,7 @@ subroutine cu_gf_deep_run(        &
 !$acc       ktopdby,kbconx,ierr2,ierr3,kbmax)
 
      integer,  dimension (its:ite), intent(inout) :: ierr
-     integer,  dimension (its:ite), intent(in) :: csum
+     integer,  dimension (its:ite), intent(in), optional :: csum
 !$acc declare copy(ierr) copyin(csum)
      integer                              ::                             &
        iloop,nens3,ki,kk,i,k

physics/CONV/Grell_Freitas/cu_gf_driver.F90

@@ -82,7 +82,7 @@ subroutine cu_gf_driver_run(ntracer,garea,im,km,dt,flag_init,flag_restart, gf_co
       integer            :: ichoicem=13  ! 0 2 5 13
       integer            :: ichoice_s=3  ! 0 1 2 3
       integer, intent(in) :: spp_cu_deep ! flag for using SPP perturbations
-      real(kind_phys), dimension(:,:), intent(in) ::        &
+      real(kind_phys), dimension(:,:), optional, intent(in) ::        &
      &                    spp_wts_cu_deep
       real(kind=kind_phys) :: spp_wts_cu_deep_tmp
 
@@ -108,10 +108,10 @@ subroutine cu_gf_driver_run(ntracer,garea,im,km,dt,flag_init,flag_restart, gf_co
         index_of_x_wind, index_of_y_wind, index_of_temperature,            &
         index_of_process_scnv, index_of_process_dcnv, ntqv, ntcw, ntiw
 !$acc declare copyin(dtidx)
-   real(kind=kind_phys),  dimension( : , : ), intent(in    ) :: forcet,forceqv_spechum
+   real(kind=kind_phys),  dimension( : , : ), intent(in    ), optional :: forcet,forceqv_spechum
    real(kind=kind_phys),  dimension( : , : ), intent(in    ) :: w,phil
    real(kind=kind_phys),  dimension( : , : ), intent(inout ) :: t,us,vs
-   real(kind=kind_phys),  dimension( : , : ), intent(inout ) :: qci_conv
+   real(kind=kind_phys),  dimension( : , : ), intent(inout ), optional :: qci_conv
    real(kind=kind_phys),  dimension( : , : ), intent(out   ) :: cnvw_moist,cnvc
    real(kind=kind_phys),  dimension( : , : ), intent(inout ) :: cliw, clcw
 !$acc declare copyin(forcet,forceqv_spechum,w,phil)
@@ -123,7 +123,7 @@ subroutine cu_gf_driver_run(ntracer,garea,im,km,dt,flag_init,flag_restart, gf_co
    integer, intent(in) :: dfi_radar_max_intervals
    real(kind=kind_phys), intent(in) :: fhour, fh_dfi_radar(:)
    integer, intent(in) :: num_dfi_radar, ix_dfi_radar(:)
-   real(kind=kind_phys), intent(in) :: cap_suppress(:,:)
+   real(kind=kind_phys), intent(in), optional :: cap_suppress(:,:)
 !$acc declare copyin(fh_dfi_radar,ix_dfi_radar,cap_suppress)
 
    integer, dimension (:), intent(out) :: hbot,htop,kcnv
@@ -137,16 +137,16 @@ subroutine cu_gf_driver_run(ntracer,garea,im,km,dt,flag_init,flag_restart, gf_co
 !  ruc variable
    real(kind=kind_phys), dimension (:),   intent(in)  :: hfx2,qfx2,psuri
    real(kind=kind_phys), dimension (:,:), intent(out) :: dd_mf,dt_mf
-   real(kind=kind_phys), dimension (:,:), intent(out) :: ud_mf
+   real(kind=kind_phys), dimension (:,:), intent(out), optional :: ud_mf
    real(kind=kind_phys), dimension (:),   intent(out) :: raincv,cld1d
-   real(kind=kind_phys), dimension (:),   intent(out) :: maxupmf
+   real(kind=kind_phys), dimension (:),   intent(out), optional :: maxupmf
    real(kind=kind_phys), dimension (:,:), intent(in)  :: t2di,p2di
 !$acc declare copyin(hfx2,qfx2,psuri,t2di,p2di)
 !$acc declare copyout(ud_mf,dd_mf,dt_mf,raincv,cld1d)
    ! Specific humidity from FV3
    real(kind=kind_phys), dimension (:,:), intent(in) :: qv2di_spechum
    real(kind=kind_phys), dimension (:,:), intent(inout) :: qv_spechum
-   real(kind=kind_phys), dimension (:), intent(inout) :: aod_gf
+   real(kind=kind_phys), dimension (:), intent(inout), optional :: aod_gf
 !$acc declare copyin(qv2di_spechum) copy(qv_spechum,aod_gf)
    ! Local water vapor mixing ratios and cloud water mixing ratios
    real(kind=kind_phys), dimension (im,km) :: qv2di, qv, forceqv, cnvw
@@ -157,11 +157,11 @@ subroutine cu_gf_driver_run(ntracer,garea,im,km,dt,flag_init,flag_restart, gf_co
    real(kind=kind_phys), intent(in   ) :: dt
 
    integer, intent(in   ) :: imfshalcnv
-   integer, dimension(:), intent(inout) :: cactiv,cactiv_m
+   integer, dimension(:), intent(inout), optional :: cactiv,cactiv_m
    real(kind_phys), dimension(:), intent(in) :: fscav
 !$acc declare copyin(fscav)
    real(kind_phys), dimension(:,:,:), intent(inout), optional :: chem3d
-   real(kind_phys), dimension(:,:), intent(inout)   :: wetdpc_deep
+   real(kind_phys), dimension(:,:), intent(inout), optional   :: wetdpc_deep
 !$acc declare copy(cactiv,cactiv_m,chem3d,wetdpc_deep)
 
    character(len=*), intent(out) :: errmsg

physics/CONV/Grell_Freitas/cu_gf_driver.meta

@@ -128,13 +128,15 @@
   dimensions = (horizontal_loop_extent)
   type = integer
   intent = inout
+  optional = True
 [cactiv_m]
   standard_name = counter_for_grell_freitas_mid_level_convection
   long_name = mid-level cloud convective activity memory
   units = none
   dimensions = (horizontal_loop_extent)
   type = integer
   intent = inout
+  optional = True
 [g]
   standard_name = gravitational_acceleration
   long_name = gravitational acceleration
@@ -175,6 +177,7 @@
   type = real
   kind = kind_phys
   intent = in
+  optional = True
 [forceqv_spechum]
   standard_name = tendendy_of_specific_humidity_due_to_nonphysics
   long_name = moisture tendency due to dynamics only
@@ -183,6 +186,7 @@
   type = real
   kind = kind_phys
   intent = in
+  optional = True
 [phil]
   standard_name = geopotential
   long_name = layer geopotential
@@ -363,6 +367,7 @@
   type = real
   kind = kind_phys
   intent = out
+  optional = True
 [dd_mf]
   standard_name = instantaneous_atmosphere_downdraft_convective_mass_flux
   long_name = (downdraft mass flux) * delt
@@ -510,6 +515,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = True
 [fhour]
   standard_name = forecast_time
   long_name = current forecast time
@@ -555,6 +561,7 @@
   type = real
   kind = kind_phys
   intent = in
+  optional = True
 [maxupmf]
   standard_name = maximum_convective_updraft_mass_flux
   long_name = maximum convective updraft mass flux within a column
@@ -563,6 +570,7 @@
   type = real
   kind = kind_phys
   intent = out
+  optional = True
 [maxMF]
   standard_name = maximum_mass_flux
   long_name = maximum mass flux within a column
@@ -571,6 +579,7 @@
   type = real
   kind = kind_phys
   intent = in
+  optional = True
 [do_mynnedmf]
   standard_name = flag_for_mellor_yamada_nakanishi_niino_pbl_scheme
   long_name = flag to activate MYNN-EDMF
@@ -614,6 +623,7 @@
   type = real
   kind = kind_phys
   intent = in
+  optional = True
 [spp_cu_deep]
   standard_name = control_for_deep_convection_spp_perturbations
   long_name = control for deep convection spp perturbations
@@ -660,6 +670,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = True
 [kdt]
   standard_name = index_of_timestep
   long_name = current forecast iteration

physics/CONV/RAS/rascnv.F90

@@ -333,7 +333,7 @@ subroutine rascnv_run(IM,     k,      itc, ntc, ntr,   dt,  dtf   &
      &,                                                   rhc
       real(kind=kind_phys), dimension(:,:), intent(out) :: ud_mf
       real(kind=kind_phys), dimension(:,:), intent(out) :: dd_mf, dt_mf
-      real(kind=kind_phys), dimension(:,:), intent(inout) :: qlcn, qicn, w_upi   &
+      real(kind=kind_phys), dimension(:,:), intent(inout), optional :: qlcn, qicn, w_upi   &
      &,                                                   cnv_mfd                &
      &,                                                   cnv_dqldt, clcn        &
      &,                                                   cnv_fice, cnv_ndrop    &

physics/CONV/RAS/rascnv.meta

@@ -514,6 +514,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = True
 [qicn]
   standard_name = mass_fraction_of_convective_cloud_ice
   long_name = mass fraction of convective cloud ice water
@@ -522,6 +523,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = True
 [w_upi]
   standard_name = vertical_velocity_for_updraft
   long_name = vertical velocity for updraft
@@ -530,6 +532,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = True
 [cf_upi]
   standard_name = convective_cloud_fraction_for_microphysics
   long_name = convective cloud fraction for microphysics
@@ -538,6 +541,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = True
 [cnv_mfd]
   standard_name = detrained_mass_flux
   long_name = detrained mass flux
@@ -546,6 +550,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = True
 [cnv_dqldt]
   standard_name = tendency_of_cloud_water_due_to_convective_microphysics
   long_name = tendency of cloud water due to convective microphysics
@@ -554,6 +559,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = True
 [clcn]
   standard_name = convective_cloud_volume_fraction
   long_name = convective cloud volume fraction
@@ -562,6 +568,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = True
 [cnv_fice]
   standard_name = ice_fraction_in_convective_tower
   long_name = ice fraction in convective tower
@@ -570,6 +577,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = True
 [cnv_ndrop]
   standard_name = number_concentration_of_cloud_liquid_water_particles_for_detrainment
   long_name = droplet number concentration in convective detrainment
@@ -578,6 +586,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = True
 [cnv_nice]
   standard_name = number_concentration_of_ice_crystals_for_detrainment
   long_name = crystal number concentration in convective detrainment
@@ -586,6 +595,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = True
 [errmsg]
   standard_name = ccpp_error_message
   long_name = error message for error handling in CCPP

physics/GWD/cires_ugwp.F90

@@ -230,10 +230,10 @@ subroutine cires_ugwp_run(do_ugwp, me,  master, im,  levs, ntrac, dtp, kdt, lonr
     real(kind=kind_phys),    intent(out), dimension(:)      :: tau_mtb, tau_ogw, tau_tofd, tau_ngw
     real(kind=kind_phys),    intent(out), dimension(:, :):: gw_dudt, gw_dvdt, gw_dtdt, gw_kdis
     real(kind=kind_phys),    intent(out), dimension(:, :):: dudt_mtb, dudt_tms
-    real(kind=kind_phys),    intent(out), dimension(:, :) :: dudt_ogw
-    real(kind=kind_phys),    intent(out), dimension(:) :: dusfc_ms, dvsfc_ms, dusfc_bl, dvsfc_bl
-    real(kind=kind_phys),    intent(out), dimension(:, :) :: dtauy2d_ms
-    real(kind=kind_phys),    intent(out), dimension(:, :) :: dtaux2d_bl, dtauy2d_bl
+    real(kind=kind_phys),    intent(out), dimension(:, :), optional :: dudt_ogw
+    real(kind=kind_phys),    intent(out), dimension(:), optional :: dusfc_ms, dvsfc_ms, dusfc_bl, dvsfc_bl
+    real(kind=kind_phys),    intent(out), dimension(:, :), optional :: dtauy2d_ms
+    real(kind=kind_phys),    intent(out), dimension(:, :), optional :: dtaux2d_bl, dtauy2d_bl
 
     ! dtend is only allocated if ldiag=.true.
     real(kind=kind_phys), optional, intent(inout) :: dtend(:,:,:)