Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Omit UGWP in HAFS SDF file following HAFS practice #62

Closed
wants to merge 2 commits into from
Closed

Omit UGWP in HAFS SDF file following HAFS practice #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a9b834
omit UGWP in HAFS SDF file following HAFS practice
mzhangw Aug 3, 2020
72daaf1
FA mp specific changes of defining variables in remapping step
mzhangw Aug 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions ccpp/suites/suite_FV3_HAFS_ferhires.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,6 @@
<scheme>GFS_PBL_generic_pre</scheme>
<scheme>hedmf</scheme>
<scheme>GFS_PBL_generic_post</scheme>
<scheme>GFS_GWD_generic_pre</scheme>
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys</scheme>
Expand Down
9 changes: 7 additions & 2 deletions gfsphysics/CCPP_layer/CCPP_typedefs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ module CCPP_typedefs
real(kind_dyn), pointer :: qr(:,:,:)
real(kind_dyn), pointer :: qs(:,:,:)
real(kind_dyn), pointer :: qg(:,:,:)
real(kind_dyn), pointer :: qf(:,:,:) ! HWRF
real(kind_dyn), pointer :: qc(:,:,:)
real(kind_dyn), pointer :: q_con(:,:,:)
integer :: nthreads
Expand All @@ -86,10 +87,10 @@ module CCPP_typedefs
!-----------------------------
subroutine interstitial_create (Interstitial, is, ie, isd, ied, js, je, jsd, jed, npz, ng, &
dt_atmos, p_split, k_split, zvir, p_ref, ak, bk, &
do_ql, do_qi, do_qr, do_qs, do_qg, do_qa, &
do_ql, do_qi, do_qr, do_qs, do_qg, do_qf, do_qa, &
kappa, hydrostatic, do_sat_adj, &
delp, delz, area, peln, phis, pkz, pt, &
qvi, qv, ql, qi, qr, qs, qg, qc, q_con, &
qvi, qv, ql, qi, qr, qs, qg, qf, qc, q_con, &
nthreads, nwat, ngas, rilist, cpilist, mpirank, mpiroot)
!
implicit none
Expand Down Expand Up @@ -117,6 +118,7 @@ subroutine interstitial_create (Interstitial, is, ie, isd, ied, js, je, jsd, jed
logical, intent(in) :: do_qr
logical, intent(in) :: do_qs
logical, intent(in) :: do_qg
logical, intent(in) :: do_qf ! HWRF
logical, intent(in) :: do_qa
real(kind_dyn), intent(in) :: kappa
logical, intent(in) :: hydrostatic
Expand All @@ -135,6 +137,7 @@ subroutine interstitial_create (Interstitial, is, ie, isd, ied, js, je, jsd, jed
real(kind_dyn), target, intent(in) :: qr(:,:,:)
real(kind_dyn), target, intent(in) :: qs(:,:,:)
real(kind_dyn), target, intent(in) :: qg(:,:,:)
real(kind_dyn), target, intent(in) :: qf(:,:,:) ! HWRF
real(kind_dyn), target, intent(in) :: qc(:,:,:)
real(kind_dyn), target, intent(in) :: q_con(:,:,:)
integer, intent(in) :: nthreads
Expand Down Expand Up @@ -205,6 +208,7 @@ subroutine interstitial_create (Interstitial, is, ie, isd, ied, js, je, jsd, jed
if (do_qr) Interstitial%qr => qr
if (do_qs) Interstitial%qs => qs
if (do_qg) Interstitial%qg => qg
if (do_qf) Interstitial%qf => qf
if (do_qa) Interstitial%qc => qc
#ifdef USE_COND
Interstitial%npzq_con = npz
Expand Down Expand Up @@ -347,6 +351,7 @@ subroutine interstitial_print(Interstitial)
if (associated(Interstitial%qr)) write (0,*) 'sum(Interstitial%qr) = ', Interstitial%qr
if (associated(Interstitial%qs)) write (0,*) 'sum(Interstitial%qs) = ', Interstitial%qs
if (associated(Interstitial%qg)) write (0,*) 'sum(Interstitial%qg) = ', Interstitial%qg
if (associated(Interstitial%qf)) write (0,*) 'sum(Interstitial%qf) = ', Interstitial%qf
if (associated(Interstitial%qc)) write (0,*) 'sum(Interstitial%qc) = ', Interstitial%qc
write (0,*) 'sum(Interstitial%q_con) = ', Interstitial%q_con
write (0,*) 'Interstitial%hydrostatic = ', Interstitial%hydrostatic
Expand Down
7 changes: 7 additions & 0 deletions gfsphysics/CCPP_layer/CCPP_typedefs.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,13 @@
dimensions = (starting_x_direction_index_domain:ending_x_direction_index_domain,starting_y_direction_index_domain:ending_y_direction_index_domain,1:vertical_dimension_for_fast_physics)
type = real
kind = kind_dyn
[qf]
standard_name = mass_weighted_rime_factor_at_Lagrangian_surface
long_name = mass weighted rime factor updated by fast physics at Lagrangian surface
units = kg kg-1
dimensions = (starting_x_direction_index_domain:ending_x_direction_index_domain,starting_y_direction_index_domain:ending_y_direction_index_domain,1:vertical_dimension_for_fast_physics)
type = real
kind = kind_dyn
[qc]
standard_name = cloud_fraction_at_Lagrangian_surface
long_name = cloud fraction at Lagrangian surface
Expand Down
4 changes: 2 additions & 2 deletions io/FV3GFS_io.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2414,8 +2414,8 @@ subroutine fv3gfs_diag_output(time, diag, atm_block, nx, ny, levs, ntcw, ntoz, &
integer :: i, j, k, idx, nblks, nb, ix, ii, jj
integer :: is_in, js_in, isc, jsc
character(len=2) :: xtra
real(kind=kind_phys), dimension(nx*ny) :: var2p
real(kind=kind_phys), dimension(nx*ny,levs) :: var3p
!real(kind=kind_phys), dimension(nx*ny) :: var2p
!real(kind=kind_phys), dimension(nx*ny,levs) :: var3p
real(kind=kind_phys), dimension(nx,ny) :: var2
real(kind=kind_phys), dimension(nx,ny,levs) :: var3
real(kind=kind_phys) :: rdt, rtime_int, rtime_intfull, lcnvfac
Expand Down