Skip to content

Commit dd0c209

Browse files
zhangxsmsdavegill
zhangxsms
authored and
davegill
committed
Fixing the problem that km_opt=5 breaks km_opt=2 and cleaning codes (#1026)
TYPE: bug fix KEYWORDS: SMS-3DTKE, package SOURCE: Xu Zhang (Shanghai Typhoon Institute) DESCRIPTION OF CHANGES: 1. Redefined the variable `l_scale` using a new name `l_diss`, which does not conflict with variables used in `km_opt=2`. 2. Packaged seven variables used in the `km_opt=5`. 3. Deleted most diagnostic variables such as `u_h_tend`, `v_h_tend`, `w_h_tend` that are seldom used by most users, and cleaned up the related codes. Only seven state variables used in `km_opt=5` are 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: - [x] em_fire test with `km_opt=2`. - [x] em_les tests with `km_opt=2` and `km_opt=5`. - [x] em_tropical_cyclone with `km_opt=2`, `km_opt=5`, and some PBL schemes.
1 parent 3d3c7e5 commit dd0c209

File tree

6 files changed

+210
-865
lines changed

6 files changed

+210
-865
lines changed

‎Registry/Registry.EM_COMMON‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -335,29 +335,14 @@ state real ht_coarse ij misc 1 - r -
335335
state real tke ikj dyn_em 2 - r "tke" "TURBULENCE KINETIC ENERGY" "m2 s-2"
336336
i1 real tke_tend ikj dyn_em 1 -
337337

338-
# variables in 3DTKE scheme (km_opt=5, 07/27/2019, XZ)
338+
# variables in 3DTKE scheme (km_opt=5)
339339
state real nlflux ikj dyn_em 1 Z - "NLFLUX" "PRESCRIBED NONLOCAL HEAT FLUX IN 3DTKE SCHEME" "K m s-1"
340340
state real gamu ij dyn_em 1 - r "GAMU" "NONLOCAL U GAMMA TERM IN 3DTKE SCHEME" "s-1"
341341
state real gamv ij dyn_em 1 - r "GAMV" "NONLOCAL V GAMMA TERM IN 3DTKE SCHEME" "s-1"
342342
state real dlk ikj dyn_em 1 - - "DLK" "TURBULENT LENGTH SCALE" "m"
343-
state real l_scale ikj dyn_em 1 - - "L_SCALE" "DISSIPATION LENGTH SCALE" "m"
343+
state real l_diss ikj dyn_em 1 - - "L_DISS" "DISSIPATION LENGTH SCALE" "m"
344344
state real elmin ikj dyn_em 1 - - "ELMIN" "FREE ATMOS LENGTH SCALE (FROM BOULAC SCHEME)" "m"
345345
state real xkmv_meso ikj dyn_em 1 - - "XKMV_MESO" "XKMV AT MESOSCALE LIMIT" "m2 s-1"
346-
state real xkmh_t ikj dyn_em 1 - - "XKMH_T" "HORIZONTAL DIFFUSIVITY BASED ON 1.5-ORDER TKE" "m2 s-1"
347-
state real U_H_TEND ikj dyn_em 1 X - "U_H_TEND" "X WIND HORIZONTAL TENDENCY IN 3DTKE SCHEME" "m s-2"
348-
state real U_Z_TEND ikj dyn_em 1 X - "U_Z_TEND" "X WIND VERTICAL TENDENCY IN 3DTKE SCHEME" "m s-2"
349-
state real V_H_TEND ikj dyn_em 1 Y - "V_H_TEND" "Y WIND HORIZONTAL TENDENCY IN 3DTKE SCHEME" "m s-2"
350-
state real V_Z_TEND ikj dyn_em 1 Y - "V_Z_TEND" "Y WIND VERTICAL TENDENCY IN 3DTKE SCHEME" "m s-2"
351-
state real W_H_TEND ikj dyn_em 1 Z - "W_H_TEND" "W WIND HORIZONTAL TENDENCY IN 3DTKE SCHEME" "m s-2"
352-
state real W_Z_TEND ikj dyn_em 1 Z - "W_Z_TEND" "W WIND VERTICAL TENDENCY IN 3DTKE SCHEME" "m s-2"
353-
state real TH_H_TEND ikj dyn_em 1 - - "TH_H_TEND" "TH HORIZONTAL TENDENCY IN 3DTKE SCHEME" "m s-2"
354-
state real TH_Z_TEND ikj dyn_em 1 - - "TH_Z_TEND" "TH VERTICAL TENDENCY IN 3DTKE SCHEME" "m s-2"
355-
state real TKE_BUOY_TEND ikj dyn_em 1 - - "TKE_BUOY_TEND" "TKE BUOYANCY TENDENCY IN 3DTKE SCHEME" "m s-2"
356-
state real TKE_SHEAR_TEND ikj dyn_em 1 - - "TKE_SHEAR_TEND" "TKE SHEAR TENDENCY IN 3DTKE SCHEME" "m s-2"
357-
state real TKE_PRODUCTION_TEND ikj dyn_em 1 - - "TKE_PRODUCTION_TEND" "TKE PRODUCTION TENDENCY IN 3DTKE SCHEME" "m s-2"
358-
state real TKE_DIFFUSION_H_TEND ikj dyn_em 1 - - "TKE_DIFFUSION_H_TEND" "TKE HORIZONTAL DIFFUSION TENDENCY IN 3DTKE SCHEME" "m s-2"
359-
state real TKE_DIFFUSION_Z_TEND ikj dyn_em 1 - - "TKE_DIFFUSION_Z_TEND" "TKE VERTICAL DIFFUSION TENDENCY IN 3DTKE SCHEME" "m s-2"
360-
361346

362347
# Pressure and Density
363348
state real p ikj dyn_em 1 - irh "p" "perturbation pressure" "Pa"
@@ -2863,6 +2848,7 @@ package goddardswscheme ra_sw_physics==5 - state:tswdn,t
28632848
package flgswscheme ra_sw_physics==7 - -
28642849
package gfdlswscheme ra_sw_physics==99 - -
28652850

2851+
package nosfcscheme sf_sfclay_physics==0 - -
28662852
package sfclayrevscheme sf_sfclay_physics==1 - -
28672853
package myjsfcscheme sf_sfclay_physics==2 - state:tke_pbl
28682854
package gfssfcscheme sf_sfclay_physics==3 - -
@@ -2908,8 +2894,7 @@ package mynn_tkebudget bl_mynn_tkebudget==1 - state:qSHEAR,
29082894
package mynn_dmp_edmf bl_mynn_edmf==1 - state:edmf_a,edmf_w,edmf_thl,edmf_qt,edmf_ent,edmf_qc,ktop_shallow,maxmf,nupdraft
29092895
package pbl_cloud icloud_bl==1 - state:cldfra_bl,qc_bl
29102896

2911-
#package sms_3dtke km_opt==5 - state:gamu,gamv,nlflux,dlk,l_scale,elmin,xkmv_meso,xkmh_t,u_h_tend,u_z_tend,v_h_tend,v_z_tend,w_h_tend,w_z_tend,th_h_tend,th_z_tend,tke_buoy_tend,tke_shear_tend,tke_production_tend,tke_diffusion_h_tend,tke_diffusion_z_tend
2912-
package sms_3dtke km_opt==5 - -
2897+
package sms_3dtke km_opt==5 - state:gamu,gamv,nlflux,dlk,l_diss,elmin,xkmv_meso
29132898

29142899
# dfi
29152900
package mynnpblscheme2_dfi bl_pbl_physics_dfi==5 - dfi_scalar:dfi_qke_adv

‎Registry/Registry.NMM‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1819,6 +1819,7 @@ package gfdlswscheme ra_sw_physics==99 - -
18191819
package hwrfswscheme ra_sw_physics==98 - state:o3rad
18201820
package heldsuarez ra_lw_physics==31 - -
18211821

1822+
package nosfcscheme sf_sfclay_physics==0 - -
18221823
package sfclayscheme sf_sfclay_physics==91 - -
18231824
package myjsfcscheme sf_sfclay_physics==2 - -
18241825
package gfssfcscheme sf_sfclay_physics==3 - -

0 commit comments

Comments
 (0)