Fixing the problem that km_opt=5 breaks km_opt=2 and cleaning codes#1026
Fixing the problem that km_opt=5 breaks km_opt=2 and cleaning codes#1026davegill merged 4 commits intowrf-model:developfrom
Conversation
|
Generic comment to reviewers @weiwangncar @dudhia @smileMchen @kkeene44 |
|
@zhangxsms @dudhia @weiwangncar Is it mandatory that a surface layer scheme be used with km_opt=5? If not, the test in check_a_mundo needs to be corrected. |
It is not mandatory, km_opt=5 can be used without surface layer (sf_sfclay_physics = 0). |
The existing logic in check_a_mundo precluded the use of "no surface layer scheme" with km_opt=5. To add the "none" option in, I needed to define "none" in both the ARW and NMM Registries. Changes to be committed: modified: Registry/Registry.EM_COMMON modified: Registry/Registry.NMM modified: share/module_check_a_mundo.F
|
@zhangxsms |
|
@weiwangncar @dudhia @llpcarson @kkeene44 Kelly is there because she has superpowers and can approve anything at all, but let's do this by the book. |
TYPE: bug fix KEYWORDS: wrfplus, TL/AD code SOURCE: internal DESCRIPTION OF CHANGES: Two recent WRF model code changes break the wrfplus compilation: 1. ESMF name change This modification allowed the CTSM development to use standard ESMF without conflicting with WRF _old_ ESMF library namespace. Commit 8af5385, PR #1066 "Enabling WRF build with ESMF library" 2. module_diffusion_em_ad.F, 3d scale aware TKE (one of these, take your pick) Commit d059afe, PR #972 "Add a scale-adaptive 3DTKE parameterization scheme as a subgrid mixing option Commit 6d95883, PR #1012 "SMS3dTKE: Remove broken packaging for km_opt=5" Commit 94e5ed9, PR #1013 "Add missing "IF km_opt==5" tests for diag computations" Commit dd0c209, PR #1026 "Fixing the problem that km_opt=5 breaks km_opt=2 and cleaning codes" LIST OF MODIFIED FILES: M share/mediation_integrate.F M wrftladj/module_diffusion_em_ad.F TESTS CONDUCTED: wrfplus code compiles now.
TYPE: bug fix
KEYWORDS: SMS-3DTKE, package
SOURCE: Xu Zhang (Shanghai Typhoon Institute)
DESCRIPTION OF CHANGES:
l_scaleusing a new namel_diss, which does not conflict withvariables used in
km_opt=2.km_opt=5.u_h_tend,v_h_tend,w_h_tendthat areseldom used by most users, and cleaned up the related codes. Only seven state variables used
in
km_opt=5are left.LIST OF MODIFIED FILES:
Registry/Registry.EM_COMMON
Registry/Registry.NMM
dyn_em/module_diffusion_em.F
dyn_em/module_first_rk_step_part2.F
dyn_em/solve_em.F
share/module_check_a_mundo.F
TESTS CONDUCTED:
km_opt=2.km_opt=2andkm_opt=5.km_opt=2,km_opt=5, and some PBL schemes.