Skip to content
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.

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

[develop] Update hash of ufs weather model and input.nml/diag_table files #663

Merged
merged 6 commits into from
Mar 21, 2023
Merged
Show file tree
Hide file tree
Changes from 4 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
2 changes: 1 addition & 1 deletion Externals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ protocol = git
repo_url = https://github.com/ufs-community/ufs-weather-model
# Specify either a branch name or a hash but not both.
#branch = develop
hash = e051e0e
hash = b388eb9
MichaelLueken marked this conversation as resolved.
Show resolved Hide resolved
local_path = sorc/ufs-weather-model
required = True

Expand Down
2 changes: 1 addition & 1 deletion parm/FV3.input.yml
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ FV3_GFS_v17_p8:
lw_file_gas: rrtmgp-data-lw-g128-210809.nc
min_lakeice: 0.15
min_seaice: 0.15
nsradar_reset: !!python/none
nsfullradar_diag: !!python/none
nstf_name: [2, 0, 0, 0, 0]
prautco: [0.00015, 0.00015]
psautco: [0.0008, 0.0005]
Expand Down
7 changes: 7 additions & 0 deletions parm/diag_table.FV3_GFS_2017_gfdlmp
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,13 @@
#"gfs_dyn", "ice_nc", "nicp", "fv3_history", "all", .false., "none", 2
#"gfs_dyn", "rain_nc", "ntrnc", "fv3_history", "all", .false., "none", 2

"gfs_phys", "frzr", "frzr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frzrb", "frzrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozr", "frozr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozrb", "frozrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowp", "tsnowp", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowpb", "tsnowpb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "rhonewsn", "rhonewsn", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ALBDO_ave", "albdo_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcp_ave", "cprat_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcpb_ave", "cpratb_ave", "fv3_history2d", "all", .false., "none", 2
Expand Down
7 changes: 7 additions & 0 deletions parm/diag_table.FV3_GFS_2017_gfdlmp_regional
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,13 @@
"gfs_phys", "rh02max", "rh02max", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "rh02min", "rh02min", "fv3_history2d", "all", .false., "none", 2

"gfs_phys", "frzr", "frzr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frzrb", "frzrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozr", "frozr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozrb", "frozrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowp", "tsnowp", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowpb", "tsnowpb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "rhonewsn", "rhonewsn", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ALBDO_ave", "albdo_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcp_ave", "cprat_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcpb_ave", "cpratb_ave", "fv3_history2d", "all", .false., "none", 2
Expand Down
7 changes: 7 additions & 0 deletions parm/diag_table.FV3_GFS_v15_thompson_mynn_lam3km
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,13 @@
"gfs_phys", "cldfra", "cldfra", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pratemax", "pratemax", "fv3_history2d", "all", .false., "none", 2

"gfs_phys", "frzr", "frzr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frzrb", "frzrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozr", "frozr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozrb", "frozrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowp", "tsnowp", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowpb", "tsnowpb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "rhonewsn", "rhonewsn", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ALBDO_ave", "albdo_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcp_ave", "cprat_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcpb_ave", "cpratb_ave", "fv3_history2d", "all", .false., "none", 2
Expand Down
7 changes: 7 additions & 0 deletions parm/diag_table.FV3_GFS_v15p2
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,13 @@
#"gfs_dyn", "ice_nc", "nicp", "fv3_history", "all", .false., "none", 2
#"gfs_dyn", "rain_nc", "ntrnc", "fv3_history", "all", .false., "none", 2

"gfs_phys", "frzr", "frzr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frzrb", "frzrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozr", "frozr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozrb", "frozrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowp", "tsnowp", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowpb", "tsnowpb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "rhonewsn", "rhonewsn", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ALBDO_ave", "albdo_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcp_ave", "cprat_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcpb_ave", "cpratb_ave", "fv3_history2d", "all", .false., "none", 2
Expand Down
7 changes: 7 additions & 0 deletions parm/diag_table.FV3_GFS_v16
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,13 @@
#"gfs_dyn", "ice_nc", "nicp", "fv3_history", "all", .false., "none", 2
#"gfs_dyn", "rain_nc", "ntrnc", "fv3_history", "all", .false., "none", 2

"gfs_phys", "frzr", "frzr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frzrb", "frzrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozr", "frozr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozrb", "frozrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowp", "tsnowp", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowpb", "tsnowpb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "rhonewsn", "rhonewsn", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ALBDO_ave", "albdo_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcp_ave", "cprat_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcpb_ave", "cpratb_ave", "fv3_history2d", "all", .false., "none", 2
Expand Down
7 changes: 7 additions & 0 deletions parm/diag_table.FV3_GFS_v17_p8
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@
"gfs_dyn", "ps", "pressfc", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "hs", "hgtsfc", "fv3_history", "all", .false., "none", 2

