Skip to content

Commit

Permalink
"include MYNN-EDMF updates from PR NOAA-EMC#630"
Browse files Browse the repository at this point in the history
  • Loading branch information
haiqinli committed Mar 13, 2023
1 parent fa0fc55 commit 91030bf
Show file tree
Hide file tree
Showing 4 changed files with 107 additions and 9 deletions.
12 changes: 6 additions & 6 deletions ccpp/data/GFS_typedefs.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1114,7 +1114,7 @@ module GFS_typedefs
logical :: do_mynnedmf
logical :: do_mynnsfclay
! DH* TODO - move this to MYNN namelist section
logical :: bl_mynn_tkebudget !< flag for activating TKE budget
integer :: tke_budget !< flag for activating TKE budget
logical :: bl_mynn_tkeadvect !< activate computation of TKE advection (not yet in use for FV3)
integer :: bl_mynn_cloudpdf !< flag to determine which cloud PDF to use
integer :: bl_mynn_mixlength !< flag for different version of mixing length formulation
Expand Down Expand Up @@ -3331,7 +3331,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
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
logical :: bl_mynn_tkebudget = .false.
integer :: tke_budget = 0
logical :: bl_mynn_tkeadvect = .false.
integer :: bl_mynn_cloudpdf = 2
integer :: bl_mynn_mixlength = 1
Expand Down Expand Up @@ -3631,7 +3631,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
bl_mynn_cloudpdf, bl_mynn_edmf, bl_mynn_edmf_mom, &
bl_mynn_edmf_tke, bl_mynn_mixlength, bl_mynn_cloudmix, &
bl_mynn_mixqt, bl_mynn_output, icloud_bl, bl_mynn_tkeadvect, &
bl_mynn_closure, bl_mynn_tkebudget, &
bl_mynn_closure, tke_budget, &
isftcflx, iz0tlnd, sfclay_compute_flux, sfclay_compute_diag, &
! *DH
gwd_opt, do_ugwp_v0, do_ugwp_v0_orog_only, &
Expand Down Expand Up @@ -4447,7 +4447,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
Model%bl_mynn_output = bl_mynn_output
Model%bl_mynn_tkeadvect = bl_mynn_tkeadvect
Model%bl_mynn_closure = bl_mynn_closure
Model%bl_mynn_tkebudget = bl_mynn_tkebudget
Model%tke_budget = tke_budget
Model%icloud_bl = icloud_bl
Model%isftcflx = isftcflx
Model%iz0tlnd = iz0tlnd
Expand Down Expand Up @@ -7209,7 +7209,7 @@ subroutine diag_create (Diag, IM, Model)
allocate (Diag%det_thl (IM,Model%levs))
allocate (Diag%det_sqv (IM,Model%levs))
endif
if (Model%bl_mynn_tkebudget) then
if (Model%tke_budget .gt. 0) then
allocate (Diag%dqke (IM,Model%levs))
allocate (Diag%qwt (IM,Model%levs))
allocate (Diag%qshear (IM,Model%levs))
Expand All @@ -7233,7 +7233,7 @@ subroutine diag_create (Diag, IM, Model)
Diag%det_thl = clear_val
Diag%det_sqv = clear_val
endif
if (Model%bl_mynn_tkebudget) then
if (Model%tke_budget .gt. 0) then
Diag%dqke = clear_val
Diag%qwt = clear_val
Diag%qshear = clear_val
Expand Down
4 changes: 2 additions & 2 deletions ccpp/data/GFS_typedefs.meta
Original file line number Diff line number Diff line change
Expand Up @@ -6327,12 +6327,12 @@
units = flag
dimensions = ()
type = logical
[bl_mynn_tkebudget]
[tke_budget]
standard_name = control_for_tke_budget_output
long_name = flag for activating TKE budget
units = flag
dimensions = ()
type = logical
type = integer
[bl_mynn_tkeadvect]
standard_name = flag_for_tke_advection
long_name = flag for activating TKE advection
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
98 changes: 98 additions & 0 deletions ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v17_p8_mynn" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
<scheme>GFS_rrtmg_setup</scheme>
<scheme>GFS_rad_time_vary</scheme>
<scheme>GFS_phys_time_vary</scheme>
</subcycle>
</group>
<group name="radiation">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>sgscloud_radpre</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rad_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw_pre</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
</subcycle>
</group>
<group name="physics">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_phys_reset</scheme>
<scheme>GFS_suite_stateout_reset</scheme>
<scheme>get_prs_fv3</scheme>
<scheme>GFS_suite_interstitial_1</scheme>
<scheme>GFS_surface_generic_pre</scheme>
<scheme>GFS_surface_composites_pre</scheme>
<scheme>dcyc2t3</scheme>
<scheme>GFS_surface_composites_inter</scheme>
<scheme>GFS_suite_interstitial_2</scheme>
</subcycle>
<!-- Surface iteration loop -->
<subcycle loop="2">
<scheme>sfc_diff</scheme>
<scheme>GFS_surface_loop_control_part1</scheme>
<scheme>sfc_nst_pre</scheme>
<scheme>sfc_nst</scheme>
<scheme>sfc_nst_post</scheme>
<scheme>noahmpdrv</scheme>
<scheme>sfc_sice</scheme>
<scheme>GFS_surface_loop_control_part2</scheme>
</subcycle>
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
<!--scheme>GFS_PBL_generic_pre</scheme-->
<!--scheme>satmedmfvdifq</scheme-->
<!--scheme>GFS_PBL_generic_post</scheme-->
<scheme>mynnedmf_wrapper</scheme>
<scheme>GFS_GWD_generic_pre</scheme>
<scheme>unified_ugwp</scheme>
<scheme>unified_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>get_phi_fv3</scheme>
<scheme>GFS_suite_interstitial_3</scheme>
<scheme>GFS_DCNV_generic_pre</scheme>
<scheme>samfdeepcnv</scheme>
<scheme>GFS_DCNV_generic_post</scheme>
<!--scheme>GFS_SCNV_generic_pre</scheme-->
<!--scheme>samfshalcnv</scheme-->
<!--scheme>GFS_SCNV_generic_post</scheme-->
<scheme>GFS_suite_interstitial_4</scheme>
<scheme>cnvc90</scheme>
<scheme>GFS_MP_generic_pre</scheme>
<scheme>mp_thompson_pre</scheme>
</subcycle>
<subcycle loop="1">
<scheme>mp_thompson</scheme>
</subcycle>
<subcycle loop="1">
<scheme>mp_thompson_post</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
</subcycle>
</group>
<group name="stochastics">
<subcycle loop="1">
<scheme>GFS_stochastics</scheme>
<scheme>phys_tend</scheme>
</subcycle>
</group>
<!-- <finalize></finalize> -->
</suite>

0 comments on commit 91030bf

Please sign in to comment.