Skip to content

merge HWRF version of saSAS into GFS version #23

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

Closed
mzhangw wants to merge 7 commits into from
Closed

merge HWRF version of saSAS into GFS version #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b67a7c6
add hwrf_samfdeep/samfshal logic in host model
mzhangw Dec 20, 2019
49f7db5
Merge branch 'dtc/develop' of https://github.com/NCAR/fv3atm into HAF…
mzhangw Dec 20, 2019
d4a6b8b
minor fix
mzhangw Dec 26, 2019
792c261
Merge branch 'dtc/develop' of https://github.com/NCAR/fv3atm into HAF…
mzhangw Dec 26, 2019
49b73a8
add nml option for HWRF SAS
mzhangw Dec 27, 2019
b8e96b6
Merge branch 'dtc/develop' of https://github.com/NCAR/fv3atm into HAF…
mzhangw Mar 24, 2020
6f2ecb6
Merge branch 'dtc/develop' of https://github.com/NCAR/fv3atm into HAF…
mzhangw Mar 30, 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
19 changes: 19 additions & 0 deletions gfsphysics/GFS_layer/GFS_typedefs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,6 +841,7 @@ module GFS_typedefs
integer :: imfshalcnv_samf = 2 !< flag for SAMF scale- & aerosol-aware mass-flux shallow convection scheme
integer :: imfshalcnv_gf = 3 !< flag for scale- & aerosol-aware Grell-Freitas scheme (GSD)
integer :: imfshalcnv_ntiedtke = 4 !< flag for new Tiedtke scheme (CAPS)
logical :: hwrf_samfdeep !< flag for HWRF SAMF deepcnv scheme (HWRF)
#endif
integer :: imfdeepcnv !< flag for mass-flux deep convection scheme
!< 1: July 2010 version of SAS conv scheme
Expand All @@ -854,6 +855,7 @@ module GFS_typedefs
integer :: imfdeepcnv_samf = 2 !< flag for SAMF scale- & aerosol-aware mass-flux deep convection scheme
integer :: imfdeepcnv_gf = 3 !< flag for scale- & aerosol-aware Grell-Freitas scheme (GSD)
integer :: imfdeepcnv_ntiedtke = 4 !< flag for new Tiedtke scheme (CAPS)
logical :: hwrf_samfshal !< flag for HWRF SAMF shalcnv scheme (HWRF)
#endif
integer :: isatmedmf !< flag for scale-aware TKE-based moist edmf scheme
!< 0: initial version of satmedmf (Nov. 2018)
Expand Down Expand Up @@ -3045,6 +3047,9 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
!< 1: updated version of satmedmf (as of May 2019)
logical :: do_deep = .true. !< whether to do deep convection
#ifdef CCPP
!mz* HWRF physics suite
logical :: hwrf_samfdeep = .false. !< flag for HWRF SAMF deepcnv scheme
logical :: hwrf_samfshal = .false. !< flag for HWRF SAMF shalcnv scheme
logical :: do_mynnedmf = .false. !< flag for MYNN-EDMF
logical :: do_mynnsfclay = .false. !< flag for MYNN Surface Layer Scheme
! DH* TODO - move to MYNN namelist section
Expand Down Expand Up @@ -3270,6 +3275,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
bl_mynn_mixqt, icloud_bl, bl_mynn_tkeadvect, gwd_opt, &
! *DH
do_myjsfc, do_myjpbl, &
hwrf_samfdeep, hwrf_samfshal, &
#endif
h2o_phys, pdfcld, shcnvcw, redrag, hybedmf, satmedmf, &
shinhong, do_ysu, dspheat, lheatstrg, cnvcld, &
Expand Down Expand Up @@ -3641,6 +3647,19 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
Model%shoc_parm = shoc_parm
Model%shocaftcnv = shocaftcnv
Model%shoc_cld = shoc_cld
!mz*: HWRF physics suite
#ifdef CCPP
if (hwrf_samfdeep .and. imfdeepcnv .ne. 2) then
write(*,*) 'Logic error: hwrf_samfdeep has to be used along with imfdeepcnv=2'
stop
end if
if (hwrf_samfshal .and. imfshalcnv .ne. 2) then
write(*,*) 'Logic error: hwrf_samfshal has to be used along with imfshalcnv=2'
stop
end if
Model%hwrf_samfdeep = hwrf_samfdeep
Model%hwrf_samfshal = hwrf_samfshal
#endif
#ifdef CCPP
if (oz_phys .and. oz_phys_2015) then
write(*,*) 'Logic error: can only use one ozone physics option (oz_phys or oz_phys_2015), not both. Exiting.'
Expand Down
12 changes: 12 additions & 0 deletions gfsphysics/GFS_layer/GFS_typedefs.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3098,6 +3098,18 @@
units = flag
dimensions = ()
type = integer
[hwrf_samfdeep]
standard_name = flag_for_hwrf_samfdeepcnv_scheme
long_name = flag for hwrf samfdeepcnv scheme
units = flag
dimensions = ()
type = logical
[hwrf_samfshal]
standard_name = flag_for_hwrf_samfshalcnv_scheme
long_name = flag for hwrf samfshalcnv scheme
units = flag
dimensions = ()
type = logical
[isatmedmf]
standard_name = choice_of_scale_aware_TKE_moist_EDMF_PBL
long_name = choice of scale-aware TKE moist EDMF PBL scheme
Expand Down