diff --git a/tests/default_vars.sh b/tests/default_vars.sh index d3ce19bffc..7d4a479b73 100755 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -501,7 +501,7 @@ export FHROT=0 export LDIAG3D=.false. export QDIAG3D=.false. export PRINT_DIFF_PGR=.false. -export MAX_OUTPUT_FIELDS=300 +export MAX_OUTPUT_FIELDS=310 # Stochastic physics export STOCHINI=.false. diff --git a/tests/parm/diag_table/diag_additional_control_dtend b/tests/parm/diag_table/diag_additional_control_dtend index 6107eb51ad..7fd7d31365 100644 --- a/tests/parm/diag_table/diag_additional_control_dtend +++ b/tests/parm/diag_table/diag_additional_control_dtend @@ -28,6 +28,7 @@ "gfs_phys", "dtend_u_phys", "dtend_u_phys", "fv3_history", "all", .false., "none", 2 "gfs_phys", "dtend_v_phys", "dtend_v_phys", "fv3_history", "all", .false., "none", 2 + "gfs_dyn", "dtend_temp_nophys", "dtend_temp_nophys", "fv3_history", "all", .false., "none", 2 "gfs_dyn", "dtend_u_nophys", "dtend_u_nophys", "fv3_history", "all", .false., "none", 2 "gfs_dyn", "dtend_v_nophys", "dtend_v_nophys", "fv3_history", "all", .false., "none", 2 diff --git a/tests/parm/diag_table/diag_table_GOCART b/tests/parm/diag_table/diag_table_GOCART index d9a1fb5ef7..d69c943eee 100644 --- a/tests/parm/diag_table/diag_table_GOCART +++ b/tests/parm/diag_table/diag_table_GOCART @@ -140,6 +140,13 @@ "gfs_dyn", "pm25", "pm25", "fv3_history", "all", .false., "none", 2 "gfs_dyn", "pm10", "pm10", "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/tests/parm/diag_table/diag_table_aod b/tests/parm/diag_table/diag_table_aod index 21a6a24dc5..6519990155 100644 --- a/tests/parm/diag_table/diag_table_aod +++ b/tests/parm/diag_table/diag_table_aod @@ -115,6 +115,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", "ALBDO_ave", "albdo_ave", "fv3_history2d", "all", .false., "none", 2 "gfs_phys", "cnvprcp_ave", "cprat_ave", "fv3_history2d", "all", .false., "none", 2 "gfs_phys", "totprcp_ave", "prate_ave", "fv3_history2d", "all", .false., "none", 2 diff --git a/tests/parm/diag_table/diag_table_aqm b/tests/parm/diag_table/diag_table_aqm index 2406088a15..3b0c02483a 100644 --- a/tests/parm/diag_table/diag_table_aqm +++ b/tests/parm/diag_table/diag_table_aqm @@ -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/tests/parm/diag_table/diag_table_gfsv16 b/tests/parm/diag_table/diag_table_gfsv16 index 9f45077058..f4ad6dcf0c 100644 --- a/tests/parm/diag_table/diag_table_gfsv16 +++ b/tests/parm/diag_table/diag_table_gfsv16 @@ -71,6 +71,13 @@ "gfs_phys", "dvsfc", "vflx_ave", "fv3_history2d", "all", .false., "none", 2 #"gfs_phys", "cnvw", "cnvcldwat", "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", "psurf", "pressfc", "fv3_history2d", "all", .false., "none", 2 "gfs_phys", "u10m", "ugrd10m", "fv3_history2d", "all", .false., "none", 2 "gfs_phys", "v10m", "vgrd10m", "fv3_history2d", "all", .false., "none", 2 diff --git a/tests/parm/diag_table/diag_table_gfsv16_thompson_extdiag b/tests/parm/diag_table/diag_table_gfsv16_thompson_extdiag index 43fcd7e5e5..841fa0b1ad 100644 --- a/tests/parm/diag_table/diag_table_gfsv16_thompson_extdiag +++ b/tests/parm/diag_table/diag_table_gfsv16_thompson_extdiag @@ -71,6 +71,13 @@ "gfs_phys", "dvsfc", "vflx_ave", "fv3_history2d", "all", .false., "none", 2 #"gfs_phys", "cnvw", "cnvcldwat", "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", "psurf", "pressfc", "fv3_history2d", "all", .false., "none", 2 "gfs_phys", "u10m", "ugrd10m", "fv3_history2d", "all", .false., "none", 2 "gfs_phys", "v10m", "vgrd10m", "fv3_history2d", "all", .false., "none", 2 diff --git a/tests/parm/diag_table/diag_table_gfsv17_template b/tests/parm/diag_table/diag_table_gfsv17_template index f4bb656839..609f806054 100644 --- a/tests/parm/diag_table/diag_table_gfsv17_template +++ b/tests/parm/diag_table/diag_table_gfsv17_template @@ -111,6 +111,13 @@ "gfs_dyn", "pm25", "pm25", "fv3_history", "all", .false., "none", 2 "gfs_dyn", "pm10", "pm10", "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/tests/parm/diag_table/diag_table_hafs b/tests/parm/diag_table/diag_table_hafs index cfa7e4a362..9a4ddfe0ec 100644 --- a/tests/parm/diag_table/diag_table_hafs +++ b/tests/parm/diag_table/diag_table_hafs @@ -155,6 +155,13 @@ "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/tests/parm/diag_table/diag_table_hafs_template b/tests/parm/diag_table/diag_table_hafs_template index c0df92f55c..802adbdc4b 100644 --- a/tests/parm/diag_table/diag_table_hafs_template +++ b/tests/parm/diag_table/diag_table_hafs_template @@ -195,6 +195,13 @@ ufs.hafs "gfs_phys", "t02min", "t02min", "fv3_history2d", "all", .false., "none", 2 "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 diff --git a/tests/parm/diag_table/diag_table_hrrr b/tests/parm/diag_table/diag_table_hrrr index ba355a93e4..ec67502b39 100644 --- a/tests/parm/diag_table/diag_table_hrrr +++ b/tests/parm/diag_table/diag_table_hrrr @@ -131,6 +131,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/tests/parm/diag_table/diag_table_hrrr_stoch b/tests/parm/diag_table/diag_table_hrrr_stoch index 813861f854..df6b2b859a 100644 --- a/tests/parm/diag_table/diag_table_hrrr_stoch +++ b/tests/parm/diag_table/diag_table_hrrr_stoch @@ -131,6 +131,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/tests/parm/diag_table/diag_table_lam b/tests/parm/diag_table/diag_table_lam index f3df771c60..03548ec076 100644 --- a/tests/parm/diag_table/diag_table_lam +++ b/tests/parm/diag_table/diag_table_lam @@ -152,6 +152,14 @@ "gfs_phys", "refl_10cm", "refl_10cm", "fv3_history2d", "all", .false., "none", 2 "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 diff --git a/tests/parm/diag_table/diag_table_mr2 b/tests/parm/diag_table/diag_table_mr2 index 3bcf4a146a..4c7e9cda7e 100644 --- a/tests/parm/diag_table/diag_table_mr2 +++ b/tests/parm/diag_table/diag_table_mr2 @@ -71,6 +71,13 @@ "gfs_phys", "dvsfc", "vflx_ave", "fv3_history2d", "all", .false., "none", 2 #"gfs_phys", "cnvw", "cnvcldwat", "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", "psurf", "pressfc", "fv3_history2d", "all", .false., "none", 2 "gfs_phys", "u10m", "ugrd10m", "fv3_history2d", "all", .false., "none", 2 "gfs_phys", "v10m", "vgrd10m", "fv3_history2d", "all", .false., "none", 2 diff --git a/tests/parm/diag_table/diag_table_noquilt b/tests/parm/diag_table/diag_table_noquilt index e519db93b0..f82a10b687 100644 --- a/tests/parm/diag_table/diag_table_noquilt +++ b/tests/parm/diag_table/diag_table_noquilt @@ -147,6 +147,13 @@ "gfs_phys", "pratemax", "pratemax", "fv3_history2d", "all", .false., "none", 2 "gfs_phys", "refl_10cm", "refl_10cm", "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/tests/parm/diag_table/diag_table_p8_gocart_micro b/tests/parm/diag_table/diag_table_p8_gocart_micro index a4986ac1fa..c9d938dc2b 100644 --- a/tests/parm/diag_table/diag_table_p8_gocart_micro +++ b/tests/parm/diag_table/diag_table_p8_gocart_micro @@ -111,6 +111,13 @@ "gfs_dyn", "pm25", "pm25", "fv3_history", "all", .false., "none", 2 "gfs_dyn", "pm10", "pm10", "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/tests/parm/diag_table/diag_table_p8_template b/tests/parm/diag_table/diag_table_p8_template index f4bb656839..609f806054 100644 --- a/tests/parm/diag_table/diag_table_p8_template +++ b/tests/parm/diag_table/diag_table_p8_template @@ -111,6 +111,13 @@ "gfs_dyn", "pm25", "pm25", "fv3_history", "all", .false., "none", 2 "gfs_dyn", "pm10", "pm10", "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/tests/parm/diag_table/diag_table_rap b/tests/parm/diag_table/diag_table_rap index c476080bdb..e2dd3144dd 100644 --- a/tests/parm/diag_table/diag_table_rap +++ b/tests/parm/diag_table/diag_table_rap @@ -111,6 +111,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/tests/parm/diag_table/diag_table_rap_noah b/tests/parm/diag_table/diag_table_rap_noah index f964f995f1..00fe068944 100644 --- a/tests/parm/diag_table/diag_table_rap_noah +++ b/tests/parm/diag_table/diag_table_rap_noah @@ -111,6 +111,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/tests/parm/diag_table/diag_table_regional b/tests/parm/diag_table/diag_table_regional index e519db93b0..f82a10b687 100644 --- a/tests/parm/diag_table/diag_table_regional +++ b/tests/parm/diag_table/diag_table_regional @@ -147,6 +147,13 @@ "gfs_phys", "pratemax", "pratemax", "fv3_history2d", "all", .false., "none", 2 "gfs_phys", "refl_10cm", "refl_10cm", "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/tests/parm/diag_table/diag_table_rrfs_a b/tests/parm/diag_table/diag_table_rrfs_a index 94f5f7cff0..152269f36e 100644 --- a/tests/parm/diag_table/diag_table_rrfs_a +++ b/tests/parm/diag_table/diag_table_rrfs_a @@ -190,6 +190,13 @@ "gfs_phys", "t02min", "t02min", "fv3_history2d", "all", .false., "none", 2 "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", "psurf", "pressfc", "fv3_history2d", "all", .false., "none", 2 "gfs_phys", "u10m", "ugrd10m", "fv3_history2d", "all", .false., "none", 2 @@ -374,4 +381,4 @@ #packing = 1 double precision # = 2 float # = 4 packed 16-bit integers -# = 8 packed 1-byte (not tested?) \ No newline at end of file +# = 8 packed 1-byte (not tested?) diff --git a/tests/parm/diag_table/diag_table_template b/tests/parm/diag_table/diag_table_template index 184005e457..37f7765f67 100644 --- a/tests/parm/diag_table/diag_table_template +++ b/tests/parm/diag_table/diag_table_template @@ -84,6 +84,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/tests/parm/diag_table/diag_table_thompson b/tests/parm/diag_table/diag_table_thompson index c5468b9f6c..588b58b98f 100644 --- a/tests/parm/diag_table/diag_table_thompson +++ b/tests/parm/diag_table/diag_table_thompson @@ -122,6 +122,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/tests/parm/diag_table/diag_table_wam b/tests/parm/diag_table/diag_table_wam index 02becf1843..4f55f96e4c 100644 --- a/tests/parm/diag_table/diag_table_wam +++ b/tests/parm/diag_table/diag_table_wam @@ -69,6 +69,13 @@ "gfs_phys", "dusfc", "uflx_ave", "fv3_history2d", "all", .false., "none", 2 "gfs_phys", "dvsfc", "vflx_ave", "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", "psurf", "pressfc", "fv3_history2d", "all", .false., "none", 2 "gfs_phys", "u10m", "ugrd10m", "fv3_history2d", "all", .false., "none", 2 "gfs_phys", "v10m", "vgrd10m", "fv3_history2d", "all", .false., "none", 2 diff --git a/tests/parm/postxconfig-NT-fv3lam.txt b/tests/parm/postxconfig-NT-fv3lam.txt index 0e0401d868..db3ccdde66 100644 --- a/tests/parm/postxconfig-NT-fv3lam.txt +++ b/tests/parm/postxconfig-NT-fv3lam.txt @@ -1,6 +1,6 @@ 2 219 -258 +264 PRSLEV 32769 ncep_nco @@ -3643,6 +3643,228 @@ surface ? ? ? +746 +ACM_GRAUPEL_ON_SURFACE +? +1 +tmpl4_8 +FROZR +NCEP +ACM +surface +0 +? +0 +? +? +0 +? +0 +? +? +? +0 +0.0 +0 +0.0 +? +0 +0.0 +0 +0.0 +1 +6.0 +0 +0 +0 +? +? +? +775 +BUCKET_GRAUPEL_ON_SURFACE +bucket graupel precipitation on surface +1 +tmpl4_8 +FROZR +NCEP +ACM +surface +0 +? +0 +? +? +0 +? +0 +? +? +? +0 +0.0 +0 +0.0 +? +0 +0.0 +0 +0.0 +1 +6.0 +0 +0 +0 +? +? +? +782 +ACM_FRAIN_ON_SURFACE +? +1 +tmpl4_8 +FRZR +NCEP +ACM +surface +0 +? +0 +? +? +0 +? +0 +? +? +? +0 +0.0 +0 +0.0 +? +0 +0.0 +0 +0.0 +1 +6.0 +0 +0 +0 +? +? +? +1003 +BUCKET_FRAIN_ON_SURFACE +? +1 +tmpl4_8 +FRZR +NCEP +ACM +surface +0 +? +0 +? +? +0 +? +0 +? +? +? +0 +0.0 +0 +0.0 +? +0 +0.0 +0 +0.0 +1 +6.0 +0 +0 +0 +? +? +? +1004 +ACM_SNOWFALL_ON_SURFACE +? +1 +tmpl4_8 +TSNOWP +? +ACM +surface +0 +? +0 +? +? +0 +? +0 +? +? +? +0 +0.0 +0 +0.0 +? +0 +0.0 +0 +0.0 +1 +6.0 +0 +0 +0 +? +? +? +1005 +BUCKET_SNOWFALL_ON_SURFACE +? +1 +tmpl4_8 +TSNOWP +? +ACM +surface +0 +? +0 +? +? +0 +? +0 +? +? +? +0 +0.0 +0 +0.0 +? +0 +0.0 +0 +0.0 +1 +6.0 +0 +0 +0 +? +? +? 34 ACM_NCPCP_ON_SURFACE ? @@ -9009,7 +9231,7 @@ spec_hgt_lvl_above_grnd ? ? 423 -MAX_MAXUVV_ON_SPEC_PRES_LVL_ABOVE_GRND_100-1000hpa +MAX_MAXUVV_ON_ISOBARIC_SFC_100-1000hpa hourly maximum Upward Vertical Velocity between 100-1000hpa 1 tmpl4_8 @@ -9046,7 +9268,7 @@ isobaric_sfc ? ? 424 -MAX_MAXDVV_ON_SPEC_PRES_LVL_ABOVE_GRND_100-1000hpa +MAX_MAXDVV_ON_ISOBARIC_SFC_100-1000hpa hourly maximum Downward Vertical Velocity between 100-1000hpa 1 tmpl4_8 @@ -10801,7 +11023,7 @@ surface ? ? 423 -MAX_MAXUVV_ON_SPEC_PRES_LVL_ABOVE_GRND_100-1000hpa +MAX_MAXUVV_ON_ISOBARIC_SFC_100-1000hpa hourly maximum Upward Vertical Velocity between 100-1000hpa 1 tmpl4_8 @@ -10838,7 +11060,7 @@ isobaric_sfc ? ? 424 -MAX_MAXDVV_ON_SPEC_PRES_LVL_ABOVE_GRND_100-1000hpa +MAX_MAXDVV_ON_ISOBARIC_SFC_100-1000hpa hourly maximum Downward Vertical Velocity between 100-1000hpa 1 tmpl4_8 diff --git a/tests/parm/postxconfig-NT.txt b/tests/parm/postxconfig-NT.txt index 9a40bb4676..16ae865984 100644 --- a/tests/parm/postxconfig-NT.txt +++ b/tests/parm/postxconfig-NT.txt @@ -1,6 +1,6 @@ 2 112 -197 +209 GFSPRS 0 ncep_nco @@ -1767,13 +1767,13 @@ HLCY spec_hgt_lvl_above_grnd 0 ? -1 -3000. +2 +3000. 1000. spec_hgt_lvl_above_grnd 0 ? -1 -0. +2 +0. 0. ? ? 0 @@ -2607,9 +2607,9 @@ entire_atmos_single_lyr ? ? ? -180 -VIS_ON_SURFACE -? +410 +GSD_VIS_ON_SURFACE +GSD_visibility on surface 1 tmpl4_0 VIS @@ -7306,6 +7306,450 @@ surface ? ? ? +746 +ACM_GRAUPEL_ON_SURFACE +? +1 +tmpl4_8 +FROZR +NCEP +ACM +surface +0 +? +0 +? +? +0 +? +0 +? +? +? +0 +0.0 +0 +0.0 +? +0 +0.0 +0 +0.0 +1 +6.0 +0 +0 +0 +? +? +? +775 +BUCKET_GRAUPEL_ON_SURFACE +bucket graupel precipitation on surface +1 +tmpl4_8 +FROZR +NCEP +ACM +surface +0 +? +0 +? +? +0 +? +0 +? +? +? +0 +0.0 +0 +0.0 +? +0 +0.0 +0 +0.0 +1 +6.0 +0 +0 +0 +? +? +? +782 +ACM_FRAIN_ON_SURFACE +? +1 +tmpl4_8 +FRZR +NCEP +ACM +surface +0 +? +0 +? +? +0 +? +0 +? +? +? +0 +0.0 +0 +0.0 +? +0 +0.0 +0 +0.0 +1 +4.0 +0 +0 +0 +? +? +? +1003 +BUCKET_FRAIN_ON_SURFACE +? +1 +tmpl4_8 +FRZR +NCEP +ACM +surface +0 +? +0 +? +? +0 +? +0 +? +? +? +0 +0.0 +0 +0.0 +? +0 +0.0 +0 +0.0 +1 +4.0 +0 +0 +0 +? +? +? +1004 +ACM_SNOWFALL_ON_SURFACE +? +1 +tmpl4_8 +TSNOWP +? +ACM +surface +0 +? +0 +? +? +0 +? +0 +? +? +? +0 +0.0 +0 +0.0 +? +0 +0.0 +0 +0.0 +1 +4.0 +0 +0 +0 +? +? +? +1005 +BUCKET_SNOWFALL_ON_SURFACE +? +1 +tmpl4_8 +TSNOWP +? +ACM +surface +0 +? +0 +? +? +0 +? +0 +? +? +? +0 +0.0 +0 +0.0 +? +0 +0.0 +0 +0.0 +1 +4.0 +0 +0 +0 +? +? +? +600 +AER_OPT_GFS_at550 +? +1 +tmpl4_48 +AOTK +? +? +entire_atmos +0 +? +0 +? +? +0 +? +0 +? +total_aerosol +smaller_than_first_limit +6 +20 +0 +0.0 +between_first_second_limit +9 +545 +9 +555 +1 +9.0 +0 +0 +0 +? +? +? +601 +DUST_AER_OPT_GFS_at550 +? +1 +tmpl4_48 +AOTK +? +? +entire_atmos +0 +? +0 +? +? +0 +? +0 +? +dust_dry +smaller_than_first_limit +6 +20 +0 +0.0 +between_first_second_limit +9 +545 +9 +555 +1 +9.0 +0 +0 +0 +? +? +? +602 +SEASALT_AER_OPT_GFS_at550 +? +1 +tmpl4_48 +AOTK +? +? +entire_atmos +0 +? +0 +? +? +0 +? +0 +? +sea_salt_dry +smaller_than_first_limit +6 +20 +0 +0.0 +between_first_second_limit +9 +545 +9 +555 +1 +9.0 +0 +0 +0 +? +? +? +603 +SULFATE_AER_OPT_GFS_at550 +? +1 +tmpl4_48 +AOTK +? +? +entire_atmos +0 +? +0 +? +? +0 +? +0 +? +sulphate_dry +smaller_than_first_limit +6 +20 +0 +0.0 +between_first_second_limit +9 +545 +9 +555 +1 +9.0 +0 +0 +0 +? +? +? +604 +ORGANIC_CARBON_AER_OPT_GFS_at550 +? +1 +tmpl4_48 +AOTK +? +? +entire_atmos +0 +? +0 +? +? +0 +? +0 +? +particulate_org_matter_dry +smaller_than_first_limit +6 +20 +0 +0.0 +between_first_second_limit +9 +545 +9 +555 +1 +9.0 +0 +0 +0 +? +? +? +605 +BLACK_CARBON_AER_OPT_GFS_at550 +? +1 +tmpl4_48 +AOTK +? +? +entire_atmos +0 +? +0 +? +? +0 +? +0 +? +black_carbon_dry +smaller_than_first_limit +6 +20 +0 +0.0 +between_first_second_limit +9 +545 +9 +555 +1 +9.0 +0 +0 +0 +? +? +? GFSFLX 0 ncep_nco diff --git a/tests/parm/postxconfig-NT_FH00.txt b/tests/parm/postxconfig-NT_FH00.txt index 73e131734b..229c1f52e9 100644 --- a/tests/parm/postxconfig-NT_FH00.txt +++ b/tests/parm/postxconfig-NT_FH00.txt @@ -1,6 +1,6 @@ 2 47 -150 +156 GFSPRS 0 ncep_nco @@ -1767,13 +1767,13 @@ HLCY spec_hgt_lvl_above_grnd 0 ? -1 -3000. +2 +3000. 1000. spec_hgt_lvl_above_grnd 0 ? -1 -0. +2 +0. 0. ? ? 0 @@ -2015,9 +2015,9 @@ surface ? ? ? -180 -VIS_ON_SURFACE -? +410 +GSD_VIS_ON_SURFACE +GSD_visibility on surface 1 tmpl4_0 VIS @@ -5567,6 +5567,228 @@ surface ? ? ? +600 +AER_OPT_GFS_at550 +? +1 +tmpl4_48 +AOTK +? +? +entire_atmos +0 +? +0 +? +? +0 +? +0 +? +total_aerosol +smaller_than_first_limit +6 +20 +0 +0.0 +between_first_second_limit +9 +545 +9 +555 +1 +9.0 +0 +0 +0 +? +? +? +601 +DUST_AER_OPT_GFS_at550 +? +1 +tmpl4_48 +AOTK +? +? +entire_atmos +0 +? +0 +? +? +0 +? +0 +? +dust_dry +smaller_than_first_limit +6 +20 +0 +0.0 +between_first_second_limit +9 +545 +9 +555 +1 +9.0 +0 +0 +0 +? +? +? +602 +SEASALT_AER_OPT_GFS_at550 +? +1 +tmpl4_48 +AOTK +? +? +entire_atmos +0 +? +0 +? +? +0 +? +0 +? +sea_salt_dry +smaller_than_first_limit +6 +20 +0 +0.0 +between_first_second_limit +9 +545 +9 +555 +1 +9.0 +0 +0 +0 +? +? +? +603 +SULFATE_AER_OPT_GFS_at550 +? +1 +tmpl4_48 +AOTK +? +? +entire_atmos +0 +? +0 +? +? +0 +? +0 +? +sulphate_dry +smaller_than_first_limit +6 +20 +0 +0.0 +between_first_second_limit +9 +545 +9 +555 +1 +9.0 +0 +0 +0 +? +? +? +604 +ORGANIC_CARBON_AER_OPT_GFS_at550 +? +1 +tmpl4_48 +AOTK +? +? +entire_atmos +0 +? +0 +? +? +0 +? +0 +? +particulate_org_matter_dry +smaller_than_first_limit +6 +20 +0 +0.0 +between_first_second_limit +9 +545 +9 +555 +1 +9.0 +0 +0 +0 +? +? +? +605 +BLACK_CARBON_AER_OPT_GFS_at550 +? +1 +tmpl4_48 +AOTK +? +? +entire_atmos +0 +? +0 +? +? +0 +? +0 +? +black_carbon_dry +smaller_than_first_limit +6 +20 +0 +0.0 +between_first_second_limit +9 +545 +9 +555 +1 +9.0 +0 +0 +0 +? +? +? GFSFLX 0 ncep_nco diff --git a/tests/parm/regional.nml.IN b/tests/parm/regional.nml.IN index de7e9c12b1..f1d0675a58 100644 --- a/tests/parm/regional.nml.IN +++ b/tests/parm/regional.nml.IN @@ -123,7 +123,7 @@ ldiag3d = .false. lradar = .true. avg_max_length = 3600. - nsradar_reset = 3600. + nsfullradar_diag = 3600. h2o_phys = .true. ldiag_ugwp = .F. do_ugwp = .F. diff --git a/tests/parm/regional_atmaq.nml.IN b/tests/parm/regional_atmaq.nml.IN index eea08755be..c99dcc4cae 100644 --- a/tests/parm/regional_atmaq.nml.IN +++ b/tests/parm/regional_atmaq.nml.IN @@ -236,7 +236,7 @@ lwhtr = .true. n_var_lndp = @[N_VAR_LNDP] n_var_spp = 0 - nsradar_reset = 3600 + nsfullradar_diag = 3600 nst_anl = .true. nstf_name = 2, 1, 0, 0, 0 oz_phys = .false. diff --git a/tests/parm/regional_rrfs_a.nml.IN b/tests/parm/regional_rrfs_a.nml.IN index fd2da3c739..ddaa2438a7 100644 --- a/tests/parm/regional_rrfs_a.nml.IN +++ b/tests/parm/regional_rrfs_a.nml.IN @@ -221,7 +221,7 @@ lwhtr = .true. n_var_lndp = 0 n_var_spp = 0 - nsradar_reset = 3600 + nsfullradar_diag = 3600 oz_phys = .false. oz_phys_2015 = .true. pdfcld = .false. diff --git a/tests/parm/regional_stoch.nml.IN b/tests/parm/regional_stoch.nml.IN index 8368c6acf3..61fa6806af 100644 --- a/tests/parm/regional_stoch.nml.IN +++ b/tests/parm/regional_stoch.nml.IN @@ -214,7 +214,7 @@ lwhtr = .true. n_var_lndp = 0 n_var_spp = @[N_VAR_SPP] - nsradar_reset = 3600 + nsfullradar_diag = 3600 nst_anl = .true. nstf_name = 2, 1, 0, 0, 0 oz_phys = @[OZ_PHYS_OLD] diff --git a/tests/parm/regional_wofs.nml.IN b/tests/parm/regional_wofs.nml.IN index bf7004d8af..b7d0b30653 100644 --- a/tests/parm/regional_wofs.nml.IN +++ b/tests/parm/regional_wofs.nml.IN @@ -195,7 +195,7 @@ lwhtr = .true. n_var_lndp = 0 n_var_spp = 0 - nsradar_reset = 3600 + nsfullradar_diag = 3600 nssl_cccn = @[NSSL_CCCN] nssl_ccn_on = @[NSSL_CCN_ON] nssl_hail_on = @[NSSL_HAIL_ON] diff --git a/tests/parm/rrfs_conus13km_hrrr.nml.IN b/tests/parm/rrfs_conus13km_hrrr.nml.IN index a78268f090..d8f951573c 100644 --- a/tests/parm/rrfs_conus13km_hrrr.nml.IN +++ b/tests/parm/rrfs_conus13km_hrrr.nml.IN @@ -245,7 +245,7 @@ ltaerosol = @[LTAEROSOL] lwhtr = .true. n_var_lndp = @[N_VAR_LNDP] - nsradar_reset = 3600 + nsfullradar_diag = 3600 nst_anl = .false. nstf_name = 2, 0, 0, 0, 0 oz_phys = .false. diff --git a/tests/rt.sh b/tests/rt.sh index 4a86089fc6..88ade1493d 100755 --- a/tests/rt.sh +++ b/tests/rt.sh @@ -29,6 +29,7 @@ usage() { [[ $# -eq 0 ]] && usage rt_single() { + rm -f $RT_SINGLE_CONF local compile_line='' local run_line='' while read -r line || [ "$line" ]; do @@ -50,20 +51,20 @@ rt_single() { if [[ $line =~ RUN ]]; then tmp_test=$(echo $line | cut -d'|' -f2 | sed -e 's/^ *//' -e 's/ *$//') if [[ $SINGLE_NAME == $tmp_test && $compile_line != '' ]]; then - echo $compile_line >$TESTS_FILE + echo $compile_line > $RT_SINGLE_CONF dep_test=$(echo $line | grep -w $tmp_test | cut -d'|' -f5 | sed -e 's/^ *//' -e 's/ *$//') if [[ $dep_test != '' ]]; then dep_line=$(cat rt.conf | grep -w "$dep_test" | grep -v "$tmp_test") dep_line="${dep_line#"${dep_line%%[![:space:]]*}"}" - echo $dep_line >>$TESTS_FILE + echo $dep_line >> $RT_SINGLE_CONF fi - echo $line >>$TESTS_FILE + echo $line >> $RT_SINGLE_CONF break fi fi - done <'rt.conf' + done < $TESTS_FILE - if [[ ! -f $TESTS_FILE ]]; then + if [[ ! -f $RT_SINGLE_CONF ]]; then echo "$SINGLE_NAME does not exist or cannot be run on $MACHINE_ID" exit 1 fi @@ -119,6 +120,8 @@ else exit 1 fi +readonly RT_SINGLE_CONF='rt_single.conf' + # Default compiler "intel" export RT_COMPILER=${RT_COMPILER:-intel} @@ -136,7 +139,7 @@ if [[ $MACHINE_ID = wcoss2.* ]]; then #ROCOTOCOMPLETE=$(which rocotocomplete) #ROCOTO_SCHEDULER=lsf - module load ecflow/5.6.0.6 + module load ecflow/5.6.0.13 module load gcc/10.3.0 python/3.8.6 ECFLOW_START=${ECF_ROOT}/scripts/server_check.sh export ECF_OUTPUTDIR=${PATHRT}/ecf_outputdir @@ -159,7 +162,7 @@ if [[ $MACHINE_ID = wcoss2.* ]]; then elif [[ $MACHINE_ID = acorn.* ]]; then - module load ecflow/5.6.0.6 + module load ecflow/5.6.0.13 module load gcc/10.3.0 python/3.8.6 ECFLOW_START=${ECF_ROOT}/scripts/server_check.sh export ECF_OUTPUTDIR=${PATHRT}/ecf_outputdir @@ -187,7 +190,7 @@ elif [[ $MACHINE_ID = gaea.* ]]; then ECFLOW_START=/lustre/f2/pdata/esrl/gsd/contrib/miniconda3/4.8.3/envs/ufs-weather-model/bin/ecflow_start.sh ECF_PORT=$(( $(id -u) + 1500 )) - DISKNM=/lustre/f2/pdata/ncep_shared/emc.nemspara/RT + DISKNM=/lustre/f2/pdata/ncep/role.epic/RT QUEUE=normal COMPILE_QUEUE=normal # ACCNR="${ACCNR:-cmp}" @@ -270,7 +273,7 @@ elif [[ $MACHINE_ID = jet.* ]]; then COMPILE_QUEUE=batch ACCNR="${ACCNR:-h-nems}" PARTITION=xjet - DISKNM=/lfs4/HFIP/h-nems/emc.nemspara/RT + DISKNM=/mnt/lfs4/HFIP/hfv3gfs/role.epic/RT dprefix=${dprefix:-/lfs4/HFIP/$ACCNR/$USER} STMP=${STMP:-$dprefix/RT_BASELINE} PTMP=${PTMP:-$dprefix/RT_RUNDIRS} @@ -400,8 +403,6 @@ while getopts ":cl:mn:dwkreh" opt; do ;; n) SINGLE_NAME=$OPTARG - TESTS_FILE='rt.conf.single' - rm -f $TESTS_FILE ;; d) export delete_rundir=true @@ -437,17 +438,19 @@ done if [[ $SINGLE_NAME != '' ]]; then rt_single + TESTS_FILE=$RT_SINGLE_CONF fi if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then TEST_35D=true fi -BL_DATE=20230103 + +BL_DATE=20230215 RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}} -INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20220414} +INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20221101} INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20220624 INPUTDATA_ROOT_BMIC=${INPUTDATA_ROOT_BMIC:-$DISKNM/NEMSfv3gfs/BM_IC-20220207} @@ -822,7 +825,7 @@ else [[ ${KEEP_RUNDIR} == false ]] && rm -rf ${RUNDIR_ROOT} [[ ${ROCOTO} == true ]] && rm -f ${ROCOTO_XML} ${ROCOTO_DB} ${ROCOTO_STATE} *_lock.db [[ ${TEST_35D} == true ]] && rm -f tests/cpld_bmark*_20* - [[ ${SINGLE_NAME} != '' ]] && rm -f rt.conf.single + [[ ${SINGLE_NAME} != '' ]] && rm -f $RT_SINGLE_CONF fi date >> ${REGRESSIONTEST_LOG}