diff --git a/atmos_model.F90 b/atmos_model.F90
index 92c154cb7..e8cc8b832 100644
--- a/atmos_model.F90
+++ b/atmos_model.F90
@@ -1443,7 +1443,7 @@ subroutine update_atmos_chemistry(state, rc)
ib = i + Atm_block%isc - 1
nb = Atm_block%blkno(ib,jb)
ix = Atm_block%ixp(ib,jb)
- hpbl(i,j) = IPD_Data(nb)%IntDiag%hpbl(ix)
+ hpbl(i,j) = IPD_Data(nb)%Tbd%hpbl(ix)
area(i,j) = IPD_Data(nb)%Grid%area(ix)
stype(i,j) = IPD_Data(nb)%Sfcprop%stype(ix)
rainc(i,j) = IPD_Data(nb)%Coupling%rainc_cpl(ix)
diff --git a/ccpp/physics b/ccpp/physics
index d1ef650d2..fadc3cd23 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit d1ef650d22c4af1414577405c489ed347657563f
+Subproject commit fadc3cd2359eac5ed874a7776724098f9445704d
diff --git a/ccpp/suites/suite_FV3_GSD_noah_mynnsfc.xml b/ccpp/suites/suite_FV3_GSD_noah_mynnsfc.xml
new file mode 100644
index 000000000..0f886fb85
--- /dev/null
+++ b/ccpp/suites/suite_FV3_GSD_noah_mynnsfc.xml
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+ GFS_time_vary_pre
+ GFS_rrtmg_setup
+ GFS_rad_time_vary
+ GFS_phys_time_vary
+
+
+
+
+ GFS_suite_interstitial_rad_reset
+ sgscloud_radpre
+ GFS_rrtmg_pre
+ rrtmg_sw_pre
+ rrtmg_sw
+ rrtmg_sw_post
+ rrtmg_lw_pre
+ rrtmg_lw
+ sgscloud_radpost
+ rrtmg_lw_post
+ GFS_rrtmg_post
+
+
+
+
+ GFS_suite_interstitial_phys_reset
+ GFS_suite_stateout_reset
+ get_prs_fv3
+ GFS_suite_interstitial_1
+ GFS_surface_generic_pre
+ GFS_surface_composites_pre
+ dcyc2t3
+ GFS_surface_composites_inter
+ GFS_suite_interstitial_2
+
+
+
+ mynnsfc_wrapper
+ GFS_surface_loop_control_part1
+ sfc_nst_pre
+ sfc_nst
+ sfc_nst_post
+ lsm_noah
+ sfc_sice
+ GFS_surface_loop_control_part2
+
+
+
+ GFS_surface_composites_post
+ dcyc2t3_post
+ sfc_diag
+ sfc_diag_post
+ GFS_surface_generic_post
+ mynnedmf_wrapper
+ GFS_GWD_generic_pre
+ cires_ugwp
+ cires_ugwp_post
+ GFS_GWD_generic_post
+ rayleigh_damp
+ GFS_suite_stateout_update
+ ozphys_2015
+ h2ophys
+ get_phi_fv3
+ GFS_suite_interstitial_3
+ GFS_DCNV_generic_pre
+ cu_gf_driver_pre
+ cu_gf_driver
+ GFS_DCNV_generic_post
+ GFS_SCNV_generic_pre
+ GFS_SCNV_generic_post
+ GFS_suite_interstitial_4
+ cnvc90
+ GFS_MP_generic_pre
+ mp_thompson_pre
+ mp_thompson
+ mp_thompson_post
+ GFS_MP_generic_post
+ cu_gf_driver_post
+ maximum_hourly_diagnostics
+
+
+
+
+ GFS_stochastics
+
+
+
+
diff --git a/ccpp/suites/suite_FV3_GSD_v0_mynnsfc.xml b/ccpp/suites/suite_FV3_GSD_v0_mynnsfc.xml
new file mode 100644
index 000000000..e71213f35
--- /dev/null
+++ b/ccpp/suites/suite_FV3_GSD_v0_mynnsfc.xml
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+ GFS_time_vary_pre
+ GFS_rrtmg_setup
+ GFS_rad_time_vary
+ GFS_phys_time_vary
+
+
+
+
+ GFS_suite_interstitial_rad_reset
+ sgscloud_radpre
+ GFS_rrtmg_pre
+ rrtmg_sw_pre
+ rrtmg_sw
+ rrtmg_sw_post
+ rrtmg_lw_pre
+ rrtmg_lw
+ sgscloud_radpost
+ rrtmg_lw_post
+ GFS_rrtmg_post
+
+
+
+
+ GFS_suite_interstitial_phys_reset
+ GFS_suite_stateout_reset
+ get_prs_fv3
+ GFS_suite_interstitial_1
+ GFS_surface_generic_pre
+ GFS_surface_composites_pre
+ dcyc2t3
+ GFS_surface_composites_inter
+ GFS_suite_interstitial_2
+
+
+
+ mynnsfc_wrapper
+ GFS_surface_loop_control_part1
+ sfc_nst_pre
+ sfc_nst
+ sfc_nst_post
+ lsm_ruc
+ lsm_ruc_sfc_sice_pre
+ sfc_sice
+ lsm_ruc_sfc_sice_post
+ GFS_surface_loop_control_part2
+
+
+
+ GFS_surface_composites_post
+ dcyc2t3_post
+ sfc_diag
+ sfc_diag_post
+ GFS_surface_generic_post
+ mynnedmf_wrapper
+ GFS_GWD_generic_pre
+ cires_ugwp
+ cires_ugwp_post
+ GFS_GWD_generic_post
+ rayleigh_damp
+ GFS_suite_stateout_update
+ ozphys_2015
+ h2ophys
+ get_phi_fv3
+ GFS_suite_interstitial_3
+ GFS_DCNV_generic_pre
+ cu_gf_driver_pre
+ cu_gf_driver
+ GFS_DCNV_generic_post
+ GFS_SCNV_generic_pre
+ GFS_SCNV_generic_post
+ GFS_suite_interstitial_4
+ cnvc90
+ GFS_MP_generic_pre
+ mp_thompson_pre
+ mp_thompson
+ mp_thompson_post
+ GFS_MP_generic_post
+ cu_gf_driver_post
+ maximum_hourly_diagnostics
+
+
+
+
+ GFS_stochastics
+
+
+
+
diff --git a/gfsphysics/GFS_layer/GFS_diagnostics.F90 b/gfsphysics/GFS_layer/GFS_diagnostics.F90
index 95f7f51e7..25657f760 100644
--- a/gfsphysics/GFS_layer/GFS_diagnostics.F90
+++ b/gfsphysics/GFS_layer/GFS_diagnostics.F90
@@ -1535,7 +1535,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%intpl_method = 'bilinear'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
- ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%hpbl(:)
+ ExtDiag(idx)%data(nb)%var2 => Tbd(nb)%hpbl(:)
enddo
idx = idx + 1
diff --git a/gfsphysics/GFS_layer/GFS_typedefs.F90 b/gfsphysics/GFS_layer/GFS_typedefs.F90
index 68e93533c..db70dd030 100644
--- a/gfsphysics/GFS_layer/GFS_typedefs.F90
+++ b/gfsphysics/GFS_layer/GFS_typedefs.F90
@@ -258,6 +258,9 @@ module GFS_typedefs
real (kind=kind_phys), pointer :: uustar (:) => null() !< boundary layer parameter
real (kind=kind_phys), pointer :: oro (:) => null() !< orography
real (kind=kind_phys), pointer :: oro_uf (:) => null() !< unfiltered orography
+ real (kind=kind_phys), pointer :: evap (:) => null() !<
+ real (kind=kind_phys), pointer :: hflx (:) => null() !<
+ real (kind=kind_phys), pointer :: qss (:) => null() !<
!-- In/Out
#ifdef CCPP
@@ -1193,6 +1196,9 @@ module GFS_typedefs
real (kind=kind_phys), pointer :: phy_f2d (:,:) => null() !< 2d arrays saved for restart
real (kind=kind_phys), pointer :: phy_f3d (:,:,:) => null() !< 3d arrays saved for restart
+!--- Diagnostic that needs to be carried over to the next time step (removed from diag_type)
+ real (kind=kind_phys), pointer :: hpbl (:) => null() !< Planetary boundary layer height
+
#ifndef CCPP
!--- for explicit data blocking
integer :: blkno !< block number of this block
@@ -1417,7 +1423,6 @@ module GFS_typedefs
real (kind=kind_phys), pointer :: dpt2m (:) => null() !< 2 meter dew point temperature
real (kind=kind_phys), pointer :: zlvl (:) => null() !< layer 1 height (m)
real (kind=kind_phys), pointer :: psurf (:) => null() !< surface pressure (Pa)
- real (kind=kind_phys), pointer :: hpbl (:) => null() !< pbl height (m)
real (kind=kind_phys), pointer :: pwat (:) => null() !< precipitable water
real (kind=kind_phys), pointer :: t1 (:) => null() !< layer 1 temperature (K)
real (kind=kind_phys), pointer :: q1 (:) => null() !< layer 1 specific humidity (kg/kg)
@@ -1667,7 +1672,6 @@ module GFS_typedefs
real (kind=kind_phys), pointer :: ep1d_ice(:) => null() !<
real (kind=kind_phys), pointer :: ep1d_land(:) => null() !<
real (kind=kind_phys), pointer :: ep1d_ocean(:) => null() !<
- real (kind=kind_phys), pointer :: evap(:) => null() !<
real (kind=kind_phys), pointer :: evap_ice(:) => null() !<
real (kind=kind_phys), pointer :: evap_land(:) => null() !<
real (kind=kind_phys), pointer :: evap_ocean(:) => null() !<
@@ -1713,7 +1717,6 @@ module GFS_typedefs
real (kind=kind_phys), pointer :: gwdcv(:,:) => null() !<
integer :: h2o_coeff !<
real (kind=kind_phys), pointer :: h2o_pres(:) => null() !<
- real (kind=kind_phys), pointer :: hflx(:) => null() !<
real (kind=kind_phys), pointer :: hflx_ice(:) => null() !<
real (kind=kind_phys), pointer :: hflx_land(:) => null() !<
real (kind=kind_phys), pointer :: hflx_ocean(:) => null() !<
@@ -1784,7 +1787,6 @@ module GFS_typedefs
real (kind=kind_phys), pointer :: qlyr(:,:) => null() !<
real (kind=kind_phys), pointer :: qrn(:,:) => null() !<
real (kind=kind_phys), pointer :: qsnw(:,:) => null() !<
- real (kind=kind_phys), pointer :: qss(:) => null() !<
real (kind=kind_phys), pointer :: qss_ice(:) => null() !<
real (kind=kind_phys), pointer :: qss_land(:) => null() !<
real (kind=kind_phys), pointer :: qss_ocean(:) => null() !<
@@ -2121,6 +2123,9 @@ subroutine sfcprop_create (Sfcprop, IM, Model)
allocate (Sfcprop%uustar (IM))
allocate (Sfcprop%oro (IM))
allocate (Sfcprop%oro_uf (IM))
+ allocate (Sfcprop%evap (IM))
+ allocate (Sfcprop%hflx (IM))
+ allocate (Sfcprop%qss (IM))
Sfcprop%slope = clear_val
Sfcprop%shdmin = clear_val
@@ -2133,6 +2138,9 @@ subroutine sfcprop_create (Sfcprop, IM, Model)
Sfcprop%uustar = clear_val
Sfcprop%oro = clear_val
Sfcprop%oro_uf = clear_val
+ Sfcprop%evap = clear_val
+ Sfcprop%hflx = clear_val
+ Sfcprop%qss = clear_val
!--- In/Out
allocate (Sfcprop%hice (IM))
@@ -4907,6 +4915,9 @@ subroutine tbd_create (Tbd, IM, Model)
! if (Model%do_shoc) Tbd%phy_f3d(:,1,Model%ntot3d-1) = 3.0
! if (Model%do_shoc) Tbd%phy_f3d(:,:,Model%ntot3d-1) = 1.0
+ allocate (Tbd%hpbl (IM))
+ Tbd%hpbl = clear_val
+
#ifndef CCPP
Tbd%blkno = BLKNO
#endif
@@ -5142,7 +5153,6 @@ subroutine diag_create (Diag, IM, Model)
allocate (Diag%dpt2m (IM))
allocate (Diag%zlvl (IM))
allocate (Diag%psurf (IM))
- allocate (Diag%hpbl (IM))
allocate (Diag%pwat (IM))
allocate (Diag%t1 (IM))
allocate (Diag%q1 (IM))
@@ -5442,7 +5452,6 @@ subroutine diag_phys_zero (Diag, Model, linit, iauwindow_center)
Diag%dpt2m = zero
Diag%zlvl = zero
Diag%psurf = zero
- Diag%hpbl = zero
Diag%pwat = zero
Diag%t1 = zero
Diag%q1 = zero
@@ -5784,7 +5793,6 @@ subroutine interstitial_create (Interstitial, IM, Model)
allocate (Interstitial%ep1d_ice (IM))
allocate (Interstitial%ep1d_land (IM))
allocate (Interstitial%ep1d_ocean (IM))
- allocate (Interstitial%evap (IM))
allocate (Interstitial%evap_ice (IM))
allocate (Interstitial%evap_land (IM))
allocate (Interstitial%evap_ocean (IM))
@@ -5827,7 +5835,6 @@ subroutine interstitial_create (Interstitial, IM, Model)
allocate (Interstitial%gwdcu (IM,Model%levs))
allocate (Interstitial%gwdcv (IM,Model%levs))
allocate (Interstitial%h2o_pres (levh2o))
- allocate (Interstitial%hflx (IM))
allocate (Interstitial%hflx_ice (IM))
allocate (Interstitial%hflx_land (IM))
allocate (Interstitial%hflx_ocean (IM))
@@ -5855,7 +5862,6 @@ subroutine interstitial_create (Interstitial, IM, Model)
allocate (Interstitial%prnum (IM,Model%levs))
allocate (Interstitial%qlyr (IM,Model%levr+LTP))
allocate (Interstitial%prcpmp (IM))
- allocate (Interstitial%qss (IM))
allocate (Interstitial%qss_ice (IM))
allocate (Interstitial%qss_land (IM))
allocate (Interstitial%qss_ocean (IM))
@@ -6328,7 +6334,6 @@ subroutine interstitial_phys_reset (Interstitial, Model)
Interstitial%ep1d_ice = huge
Interstitial%ep1d_land = huge
Interstitial%ep1d_ocean = huge
- Interstitial%evap = clear_val
Interstitial%evap_ice = huge
Interstitial%evap_land = huge
Interstitial%evap_ocean = huge
@@ -6367,7 +6372,6 @@ subroutine interstitial_phys_reset (Interstitial, Model)
Interstitial%gflx_ocean = zero
Interstitial%gwdcu = clear_val
Interstitial%gwdcv = clear_val
- Interstitial%hflx = clear_val
Interstitial%hflx_ice = huge
Interstitial%hflx_land = huge
Interstitial%hflx_ocean = huge
@@ -6387,7 +6391,6 @@ subroutine interstitial_phys_reset (Interstitial, Model)
Interstitial%oc = clear_val
Interstitial%prcpmp = clear_val
Interstitial%prnum = clear_val
- Interstitial%qss = clear_val
Interstitial%qss_ice = huge
Interstitial%qss_land = huge
Interstitial%qss_ocean = huge
@@ -6639,7 +6642,6 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno)
write (0,*) 'sum(Interstitial%ep1d_ice ) = ', sum(Interstitial%ep1d_ice )
write (0,*) 'sum(Interstitial%ep1d_land ) = ', sum(Interstitial%ep1d_land )
write (0,*) 'sum(Interstitial%ep1d_ocean ) = ', sum(Interstitial%ep1d_ocean )
- write (0,*) 'sum(Interstitial%evap ) = ', sum(Interstitial%evap )
write (0,*) 'sum(Interstitial%evap_ice ) = ', sum(Interstitial%evap_ice )
write (0,*) 'sum(Interstitial%evap_land ) = ', sum(Interstitial%evap_land )
write (0,*) 'sum(Interstitial%evap_ocean ) = ', sum(Interstitial%evap_ocean )
@@ -6682,7 +6684,6 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno)
write (0,*) 'sum(Interstitial%gflx_ocean ) = ', sum(Interstitial%gflx_ocean )
write (0,*) 'sum(Interstitial%gwdcu ) = ', sum(Interstitial%gwdcu )
write (0,*) 'sum(Interstitial%gwdcv ) = ', sum(Interstitial%gwdcv )
- write (0,*) 'sum(Interstitial%hflx ) = ', sum(Interstitial%hflx )
write (0,*) 'sum(Interstitial%hflx_ice ) = ', sum(Interstitial%hflx_ice )
write (0,*) 'sum(Interstitial%hflx_land ) = ', sum(Interstitial%hflx_land )
write (0,*) 'sum(Interstitial%hflx_ocean ) = ', sum(Interstitial%hflx_ocean )
@@ -6713,7 +6714,6 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno)
write (0,*) 'sum(Interstitial%prcpmp ) = ', sum(Interstitial%prcpmp )
write (0,*) 'sum(Interstitial%prnum ) = ', sum(Interstitial%prnum )
write (0,*) 'sum(Interstitial%qlyr ) = ', sum(Interstitial%qlyr )
- write (0,*) 'sum(Interstitial%qss ) = ', sum(Interstitial%qss )
write (0,*) 'sum(Interstitial%qss_ice ) = ', sum(Interstitial%qss_ice )
write (0,*) 'sum(Interstitial%qss_land ) = ', sum(Interstitial%qss_land )
write (0,*) 'sum(Interstitial%qss_ocean ) = ', sum(Interstitial%qss_ocean )
diff --git a/gfsphysics/GFS_layer/GFS_typedefs.meta b/gfsphysics/GFS_layer/GFS_typedefs.meta
index 074f79381..1c3011902 100644
--- a/gfsphysics/GFS_layer/GFS_typedefs.meta
+++ b/gfsphysics/GFS_layer/GFS_typedefs.meta
@@ -1269,6 +1269,27 @@
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
+[evap]
+ standard_name = kinematic_surface_upward_latent_heat_flux
+ long_name = kinematic surface upward latent heat flux
+ units = kg kg-1 m s-1
+ dimensions = (horizontal_dimension)
+ type = real
+ kind = kind_phys
+[hflx]
+ standard_name = kinematic_surface_upward_sensible_heat_flux
+ long_name = kinematic surface upward sensible heat flux
+ units = K m s-1
+ dimensions = (horizontal_dimension)
+ type = real
+ kind = kind_phys
+[qss]
+ standard_name = surface_specific_humidity
+ long_name = surface air saturation specific humidity
+ units = kg kg-1
+ dimensions = (horizontal_dimension)
+ type = real
+ kind = kind_phys
[raincprv]
standard_name = lwe_thickness_of_convective_precipitation_amount_from_previous_timestep
long_name = convective_precipitation_amount from previous timestep
@@ -4097,6 +4118,13 @@
dimensions = (horizontal_dimension,vertical_dimension_of_h2o_forcing_data,number_of_coefficients_in_h2o_forcing_data)
type = real
kind = kind_phys
+[hpbl]
+ standard_name = atmosphere_boundary_layer_thickness
+ long_name = pbl height
+ units = m
+ dimensions = (horizontal_dimension)
+ type = real
+ kind = kind_phys
[in_nm]
standard_name = in_number_concentration
long_name = IN number concentration
@@ -5127,13 +5155,6 @@
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
-[hpbl]
- standard_name = atmosphere_boundary_layer_thickness
- long_name = pbl height
- units = m
- dimensions = (horizontal_dimension)
- type = real
- kind = kind_phys
[pwat]
standard_name = column_precipitable_water
long_name = precipitable water
@@ -6640,13 +6661,6 @@
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
-[evap]
- standard_name = kinematic_surface_upward_latent_heat_flux
- long_name = kinematic surface upward latent heat flux
- units = kg kg-1 m s-1
- dimensions = (horizontal_dimension)
- type = real
- kind = kind_phys
[evap_ocean]
standard_name = kinematic_surface_upward_latent_heat_flux_over_ocean
long_name = kinematic surface upward latent heat flux over ocean
@@ -7063,13 +7077,6 @@
dimensions = (vertical_dimension_of_h2o_forcing_data)
type = real
kind = kind_phys
-[hflx]
- standard_name = kinematic_surface_upward_sensible_heat_flux
- long_name = kinematic surface upward sensible heat flux
- units = K m s-1
- dimensions = (horizontal_dimension)
- type = real
- kind = kind_phys
[hflx_ocean]
standard_name = kinematic_surface_upward_sensible_heat_flux_over_ocean
long_name = kinematic surface upward sensible heat flux over ocean
@@ -7514,13 +7521,6 @@
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
-[qss]
- standard_name = surface_specific_humidity
- long_name = surface air saturation specific humidity
- units = kg kg-1
- dimensions = (horizontal_dimension)
- type = real
- kind = kind_phys
[qss_ocean]
standard_name = surface_specific_humidity_over_ocean
long_name = surface air saturation specific humidity over ocean
diff --git a/gfsphysics/physics/GFS_debug.F90 b/gfsphysics/physics/GFS_debug.F90
index 75fa97603..1f6ae5096 100644
--- a/gfsphysics/physics/GFS_debug.F90
+++ b/gfsphysics/physics/GFS_debug.F90
@@ -172,7 +172,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
call print_var(mpirank,omprank, blkno, 'Sfcprop%dt_cool ', Sfcprop%dt_cool)
call print_var(mpirank,omprank, blkno, 'Sfcprop%qrain ', Sfcprop%qrain)
end if
- ! CCPP only
+ ! CCPP/RUC only
!if (Model%lsm == Model%lsm_ruc) then
! call print_var(mpirank,omprank, blkno, 'Sfcprop%sh2o', Sfcprop%sh2o)
! call print_var(mpirank,omprank, blkno, 'Sfcprop%smois', Sfcprop%smois)
@@ -215,6 +215,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
call print_var(mpirank,omprank, blkno, 'Tbd%acv' , Tbd%acv)
call print_var(mpirank,omprank, blkno, 'Tbd%acvb' , Tbd%acvb)
call print_var(mpirank,omprank, blkno, 'Tbd%acvt' , Tbd%acvt)
+ call print_var(mpirank,omprank, blkno, 'Tbd%hpbl' , Tbd%hpbl)
if (Model%do_sppt) then
call print_var(mpirank,omprank, blkno, 'Tbd%dtdtr' , Tbd%dtdtr)
call print_var(mpirank,omprank, blkno, 'Tbd%dtotprcp' , Tbd%dtotprcp)
@@ -284,7 +285,6 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
call print_var(mpirank,omprank, blkno, 'Diag%dpt2m ', Diag%dpt2m)
call print_var(mpirank,omprank, blkno, 'Diag%zlvl ', Diag%zlvl)
call print_var(mpirank,omprank, blkno, 'Diag%psurf ', Diag%psurf)
- call print_var(mpirank,omprank, blkno, 'Diag%hpbl ', Diag%hpbl)
call print_var(mpirank,omprank, blkno, 'Diag%pwat ', Diag%pwat)
call print_var(mpirank,omprank, blkno, 'Diag%t1 ', Diag%t1)
call print_var(mpirank,omprank, blkno, 'Diag%q1 ', Diag%q1)
@@ -300,7 +300,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
call print_var(mpirank,omprank, blkno, 'Diag%tdomzr ', Diag%tdomzr)
call print_var(mpirank,omprank, blkno, 'Diag%tdomip ', Diag%tdomip)
call print_var(mpirank,omprank, blkno, 'Diag%tdoms ', Diag%tdoms)
- ! CCPP only
+ ! CCPP/RUC only
!if (Model%lsm == Model%lsm_ruc) then
! call print_var(mpirank,omprank, blkno, 'Diag%wet1 ', Sfcprop%wetness)
!else
@@ -336,7 +336,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
if(Model%lradar) then
call print_var(mpirank,omprank, blkno, 'Diag%refl_10cm ', Diag%refl_10cm)
end if
- ! CCPP only
+ ! CCPP/MYNNPBL only
!if (Model%do_mynnedmf) then
! call print_var(mpirank,omprank, blkno, 'Diag%edmf_a ', Diag%edmf_a)
! call print_var(mpirank,omprank, blkno, 'Diag%edmf_w ', Diag%edmf_w)