Skip to content

Commit

Permalink
Merge pull request NCAR#18 from SamuelTrahanNOAA/bugfix/diaghpbl_to_t…
Browse files Browse the repository at this point in the history 
…bdhpbl

Correction: Diag%hpbl => Tbd%hpbl
  • Loading branch information
@DomHeinzeller
DomHeinzeller committed Apr 6, 2020
2 parents 5b6a22d + af8c130 commit 0963476
Showing 1 changed file with 24 additions and 24 deletions.
48 changes: 24 additions & 24 deletions gfsphysics/GFS_layer/GFS_physics_driver.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2335,7 +2335,7 @@ subroutine GFS_physics_driver &
Diag%v10m, Sfcprop%ffmm, Sfcprop%ffhh, Sfcprop%tsfc, hflx,&
evap, stress, wind, kpbl, Statein%prsi, del, Statein%prsl,&
Statein%prslk, Statein%phii, Statein%phil, dtp, dusfc1, &
dvsfc1, dtsfc1, dqsfc1, dkt, Diag%hpbl, kinver, &
dvsfc1, dtsfc1, dqsfc1, dkt, Tbd%hpbl, kinver, &
Model%xkzm_m, Model%xkzm_h, Model%xkzm_s, Model%xkzminv, &
lprnt, ipr, me)
! if (lprnt) write(0,*)'aftmonshoc=',Statein%tgrs(ipr,:)
Expand All @@ -2356,7 +2356,7 @@ subroutine GFS_physics_driver &
Sfcprop%ffmm, Sfcprop%ffhh, Sfcprop%tsfc, hflx, evap, &
stress, wind, kpbl, Statein%prsi, del, Statein%prsl, &
Statein%prslk, Statein%phii, Statein%phil, dtp, &
Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Diag%hpbl, &
Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Tbd%hpbl, &
kinver, Model%xkzm_m, Model%xkzm_h, Model%xkzm_s)
!*## CCPP ##
elseif (Model%isatmedmf == 1) then ! updated version of satmedmfvdif (May 2019)
Expand All @@ -2369,7 +2369,7 @@ subroutine GFS_physics_driver &
Sfcprop%ffmm, Sfcprop%ffhh, Sfcprop%tsfc, hflx, evap, &
stress, wind, kpbl, Statein%prsi, del, Statein%prsl, &
Statein%prslk, Statein%phii, Statein%phil, dtp, &
Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Diag%hpbl, &
Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Tbd%hpbl, &
kinver, Model%xkzm_m, Model%xkzm_h, Model%xkzm_s, &
Model%dspfac, Model%bl_upfr, Model%bl_dnfr)
!*## CCPP ##
Expand All @@ -2383,7 +2383,7 @@ subroutine GFS_physics_driver &
Sfcprop%ffhh, Sfcprop%tsfc, qss, hflx, evap, stress, &
wind, kpbl, Statein%prsi, del, Statein%prsl, &
Statein%prslk, Statein%phii, Statein%phil, dtp, &
Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Diag%hpbl,&
Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Tbd%hpbl,&
gamt, gamq, dkt, kinver, Model%xkzm_m, Model%xkzm_h, &
Model%xkzm_s, lprnt, ipr, &
Model%xkzminv, Model%moninq_fac)
Expand All @@ -2395,7 +2395,7 @@ subroutine GFS_physics_driver &
Sfcprop%ffhh, Sfcprop%tsfc, qss, hflx, evap, stress, &
wind, kpbl, Statein%prsi, del, Statein%prsl, &
Statein%prslk, Statein%phii, Statein%phil, dtp, &
Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Diag%hpbl,&
Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Tbd%hpbl,&
gamt, gamq, dkt, kinver, Model%xkzm_m, Model%xkzm_h, &
Model%xkzm_s, lprnt, ipr, &
Model%xkzminv, Model%moninq_fac,islmsk)
Expand All @@ -2419,7 +2419,7 @@ subroutine GFS_physics_driver &
Sfcprop%ffmm, Sfcprop%ffhh, Sfcprop%tsfc, qss, hflx, evap, &
stress, wind, kpbl, Statein%prsi, del, Statein%prsl, &
Statein%prslk, Statein%phii, Statein%phil, dtp, &
Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Diag%hpbl, &
Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Tbd%hpbl, &
gamt, gamq, dkt, kinver, Model%xkzm_m, Model%xkzm_h, &
Model%xkzm_s, lprnt, ipr, &
Model%xkzminv, Model%moninq_fac, Model%rbcr)
Expand All @@ -2431,7 +2431,7 @@ subroutine GFS_physics_driver &
Sfcprop%tsfc, qss, hflx, evap, stress, wind, kpbl, &
Statein%prsi, del, Statein%prsl, Statein%prslk, &
Statein%phii, Statein%phil, dtp, dusfc1, dvsfc1, &
dtsfc1, dqsfc1, Diag%hpbl, gamt, gamq, dkt, kinver, &
dtsfc1, dqsfc1, Tbd%hpbl, gamt, gamq, dkt, kinver, &
Model%xkzm_m, Model%xkzm_h)
else
call moninp(ix, im, levs, nvdiff, dvdt, dudt, dtdt, dqdt, &
Expand All @@ -2440,7 +2440,7 @@ subroutine GFS_physics_driver &
Sfcprop%tsfc, qss, hflx, evap, stress, wind, kpbl, &
Statein%prsi, del, Statein%prsl, Statein%phii, &
Statein%phil, dtp, dusfc1, dvsfc1, dtsfc1, dqsfc1, &
Diag%hpbl, gamt, gamq, dkt, Model%xkzm_m, Model%xkzm_h)
Tbd%hpbl, gamt, gamq, dkt, Model%xkzm_m, Model%xkzm_h)
endif

