diff --git a/Externals.cfg b/Externals.cfg index e3c572bead..951e65267d 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -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 local_path = sorc/ufs-weather-model required = True @@ -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 diff --git a/parm/FV3.input.yml b/parm/FV3.input.yml index 094fbda73b..6ab6c7e778 100644 --- a/parm/FV3.input.yml +++ b/parm/FV3.input.yml @@ -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] diff --git a/parm/diag_table.FV3_GFS_2017_gfdlmp b/parm/diag_table.FV3_GFS_2017_gfdlmp index 8b64d1ee91..5339c9b373 100755 --- a/parm/diag_table.FV3_GFS_2017_gfdlmp +++ b/parm/diag_table.FV3_GFS_2017_gfdlmp @@ -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 diff --git a/parm/diag_table.FV3_GFS_2017_gfdlmp_regional b/parm/diag_table.FV3_GFS_2017_gfdlmp_regional index dbcfbb1f65..56dbcba01b 100644 --- a/parm/diag_table.FV3_GFS_2017_gfdlmp_regional +++ b/parm/diag_table.FV3_GFS_2017_gfdlmp_regional @@ -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 diff --git a/parm/diag_table.FV3_GFS_v15_thompson_mynn_lam3km b/parm/diag_table.FV3_GFS_v15_thompson_mynn_lam3km index 6f32189582..68a95d652a 100644 --- a/parm/diag_table.FV3_GFS_v15_thompson_mynn_lam3km +++ b/parm/diag_table.FV3_GFS_v15_thompson_mynn_lam3km @@ -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 diff --git a/parm/diag_table.FV3_GFS_v15p2 b/parm/diag_table.FV3_GFS_v15p2 index 129061171f..8b1863028b 100755 --- a/parm/diag_table.FV3_GFS_v15p2 +++ b/parm/diag_table.FV3_GFS_v15p2 @@ -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 diff --git a/parm/diag_table.FV3_GFS_v16 b/parm/diag_table.FV3_GFS_v16 index 129061171f..8b1863028b 100755 --- a/parm/diag_table.FV3_GFS_v16 +++ b/parm/diag_table.FV3_GFS_v16 @@ -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 diff --git a/parm/diag_table.FV3_GFS_v17_p8 b/parm/diag_table.FV3_GFS_v17_p8 index 3c5b58508a..bd53dbfdb7 100644 --- a/parm/diag_table.FV3_GFS_v17_p8 +++ b/parm/diag_table.FV3_GFS_v17_p8 @@ -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 diff --git a/parm/diag_table.FV3_HRRR b/parm/diag_table.FV3_HRRR index 45d5c87d19..0712e55fca 100755 --- a/parm/diag_table.FV3_HRRR +++ b/parm/diag_table.FV3_HRRR @@ -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 diff --git a/parm/diag_table.FV3_RRFS_v0 b/parm/diag_table.FV3_RRFS_v0 index a3cb733d5c..59db1ae94f 100644 --- a/parm/diag_table.FV3_RRFS_v0 +++ b/parm/diag_table.FV3_RRFS_v0 @@ -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 diff --git a/parm/diag_table.FV3_RRFS_v1beta b/parm/diag_table.FV3_RRFS_v1beta index 00690a5498..ab51580c95 100755 --- a/parm/diag_table.FV3_RRFS_v1beta +++ b/parm/diag_table.FV3_RRFS_v1beta @@ -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 diff --git a/parm/diag_table.FV3_WoFS_v0 b/parm/diag_table.FV3_WoFS_v0 index 5e1c7c89bb..301246fa42 100644 --- a/parm/diag_table.FV3_WoFS_v0 +++ b/parm/diag_table.FV3_WoFS_v0 @@ -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 diff --git a/parm/diag_table_aqm.FV3_GFS_v15p2 b/parm/diag_table_aqm.FV3_GFS_v15p2 index feff256c3f..a58303449f 100644 --- a/parm/diag_table_aqm.FV3_GFS_v15p2 +++ b/parm/diag_table_aqm.FV3_GFS_v15p2 @@ -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 diff --git a/parm/diag_table_aqm.FV3_GFS_v16 b/parm/diag_table_aqm.FV3_GFS_v16 index feff256c3f..a58303449f 100644 --- a/parm/diag_table_aqm.FV3_GFS_v16 +++ b/parm/diag_table_aqm.FV3_GFS_v16 @@ -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 diff --git a/parm/diag_table_aqm.FV3_GFS_v17_p8 b/parm/diag_table_aqm.FV3_GFS_v17_p8 index ed45de59e9..6aa4ceb34e 100644 --- a/parm/diag_table_aqm.FV3_GFS_v17_p8 +++ b/parm/diag_table_aqm.FV3_GFS_v17_p8 @@ -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 diff --git a/parm/input.nml.FV3 b/parm/input.nml.FV3 index 8cdf3258e5..bd6244d2d9 100644 --- a/parm/input.nml.FV3 +++ b/parm/input.nml.FV3 @@ -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. diff --git a/ush/config_defaults.yaml b/ush/config_defaults.yaml index fbb59040a7..ffff322b44 100644 --- a/ush/config_defaults.yaml +++ b/ush/config_defaults.yaml @@ -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 }}' #----------------------------