Skip to content

Commit

Permalink
Merge pull request #164 from jwolff-ncar/feature/jkw_stoch_updates
Browse files Browse the repository at this point in the history 
Modified diag_table* to include stochastic block. Updated stochastic …
  • Loading branch information
@jwolff-ncar
jwolff-ncar committed Mar 16, 2020
2 parents b791f27 + 0ffd653 commit ae88569
Show file tree
Hide file tree
Showing 9 changed files with 99 additions and 60 deletions.
7 changes: 6 additions & 1 deletion ush/templates/diag_table.FV3_CPT_v0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,12 @@
"gfs_phys", "nbdsf_ave", "nbdsf_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "nddsf_ave", "nddsf_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "trans_ave", "trans_ave", "fv3_history2d", "all", .false., "none", 2

# Stochastic physics
"gfs_phys", "sppt_wts", "sppt_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebu_wts", "skebu_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebv_wts", "skebv_wts", "fv3_history", "all", .false., "none", 2
"dynamics", "diss_est", "diss_est", "fv3_history", "all", .false., "none", 2
"gfs_phys", "shum_wts", "shum_wts", "fv3_history", "all", .false., "none", 2
#=============================================================================================
#
#====> This file can be used with diag_manager/v2.0a (or higher) <====
Expand Down
7 changes: 6 additions & 1 deletion ush/templates/diag_table.FV3_GFS_2017_gfdlmp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,12 @@
"gfs_phys", "nbdsf_ave", "nbdsf_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "nddsf_ave", "nddsf_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "trans_ave", "trans_ave", "fv3_history2d", "all", .false., "none", 2

# Stochastic physics
"gfs_phys", "sppt_wts", "sppt_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebu_wts", "skebu_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebv_wts", "skebv_wts", "fv3_history", "all", .false., "none", 2
"dynamics", "diss_est", "diss_est", "fv3_history", "all", .false., "none", 2
"gfs_phys", "shum_wts", "shum_wts", "fv3_history", "all", .false., "none", 2
#=============================================================================================
#
#====> This file can be used with diag_manager/v2.0a (or higher) <====
Expand Down
6 changes: 6 additions & 0 deletions ush/templates/diag_table.FV3_GFS_v15p2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,12 @@
"gfs_phys", "nbdsf_ave", "nbdsf_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "nddsf_ave", "nddsf_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "trans_ave", "trans_ave", "fv3_history2d", "all", .false., "none", 2
# Stochastic physics
"gfs_phys", "sppt_wts", "sppt_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebu_wts", "skebu_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebv_wts", "skebv_wts", "fv3_history", "all", .false., "none", 2
"dynamics", "diss_est", "diss_est", "fv3_history", "all", .false., "none", 2
"gfs_phys", "shum_wts", "shum_wts", "fv3_history", "all", .false., "none", 2

#=============================================================================================
#
Expand Down
6 changes: 6 additions & 0 deletions ush/templates/diag_table.FV3_GFS_v16beta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,12 @@
"gfs_phys", "nbdsf_ave", "nbdsf_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "nddsf_ave", "nddsf_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "trans_ave", "trans_ave", "fv3_history2d", "all", .false., "none", 2
# Stochastic physics
"gfs_phys", "sppt_wts", "sppt_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebu_wts", "skebu_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebv_wts", "skebv_wts", "fv3_history", "all", .false., "none", 2
"dynamics", "diss_est", "diss_est", "fv3_history", "all", .false., "none", 2
"gfs_phys", "shum_wts", "shum_wts", "fv3_history", "all", .false., "none", 2

#=============================================================================================
#
Expand Down
6 changes: 6 additions & 0 deletions ush/templates/diag_table.FV3_GSD_SAR
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,12 @@
# Prognostic/diagnostic variables from RUC LSM
"gfs_sfc", "snowfall_acc", "snowfall_acc", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "swe_snowfall_acc", "swe_snowfall_acc", "fv3_history2d", "all", .false., "none", 2
# Stochastic physics
"gfs_phys", "sppt_wts", "sppt_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebu_wts", "skebu_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebv_wts", "skebv_wts", "fv3_history", "all", .false., "none", 2
"dynamics", "diss_est", "diss_est", "fv3_history", "all", .false., "none", 2
"gfs_phys", "shum_wts", "shum_wts", "fv3_history", "all", .false., "none", 2

#=============================================================================================
#
Expand Down
6 changes: 6 additions & 0 deletions ush/templates/diag_table.FV3_GSD_v0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,12 @@
# Prognostic/diagnostic variables from RUC LSM
"gfs_sfc", "snowfall_acc", "snowfall_acc", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "swe_snowfall_acc", "swe_snowfall_acc", "fv3_history2d", "all", .false., "none", 2
# Stochastic physics
"gfs_phys", "sppt_wts", "sppt_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebu_wts", "skebu_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebv_wts", "skebv_wts", "fv3_history", "all", .false., "none", 2
"dynamics", "diss_est", "diss_est", "fv3_history", "all", .false., "none", 2
"gfs_phys", "shum_wts", "shum_wts", "fv3_history", "all", .false., "none", 2