endif ! end if_hybedmf
Expand Down Expand Up @@ -2593,7 +2593,7 @@ subroutine GFS_physics_driver &
Diag%v10m, Sfcprop%ffmm, Sfcprop%ffhh, Sfcprop%tsfc, hflx, &
evap, stress, wind, kpbl, Statein%prsi, del, Statein%prsl, &
Statein%prslk, Statein%phii, Statein%phil, dtp, dusfc1, &
dvsfc1, dtsfc1, dqsfc1, dkt, Diag%hpbl, kinver, &
dvsfc1, dtsfc1, dqsfc1, dkt, Tbd%hpbl, kinver, &
Model%xkzm_m, Model%xkzm_h, Model%xkzm_s, Model%xkzminv, &
lprnt, ipr, me)
!*## CCPP ##
Expand All @@ -2609,7 +2609,7 @@ subroutine GFS_physics_driver &
Sfcprop%ffmm, Sfcprop%ffhh, Sfcprop%tsfc, hflx, evap, &
stress, wind, kpbl, Statein%prsi, del, Statein%prsl, &
Statein%prslk, Statein%phii, Statein%phil, dtp, &
Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Diag%hpbl, &
Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Tbd%hpbl, &
kinver, Model%xkzm_m, Model%xkzm_h, Model%xkzm_s)
!*## CCPP ##
elseif (Model%isatmedmf == 1) then ! updated version of satmedmfvdif (May 2019)
Expand All @@ -2622,7 +2622,7 @@ subroutine GFS_physics_driver &
Sfcprop%ffmm, Sfcprop%ffhh, Sfcprop%tsfc, hflx, evap, &
stress, wind, kpbl, Statein%prsi, del, Statein%prsl, &
Statein%prslk, Statein%phii, Statein%phil, dtp, &
Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Diag%hpbl, &
Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Tbd%hpbl, &
kinver, Model%xkzm_m, Model%xkzm_h, Model%xkzm_s, &
Model%dspfac, Model%bl_upfr, Model%bl_dnfr)
!*## CCPP ##
Expand All @@ -2638,7 +2638,7 @@ subroutine GFS_physics_driver &
Sfcprop%ffhh, Sfcprop%tsfc, qss, hflx, evap, stress, &
wind, kpbl, Statein%prsi, del, Statein%prsl, &
Statein%prslk, Statein%phii, Statein%phil, dtp, &
Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Diag%hpbl, &
Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Tbd%hpbl, &
gamt, gamq, dkt, kinver, Model%xkzm_m, Model%xkzm_h, &
Model%xkzm_s, lprnt, ipr, &
Model%xkzminv, Model%moninq_fac)
Expand All @@ -2652,7 +2652,7 @@ subroutine GFS_physics_driver &
Sfcprop%ffhh, Sfcprop%tsfc, qss, hflx, evap, stress, &
wind, kpbl, Statein%prsi, del, Statein%prsl, &
Statein%prslk, Statein%phii, Statein%phil, dtp, &
Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Diag%hpbl, &
Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Tbd%hpbl, &
gamt, gamq, dkt, kinver, Model%xkzm_m, Model%xkzm_h, &
Model%xkzm_s, lprnt, ipr, &
Model%xkzminv, Model%moninq_fac,islmsk)
Expand All @@ -2664,7 +2664,7 @@ subroutine GFS_physics_driver &
Sfcprop%ffmm, Sfcprop%ffhh, Sfcprop%tsfc, qss, hflx, evap, &
stress, wind, kpbl, Statein%prsi, del, Statein%prsl, &
Statein%prslk, Statein%phii, Statein%phil, dtp, &
Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Diag%hpbl, &
Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Tbd%hpbl, &
gamt, gamq, dkt, kinver, Model%xkzm_m, Model%xkzm_h, &
Model%xkzm_s, lprnt, ipr, &
Model%xkzminv, Model%moninq_fac, Model%rbcr)
Expand All @@ -2676,7 +2676,7 @@ subroutine GFS_physics_driver &
Sfcprop%tsfc, qss, hflx, evap, stress, wind, kpbl, &
Statein%prsi, del, Statein%prsl, Statein%prslk, &
Statein%phii, Statein%phil, dtp, dusfc1, dvsfc1, &
dtsfc1, dqsfc1, Diag%hpbl, gamt, gamq, dkt, kinver, &
dtsfc1, dqsfc1, Tbd%hpbl, gamt, gamq, dkt, kinver, &
Model%xkzm_m, Model%xkzm_h)
else
call moninp(ix, im, levs, nvdiff, dvdt, dudt, dtdt, dvdftra, &
Expand All @@ -2685,7 +2685,7 @@ subroutine GFS_physics_driver &
Sfcprop%tsfc, qss, hflx, evap, stress, wind, kpbl, &
Statein%prsi, del, Statein%prsl, Statein%phii, &
Statein%phil, dtp, dusfc1, dvsfc1, dtsfc1, dqsfc1, &
Diag%hpbl, gamt, gamq, dkt, Model%xkzm_m, Model%xkzm_h)
Tbd%hpbl, gamt, gamq, dkt, Model%xkzm_m, Model%xkzm_h)
endif

