Skip to content

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

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
MichaelLueken merged 6 commits into from
Mar 21, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
49b7f5b
updae hash of ufs-weather-model
chan-hoo Mar 9, 2023
0dcba7f
update input.nml and diag tables for recent var change
chan-hoo Mar 9, 2023
41caa59
update hash of upp
chan-hoo Mar 10, 2023
f9e0d1a
back to original hash of upp
chan-hoo Mar 14, 2023
a2f839b
Update UPP hash and point to updated post control file in weather mod…
MichaelLueken Mar 20, 2023
fe6ed4b
Merge pull request #7 from MichaelLueken/bugfix/input
chan-hoo Mar 20, 2023
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
4 changes: 2 additions & 2 deletions Externals.cfg
View file
Open in desktop
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
Comment thread
MichaelLueken marked this conversation as resolved.
local_path = sorc/ufs-weather-model
required = True

Expand All @@ -21,7 +21,7 @@ protocol = git
repo_url = https://github.com/NOAA-EMC/UPP
# Specify either a branch name or a hash but not both.
#branch = develop
hash = 2b2c84a
hash = b37f8ab
local_path = sorc/UPP
required = True

Expand Down
2 changes: 1 addition & 1 deletion parm/FV3.input.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions ush/config_defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2008,8 +2008,8 @@ task_run_post:
#
#-----------------------------------------------------------------------
#
USE_CUSTOM_POST_CONFIG_FILE: false
CUSTOM_POST_CONFIG_FP: ""
USE_CUSTOM_POST_CONFIG_FILE: true
CUSTOM_POST_CONFIG_FP: '{{ user.SORCdir }}/ufs-weather-model/tests/parm/postxconfig-NT-fv3lam.txt'
POST_OUTPUT_DOMAIN_NAME: '{{ workflow.PREDEF_GRID_NAME }}'

#----------------------------
Expand Down