#=============================================================================================
#
Expand Down
43 changes: 23 additions & 20 deletions ush/templates/input.nml.FV3_CPT_v0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,28 +325,31 @@
FSNOS = 99999,
FSICS = 99999,
/

&nam_stochy
lon_s=768,
lat_s=384,
ntrunc=382,
SKEBNORM=1,
SKEB_NPASS=30,
SKEB_VDOF=5,
SKEB=-999.,
SKEB_TAU=2.16E4,
SKEB_LSCALE=1000.E3,
SHUM=-999.,
SHUM_TAU=21600,
SHUM_LSCALE=500000,
SPPT=-999.,
SPPT_TAU=21600,
SPPT_LSCALE=500000,
SPPT_LOGIT=.TRUE.,
SPPT_SFCLIMIT=.TRUE.,
ISEED_SHUM=1,
ISEED_SKEB=2,
ISEED_SPPT=3,
new_lscale=.true.,
sppt=1.0,
sppt_tau = 2.16E4,
sppt_lscale=150.E3,
USE_ZMTNBLCK=.FALSE.,
SPPT_LOGIT=.TRUE.,
SPPT_SFCLIMIT=.FALSE.,
ISEED_SPPT=1,
SHUM=0.006,
SHUM_TAU=21600,
SHUM_LSCALE=150.E3,
ISEED_SHUM=2,
SKEBNORM=1,
SKEB=0.5,
SKEB_VDOF=10,
SKEB_TAU=21600.,
SKEB_LSCALE=150.E3,
ISEED_SKEB=3,
skebint=3600,
spptint=3600,
shumint=3600,
/

&nam_sfcperts
/

Expand Down
39 changes: 20 additions & 19 deletions ush/templates/input.nml.FV3_GSD_SAR
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,26 +272,27 @@
/

&nam_stochy
lon_s=768,
lat_s=384,
ntrunc=382,
SKEBNORM=1,
SKEB_NPASS=30,
SKEB_VDOF=5,
SKEB=@[SKEB],
SKEB_TAU=2.16E4,
SKEB_LSCALE=1000.E3,
SHUM=@[SHUM],
SHUM_TAU=21600,
SHUM_LSCALE=500000,
SPPT=@[SPPT],
SPPT_TAU=21600,
SPPT_LSCALE=500000,
new_lscale=.true.,
sppt=1.0,
sppt_tau = 2.16E4,
sppt_lscale=150.E3,
USE_ZMTNBLCK=.FALSE.,
SPPT_LOGIT=.TRUE.,
SPPT_SFCLIMIT=.TRUE.,
ISEED_SHUM=1,
ISEED_SKEB=2,
ISEED_SPPT=3,
SPPT_SFCLIMIT=.FALSE.,
ISEED_SPPT=1,
SHUM=0.006,
SHUM_TAU=21600,
SHUM_LSCALE=150.E3,
ISEED_SHUM=2,
SKEBNORM=1,
SKEB=0.5,
SKEB_VDOF=10,
SKEB_TAU=21600.,
SKEB_LSCALE=150.E3,
ISEED_SKEB=3,
skebint=3600,
spptint=3600,
shumint=3600,
/

&nam_sfcperts
Expand Down
39 changes: 20 additions & 19 deletions ush/templates/input.nml.FV3_GSD_v0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,26 +260,27 @@
/

&nam_stochy
lon_s=768,
lat_s=384,
ntrunc=382,
SKEBNORM=1,
SKEB_NPASS=30,
SKEB_VDOF=5,
SKEB=@[SKEB],
SKEB_TAU=2.16E4,
SKEB_LSCALE=1000.E3,
SHUM=@[SHUM],
SHUM_TAU=21600,
SHUM_LSCALE=500000,
SPPT=@[SPPT],
SPPT_TAU=21600,
SPPT_LSCALE=500000,
new_lscale=.true.,
sppt=1.0,
sppt_tau = 2.16E4,
sppt_lscale=150.E3,
USE_ZMTNBLCK=.FALSE.,
SPPT_LOGIT=.TRUE.,
SPPT_SFCLIMIT=.TRUE.,
ISEED_SHUM=1,
ISEED_SKEB=2,
ISEED_SPPT=3,
SPPT_SFCLIMIT=.FALSE.,
ISEED_SPPT=1,
SHUM=0.006,
SHUM_TAU=21600,
SHUM_LSCALE=150.E3,
ISEED_SHUM=2,
SKEBNORM=1,
SKEB=0.5,
SKEB_VDOF=10,
SKEB_TAU=21600.,
SKEB_LSCALE=150.E3,
ISEED_SKEB=3,
skebint=3600,
spptint=3600,
shumint=3600,
/

&nam_sfcperts
Expand Down

0 comments on commit ae88569

Please sign in to comment.