endif ! end if_satmedmf
Expand Down Expand Up @@ -3615,7 +3615,7 @@ subroutine GFS_physics_driver &
! if (lprnt) write(0,*)'aftshocgq0=',Stateout%gq0(ipr,1:60,1)
! if (lprnt) write(0,*)' aft shoc tke=',clw(ipr,1:25,ntk), &
! &' kdt=',kdt,'xlon=',grid%xlon(ipr),' xlat=',grid%xlat(ipr)
! if (lprnt) write(0,*)' aftshoccld=',tbd%phy_f3d(ipr,:,ntot3d-2)*100
! if (lprnt) write(0,*)' aftshoccld=',Tbd%phy_f3d(ipr,:,ntot3d-2)*100
! if (lprnt) write(0,*)' aftshocice=',clw(ipr,:,1)
! if (lprnt) write(0,*)' aftshocwat=',clw(ipr,:,2)
! write(1000+me,*)' at latitude = ',lat
Expand Down Expand Up @@ -4265,7 +4265,7 @@ subroutine GFS_physics_driver &
Statein%pgr, Statein%phil, clw, Stateout%gq0, &
Stateout%gt0, Stateout%gu0, Stateout%gv0, rain1, &
kbot, ktop, kcnv, islmsk, Statein%vvl, ncld, &
Diag%hpbl, hflx, evap, ud_mf, dt_mf, cnvw, cnvc, &
Tbd%hpbl, hflx, evap, ud_mf, dt_mf, cnvw, cnvc, &
Model%clam_shal, Model%c0s_shal, Model%c1_shal, &
Model%pgcon_shal)
!*## CCPP ##
Expand Down Expand Up @@ -4305,7 +4305,7 @@ subroutine GFS_physics_driver &
Stateout%gq0(:,:,1), Stateout%gt0, &
Stateout%gu0, Stateout%gv0, Model%fscav, &
rain1, kbot, ktop, kcnv, islmsk, garea, &
Statein%vvl, ncld, Diag%hpbl, ud_mf, &
Statein%vvl, ncld, Tbd%hpbl, ud_mf, &
dt_mf, cnvw, cnvc, &
Model%clam_shal, Model%c0s_shal, Model%c1_shal, &
Model%pgcon_shal, Model%asolfac_shal)
Expand Down Expand Up @@ -4892,7 +4892,7 @@ subroutine GFS_physics_driver &
! if (lprnt) write(0,*)' qsnwb=',qsnw(ipr,:),' kdt=',kdt
! if (lprnt) write(0,*)' qglb=',qgl(ipr,:),' kdt=',kdt
! if (lprnt) write(0,*)' rhc=',rhc(ipr,:),' kdt=',kdt,' kk=',kk
! if (lprnt) write(0,*)' cloudsb=',tbd%phy_f3d(ipr,:,1)*100,' kdt=',kdt
! if (lprnt) write(0,*)' cloudsb=',Tbd%phy_f3d(ipr,:,1)*100,' kdt=',kdt
! if (lprnt) write(0,*)' cloudsb=',Tbd%phy_f3d(ipr,:,1)*100,' kdt=',kdt
! if (lprnt) write(0,*)' clcn=',clcn(ipr,:)*100,' kdt=',kdt
! txa(:,:) = Stateout%gq0(:,:,1)
Expand All @@ -4904,8 +4904,8 @@ subroutine GFS_physics_driver &
Statein%prsi, Statein%phil, Statein%phii, &
Statein%vvl, clw(1,1,2), QLCN, clw(1,1,1), QICN, &
Radtend%htrlw, Radtend%htrsw, w_upi, cf_upi, &
FRLAND, Diag%HPBL, CNV_MFD, CNV_DQLDT, &
! FRLAND, Diag%HPBL, CNV_MFD, CNV_PRC3, CNV_DQLDT, &
FRLAND, Tbd%Hpbl, CNV_MFD, CNV_DQLDT, &
! FRLAND, Tbd%Hpbl, CNV_MFD, CNV_PRC3, CNV_DQLDT, &
CLCN, Stateout%gu0, Stateout%gv0, Diag%dusfc, &
Diag%dvsfc, dusfc1, dvsfc1, dusfc1, dvsfc1, &
CNV_FICE, CNV_NDROP, CNV_NICE, Stateout%gq0(1,1,1), &
Expand Down Expand Up @@ -4947,7 +4947,7 @@ subroutine GFS_physics_driver &
! if (lprnt) write(0,*)' clw1aft=',stateout%gq0(ipr,:,ntiw),' kdt=',kdt
! if (ntgl > 0 .and. lprnt) &
! write(0,*)' cgw1aft=',stateout%gq0(ipr,:,ntgl),' kdt=',kdt
! if (lprnt) write(0,*)' cloudsm=',tbd%phy_f3d(ipr,:,1)*100,' kdt=',kdt
! if (lprnt) write(0,*)' cloudsm=',Tbd%phy_f3d(ipr,:,1)*100,' kdt=',kdt
! if (lprnt) write(0,*)' clw2aft=',stateout%gq0(ipr,:,ntcw),' kdt=',kdt
! if (lprnt) write(0,*)' qrna=',qrn(ipr,:),' kdt=',kdt
! if (lprnt) write(0,*)' qsnwa=',qsnw(ipr,:),' kdt=',kdt
Expand Down Expand Up @@ -4991,7 +4991,7 @@ subroutine GFS_physics_driver &
!*## CCPP ##
endif

! if (lprnt) write(0,*)' cloudsm=',tbd%phy_f3d(ipr,:,1)*100,' kdt=',kdt
! if (lprnt) write(0,*)' cloudsm=',Tbd%phy_f3d(ipr,:,1)*100,' kdt=',kdt
! if (lprnt) write(0,*)' clw2aft=',stateout%gq0(ipr,:,ntcw),' kdt=',kdt
! if (lprnt) write(0,*)' qrna=',qrn(ipr,:),' kdt=',kdt
! if (lprnt) write(0,*)' qsnwa=',qsnw(ipr,:),' kdt=',kdt
Expand Down

0 comments on commit 0963476

Please sign in to comment.