Skip to content

Fixing the problem that km_opt=5 breaks km_opt=2 and cleaning codes #1026

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

Merged
davegill merged 4 commits into from
Jan 28, 2020
Merged

Fixing the problem that km_opt=5 breaks km_opt=2 and cleaning codes #1026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c4bdb83
Fixing the problem opt_km=5 breaks opt_km=2 and cleaning codes and va…
yunlinzhang Dec 1, 2019
7d93214
Remove XZ in Registry
davegill Dec 4, 2019
934898c
remove !XZ
smileMchen Dec 4, 2019
53a1a8c
Allow sf_sfclay_physics=0 with km_opt=5
davegill Jan 24, 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
23 changes: 4 additions & 19 deletions Registry/Registry.EM_COMMON
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,29 +337,14 @@ state real ht_coarse ij misc 1 - r -
state real tke ikj dyn_em 2 - r "tke" "TURBULENCE KINETIC ENERGY" "m2 s-2"
i1 real tke_tend ikj dyn_em 1 -

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


# Pressure and Density
state real p ikj dyn_em 1 - irh "p" "perturbation pressure" "Pa"
Expand Down Expand Up @@ -2869,6 +2854,7 @@ package goddardswscheme ra_sw_physics==5 - state:tswdn,t
package flgswscheme ra_sw_physics==7 - -
package gfdlswscheme ra_sw_physics==99 - -

package nosfcscheme sf_sfclay_physics==0 - -
package sfclayrevscheme sf_sfclay_physics==1 - -
package myjsfcscheme sf_sfclay_physics==2 - state:tke_pbl
package gfssfcscheme sf_sfclay_physics==3 - -
Expand Down Expand Up @@ -2914,8 +2900,7 @@ package mynn_tkebudget bl_mynn_tkebudget==1 - state:qSHEAR,
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
package pbl_cloud icloud_bl==1 - state:cldfra_bl,qc_bl

#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
package sms_3dtke km_opt==5 - -
package sms_3dtke km_opt==5 - state:gamu,gamv,nlflux,dlk,l_diss,elmin,xkmv_meso

# dfi
package mynnpblscheme2_dfi bl_pbl_physics_dfi==5 - dfi_scalar:dfi_qke_adv
Expand Down
1 change: 1 addition & 0 deletions Registry/Registry.NMM
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1819,6 +1819,7 @@ package gfdlswscheme ra_sw_physics==99 - -
package hwrfswscheme ra_sw_physics==98 - state:o3rad
package heldsuarez ra_lw_physics==31 - -

package nosfcscheme sf_sfclay_physics==0 - -
package sfclayscheme sf_sfclay_physics==91 - -
package myjsfcscheme sf_sfclay_physics==2 - -
package gfssfcscheme sf_sfclay_physics==3 - -
Expand Down
Loading