Skip to content
Closed
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
40 changes: 30 additions & 10 deletions Registry/Registry.EM_COMMON
Original file line number Diff line number Diff line change
Expand Up @@ -2424,6 +2424,7 @@ rconfig integer irr_ph namelist,physics max_domains 0

rconfig integer sf_surface_physics namelist,physics max_domains -1 rh "sf_surface_physics" "" ""
rconfig integer bl_pbl_physics namelist,physics max_domains -1 rh "bl_pbl_physics" "" ""
rconfig integer bl_pbl_physics_proxy derived max_domains -1 rh "bl_pbl_physics_proxy" "" ""
rconfig integer bl_mynn_tkebudget namelist,physics max_domains 0 rh "bl_mynn_tkebudget" "" ""
rconfig integer ysu_topdown_pblmix namelist,physics 1 1 rh "ysu_topdown_pblmix" "" ""
rconfig integer shinhong_tke_diag namelist,physics max_domains 0 rh "shinhong_tke_diag" "" ""
Expand Down Expand Up @@ -3086,19 +3087,38 @@ package drip sf_surf_irr_alloc==2 - state:irrigat
package sprinkler sf_surf_irr_alloc==3 - state:irrigation,irr_rand_field


package les_proxy bl_pbl_physics_proxy==0 - -
package ysu_proxy bl_pbl_physics_proxy==1 - -
package myjpbl_proxy bl_pbl_physics_proxy==2 - state:tke_pbl,el_pbl
package gfs_proxy bl_pbl_physics_proxy==3 - -
package qnsepbl_proxy bl_pbl_physics_proxy==4 - state:tke_pbl,el_pbl,massflux_EDKF,entr_EDKF,detr_EDKF,thl_up,thv_up,rv_up,rt_up,rc_up,u_up,v_up,frac_up,rc_mf
package mynnpbl_proxy2 bl_pbl_physics_proxy==5 - scalar:qke_adv;state:qke,tke_pbl,sh3d,tsq,qsq,cov,el_pbl
package mynnpbl_proxy3 bl_pbl_physics_proxy==6 - scalar:qke_adv;state:qke,tke_pbl,sh3d,tsq,qsq,cov,el_pbl
package acmpbl_proxy bl_pbl_physics_proxy==7 - -
package boulac_proxy bl_pbl_physics_proxy==8 - state:el_pbl,tke_pbl,wu_tur,wv_tur,wt_tur,wq_tur
package camuwpbl_proxy bl_pbl_physics_proxy==9 - state:tauresx2d,tauresy2d,tpert2d,qpert2d,wpert2d,tke_pbl,smaw3d,wsedl3d,turbtype3d
package temfpbl_proxy bl_pbl_physics_proxy==10 - state:te_temf,kh_temf,km_temf,shf_temf,qf_temf,uw_temf,vw_temf,wupd_temf,mf_temf,thup_temf,qlup_temf,qtup_temf,cf3d_temf,hd_temf,lcl_temf,hct_temf,cfm_temf
package shinhong_proxy bl_pbl_physics_proxy==11 - state:el_pbl,tke_pbl
package gbmpbl_proxy bl_pbl_physics_proxy==12 - state:exch_tke,el_pbl,tke_pbl
package eeps_proxy bl_pbl_physics_proxy==16 - scalar:pek_adv,pep_adv;state:tke_pbl,pep_pbl
package mrf_proxy bl_pbl_physics_proxy==99 - -

