Skip to content

Commit

Permalink
fix bugs found in pbl and ozone 3d diagnostic tendencies (NOAA-EMC#26)
Browse files Browse the repository at this point in the history
PBL tendencies were missing in two schemes; now fixed. Squashed commit of the following:

* fix bugs found in pbl and ozone 3d diagnostic tendencies
* remove debugging prints
* implied shape arrays for five variables
* more block labels in CCPP
* make the logging less wordy
* point to hash 238c84c of ccpp/physics
  • Loading branch information
SamuelTrahanNOAA authored May 14, 2020
1 parent 1193c21 commit bfe13b0
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 11 deletions.
2 changes: 1 addition & 1 deletion ccpp/physics
30 changes: 20 additions & 10 deletions gfsphysics/GFS_layer/GFS_typedefs.F90
Original file line number Diff line number Diff line change
Expand Up @@ -3311,42 +3311,52 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
#ifdef CCPP

if(gwd_opt==1) then
write(0,*) 'FLAG: gwd_opt==1 so gwd not generic'
if(me==master) &
write(0,*) 'FLAG: gwd_opt==1 so gwd not generic'
Model%flag_for_gwd_generic_tend=.false.
else
elseif(me==master) then
write(0,*) 'NO FLAG: gwd is generic'
endif

if(satmedmf .and. isatmedmf==0) then
write(0,*) 'FLAG: satmedmf and isatedmf=0 so pbl not generic'
if(me==master) &
write(0,*) 'FLAG: satmedmf and isatedmf=0 so pbl not generic'
Model%flag_for_pbl_generic_tend=.false.
elseif(satmedmf .and. isatmedmf==1) then
if(me==master) &
write(0,*) 'FLAG: satmedmf and isatedmf=1 so pbl not generic'
Model%flag_for_pbl_generic_tend=.false.
else if(hybedmf) then
write(0,*) 'FLAG: hybedmf so pbl not generic'
if(me==master) &
write(0,*) 'FLAG: hybedmf so pbl not generic'
Model%flag_for_pbl_generic_tend=.false.
else if(do_mynnedmf) then
write(0,*) 'FLAG: do_mynnedmf so pbl not generic'
if(me==master) &
write(0,*) 'FLAG: do_mynnedmf so pbl not generic'
Model%flag_for_pbl_generic_tend=.false.
else
elseif(me==master) then
write(0,*) 'NO FLAG: pbl is generic'
endif

if(imfshalcnv == Model%imfshalcnv_gf) then
write(0,*) 'FLAG: imfshalcnv_gf so scnv not generic'
if(me==master) &
write(0,*) 'FLAG: imfshalcnv_gf so scnv not generic'
Model%flag_for_scnv_generic_tend=.false.
! else if(imfshalcnv == Model%imfshalcnv_samf) then
! write(0,*) 'FLAG: imfshalcnv_samf so scnv not generic'
! Model%flag_for_scnv_generic_tend=.false.
else
elseif(me==master) then
write(0,*) 'NO FLAG: scnv is generic'
endif

if(imfdeepcnv == Model%imfdeepcnv_gf) then
write(0,*) 'FLAG: imfdeepcnv_gf so dcnv not generic'
if(me==master) &
write(0,*) 'FLAG: imfdeepcnv_gf so dcnv not generic'
Model%flag_for_dcnv_generic_tend=.false.
! else if(imfdeepcnv == Model%imfdeepcnv_samf) then
! write(0,*) 'FLAG: imfdeepcnv_samf so dcnv not generic'
! Model%flag_for_dcnv_generic_tend=.false.
else
elseif(me==master) then
write(0,*) 'NO FLAG: dcnv is generic'
endif
#endif
Expand Down

0 comments on commit bfe13b0

Please sign in to comment.