Skip to content

Commit

Permalink
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physics…
Browse files Browse the repository at this point in the history 
… into HEAD
  • Loading branch information
dustinswales committed Jan 5, 2023
2 parents db9be65 + df5f5e2 commit 5b17798
Show file tree
Hide file tree
Showing 14 changed files with 1,504 additions and 518 deletions.
17 changes: 12 additions & 5 deletions physics/cires_ugwp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,11 +195,13 @@ end subroutine cires_ugwp_finalize
! \section det_cires_ugwp CIRES UGWP V0 Scheme Detailed Algorithm
subroutine cires_ugwp_run(do_ugwp, me, master, im, levs, ntrac, dtp, kdt, lonr, &
oro, oro_uf, hprime, nmtvr, oc, theta, sigma, gamma, elvmax, clx, oa4, &
do_tofd, ldiag_ugwp, cdmbgwd, xlat, xlat_d, sinlat, coslat, area, &
ugrs, vgrs, tgrs, qgrs, prsi, prsl, prslk, phii, phil, &
do_tofd, ldiag_ugwp, cdmbgwd, xlat, xlat_d, sinlat, coslat, &
area, ugrs, vgrs, tgrs, qgrs, prsi, prsl, prslk, phii, phil, &
del, kpbl, dusfcg, dvsfcg, gw_dudt, gw_dvdt, gw_dtdt, gw_kdis, &
tau_tofd, tau_mtb, tau_ogw, tau_ngw, zmtb, zlwb, zogw, &
dudt_mtb,dudt_ogw, dudt_tms, du3dt_mtb, du3dt_ogw, du3dt_tms, &
dusfc_ms, dvsfc_ms, dusfc_bl, dvsfc_bl, &
dudt_ogw, dtauy2d_ms, dtaux2d_bl, dtauy2d_bl, &
dudt_mtb, dudt_tms, du3dt_mtb, du3dt_ogw, du3dt_tms, &
dudt, dvdt, dtdt, rdxzb, con_g, con_pi, con_cp, con_rd, con_rv, con_fvirt, &
con_omega, rain, ntke, q_tke, dqdt_tke, lprnt, ipr, &
dtend, dtidx, index_of_x_wind, index_of_y_wind, index_of_temperature, &
Expand Down Expand Up @@ -228,6 +230,9 @@ subroutine cires_ugwp_run(do_ugwp, me, master, im, levs, ntrac, dtp, kdt, lonr
real(kind=kind_phys), intent(out), dimension(:) :: tau_mtb, tau_ogw, tau_tofd, tau_ngw
real(kind=kind_phys), intent(out), dimension(:, :):: gw_dudt, gw_dvdt, gw_dtdt, gw_kdis
real(kind=kind_phys), intent(out), dimension(:, :):: dudt_mtb, dudt_ogw, dudt_tms
real(kind=kind_phys), intent(out), dimension(:) :: dusfc_ms, dvsfc_ms, dusfc_bl, dvsfc_bl
real(kind=kind_phys), intent(out), dimension(:, :) :: dtauy2d_ms
real(kind=kind_phys), intent(out), dimension(:, :) :: dtaux2d_bl, dtauy2d_bl

! dtend is only allocated if ldiag=.true.
real(kind=kind_phys), optional, intent(inout) :: dtend(:,:,:)
Expand Down Expand Up @@ -314,9 +319,11 @@ subroutine cires_ugwp_run(do_ugwp, me, master, im, levs, ntrac, dtp, kdt, lonr
ugrs, vgrs, tgrs, qgrs(:,:,1), &
kpbl, prsi, del, prsl, prslk, phii, phil, dtp, kdt, &
hprime, oc, oa4, clx, theta, sigma, gamma, &
elvmax, dusfcg, dvsfcg, &
elvmax, dusfcg, dvsfcg, dudt_ogw, dtauy2d_ms, &
dtaux2d_bl, dtauy2d_bl, dusfc_ms, dvsfc_ms, &
dusfc_bl, dvsfc_bl, &
con_g, con_cp, con_rd, con_rv, lonr, &
nmtvr, cdmbgwd, me, lprnt, ipr, rdxzb, &
nmtvr, cdmbgwd, me, lprnt, ipr, rdxzb, ldiag_ugwp, &
errmsg, errflg)
if (errflg/=0) return
endif
Expand Down
66 changes: 61 additions & 5 deletions physics/cires_ugwp.meta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,11 +596,35 @@
type = real
kind = kind_phys
intent = out
[dudt_mtb]
standard_name = instantaneous_change_in_x_wind_due_to_mountain_blocking_drag
long_name = instantaneous change in x wind due to mountain blocking drag
units = m s-2
dimensions = (horizontal_loop_extent,vertical_layer_dimension)
[dusfc_ms]
standard_name = vertically_integrated_x_momentum_flux_due_to_mesoscale_orographic_gravity_wave_drag
long_name = integrated x momentum flux from mesoscale gwd
units = Pa
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
intent = out
[dvsfc_ms]
standard_name = vertically_integrated_y_momentum_flux_due_to_mesoscale_orographic_gravity_wave_drag
long_name = integrated y momentum flux from mesoscale gwd
units = Pa
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
intent = out
[dusfc_bl]
standard_name = vertically_integrated_x_momentum_flux_due_to_blocking_drag
long_name = integrated x momentum flux from blocking drag
units = Pa
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
intent = out
[dvsfc_bl]
standard_name = vertically_integrated_y_momentum_flux_due_to_blocking_drag
long_name = integrated y momentum flux from blocking drag
units = Pa
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
intent = out
Expand All @@ -612,6 +636,38 @@
type = real
kind = kind_phys
intent = out
[dtauy2d_ms]
standard_name = tendency_of_y_wind_due_to_mesoscale_orographic_gravity_wave_drag
long_name = instantaneous change in y wind due to orographic gw drag
units = m s-2
dimensions = (horizontal_loop_extent,vertical_layer_dimension)
type = real
kind = kind_phys
intent = out
[dtaux2d_bl]
standard_name = tendency_of_x_wind_due_to_blocking_drag
long_name = x wind tendency from blocking drag
units = m s-2
dimensions = (horizontal_loop_extent,vertical_layer_dimension)
type = real
kind = kind_phys
intent = out
[dtauy2d_bl]
standard_name = tendency_of_y_wind_due_to_blocking_drag
long_name = y wind tendency from blocking drag
units = m s-2
dimensions = (horizontal_loop_extent,vertical_layer_dimension)
type = real
kind = kind_phys
intent = out
[dudt_mtb]
standard_name = instantaneous_change_in_x_wind_due_to_mountain_blocking_drag
long_name = instantaneous change in x wind due to mountain blocking drag
units = m s-2
dimensions = (horizontal_loop_extent,vertical_layer_dimension)
type = real
kind = kind_phys
intent = out
[dudt_tms]
standard_name = tendency_of_x_wind_due_to_turbulent_orographic_form_drag
long_name = instantaneous change in x wind due to TOFD
Expand Down
Loading

0 comments on commit 5b17798

Please sign in to comment.