Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions schemes/zhang_mcfarlane/zm_conv_options.F90
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module zm_conv_options
subroutine zm_conv_options_init(masterproc, iulog, &
zmconv_c0_lnd, zmconv_c0_ocn, zmconv_ke, zmconv_ke_lnd, &
zmconv_momcu, zmconv_momcd, zmconv_num_cin, &
no_deep_pbl_in, zmconv_tiedke_add, &
no_deep_pbl_in, zmconv_tiedtke_add, &
zmconv_capelmt, zmconv_dmpdz, zmconv_parcel_pbl, &
zmconv_parcel_hscale, zmconv_tau)

Expand All @@ -25,7 +25,7 @@ subroutine zm_conv_options_init(masterproc, iulog, &
real(kind_phys),intent(in) :: zmconv_momcu
real(kind_phys),intent(in) :: zmconv_momcd
logical, intent(in) :: no_deep_pbl_in ! no_deep_pbl = .true. eliminates ZM convection entirely within PBL
real(kind_phys),intent(in) :: zmconv_tiedke_add
real(kind_phys),intent(in) :: zmconv_tiedtke_add
real(kind_phys),intent(in) :: zmconv_capelmt
real(kind_phys),intent(in) :: zmconv_dmpdz
logical, intent(in) :: zmconv_parcel_pbl ! Should the parcel properties include PBL mixing?
Expand All @@ -42,7 +42,7 @@ subroutine zm_conv_options_init(masterproc, iulog, &
write(iulog,*) 'tuning parameters zm_conv_options_init: no_deep_pbl',no_deep_pbl_in
write(iulog,*) 'tuning parameters zm_conv_options_init: zm_capelmt', zmconv_capelmt
write(iulog,*) 'tuning parameters zm_conv_options_init: zm_dmpdz', zmconv_dmpdz
write(iulog,*) 'tuning parameters zm_conv_options_init: zm_tiedke_add', zmconv_tiedke_add
write(iulog,*) 'tuning parameters zm_conv_options_init: zm_tiedke_add', zmconv_tiedtke_add
write(iulog,*) 'tuning parameters zm_conv_options_init: zm_parcel_pbl', zmconv_parcel_pbl
write(iulog,*) 'tuning parameters zm_conv_options_init: zm_parcel_hscale', zmconv_parcel_hscale
endif
Expand Down
2 changes: 1 addition & 1 deletion schemes/zhang_mcfarlane/zm_conv_options.meta
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
type = logical
dimensions = ()
intent = in
[ zmconv_tiedke_add ]
[ zmconv_tiedtke_add ]
standard_name = parcel_temperature_perturbation_for_zhang_mcfarlane_deep_convection_scheme
units = K
type = real | kind = kind_phys
Expand Down
2 changes: 1 addition & 1 deletion schemes/zhang_mcfarlane/zm_conv_options_namelist.xml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
</values>
</entry>

<entry id="zmconv_tiedke_add">
<entry id="zmconv_tiedtke_add">
<category>conv</category>
<group>zmconv_nl</group>
<standard_name>parcel_temperature_perturbation_for_zhang_mcfarlane_deep_convection_scheme</standard_name>
Expand Down
6 changes: 3 additions & 3 deletions schemes/zhang_mcfarlane/zm_convr.F90
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ module zm_convr
subroutine zm_convr_init(plev, plevp, cpair, epsilo, gravit, latvap, tmelt, rair, &
pref_edge, zmconv_c0_lnd, zmconv_c0_ocn, zmconv_ke, zmconv_ke_lnd, &
zmconv_momcu, zmconv_momcd, zmconv_num_cin, &
no_deep_pbl_in, zmconv_tiedke_add, &
no_deep_pbl_in, zmconv_tiedtke_add, &
zmconv_capelmt, zmconv_dmpdz, zmconv_parcel_pbl, zmconv_parcel_hscale, zmconv_tau, &
masterproc, iulog, errmsg, errflg)

Expand All @@ -80,7 +80,7 @@ subroutine zm_convr_init(plev, plevp, cpair, epsilo, gravit, latvap, tmelt, rair
real(kind_phys),intent(in) :: zmconv_momcu
real(kind_phys),intent(in) :: zmconv_momcd
logical, intent(in) :: no_deep_pbl_in ! no_deep_pbl = .true. eliminates ZM convection entirely within PBL
real(kind_phys),intent(in) :: zmconv_tiedke_add
real(kind_phys),intent(in) :: zmconv_tiedtke_add
real(kind_phys),intent(in) :: zmconv_capelmt
real(kind_phys),intent(in) :: zmconv_dmpdz
logical, intent(in) :: zmconv_parcel_pbl ! Should the parcel properties include PBL mixing?
Expand Down Expand Up @@ -114,7 +114,7 @@ subroutine zm_convr_init(plev, plevp, cpair, epsilo, gravit, latvap, tmelt, rair
momcu = zmconv_momcu
momcd = zmconv_momcd

tiedke_add = zmconv_tiedke_add
tiedke_add = zmconv_tiedtke_add
capelmt = zmconv_capelmt
dmpdz_param = zmconv_dmpdz
no_deep_pbl = no_deep_pbl_in
Expand Down
2 changes: 1 addition & 1 deletion schemes/zhang_mcfarlane/zm_convr.meta
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
type = logical
dimensions = ()
intent = in
[ zmconv_tiedke_add ]
[ zmconv_tiedtke_add ]
standard_name = parcel_temperature_perturbation_for_zhang_mcfarlane_deep_convection_scheme
units = K
type = real | kind = kind_phys
Expand Down
Loading