# Note - add packaged dependencies to the above "proxy" list. This enables
# LES PBL to be used on FG domains.
package lesscheme bl_pbl_physics==0 - -
package ysuscheme bl_pbl_physics==1 - -
package myjpblscheme bl_pbl_physics==2 - state:tke_pbl,el_pbl
package myjpblscheme bl_pbl_physics==2 - -
package gfsscheme bl_pbl_physics==3 - -
package qnsepblscheme bl_pbl_physics==4 - state:tke_pbl,el_pbl,massflux_EDKF,entr_EDKF,detr_EDKF,thl_up,thv_up,rv_up,rt_up,rc_up,u_up,v_up,frac_up,rc_mf
package mynnpblscheme2 bl_pbl_physics==5 - scalar:qke_adv;state:qke,tke_pbl,sh3d,tsq,qsq,cov,el_pbl
package mynnpblscheme3 bl_pbl_physics==6 - scalar:qke_adv;state:qke,tke_pbl,sh3d,tsq,qsq,cov,el_pbl
package qnsepblscheme bl_pbl_physics==4 - -
package mynnpblscheme2 bl_pbl_physics==5 - -
package mynnpblscheme3 bl_pbl_physics==6 - -
package acmpblscheme bl_pbl_physics==7 - -
package boulacscheme bl_pbl_physics==8 - state:el_pbl,tke_pbl,wu_tur,wv_tur,wt_tur,wq_tur
package camuwpblscheme bl_pbl_physics==9 - state:tauresx2d,tauresy2d,tpert2d,qpert2d,wpert2d,tke_pbl,smaw3d,wsedl3d,turbtype3d
package temfpblscheme bl_pbl_physics==10 - state:te_temf,kh_temf,km_temf,shf_temf,qf_temf,uw_temf,vw_temf,wupd_temf,mf_temf,thup_temf,qlup_temf,qtup_temf,cf3d_temf,hd_temf,lcl_temf,hct_temf,cfm_temf
package shinhongscheme bl_pbl_physics==11 - state:el_pbl,tke_pbl
package gbmpblscheme bl_pbl_physics==12 - state:exch_tke,el_pbl,tke_pbl
package eepsscheme bl_pbl_physics==16 - scalar:pek_adv,pep_adv;state:tke_pbl,pep_pbl
package boulacscheme bl_pbl_physics==8 - -
package camuwpblscheme bl_pbl_physics==9 - -
package temfpblscheme bl_pbl_physics==10 - -
package shinhongscheme bl_pbl_physics==11 - -
package gbmpblscheme bl_pbl_physics==12 - -
package eepsscheme bl_pbl_physics==16 - -
package mrfscheme bl_pbl_physics==99 - -

package mynn_tkebudget bl_mynn_tkebudget==1 - state:qSHEAR,qBUOY,qDISS,qWT,dqke
Expand Down
30 changes: 30 additions & 0 deletions share/module_check_a_mundo.F
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,36 @@ END FUNCTION bep_bem_ngr_u
END IF
ENDDO

!-----------------------------------------------------------------------
! Handle the behind the scenes shuffling of the PBL package info,
! in support of generalizing usage of the LES PBL option on the FG.
!-----------------------------------------------------------------------
exists = .FALSE.
DO i = 1, model_config_rec % max_dom
IF ( .NOT. model_config_rec % grid_allowed(i) ) CYCLE
model_config_rec % bl_pbl_physics_proxy(i) = model_config_rec % bl_pbl_physics(i)
IF ( model_config_rec % bl_pbl_physics(i) .EQ. lesscheme ) THEN
exists = .TRUE.
END IF
ENDDO
IF ( ( exists ) .AND. ( model_config_rec % bl_pbl_physics(1) .NE. lesscheme ) ) THEN
DO i = 2, model_config_rec % max_dom
IF ( .NOT. model_config_rec % grid_allowed(i) ) CYCLE
IF ( model_config_rec % bl_pbl_physics(i) .EQ. lesscheme ) THEN
model_config_rec % bl_pbl_physics_proxy(i) = model_config_rec % bl_pbl_physics_proxy(1)
END IF
ENDDO
END IF
print *,' DAVE TEST'
print *,' PBL PBL '
print *,' PROXY PHYSICS'
print *,' (mem) (scheme)'
print *,' ------------------'
DO i = 1, model_config_rec % max_dom
print *,model_config_rec % bl_pbl_physics_proxy(i),model_config_rec % bl_pbl_physics(i)
ENDDO
print *,' ------------------'

!-----------------------------------------------------------------------
! Urban physics set up. If the run-time option for use_wudapt_lcz = 0,
! then the number of urban classes is 3. Else, if the use_wudapt_lcz = 1,
Expand Down