"gfs_phys", "frzr", "frzr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frzrb", "frzrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozr", "frozr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozrb", "frozrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowp", "tsnowp", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowpb", "tsnowpb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "rhonewsn", "rhonewsn", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cldfra", "cldfra", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ALBDO_ave", "albdo_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcp_ave", "cprat_ave", "fv3_history2d", "all", .false., "none", 2
Expand Down
7 changes: 7 additions & 0 deletions parm/diag_table.FV3_HRRR
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,13 @@
"gfs_dyn", "maxvort02", "maxvort02", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "maxvorthy1", "maxvorthy1", "fv3_history", "all", .false., "none", 2

"gfs_phys", "frzr", "frzr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frzrb", "frzrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozr", "frozr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozrb", "frozrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowp", "tsnowp", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowpb", "tsnowpb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "rhonewsn", "rhonewsn", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ALBDO_ave", "albdo_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcp_ave", "cprat_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcpb_ave", "cpratb_ave", "fv3_history2d", "all", .false., "none", 2
Expand Down
7 changes: 7 additions & 0 deletions parm/diag_table.FV3_RRFS_v0
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,13 @@
"gfs_dyn", "maxvort02", "maxvort02", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "maxvorthy1", "maxvorthy1", "fv3_history", "all", .false., "none", 2

"gfs_phys", "frzr", "frzr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frzrb", "frzrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozr", "frozr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozrb", "frozrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowp", "tsnowp", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowpb", "tsnowpb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "rhonewsn", "rhonewsn", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ALBDO_ave", "albdo_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcp_ave", "cprat_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcpb_ave", "cpratb_ave", "fv3_history2d", "all", .false., "none", 2
Expand Down
7 changes: 7 additions & 0 deletions parm/diag_table.FV3_RRFS_v1beta
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,13 @@
"gfs_dyn", "maxvort02", "maxvort02", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "maxvorthy1", "maxvorthy1", "fv3_history", "all", .false., "none", 2

"gfs_phys", "frzr", "frzr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frzrb", "frzrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozr", "frozr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozrb", "frozrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowp", "tsnowp", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowpb", "tsnowpb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "rhonewsn", "rhonewsn", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ALBDO_ave", "albdo_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcp_ave", "cprat_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcpb_ave", "cpratb_ave", "fv3_history2d", "all", .false., "none", 2
Expand Down
7 changes: 7 additions & 0 deletions parm/diag_table.FV3_WoFS_v0
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,13 @@
"gfs_dyn", "maxvort02", "maxvort02", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "maxvorthy1", "maxvorthy1", "fv3_history", "all", .false., "none", 2

"gfs_phys", "frzr", "frzr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frzrb", "frzrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozr", "frozr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozrb", "frozrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowp", "tsnowp", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowpb", "tsnowpb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "rhonewsn", "rhonewsn", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ALBDO_ave", "albdo_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcp_ave", "cprat_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcpb_ave", "cpratb_ave", "fv3_history2d", "all", .false., "none", 2
Expand Down
7 changes: 7 additions & 0 deletions parm/diag_table_aqm.FV3_GFS_v15p2
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,13 @@
#"gfs_dyn", "ice_nc", "nicp", "fv3_history", "all", .false., "none", 2
#"gfs_dyn", "rain_nc", "ntrnc", "fv3_history", "all", .false., "none", 2

"gfs_phys", "frzr", "frzr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frzrb", "frzrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozr", "frozr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozrb", "frozrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowp", "tsnowp", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowpb", "tsnowpb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "rhonewsn", "rhonewsn", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ALBDO_ave", "albdo_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcp_ave", "cprat_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcpb_ave", "cpratb_ave", "fv3_history2d", "all", .false., "none", 2
Expand Down
7 changes: 7 additions & 0 deletions parm/diag_table_aqm.FV3_GFS_v16
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,13 @@
#"gfs_dyn", "ice_nc", "nicp", "fv3_history", "all", .false., "none", 2
#"gfs_dyn", "rain_nc", "ntrnc", "fv3_history", "all", .false., "none", 2

"gfs_phys", "frzr", "frzr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frzrb", "frzrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozr", "frozr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozrb", "frozrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowp", "tsnowp", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowpb", "tsnowpb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "rhonewsn", "rhonewsn", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ALBDO_ave", "albdo_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcp_ave", "cprat_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcpb_ave", "cpratb_ave", "fv3_history2d", "all", .false., "none", 2
Expand Down
7 changes: 7 additions & 0 deletions parm/diag_table_aqm.FV3_GFS_v17_p8
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@
"gfs_dyn", "ps", "pressfc", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "hs", "hgtsfc", "fv3_history", "all", .false., "none", 2

"gfs_phys", "frzr", "frzr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frzrb", "frzrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozr", "frozr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozrb", "frozrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowp", "tsnowp", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowpb", "tsnowpb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "rhonewsn", "rhonewsn", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cldfra", "cldfra", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ALBDO_ave", "albdo_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcp_ave", "cprat_ave", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion parm/input.nml.FV3
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
lsoil_lsm = 9
ltaerosol = .true.
lwhtr = .true.
nsradar_reset = 3600
nsfullradar_diag = 3600
nst_anl = .true.
nstf_name = 2,1,0,0,0
oz_phys = .false.
Expand Down