Skip to content

gsd/develop: handle blocked data structures in init and finalize routines, revert workaround in mp_thompson_init, metadata cleanup #29

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

Merged
DomHeinzeller merged 10 commits into from
Jun 1, 2020
Merged

gsd/develop: handle blocked data structures in init and finalize routines, revert workaround in mp_thompson_init, metadata cleanup #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7d7c2ca
physics/rrtmgp_lw_cloud_sampling.*, physics/rrtmgp_sw_cloud_sampling.…
climbfuji May 20, 2020
4b5c379
Remove physics/GFS_suite_init_finalize_test.*
climbfuji May 20, 2020
5f01f22
Merge branch 'gsd/develop' of https://github.com/NOAA-GSD/ccpp-physic…
climbfuji May 26, 2020
d44e2e7
Clean up use of horizontal_dimension versus horizontal_loop_extent in…
climbfuji May 27, 2020
b3c070d
physics/GFS_debug.F90: bugfix for conditionally allocated variables
climbfuji May 27, 2020
fca0786
physics/GFS_phys_time_vary.fv3.meta: bugfix, use correct dimensions i…
climbfuji May 27, 2020
2354a89
physics/module_bl_mynn.F90: fix compiler warning
climbfuji May 27, 2020
6d6dd49
physics/mp_thompson.{F90,meta}: revert workaround in mp_thompson_init…
climbfuji May 27, 2020
5e5cfb3
Minor bugfixes for handling conditionally allocated variables
climbfuji May 27, 2020
ecd6777
Remove legacy code in physics/module_mp_thompson.F90
climbfuji May 28, 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
8 changes: 4 additions & 4 deletions physics/GFS_MP_generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ end subroutine GFS_MP_generic_post_init
!!
!> \section gfs_mp_gen GFS MP Generic Post General Algorithm
!> @{
subroutine GFS_MP_generic_post_run(im, ix, levs, kdt, nrcm, ncld, nncl, ntcw, ntrac, imp_physics, imp_physics_gfdl, &
subroutine GFS_MP_generic_post_run(im, levs, kdt, nrcm, ncld, nncl, ntcw, ntrac, imp_physics, imp_physics_gfdl, &
imp_physics_thompson, imp_physics_mg, imp_physics_fer_hires, cal_pre, lssav, ldiag3d, qdiag3d, cplflx, cplchm, con_g, dtf, frain, rainc, rain1, &
rann, xlat, xlon, gt0, gq0, prsl, prsi, phii, tsfc, ice, snow, graupel, save_t, save_qv, rain0, ice0, snow0, &
graupel0, del, rain, domr_diag, domzr_diag, domip_diag, doms_diag, tprcp, srflag, sr, cnvprcp, totprcp, totice, &
Expand All @@ -104,15 +104,15 @@ subroutine GFS_MP_generic_post_run(im, ix, levs, kdt, nrcm, ncld, nncl, ntcw, nt

implicit none

integer, intent(in) :: im, ix, levs, kdt, nrcm, ncld, nncl, ntcw, ntrac
integer, intent(in) :: im, levs, kdt, nrcm, ncld, nncl, ntcw, ntrac
integer, intent(in) :: imp_physics, imp_physics_gfdl, imp_physics_thompson, imp_physics_mg, imp_physics_fer_hires
logical, intent(in) :: cal_pre, lssav, ldiag3d, qdiag3d, cplflx, cplchm

real(kind=kind_phys), intent(in) :: dtf, frain, con_g
real(kind=kind_phys), dimension(im), intent(in) :: rainc, rain1, xlat, xlon, tsfc
real(kind=kind_phys), dimension(im), intent(inout) :: ice, snow, graupel
real(kind=kind_phys), dimension(im), intent(in) :: rain0, ice0, snow0, graupel0
real(kind=kind_phys), dimension(ix,nrcm), intent(in) :: rann
real(kind=kind_phys), dimension(im,nrcm), intent(in) :: rann
real(kind=kind_phys), dimension(im,levs), intent(in) :: gt0, prsl, save_t, save_qv, del
real(kind=kind_phys), dimension(im,levs+1), intent(in) :: prsi, phii
real(kind=kind_phys), dimension(im,levs,ntrac), intent(in) :: gq0
Expand Down Expand Up @@ -224,7 +224,7 @@ subroutine GFS_MP_generic_post_run(im, ix, levs, kdt, nrcm, ncld, nncl, ntcw, nt

if (cal_pre) then ! hchuang: add dominant precipitation type algorithm
!
call calpreciptype (kdt, nrcm, im, ix, levs, levs+1, &
call calpreciptype (kdt, nrcm, im, im, levs, levs+1, &
rann, xlat, xlon, gt0, &
gq0(:,:,1), prsl, prsi, &
rain, phii, tsfc, & ! input
Expand Down
8 changes: 0 additions & 8 deletions physics/GFS_MP_generic.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,6 @@
type = integer
intent = in
optional = F
[ix]
standard_name = horizontal_dimension
long_name = horizontal dimension
units = count
dimensions = ()
type = integer
intent = in
optional = F
[levs]
standard_name = vertical_dimension
long_name = vertical layer dimension
Expand Down
18 changes: 12 additions & 6 deletions physics/GFS_debug.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,12 +348,18 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
end if
! 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)
call print_var(mpirank,omprank, blkno, 'Diag%edmf_qt ', Diag%edmf_qt)
call print_var(mpirank,omprank, blkno, 'Diag%edmf_thl ', Diag%edmf_thl)
call print_var(mpirank,omprank, blkno, 'Diag%edmf_ent ', Diag%edmf_ent)
call print_var(mpirank,omprank, blkno, 'Diag%edmf_qc ', Diag%edmf_qc)
if (Model%bl_mynn_output .ne. 0) 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)
call print_var(mpirank,omprank, blkno, 'Diag%edmf_qt ', Diag%edmf_qt)
call print_var(mpirank,omprank, blkno, 'Diag%edmf_thl ', Diag%edmf_thl)
call print_var(mpirank,omprank, blkno, 'Diag%edmf_ent ', Diag%edmf_ent)
call print_var(mpirank,omprank, blkno, 'Diag%edmf_qc ', Diag%edmf_qc)
call print_var(mpirank,omprank, blkno, 'Diag%sub_thl ', Diag%sub_thl)
call print_var(mpirank,omprank, blkno, 'Diag%sub_sqv ', Diag%sub_sqv)
call print_var(mpirank,omprank, blkno, 'Diag%det_thl ', Diag%det_thl)
call print_var(mpirank,omprank, blkno, 'Diag%det_sqv ', Diag%det_sqv)
end if
call print_var(mpirank,omprank, blkno, 'Diag%nupdraft ', Diag%nupdraft)
call print_var(mpirank,omprank, blkno, 'Diag%maxMF ', Diag%maxMF)
call print_var(mpirank,omprank, blkno, 'Diag%ktop_plume ', Diag%ktop_plume)
Expand Down
6 changes: 3 additions & 3 deletions physics/GFS_phys_time_vary.fv3.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
standard_name = GFS_data_type_instance_all_blocks
long_name = Fortran DDT containing FV3-GFS data
units = DDT
dimensions = (ccpp_block_number)
dimensions = (ccpp_block_count)
type = GFS_data_type
intent = inout
optional = F
Expand All @@ -21,7 +21,7 @@
standard_name = GFS_interstitial_type_instance_all_threads
long_name = Fortran DDT containing FV3-GFS interstitial data
units = DDT
dimensions = (ccpp_thread_number)
dimensions = (omp_threads)
type = GFS_interstitial_type
intent = inout
optional = F
Expand Down Expand Up @@ -81,7 +81,7 @@
standard_name = GFS_data_type_instance_all_blocks
long_name = Fortran DDT containing FV3-GFS data
units = DDT
dimensions = (ccpp_block_number)
dimensions = (ccpp_block_count)
type = GFS_data_type
intent = inout
optional = F
Expand Down
4 changes: 2 additions & 2 deletions physics/GFS_rrtmg_setup.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@
intent = in
optional = F
[im]
standard_name = horizontal_loop_extent
long_name = horizontal loop extent
standard_name = horizontal_dimension
long_name = horizontal dimension
units = count
dimensions = ()
type = integer
Expand Down
4 changes: 1 addition & 3 deletions physics/GFS_rrtmgp_pre.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,10 @@ module GFS_rrtmgp_pre
!! \section arg_table_GFS_rrtmgp_pre_init
!! \htmlinclude GFS_rrtmgp_pre_init.html
!!
subroutine GFS_rrtmgp_pre_init(Model, Radtend, active_gases_array, errmsg, errflg)
subroutine GFS_rrtmgp_pre_init(Model, active_gases_array, errmsg, errflg)
! Inputs
type(GFS_control_type), intent(inout) :: &
Model ! DDT: FV3-GFS model control parameters
type(GFS_radtend_type), intent(inout) :: &
Radtend ! DDT: FV3-GFS radiation tendencies

! Outputs
character(len=*),dimension(Model%ngases), intent(out) :: &
Expand Down
8 changes: 0 additions & 8 deletions physics/GFS_rrtmgp_pre.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,6 @@
type = GFS_control_type
intent = inout
optional = F
[Radtend]
standard_name = GFS_radtend_type_instance
long_name = instance of derived type GFS_radtend_type
units = DDT
dimensions = ()
type = GFS_radtend_type
intent = inout
optional = F
[active_gases_array]
standard_name = list_of_active_gases_used_by_RRTMGP
long_name = list of active gases used by RRTMGP
Expand Down
5 changes: 2 additions & 3 deletions physics/GFS_rrtmgp_sw_post.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ subroutine GFS_rrtmgp_sw_post_run (Model, Grid, Diag, Radtend, Coupling, Statein
! dnfxc - total sky dnward flux (W/m2)
! upfx0 - clear sky upward flux (W/m2)
! dnfx0 - clear sky dnward flux (W/m2)
type(cmpfsw_type), dimension(nCol), intent(inout), optional :: &
type(cmpfsw_type), dimension(nCol), intent(inout) :: &
scmpsw ! 2D surface fluxes, components:
! uvbfc - total sky downward uv-b flux at (W/m2)
! uvbf0 - clear sky downward uv-b flux at (W/m2)
Expand All @@ -105,7 +105,7 @@ subroutine GFS_rrtmgp_sw_post_run (Model, Grid, Diag, Radtend, Coupling, Statein
integer :: i, j, k, iSFC, iTOA, itop, ibtc
real(kind_phys) :: tem0d, tem1, tem2
real(kind_phys), dimension(nDay, Model%levs) :: thetaTendClrSky, thetaTendAllSky
logical :: l_fluxessw2d, top_at_1, l_sfcFluxessw1D
logical :: l_fluxessw2d, top_at_1

! Initialize CCPP error handling variables
errmsg = ''
Expand All @@ -116,7 +116,6 @@ subroutine GFS_rrtmgp_sw_post_run (Model, Grid, Diag, Radtend, Coupling, Statein

! Are any optional outputs requested?
l_fluxessw2d = present(flxprf_sw)
l_sfcfluxessw1D = present(scmpsw)

! #######################################################################################
! What is vertical ordering?
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_rrtmgp_sw_post.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
dimensions = (horizontal_dimension)
type = cmpfsw_type
intent = inout
optional = T
optional = F
[ncol]
standard_name = horizontal_loop_extent
long_name = horizontal loop extent
Expand Down
59 changes: 0 additions & 59 deletions physics/GFS_suite_init_finalize_test.F90
View file
Open in desktop

This file was deleted.

64 changes: 0 additions & 64 deletions physics/GFS_suite_init_finalize_test.meta
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion physics/cires_ugwp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ subroutine cires_ugwp_run(do_ugwp, me, master, im, levs, ntrac, dtp, kdt, lonr
enddo

if (cdmbgwd(1) > 0.0 .or. cdmbgwd(2) > 0.0) then
call gwdps_run(im, im, levs, Pdvdt, Pdudt, Pdtdt, &
call gwdps_run(im, levs, Pdvdt, Pdudt, Pdtdt, &
ugrs, vgrs, tgrs, qgrs, &
kpbl, prsi, del, prsl, prslk, phii, phil, dtp, kdt, &
hprime, oc, oa4, clx, theta, sigma, gamma, &
Expand Down
6 changes: 3 additions & 3 deletions physics/cnvc90.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ end subroutine cnvc90_init
!! \htmlinclude cnvc90_run.html
!!
! \section gen_cnvc_run GFS cnvc90_run General Algorithm
SUBROUTINE cnvc90_run(CLSTP,IM,IX,RN,KBOT,KTOP,KM,PRSI, &
SUBROUTINE cnvc90_run(CLSTP,IM,RN,KBOT,KTOP,KM,PRSI, &
& ACV,ACVB,ACVT,CV,CVB,CVT,errmsg,errflg)

USE MACHINE, ONLY :kind_phys
implicit none

! Interface variables
real(kind=kind_phys), intent(in) :: clstp
integer, intent(in) :: im, ix, km
integer, intent(in) :: im, km
real(kind=kind_phys), intent(in) :: RN(IM)
integer, intent(in) :: KBOT(IM)
integer, intent(in) :: KTOP(IM)
real(kind=kind_phys), intent(in) :: prsi(ix,km+1)
real(kind=kind_phys), intent(in) :: prsi(IM,km+1)
real(kind=kind_phys), intent(inout) :: ACV(IM)
real(kind=kind_phys), intent(inout) :: ACVB(IM)
real(kind=kind_phys), intent(inout) :: ACVT(IM)
Expand Down
8 changes: 0 additions & 8 deletions physics/cnvc90.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,6 @@
type = integer
intent = in
optional = F
[ix]
standard_name = horizontal_dimension
long_name = horizontal dimension
units = count
dimensions = ()
type = integer
intent = in
optional = F
[rn]
standard_name = lwe_thickness_of_convective_precipitation_amount_on_dynamics_timestep
long_name = convective rainfall amount on dynamics timestep
Expand Down
Loading