diff --git a/met/data/config/Ascii2NcConfig_default b/met/data/config/Ascii2NcConfig_default index 7659fefc88..458e31df81 100644 --- a/met/data/config/Ascii2NcConfig_default +++ b/met/data/config/Ascii2NcConfig_default @@ -49,4 +49,4 @@ message_type_map = [ // Indicate a version number for the contents of this configuration file. // The value should generally not be modified. // -version = "V10.0.0"; +version = "V10.1.0"; diff --git a/met/data/config/EnsembleStatConfig_default b/met/data/config/EnsembleStatConfig_default index 81c0c30c77..e18b258044 100644 --- a/met/data/config/EnsembleStatConfig_default +++ b/met/data/config/EnsembleStatConfig_default @@ -291,6 +291,6 @@ rng = { grid_weight_flag = NONE; output_prefix = ""; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/data/config/GridDiagConfig_default b/met/data/config/GridDiagConfig_default index b2dc85319e..9ff8d0b81e 100644 --- a/met/data/config/GridDiagConfig_default +++ b/met/data/config/GridDiagConfig_default @@ -61,6 +61,6 @@ mask = { //////////////////////////////////////////////////////////////////////////////// -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/data/config/GridStatConfig_default b/met/data/config/GridStatConfig_default index c32872783a..e79a3e42b1 100644 --- a/met/data/config/GridStatConfig_default +++ b/met/data/config/GridStatConfig_default @@ -53,6 +53,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -256,6 +257,6 @@ nc_pairs_flag = { grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = ""; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/data/config/MODEAnalysisConfig_default b/met/data/config/MODEAnalysisConfig_default index 15363eccfc..2a1e3849c6 100644 --- a/met/data/config/MODEAnalysisConfig_default +++ b/met/data/config/MODEAnalysisConfig_default @@ -188,6 +188,6 @@ unmatched = FALSE; //////////////////////////////////////////////////////////////////////////////// -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/data/config/MODEConfig_default b/met/data/config/MODEConfig_default index e4a5cf9701..0b38827ef3 100644 --- a/met/data/config/MODEConfig_default +++ b/met/data/config/MODEConfig_default @@ -244,6 +244,6 @@ shift_right = 0; // grid squares //////////////////////////////////////////////////////////////////////////////// output_prefix = ""; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/data/config/MTDConfig_default b/met/data/config/MTDConfig_default index af89f2d5ef..6e539d30d6 100644 --- a/met/data/config/MTDConfig_default +++ b/met/data/config/MTDConfig_default @@ -232,6 +232,6 @@ txt_output = { output_prefix = ""; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/data/config/Madis2NcConfig_default b/met/data/config/Madis2NcConfig_default index 0dc7fbdf25..41cfb3a477 100644 --- a/met/data/config/Madis2NcConfig_default +++ b/met/data/config/Madis2NcConfig_default @@ -34,4 +34,4 @@ time_summary = { // Indicate a version number for the contents of this configuration file. // The value should generally not be modified. // -version = "V10.0.0"; +version = "V10.1.0"; diff --git a/met/data/config/PB2NCConfig_default b/met/data/config/PB2NCConfig_default index e20be13f62..82750e9912 100644 --- a/met/data/config/PB2NCConfig_default +++ b/met/data/config/PB2NCConfig_default @@ -153,6 +153,6 @@ time_summary = { //////////////////////////////////////////////////////////////////////////////// tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/data/config/Point2GridConfig_default b/met/data/config/Point2GridConfig_default index 04d62a4364..4429c77d59 100644 --- a/met/data/config/Point2GridConfig_default +++ b/met/data/config/Point2GridConfig_default @@ -77,6 +77,6 @@ quality_mark_thresh = 2; //////////////////////////////////////////////////////////////////////////////// tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/data/config/PointStatConfig_default b/met/data/config/PointStatConfig_default index b0a4981c62..048ff2cb4a 100644 --- a/met/data/config/PointStatConfig_default +++ b/met/data/config/PointStatConfig_default @@ -46,6 +46,7 @@ cnt_logic = UNION; wind_thresh = [ NA ]; wind_logic = UNION; eclv_points = 0.05; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -288,6 +289,6 @@ output_flag = { tmp_dir = "/tmp"; output_prefix = ""; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/data/config/RMWAnalysisConfig_default b/met/data/config/RMWAnalysisConfig_default index 9f68709615..da5d813a30 100644 --- a/met/data/config/RMWAnalysisConfig_default +++ b/met/data/config/RMWAnalysisConfig_default @@ -64,7 +64,7 @@ valid_mask = ""; //////////////////////////////////////////////////////////////////////////////// -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/data/config/STATAnalysisConfig_GO_Index b/met/data/config/STATAnalysisConfig_GO_Index index 4f854fdf30..2b5ce181f5 100644 --- a/met/data/config/STATAnalysisConfig_GO_Index +++ b/met/data/config/STATAnalysisConfig_GO_Index @@ -153,9 +153,10 @@ boot = { //////////////////////////////////////////////////////////////////////////////// +hss_ec_value = NA; rank_corr_flag = FALSE; vif_flag = FALSE; tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/data/config/STATAnalysisConfig_default b/met/data/config/STATAnalysisConfig_default index bc4a50ca44..8ce7bde069 100644 --- a/met/data/config/STATAnalysisConfig_default +++ b/met/data/config/STATAnalysisConfig_default @@ -108,9 +108,10 @@ wmo_fisher_stats = [ "CNT:PR_CORR", "CNT:SP_CORR", //////////////////////////////////////////////////////////////////////////////// +hss_ec_value = NA; rank_corr_flag = FALSE; vif_flag = FALSE; tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/data/config/SeriesAnalysisConfig_default b/met/data/config/SeriesAnalysisConfig_default index d34c85b8c6..c725cb2a5c 100644 --- a/met/data/config/SeriesAnalysisConfig_default +++ b/met/data/config/SeriesAnalysisConfig_default @@ -143,8 +143,9 @@ output_stats = { //////////////////////////////////////////////////////////////////////////////// +hss_ec_value = NA; rank_corr_flag = FALSE; tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/data/config/TCGenConfig_default b/met/data/config/TCGenConfig_default index 1a135491f5..9ed75cc2c2 100644 --- a/met/data/config/TCGenConfig_default +++ b/met/data/config/TCGenConfig_default @@ -282,4 +282,4 @@ nc_pairs_grid = "G003"; // Indicate a version number for the contents of this configuration file. // The value should generally not be modified. // -version = "V10.0.0"; +version = "V10.1.0"; diff --git a/met/data/config/TCPairsConfig_default b/met/data/config/TCPairsConfig_default index 08dbee43d8..8c62d1dce3 100644 --- a/met/data/config/TCPairsConfig_default +++ b/met/data/config/TCPairsConfig_default @@ -145,4 +145,4 @@ basin_map = [ // Indicate a version number for the contents of this configuration file. // The value should generally not be modified. // -version = "V10.0.0"; +version = "V10.1.0"; diff --git a/met/data/config/TCRMWConfig_default b/met/data/config/TCRMWConfig_default index fe587c53e0..8d9acfc338 100644 --- a/met/data/config/TCRMWConfig_default +++ b/met/data/config/TCRMWConfig_default @@ -104,6 +104,6 @@ rmw_scale = 0.2; //////////////////////////////////////////////////////////////////////////////// -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/data/config/TCStatConfig_default b/met/data/config/TCStatConfig_default index d385b01353..3857a8501f 100644 --- a/met/data/config/TCStatConfig_default +++ b/met/data/config/TCStatConfig_default @@ -203,4 +203,4 @@ jobs = []; // Indicate a version number for the contents of this configuration file. // The value should generally not be modified. // -version = "V10.0.0"; +version = "V10.1.0"; diff --git a/met/data/config/WaveletStatConfig_default b/met/data/config/WaveletStatConfig_default index 19cf73eb65..5a50fe2f0d 100644 --- a/met/data/config/WaveletStatConfig_default +++ b/met/data/config/WaveletStatConfig_default @@ -138,6 +138,6 @@ wvlt_plot = { //////////////////////////////////////////////////////////////////////////////// output_prefix = ""; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/data/table_files/Makefile.am b/met/data/table_files/Makefile.am index aac15fa588..354ba05876 100644 --- a/met/data/table_files/Makefile.am +++ b/met/data/table_files/Makefile.am @@ -19,6 +19,7 @@ tablefilesdir = $(pkgdatadir)/table_files tablefiles_DATA = \ + met_header_columns_V10.1.txt \ met_header_columns_V10.0.txt \ met_header_columns_V9.1.txt \ met_header_columns_V9.0.txt \ diff --git a/met/data/table_files/met_header_columns_V10.1.txt b/met/data/table_files/met_header_columns_V10.1.txt new file mode 100644 index 0000000000..6c64d89a5f --- /dev/null +++ b/met/data/table_files/met_header_columns_V10.1.txt @@ -0,0 +1,37 @@ +V10.1 : STAT : CNT : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FBAR FBAR_NCL FBAR_NCU FBAR_BCL FBAR_BCU FSTDEV FSTDEV_NCL FSTDEV_NCU FSTDEV_BCL FSTDEV_BCU OBAR OBAR_NCL OBAR_NCU OBAR_BCL OBAR_BCU OSTDEV OSTDEV_NCL OSTDEV_NCU OSTDEV_BCL OSTDEV_BCU PR_CORR PR_CORR_NCL PR_CORR_NCU PR_CORR_BCL PR_CORR_BCU SP_CORR KT_CORR RANKS FRANK_TIES ORANK_TIES ME ME_NCL ME_NCU ME_BCL ME_BCU ESTDEV ESTDEV_NCL ESTDEV_NCU ESTDEV_BCL ESTDEV_BCU MBIAS MBIAS_BCL MBIAS_BCU MAE MAE_BCL MAE_BCU MSE MSE_BCL MSE_BCU BCMSE BCMSE_BCL BCMSE_BCU RMSE RMSE_BCL RMSE_BCU E10 E10_BCL E10_BCU E25 E25_BCL E25_BCU E50 E50_BCL E50_BCU E75 E75_BCL E75_BCU E90 E90_BCL E90_BCU EIQR EIQR_BCL EIQR_BCU MAD MAD_BCL MAD_BCU ANOM_CORR ANOM_CORR_NCL ANOM_CORR_NCU ANOM_CORR_BCL ANOM_CORR_BCU ME2 ME2_BCL ME2_BCU MSESS MSESS_BCL MSESS_BCU RMSFA RMSFA_BCL RMSFA_BCU RMSOA RMSOA_BCL RMSOA_BCU ANOM_CORR_UNCNTR ANOM_CORR_UNCNTR_BCL ANOM_CORR_UNCNTR_BCU +V10.1 : STAT : CTC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FY_OY FY_ON FN_OY FN_ON +V10.1 : STAT : CTS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL BASER BASER_NCL BASER_NCU BASER_BCL BASER_BCU FMEAN FMEAN_NCL FMEAN_NCU FMEAN_BCL FMEAN_BCU ACC ACC_NCL ACC_NCU ACC_BCL ACC_BCU FBIAS FBIAS_BCL FBIAS_BCU PODY PODY_NCL PODY_NCU PODY_BCL PODY_BCU PODN PODN_NCL PODN_NCU PODN_BCL PODN_BCU POFD POFD_NCL POFD_NCU POFD_BCL POFD_BCU FAR FAR_NCL FAR_NCU FAR_BCL FAR_BCU CSI CSI_NCL CSI_NCU CSI_BCL CSI_BCU GSS GSS_BCL GSS_BCU HK HK_NCL HK_NCU HK_BCL HK_BCU HSS HSS_BCL HSS_BCU ODDS ODDS_NCL ODDS_NCU ODDS_BCL ODDS_BCU LODDS LODDS_NCL LODDS_NCU LODDS_BCL LODDS_BCU ORSS ORSS_NCL ORSS_NCU ORSS_BCL ORSS_BCU EDS EDS_NCL EDS_NCU EDS_BCL EDS_BCU SEDS SEDS_NCL SEDS_NCU SEDS_BCL SEDS_BCU EDI EDI_NCL EDI_NCU EDI_BCL EDI_BCU SEDI SEDI_NCL SEDI_NCU SEDI_BCL SEDI_BCU BAGSS BAGSS_BCL BAGSS_BCU +V10.1 : STAT : FHO : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL F_RATE H_RATE O_RATE +V10.1 : STAT : ISC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL TILE_DIM TILE_XLL TILE_YLL NSCALE ISCALE MSE ISC FENERGY2 OENERGY2 BASER FBIAS +V10.1 : STAT : MCTC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL (N_CAT) F[0-9]*_O[0-9]* EC_VALUE +V10.1 : STAT : MCTS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL N_CAT ACC ACC_NCL ACC_NCU ACC_BCL ACC_BCU HK HK_BCL HK_BCU HSS HSS_BCL HSS_BCU GER GER_BCL GER_BCU HSS_EC HSS_EC_BCL HSS_EC_BCU EC_VALUE +V10.1 : STAT : MPR : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL INDEX OBS_SID OBS_LAT OBS_LON OBS_LVL OBS_ELV FCST OBS OBS_QC CLIMO_MEAN CLIMO_STDEV CLIMO_CDF +V10.1 : STAT : NBRCNT : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FBS FBS_BCL FBS_BCU FSS FSS_BCL FSS_BCU AFSS AFSS_BCL AFSS_BCU UFSS UFSS_BCL UFSS_BCU F_RATE F_RATE_BCL F_RATE_BCU O_RATE O_RATE_BCL O_RATE_BCU +V10.1 : STAT : NBRCTC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FY_OY FY_ON FN_OY FN_ON +V10.1 : STAT : NBRCTS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL BASER BASER_NCL BASER_NCU BASER_BCL BASER_BCU FMEAN FMEAN_NCL FMEAN_NCU FMEAN_BCL FMEAN_BCU ACC ACC_NCL ACC_NCU ACC_BCL ACC_BCU FBIAS FBIAS_BCL FBIAS_BCU PODY PODY_NCL PODY_NCU PODY_BCL PODY_BCU PODN PODN_NCL PODN_NCU PODN_BCL PODN_BCU POFD POFD_NCL POFD_NCU POFD_BCL POFD_BCU FAR FAR_NCL FAR_NCU FAR_BCL FAR_BCU CSI CSI_NCL CSI_NCU CSI_BCL CSI_BCU GSS GSS_BCL GSS_BCU HK HK_NCL HK_NCU HK_BCL HK_BCU HSS HSS_BCL HSS_BCU ODDS ODDS_NCL ODDS_NCU ODDS_BCL ODDS_BCU LODDS LODDS_NCL LODDS_NCU LODDS_BCL LODDS_BCU ORSS ORSS_NCL ORSS_NCU ORSS_BCL ORSS_BCU EDS EDS_NCL EDS_NCU EDS_BCL EDS_BCU SEDS SEDS_NCL SEDS_NCU SEDS_BCL SEDS_BCU EDI EDI_NCL EDI_NCU EDI_BCL EDI_BCU SEDI SEDI_NCL SEDI_NCU SEDI_BCL SEDI_BCU BAGSS BAGSS_BCL BAGSS_BCU +V10.1 : STAT : GRAD : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FGBAR OGBAR MGBAR EGBAR S1 S1_OG FGOG_RATIO DX DY +V10.1 : STAT : DMAP : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FY OY FBIAS BADDELEY HAUSDORFF MED_FO MED_OF MED_MIN MED_MAX MED_MEAN FOM_FO FOM_OF FOM_MIN FOM_MAX FOM_MEAN ZHU_FO ZHU_OF ZHU_MIN ZHU_MAX ZHU_MEAN +V10.1 : STAT : ORANK : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL INDEX OBS_SID OBS_LAT OBS_LON OBS_LVL OBS_ELV OBS PIT RANK N_ENS_VLD (N_ENS) ENS_[0-9]* OBS_QC ENS_MEAN CLIMO_MEAN SPREAD ENS_MEAN_OERR SPREAD_OERR SPREAD_PLUS_OERR CLIMO_STDEV +V10.1 : STAT : PCT : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL (N_THRESH) THRESH_[0-9]* OY_[0-9]* ON_[0-9]* +V10.1 : STAT : PJC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL (N_THRESH) THRESH_[0-9]* OY_TP_[0-9]* ON_TP_[0-9]* CALIBRATION_[0-9]* REFINEMENT_[0-9]* LIKELIHOOD_[0-9]* BASER_[0-9]* +V10.1 : STAT : PRC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL (N_THRESH) THRESH_[0-9]* PODY_[0-9]* POFD_[0-9]* +V10.1 : STAT : PSTD : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL (N_THRESH) BASER BASER_NCL BASER_NCU RELIABILITY RESOLUTION UNCERTAINTY ROC_AUC BRIER BRIER_NCL BRIER_NCU BRIERCL BRIERCL_NCL BRIERCL_NCU BSS BSS_SMPL THRESH_[0-9]* +V10.1 : STAT : ECLV : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL BASER VALUE_BASER (N_PTS) CL_[0-9]* VALUE_[0-9]* +V10.1 : STAT : ECNT : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL N_ENS CRPS CRPSS IGN ME RMSE SPREAD ME_OERR RMSE_OERR SPREAD_OERR SPREAD_PLUS_OERR CRPSCL CRPS_EMP CRPSCL_EMP CRPSS_EMP +V10.1 : STAT : RPS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL N_PROB RPS_REL RPS_RES RPS_UNC RPS RPSS RPSS_SMPL RPS_COMP +V10.1 : STAT : RHIST : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL (N_RANK) RANK_[0-9]* +V10.1 : STAT : PHIST : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL BIN_SIZE (N_BIN) BIN_[0-9]* +V10.1 : STAT : RELP : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL (N_ENS) RELP_[0-9]* +V10.1 : STAT : SAL1L2 : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FABAR OABAR FOABAR FFABAR OOABAR MAE +V10.1 : STAT : SL1L2 : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FBAR OBAR FOBAR FFBAR OOBAR MAE +V10.1 : STAT : SSVAR : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL N_BIN BIN_i BIN_N VAR_MIN VAR_MAX VAR_MEAN FBAR OBAR FOBAR FFBAR OOBAR FBAR_NCL FBAR_NCU FSTDEV FSTDEV_NCL FSTDEV_NCU OBAR_NCL OBAR_NCU OSTDEV OSTDEV_NCL OSTDEV_NCU PR_CORR PR_CORR_NCL PR_CORR_NCU ME ME_NCL ME_NCU ESTDEV ESTDEV_NCL ESTDEV_NCU MBIAS MSE BCMSE RMSE +V10.1 : STAT : VAL1L2 : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL UFABAR VFABAR UOABAR VOABAR UVFOABAR UVFFABAR UVOOABAR +V10.1 : STAT : VL1L2 : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL UFBAR VFBAR UOBAR VOBAR UVFOBAR UVFFBAR UVOOBAR F_SPEED_BAR O_SPEED_BAR +V10.1 : STAT : VCNT : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FBAR FBAR_BCL FBAR_BCU OBAR OBAR_BCL OBAR_BCU FS_RMS FS_RMS_BCL FS_RMS_BCU OS_RMS OS_RMS_BCL OS_RMS_BCU MSVE MSVE_BCL MSVE_BCU RMSVE RMSVE_BCL RMSVE_BCU FSTDEV FSTDEV_BCL FSTDEV_BCU OSTDEV OSTDEV_BCL OSTDEV_BCU FDIR FDIR_BCL FDIR_BCU ODIR ODIR_BCL ODIR_BCU FBAR_SPEED FBAR_SPEED_BCL FBAR_SPEED_BCU OBAR_SPEED OBAR_SPEED_BCL OBAR_SPEED_BCU VDIFF_SPEED VDIFF_SPEED_BCL VDIFF_SPEED_BCU VDIFF_DIR VDIFF_DIR_BCL VDIFF_DIR_BCU SPEED_ERR SPEED_ERR_BCL SPEED_ERR_BCU SPEED_ABSERR SPEED_ABSERR_BCL SPEED_ABSERR_BCU DIR_ERR DIR_ERR_BCL DIR_ERR_BCU DIR_ABSERR DIR_ABSERR_BCL DIR_ABSERR_BCU +V10.1 : STAT : GENMPR : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL INDEX STORM_ID AGEN_INIT AGEN_FHR AGEN_LAT AGEN_LON AGEN_DLAND BGEN_LAT BGEN_LON BGEN_DLAND GEN_DIST GEN_TDIFF INIT_TDIFF DEV_CAT OPS_CAT + +V10.1 : MODE : OBJ : VERSION MODEL N_VALID GRID_RES DESC FCST_LEAD FCST_VALID FCST_ACCUM OBS_LEAD OBS_VALID OBS_ACCUM FCST_RAD FCST_THR OBS_RAD OBS_THR FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE OBJECT_ID OBJECT_CAT CENTROID_X CENTROID_Y CENTROID_LAT CENTROID_LON AXIS_ANG LENGTH WIDTH AREA AREA_THRESH CURVATURE CURVATURE_X CURVATURE_Y COMPLEXITY INTENSITY_10 INTENSITY_25 INTENSITY_50 INTENSITY_75 INTENSITY_90 INTENSITY_USER INTENSITY_SUM CENTROID_DIST BOUNDARY_DIST CONVEX_HULL_DIST ANGLE_DIFF ASPECT_DIFF AREA_RATIO INTERSECTION_AREA UNION_AREA SYMMETRIC_DIFF INTERSECTION_OVER_AREA CURVATURE_RATIO COMPLEXITY_RATIO PERCENTILE_INTENSITY_RATIO INTEREST +V10.1 : MODE : CTS : VERSION MODEL N_VALID GRID_RES DESC FCST_LEAD FCST_VALID FCST_ACCUM OBS_LEAD OBS_VALID OBS_ACCUM FCST_RAD FCST_THR OBS_RAD OBS_THR FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE FIELD TOTAL FY_OY FY_ON FN_OY FN_ON BASER FMEAN ACC FBIAS PODY PODN POFD FAR CSI GSS HK HSS ODDS + +V10.1 : TCST : TCMPR : VERSION AMODEL BMODEL DESC STORM_ID BASIN CYCLONE STORM_NAME INIT LEAD VALID INIT_MASK VALID_MASK LINE_TYPE TOTAL INDEX LEVEL WATCH_WARN INITIALS ALAT ALON BLAT BLON TK_ERR X_ERR Y_ERR ALTK_ERR CRTK_ERR ADLAND BDLAND AMSLP BMSLP AMAX_WIND BMAX_WIND AAL_WIND_34 BAL_WIND_34 ANE_WIND_34 BNE_WIND_34 ASE_WIND_34 BSE_WIND_34 ASW_WIND_34 BSW_WIND_34 ANW_WIND_34 BNW_WIND_34 AAL_WIND_50 BAL_WIND_50 ANE_WIND_50 BNE_WIND_50 ASE_WIND_50 BSE_WIND_50 ASW_WIND_50 BSW_WIND_50 ANW_WIND_50 BNW_WIND_50 AAL_WIND_64 BAL_WIND_64 ANE_WIND_64 BNE_WIND_64 ASE_WIND_64 BSE_WIND_64 ASW_WIND_64 BSW_WIND_64 ANW_WIND_64 BNW_WIND_64 ARADP BRADP ARRP BRRP AMRD BMRD AGUSTS BGUSTS AEYE BEYE ADIR BDIR ASPEED BSPEED ADEPTH BDEPTH +V10.1 : TCST : PROBRIRW : VERSION AMODEL BMODEL DESC STORM_ID BASIN CYCLONE STORM_NAME INIT LEAD VALID INIT_MASK VALID_MASK LINE_TYPE ALAT ALON BLAT BLON INITIALS TK_ERR X_ERR Y_ERR ADLAND BDLAND RIRW_BEG RIRW_END RIRW_WINDOW AWIND_END BWIND_BEG BWIND_END BDELTA BDELTA_MAX BLEVEL_BEG BLEVEL_END (N_THRESH) THRESH_[0-9]* PROB_[0-9]* diff --git a/met/data/table_files/stat_column_description.txt b/met/data/table_files/stat_column_description.txt index cc11747af0..b5a10899d0 100644 --- a/met/data/table_files/stat_column_description.txt +++ b/met/data/table_files/stat_column_description.txt @@ -86,6 +86,10 @@ MCTS_HSS_BCU "Heidke skill score bootstrap confidence interval upper limit" MCTS_GER "Gerrity skill score" MCTS_GER_BCL "Gerrity skill score bootstrap confidence interval lower limit" MCTS_GER_BCU "Gerrity skill score bootstrap confidence interval upper limit" +MCTS_HSS_EC "Heidke skill score with expected correct" +MCTS_HSS_EC_BCL "Heidke skill score with expected correct bootstrap confidence interval lower limit" +MCTS_HSS_EC_BCU "Heidke skill score with expected correct bootstrap confidence interval upper limit" +MCTS_EC_VALUE "Heidke skill score expected correct value" CNT_TOTAL "Total number of matched pairs" CNT_FBAR "Forecast mean" CNT_FBAR_NCL "Forecast mean normal confidence interval lower limit" diff --git a/met/docs/Users_Guide/appendixC.rst b/met/docs/Users_Guide/appendixC.rst index 05905e9c67..547e211d7f 100644 --- a/met/docs/Users_Guide/appendixC.rst +++ b/met/docs/Users_Guide/appendixC.rst @@ -240,7 +240,7 @@ HK is also known as the True Skill Statistic (TSS) and less commonly (although p Heidke Skill Score (HSS) ~~~~~~~~~~~~~~~~~~~~~~~~ -Called "HSS" in CTS output :numref:`table_PS_format_info_CTS` +Called "HSS" in CTS output :numref:`table_PS_format_info_CTS` and "HSS" in MCTS output :numref:`table_PS_format_info_MCTS` HSS is a skill score based on Accuracy, where the Accuracy is corrected by the number of correct forecasts that would be expected by chance. In particular, @@ -250,8 +250,27 @@ where .. math:: C_2 = \frac{(n_{11} + n_{10}) (n_{11} + n_{01}) + (n_{01} + n_{00}) (n_{10} + n_{00})}{T}. +A more general format that uses percentages is provided by Ou (:ref:`Ou, 2016 `), + +.. math:: \text{HSS(\%) } = 100 \ast \frac{(H - E)}{(T - E)} + +where H is the number of forecasts in the correct category and E is the expected number of forecasts by chance. + HSS can range from minus infinity to 1. A perfect forecast would have HSS = 1. +Heidke Skill Score - Expected Correct (HSS_EC) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Called "HSS_EC" in MCTS output :numref:`table_PS_format_info_MCTS` + +HSS_EC is a skill score based on Accuracy, where the Accuracy is corrected by the number of correct forecasts that would be expected by chance. In particular, + +.. math:: \text{HSS } = \frac{n_{11} + n_{00} - C_2}{T - C_2}, + +The C_2 value is user-configurable with a default value of T divided by the number of contingency table categories. + +HSS_EC can range from minus infinity to 1. A perfect forecast would have HSS_EC = 1. + Odds Ratio (OR) ~~~~~~~~~~~~~~~ diff --git a/met/docs/Users_Guide/config_options.rst b/met/docs/Users_Guide/config_options.rst index b27e819908..a490ea1e27 100644 --- a/met/docs/Users_Guide/config_options.rst +++ b/met/docs/Users_Guide/config_options.rst @@ -291,7 +291,9 @@ References: Settings common to multiple tools _________________________________ -**exit_on_warning** +.. _exit_on_warning: + +:ref:`exit_on_warning ` The "exit_on_warning" entry in ConfigConstants may be set to true or false. If set to true and a MET tool encounters a warning, it will immediately exit @@ -301,8 +303,10 @@ with bad status after writing the warning message. exit_on_warning = FALSE; -**nc_compression** - +.. _nc_compression: + +:ref:`nc_compression ` + The "nc_compression" entry in ConfigConstants defines the compression level for the NetCDF variables. Setting this option in the config file of one of the tools overrides the default value set in ConfigConstants. The @@ -322,7 +326,9 @@ writing of NetCDF files within MET significantly. nc_compression = 0; -**output_precision** +.. _output_precision: + +:ref:`output_precision ` The "output_precision" entry in ConfigConstants defines the precision (number of significant decimal places) to be written to the ASCII output @@ -333,8 +339,10 @@ override the default value set in ConfigConstants. output_precision = 5; -**tmp_dir** - +.. _tmp_dir_1: + +:ref:`tmp_dir ` + The "tmp_dir" entry in ConfigConstants defines the directory for the temporary files. The directory must exist and be writable. The environment variable MET_TMP_DIR overrides the default value at the configuration file. @@ -345,8 +353,10 @@ Some tools override the temporary directory by the command line argument tmp_dir = "/tmp"; -**message_type_group_map** +.. _message_type_group_map_1: +:ref:`message_type_group_map ` + The "message_type_group_map" entry is an array of dictionaries, each containing a "key" string and "val" string. This defines a mapping of message type group names to a comma-separated list of values. This map is @@ -364,7 +374,9 @@ which surface verification logic should be applied. { key = "ONLYSF"; val = "ADPSFC,SFCSHP"; } ]; -**message_type_map** +.. _message_type_map: + +:ref:`message_type_map ` The "message_type_map" entry is an array of dictionaries, each containing a "key" string and "val" string. This defines a mapping of input strings @@ -387,8 +399,10 @@ types. { key = "FM-97 ACARS"; val = "AIRCFT"; } ]; -**model** - +.. _model: + +:ref:`model ` + The "model" entry specifies a name for the model being verified. This name is written to the MODEL column of the ASCII output generated. If you're verifying multiple models, you should choose descriptive model names (no @@ -399,8 +413,10 @@ e.g. model = "GFS"; model = "WRF"; -**desc** - +.._desc: + +:ref:`desc ` + The "desc" entry specifies a user-specified description for each verification task. This string is written to the DESC column of the ASCII output generated. It may be set separately in each "obs.field" verification task @@ -414,8 +430,10 @@ e.g. desc = "QC_9"; desc = "NA"; -**obtype** - +.. _obtype: + +:ref:`obtype ` + The "obtype" entry specifies a name to describe the type of verifying gridded observation used. This name is written to the OBTYPE column in the ASCII output generated. If you're using multiple types of verifying observations, @@ -428,8 +446,10 @@ the configuration file obtype value is written. obtype = "ANALYS"; -**regrid** - +.. _regrid: + +:ref:`regrid ` + The "regrid" entry is a dictionary containing information about how to handle input gridded data files. The "regrid" entry specifies regridding logic using the following entries: @@ -535,7 +555,9 @@ using the following entries: censor_val = []; } -**fcst** +.. _fcst: + +:ref:`fcst ` The "fcst" entry is a dictionary containing information about the field(s) to be verified. This dictionary may include the following entries: @@ -962,8 +984,10 @@ File-format specific settings for the "field" entry: ]; } -**obs** - +.. _obs: + +:ref:`obs ` + The "obs" entry specifies the same type of information as "fcst", but for the observation data. It will often be set to the same things as "fcst", as shown in the example below. However, when comparing forecast and @@ -1085,8 +1109,10 @@ or obs = fcst; -**climo_mean** - +.. _climo_mean: + +:ref:`climo_mean ` + The "climo_mean" dictionary specifies climatology mean data to be read by the Grid-Stat, Point-Stat, Ensemble-Stat, and Series-Analysis tools. It consists of several entires defining the climatology file names and fields to be used. @@ -1141,8 +1167,10 @@ of several entires defining the climatology file names and fields to be used. hour_interval = 6; } -**climo_stdev** - +.. _climo_stdev: + +:ref:`climo_stdev ` + The "climo_stdev" dictionary specifies climatology standard deviation data to be read by the Grid-Stat, Point-Stat, Ensemble-Stat, and Series-Analysis tools. The "climo_mean" and "climo_stdev" data define the climatological @@ -1171,8 +1199,10 @@ over the "climo_mean" setting and then updating the "file_name" entry. file_name = [ "/path/to/climatological/standard/deviation/files" ]; } -**climo_cdf** - +.. _climo_cdf: + +:ref:`climo_cdf ` + The "climo_cdf" dictionary specifies how the the climatological mean ("climo_mean") and standard deviation ("climo_stdev") data are used to evaluate model performance relative to where the observation value falls @@ -1234,8 +1264,10 @@ all pairs into a single climatological bin. write_bins = FALSE; or TRUE } -**climatology data for probability forecasts** +.. _climato_data: +:ref:`climatology data for probability forecasts ` + When specifying climatology data for probability forecasts, either supply a probabilistic "climo_mean" field or non-probabilistic "climo_mean" and "climo_stdev" fields from which a normal approximation of the climatological @@ -1250,7 +1282,9 @@ the MET tools use the mean, standard deviation, and observation event threshold to derive a normal approximation of the climatological probabilities. Those derived probability values are used to compute BSS. -**mask_missing_flag** +.. _mask_missing_flag: + +:ref:`mask_missing_flag ` The "mask_missing_flag" entry specifies how missing data should be handled in the Wavelet-Stat and MODE tools: @@ -1268,7 +1302,9 @@ in the Wavelet-Stat and MODE tools: mask_missing_flag = BOTH; -**obs_window** +.. _obs_window: + +:ref:`obs_window ` The "obs_window" entry is a dictionary specifying a beginning ("beg" entry) and ending ("end" entry) time offset values in seconds. It defines @@ -1284,8 +1320,10 @@ Point-Stat and Ensemble-Stat, the reference time is the forecast valid time. end = 5400; } -**mask** +.. _mask: +:ref:`mask ` + The "mask" entry is a dictionary that specifies the verification masking regions to be used when computing statistics. Each mask defines a geographic extent, and any matched pairs falling inside that area will be @@ -1394,7 +1432,9 @@ is included in the mask. } -**ci_alpha** +.. _ci_alpha: + +:ref:`ci_alpha ` The "ci_alpha" entry is an array of floats specifying the values for alpha to be used when computing confidence intervals. Values of alpha must be @@ -1406,7 +1446,9 @@ interval. ci_alpha = [ 0.05, 0.10 ]; -**boot** +.. _boot: + +:ref:`boot ` The "boot" entry defines the parameters to be used in calculation of bootstrap confidence intervals. The interval variable indicates what method @@ -1468,7 +1510,9 @@ should be used for computing bootstrap confidence intervals: seed = ""; } -**interp** +.. _interp: + +:ref:`interp ` The "interp" entry is a dictionary that specifies what interpolation or smoothing (for the Grid-Stat tool) methods should be applied. @@ -1571,8 +1615,10 @@ This dictionary may include the following entries: ]; } -**nbrhd** - +.. _nbrhd: + +:ref:`nbrhd ` + The "nbrhd" entry is a dictionary that is very similar to the "interp" entry. It specifies information for computing neighborhood statistics in Grid-Stat. This dictionary may include the following entries: @@ -1616,8 +1662,10 @@ Grid-Stat. This dictionary may include the following entries: cov_thresh = [ >=0.5 ]; } -**fourier** +.. _fourier: +:ref:`fourier ` + The "fourier" entry is a dictionary which specifies the application of the Fourier decomposition method. It consists of two arrays of the same length which define the beginning and ending wave numbers to be included. If the @@ -1647,7 +1695,9 @@ of the verification grid: wave_1d_end = [ 3, 9, 20 ]; } -**gradient** +.. _gradient: + +:ref:`gradient ` The "gradient" entry is a dictionary which specifies the number and size of gradients to be computed. The "dx" and "dy" entries specify the size of the @@ -1667,8 +1717,10 @@ This configuration option may be set separately in each "obs.field" entry. dy = [ 1 ]; } -**distance_map** - +.. _distance_map: + +:ref:`distance_map ` + The "distance_map" entry is a dictionary containing options related to the distance map statistics in the DMAP output line type. The "baddeley_p" entry is an integer specifying the exponent used in the Lp-norm when computing the @@ -1693,8 +1745,10 @@ This configuration option may be set separately in each "obs.field" entry. zhu_weight = 0.5; } -**land_mask** - +.. _land_mask: + +:ref:`land_mask ` + The "land_mask" dictionary defines the land/sea mask field which is used when verifying at the surface. For point observations whose message type appears in the "LANDSF" entry of the "message_type_group_map" setting, @@ -1720,8 +1774,10 @@ land_mask.flag may be set separately in each "obs.field" entry. thresh = eq1; } -**topo_mask** - +.. _topo_mask: + +:ref:`topo_mask ` + The "topo_mask" dictionary defines the model topography field which is used when verifying at the surface. This logic is applied to point observations whose message type appears in the "SURFACE" entry of the @@ -1749,8 +1805,10 @@ topo_mask.flag may be set separately in each "obs.field" entry. interp_fcst_thresh = ge-50&&le50; } -**hira** +.. _hira: +:ref:`hira ` + The "hira" entry is a dictionary that is very similar to the "interp" and "nbrhd" entries. It specifies information for applying the High Resolution Assessment (HiRA) verification logic in Point-Stat. HiRA is analogous to @@ -1801,8 +1859,10 @@ This dictionary may include the following entries: prob_cat_thresh = []; } -**output_flag** +.. _output_flag: +:ref:`output_flag ` + The "output_flag" entry is a dictionary that specifies what verification methods should be applied to the input data. Options exist for each output line type from the MET tools. Each line type may be set to one of: @@ -1851,7 +1911,9 @@ output line type from the MET tools. Each line type may be set to one of: grad = NONE; Gradient statistics (S1 score) } -**nc_pairs_flag** +.. _nc_pairs_flag: + +:ref:`nc_pairs_flag ` The "nc_pairs_flag" can be set either to a boolean value or a dictionary in either Grid-Stat, Wavelet-Stat or MODE. The dictionary (with slightly @@ -1881,7 +1943,9 @@ netcdf output will be generated. apply_mask = TRUE; } -**nc_pairs_var_name** +.. _nc_pairs_var_name: + +:ref:`nc_pairs_var_name ` The "nc_pairs_var_name" entry specifies a string for each verification task in Grid-Stat. This string is parsed from each "obs.field" dictionary entry @@ -1900,8 +1964,10 @@ For example: nc_pairs_var_name = ""; -**nc_pairs_var_suffix** - +.. _nc_pairs_var_suffix: + +:ref:`nc_pairs_var_suffix ` + The "nc_pairs_var_suffix" entry is similar to the "nc_pairs_var_name" entry described above. It is also parsed from each "obs.field" dictionary entry. However, it defines a suffix to be appended to the output variable name. @@ -1922,8 +1988,10 @@ now deprecated. nc_pairs_var_suffix = ""; -**ps_plot_flag** - +.. _ps_plot_flag: + +:ref:`ps_plot_flag ` + The "ps_plot_flag" entry is a boolean value for Wavelet-Stat and MODE indicating whether a PostScript plot should be generated summarizing the verification. @@ -1932,8 +2000,10 @@ the verification. ps_plot_flag = TRUE; -**grid_weight_flag** +.. _grid_weight_flag: +:ref:`grid_weight_flag ` + The "grid_weight_flag" specifies how grid weighting should be applied during the computation of continuous statistics and partial sums. It is meant to account for grid box area distortion and is often applied to global @@ -1955,7 +2025,27 @@ by the sum of the weights for the current masking region. grid_weight_flag = NONE; -**rank_corr_flag** +.. _hss_ec_value: + +ref:`hss_ec_value ` + +The "hss_ec_value" entry is a floating point number used in the computation +of the HSS_EC statistic in the MCTS line type. It specifies the expected +correct (EC) rate by chance for multi-category contingency tables. If set +to its default value of NA, it will automatically be replaced with 1.0 +divided by the MCTC table dimension. For example, for a 4x4 table, the +default hss_ec_value is 1.0 / 4 = 0.25. + +It set, it must greater than or equal to 0.0 and less than 1.0. A value of +0.0 produces an HSS_EC statistic equal to the Accuracy statistic. + +.. code-block:: none + + hss_ec_value = NA; + +.. _rank_corr_flag: + +ref:`rank_corr_flag ` The "rank_corr_flag" entry is a boolean to indicate whether Kendall's Tau and Spearman's Rank Correlation Coefficients (in the CNT line type) should @@ -1966,7 +2056,9 @@ intensive and slows down the runtime significantly. rank_corr_flag = FALSE; -**duplicate_flag** +.. _duplicate_flag: + +:ref:`duplicate_flag ` The "duplicate_flag" entry specifies how to handle duplicate point observations in Point-Stat and Ensemble-Stat: @@ -1987,7 +2079,9 @@ in those cases. duplicate_flag = NONE; -**obs_summary** +.. _obs_summary: + +:ref:`obs_summary ` The "obs_summary" entry specifies how to compute statistics on observations that appear at a single location (lat,lon,level,elev) @@ -2022,8 +2116,10 @@ in those cases. obs_summary = NONE; -**obs_perc_value** +.. _obs_perc_value: +:ref:`obs_perc_value ` + Percentile value to use when obs_summary = PERC .. code-block:: none @@ -2031,7 +2127,9 @@ Percentile value to use when obs_summary = PERC obs_perc_value = 50; -**obs_quality** +.. _obs_quality: + +:ref:`obs_quality ` The "obs_quality" entry specifies the quality flag values that are to be retained and used for verification. An empty list signifies that all @@ -2045,7 +2143,9 @@ an array of strings, even if the values themselves are numeric. obs_quality = [ "1", "2", "3", "9" ]; -**met_data_dir** +.. _met_data_dir: + +:ref:`met_data_dir ` The "met_data_dir" entry specifies the location of the internal MET data sub-directory which contains data files used when generating plots. It @@ -2056,8 +2156,10 @@ locate the static data files they need at run time. met_data_dir = "MET_BASE"; -**fcst_raw_plot, obs_raw_plot, wvlt_plot, object_plot** - +.. _many_plots: + +:ref:`fcst_raw_plot, obs_raw_plot, wvlt_plot, object_plot ` + The "fcst_raw_plot" entry is a dictionary used by Wavelet-Stat and MODE containing colortable plotting information for the plotting of the raw forecast field: @@ -2087,7 +2189,9 @@ forecast field: The "obs_raw_plot", "wvlt_plot", and "object_plot" entries are dictionaries similar to the "fcst_raw_plot" described above. -**tmp_dir** +.. _tmp_dir_2: + +:ref:`tmp_dir ` The "tmp_dir" entry is a string specifying the location where temporary files should be written. @@ -2097,7 +2201,9 @@ files should be written. tmp_dir = "/tmp"; -**output_prefix** +.. _output_prefix: + +:ref:`output_prefix ` The "output_prefix" entry specifies a string to be included in the output file name. The MET statistics tools construct output file names that @@ -2109,8 +2215,10 @@ of the same tool. output_prefix = ""; -**version** - +.. _version: + +:ref:`version ` + The "version" entry specifies the version number of the configuration file. The configuration file version number should match the version number of the MET code being run. This value should generally not be modified. @@ -2119,8 +2227,10 @@ the MET code being run. This value should generally not be modified. version = "VN.N"; -**time_summary** - +.. _time_summary: + +:ref:`time_summary ` + This feature was implemented to allow additional processing of observations with high temporal resolution. The "flag" entry toggles the "time_summary" on (TRUE) and off (FALSE). Obs may be summarized across the user specified @@ -2196,7 +2306,9 @@ _____________________________________ EnsembleStatConfig_default ~~~~~~~~~~~~~~~~~~~~~~~~~~ -**ens** +.. _ens: + +:ref:`ens ` The "ens" entry is a dictionary that specifies the fields for which ensemble products should be generated. This is very similar to the "fcst" and "obs" @@ -2238,8 +2350,10 @@ entries. This dictionary may include the following entries: ]; } -**nbrhd_prob** - +.. _nbrhd_prob: + +:ref:`nbrhd_prob ` + The nbrhd_prob dictionary defines the neighborhoods used to compute NEP and NMEP output. The neighborhood shape is a SQUARE or CIRCLE centered on the current point, and the width array specifies the width of the square or @@ -2259,7 +2373,9 @@ specified. vld_thresh = 0.0; } -**nmep_smooth** +.. _nmep_smooth: + +:ref:`nmep_smooth ` Similar to the interp dictionary, the nmep_smooth dictionary includes a type array of dictionaries to define one or more methods for smoothing the NMEP @@ -2285,7 +2401,9 @@ combination of the categorical threshold (cat_thresh), neighborhood width ]; } -**fcst, obs** +.. _fcst, obs_1: + +:ref:`fcst, obs ` The fcst and obs entries define the fields for which Ensemble-Stat should compute rank histograms, probability integral transform histograms, @@ -2323,8 +2441,10 @@ data is provided, the climo_cdf thresholds will be used instead. } -**nc_var_str** - +.. _nc_var_str: + +:ref:`nc_var_str ` + The "nc_var_str" entry specifies a string for each ensemble field and verification task in Ensemble-Stat. This string is parsed from each "ens.field" and "obs.field" dictionary entry and is used to customize @@ -2339,7 +2459,9 @@ e.g. nc_var_str = "MIN"; nc_var_str = ""; -**obs_thresh** +.. _obs_thresh: + +:ref:`obs_thresh ` The "obs_thresh" entry is an array of thresholds for filtering observation values prior to applying ensemble verification logic. They specify the values @@ -2352,7 +2474,9 @@ This option may be set separately for each obs.field entry. obs_thresh = [ NA ]; -**skip_const** +.. _skip_const: + +:ref:`skip_const ` Setting "skip_const" to true tells Ensemble-Stat to exclude pairs where all the ensemble members and the observation have a constant value. For example, @@ -2365,7 +2489,9 @@ random. skip_const = FALSE; -**obs_error** +.. _obs_error: + +:ref:`obs_error ` Observation error options @@ -2422,7 +2548,9 @@ levels, and range of values. max = NA; } -**ensemble_flag** +.. _ensemble_flag: + +:ref:`ensemble_flag ` The "ensemble_flag" entry is a dictionary of boolean value indicating which ensemble products should be generated: @@ -2473,7 +2601,9 @@ which ensemble products should be generated: weight = FALSE; } -**rng** +.. _rng: + +:ref:`rng ` See: `Random Number Generator Performance `_ used for random assignment of ranks when they are tied. @@ -2826,7 +2956,9 @@ MET User's Guide for a description of these attributes. MODEConfig_default ~~~~~~~~~~~~~~~~~~ -**quilt** +.. _quilt: + +:ref:`quilt ` The "quilt" entry is a boolean to indicate whether all permutations of convolution radii and thresholds should be run. If set to false, the number @@ -2841,7 +2973,9 @@ MODE will be run. quilt = false; -**fcst, obs** +.. _fcst, obs_2: + +:ref:`fcst, obs ` The object definition settings for MODE are contained within the "fcst" and "obs" entries: @@ -2925,7 +3059,9 @@ The object definition settings for MODE are contained within the "fcst" and merge_flag = THRESH; } -**grid_res** +.. _grid_res: + +:ref:`grid_res ` The "grid_res" entry is the nominal spacing for each grid square in kilometers. The variable is not used directly in the code, but subsequent @@ -2937,7 +3073,9 @@ are used for these variables. grid_res = 4; -**match_flag** +.. _match_flag: + +:ref:`match_flag ` The "match_flag" entry specifies the matching method to be applied: @@ -2955,8 +3093,10 @@ The "match_flag" entry specifies the matching method to be applied: match_flag = MERGE_BOTH; -**max_centroid_dist** - +.. _max_centroid_dist: + +:ref:`max_centroid_dist ` + The "max_centroid_dist" entry specifies the maximum allowable distance in grid squares between the centroids of objects for them to be compared. Setting this to a reasonable value speeds up the runtime enabling MODE to @@ -2966,8 +3106,10 @@ skip unreasonable object comparisons. max_centroid_dist = 800.0/grid_res; -**weight** - +.. _weight: + +:ref:`weight ` + The weight variables control how much weight is assigned to each pairwise attribute when computing a total interest value for object pairs. The weights need not sum to any particular value but must be non-negative. When the @@ -2988,7 +3130,9 @@ sum of the weights listed. inten_perc_value = 50; } -**interest_function** +.. _interest_function: + +:ref:`interest_function ` The set of interest function variables listed define which values are of interest for each pairwise attribute measured. The interest functions may be @@ -3044,7 +3188,9 @@ mathematical functions. inten_perc_ratio = ratio_if; } -**total_interest_thresh** +.. _total_interest_thresh: + +:ref:`total_interest_thresh ` The total_interest_thresh variable should be set between 0 and 1. This threshold is applied to the total interest values computed for each pair of @@ -3054,8 +3200,10 @@ objects and is used in determining matches. total_interest_thresh = 0.7; -**print_interest_thresh** - +.. _print_interest_thresh: + +:ref:`print_interest_thresh ` + The print_interest_thresh variable determines which pairs of object attributes will be written to the output object attribute ASCII file. The user may choose to set the print_interest_thresh to the same value as the @@ -3068,7 +3216,9 @@ the max_centroid_dist variable. print_interest_thresh = 0.0; -**plot_valid_flag** +.. _plot_valid_flag: + +:ref:`plot_valid_flag ` When applied, the plot_valid_flag variable indicates that only the region containing valid data after masking is applied should be plotted. TRUE @@ -3079,7 +3229,9 @@ region containing valid data after masking should be plotted. plot_valid_flag = FALSE; -**plot_gcarc_flag** +.. _plot_gcarc_flag: + +:ref:`plot_gcarc_flag ` When applied, the plot_gcarc_flag variable indicates that the edges of polylines should be plotted using great circle arcs as opposed to straight @@ -3089,7 +3241,9 @@ lines in the grid. plot_gcarc_flag = FALSE; -**ct_stats_flag** +.. _ct_stats_flag: + +:ref:`ct_stats_flag ` The ct_stats_flag can be set to TRUE or FALSE to produce additional output, in the form of contingency table counts and statistics. @@ -3098,8 +3252,10 @@ in the form of contingency table counts and statistics. ct_stats_flag = TRUE; -**shift_right** - +.. _shift_right: + +:ref:`shift_right ` + When MODE is run on global grids, this parameter specifies how many grid squares to shift the grid to the right. MODE does not currently connect objects from one side of a global grid to the other, potentially causing @@ -3173,7 +3329,9 @@ following criteria: 7 - Auxiliary levels generated via interpolation from spanning levels (upper-air profile reports) -**message_type** +.. _message_type: + +:ref:`message_type ` In the PB2NC tool, the "message_type" entry is an array of message types to be retained. An empty list indicates that all should be retained. @@ -3194,7 +3352,9 @@ For example: message_type = []; -**message_type_group_map** +.. _message_type_group_map_2: + +:ref:`message_type_group_map ` Mapping of message type group name to comma-separated list of values. The default setting defines ANYAIR, ANYSFC, and ONLYSF as groups. @@ -3209,8 +3369,10 @@ Derive PRMSL only for SURFACE message types. { key = "ONLYSF"; val = "ADPSFC,SFCSHP"; } ]; -**station_id** - +.. _station_id: + +:ref:`station_id ` + The "station_id" entry is an array of station ids to be retained or the filename which contains station ids. An array of station ids contains a comma-separated list. An empty list indicates that all @@ -3222,7 +3384,9 @@ For example: station_id = [ "KDEN" ]; station_id = []; -**elevation_range** +.. _elevation_range: + +:ref:`elevation_range ` The "elevation_range" entry is a dictionary which contains "beg" and "end" entries specifying the range of observing locations elevations to be @@ -3235,8 +3399,10 @@ retained. end = 100000; } -**pb_report_type** - +.. _pb_report_type: + +:ref:`pb_report_type ` + The "pb_report_type" entry is an array of PREPBUFR report types to be retained. The numeric "pb_report_type" entry allows for further stratification within message types. An empty list indicates that all should @@ -3255,8 +3421,10 @@ For example: pb_report_type = []; -**in_report_type** - +.. _in_report_type: + +:ref:`in_report_type ` + The "in_report_type" entry is an array of input report type values to be retained. The numeric "in_report_type" entry provides additional stratification of observations. An empty list indicates that all should @@ -3274,7 +3442,9 @@ For example: in_report_type = []; -**instrument_type** +.. _instrument_type: + +:ref:`instrument_type ` The "instrument_type" entry is an array of instrument types to be retained. An empty list indicates that all should be retained. @@ -3283,8 +3453,10 @@ An empty list indicates that all should be retained. instrument_type = []; -**level_range** - +.. _level_range: + +:ref:`level_range ` + The "level_range" entry is a dictionary which contains "beg" and "end" entries specifying the range of vertical levels (1 to 255) to be retained. @@ -3295,8 +3467,10 @@ entries specifying the range of vertical levels (1 to 255) to be retained. end = 255; } -**level_category** - +.. _level_category: + +:ref:`level_category ` + The "level_category" entry is an array of integers specifying which level categories should be retained: @@ -3331,7 +3505,9 @@ See: `Current Table A Entries in PREPBUFR mnemonic table ` The "obs_bufr_var" entry is an array of strings containing BUFR variable names to be retained or derived. This replaces the "obs_grib_code" setting @@ -3351,7 +3527,9 @@ command line option to see the list of available observation variables. obs_bufr_var = [ "QOB", "TOB", "ZOB", "UOB", "VOB" ]; -**obs_bufr_map** +.. _obs_bufr_map: + +:ref:`obs_bufr_map ` Mapping of input BUFR variable names to output variables names. The default PREPBUFR map, obs_prepbufr_map, is appended to this map. @@ -3362,8 +3540,10 @@ of the forecast the observation is used to verify. obs_bufr_map = []; -**obs_prefbufr_map** - +.. _obs_prefbufr_map: + +:ref:`obs_prefbufr_map ` + Default mapping for PREPBUFR. Replace input BUFR variable names with GRIB abbreviations in the output. This default map is appended to obs_bufr_map. This should not typically be overridden. This default mapping provides @@ -3387,8 +3567,10 @@ abbreviations to the output. { key = "D_PRMSL"; val = "PRMSL"; } ]; -**quality_mark_thresh** - +.. _quality_mark_thresh: + +:ref:`quality_mark_thresh ` + The "quality_mark_thresh" entry specifies the maximum quality mark value to be retained. Observations with a quality mark LESS THAN OR EQUAL TO this threshold will be retained, while observations with a quality mark @@ -3400,8 +3582,10 @@ See `Code table for observation quality markers ` + The "event_stack_flag" entry is set to "TOP" or "BOTTOM" to specify whether observations should be drawn from the top of the event stack (most quality controlled) or the bottom of the event stack (most raw). @@ -3413,7 +3597,9 @@ stack (most quality controlled) or the bottom of the event stack (most raw). SeriesAnalysisConfig_default ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -**block_size** +.. _block_size: + +:ref:`block_size ` Computation may be memory intensive, especially for large grids. The "block_size" entry sets the number of grid points to be processed @@ -3424,8 +3610,10 @@ require less memory but increase the number of passes through the data. block_size = 1024; -**vld_thresh** - +.. _vld_thresh: + +:ref:`vld_thresh ` + Ratio of valid matched pairs to total length of series for a grid point. If valid threshold is exceeded at that grid point the statistics are computed and stored. If not, a bad data flag is stored. The default @@ -3436,8 +3624,10 @@ setting requires all data in the series to be valid. vld_thresh = 1.0; -**output_stats** - +.. _output_stats: + +:ref:`output_stats ` + Statistical output types need to be specified explicitly. Refer to User's Guide for available output types. To keep output file size reasonable, it is recommended to process a few output types at a time, especially if the @@ -3462,7 +3652,9 @@ grid is large. STATAnalysisConfig_default ~~~~~~~~~~~~~~~~~~~~~~~~~~ -**jobs** +.. _jobs: + +:ref:`jobs ` The "jobs" entry is an array of STAT-Analysis jobs to be performed. Each element in the array contains the specifications for a single analysis @@ -3836,7 +4028,8 @@ Where "job_name" is set to one of the following: "-boot_seed value" .. code-block:: none - + + "-hss_ec_value value" "-rank_corr_flag value" "-vif_flag value" @@ -3928,7 +4121,9 @@ confidence intervals computed for the aggregated statistics. WaveletStatConfig_default ~~~~~~~~~~~~~~~~~~~~~~~~~ -**grid_decomp_flag** +.. _grid_decomp_flag: + +:ref:`grid_decomp_flag ` The "grid_decomp_flag" entry specifies how the grid should be decomposed in Wavelet-Stat into dyadic (2^n x 2^n) tiles: @@ -3943,8 +4138,10 @@ Wavelet-Stat into dyadic (2^n x 2^n) tiles: grid_decomp_flag = AUTO; -**tile** - +.. _tile: + +:ref:`tile ` + The "tile" entry is a dictionary that specifies how tiles should be defined in Wavelet-Stat when the "grid_decomp_flag" is set to "TILE": @@ -3967,8 +4164,10 @@ in Wavelet-Stat when the "grid_decomp_flag" is set to "TILE": ]; } -**wavelet** - +.. _wavelet: + +:ref:`wavelet ` + The "wavelet" entry is a dictionary in Wavelet-Stat that specifies how the wavelet decomposition should be performed: @@ -4002,8 +4201,10 @@ wavelet decomposition should be performed: member = 2; } -**obs_raw_plot, wvlt_plot, object_plot** - +.. _obs_raw_wvlt_object_plots: + +:ref:`obs_raw_plot, wvlt_plot, object_plot ` + The "obs_raw_plot", "wvlt_plot", and "object_plot" entries are dictionaries similar to the "fcst_raw_plot" described in the "Settings common to multiple tools" section. @@ -4011,12 +4212,16 @@ tools" section. WWMCARegridConfig_default ~~~~~~~~~~~~~~~~~~~~~~~~~ -**to_grid** +.. _to_grid: + +:ref:`to_grid ` Please see the description of the "to_grid" entry in the "regrid" dictionary above. -**NetCDF output information** - +.. _NetCDF output information: + +:ref:`NetCDF output information ` + Supply the NetCDF output information. For example: .. code-block:: none @@ -4033,15 +4238,19 @@ Supply the NetCDF output information. For example: long_name = ""; level = ""; -**max_minutes (pixel age)** - +.. _max_minutes (pixel age): + +:ref:`max_minutes (pixel age) ` + Maximum pixel age in minutes .. code-block:: none max_minutes = 120; -**swap_endian** +.. _swap_endian: + +:ref:`swap_endian ` The WWMCA pixel age data is stored in binary data files in 4-byte blocks. The swap_endian option indicates whether the endian-ness of the data should @@ -4051,8 +4260,10 @@ be swapped after reading. swap_endian = TRUE; -**write_pixel_age** - +.. _write_pixel_age: + +:ref:`write_pixel_age ` + By default, wwmca_regrid writes the cloud percent data specified on the command line to the output file. This option writes the pixel age data, in minutes, to the output file instead. diff --git a/met/docs/Users_Guide/config_options_tc.rst b/met/docs/Users_Guide/config_options_tc.rst index 11f7330b4b..f3fcc75450 100644 --- a/met/docs/Users_Guide/config_options_tc.rst +++ b/met/docs/Users_Guide/config_options_tc.rst @@ -8,7 +8,9 @@ See :numref:`config_options` for a description of the configuration file syntax. Configuration settings common to multiple tools _______________________________________________ -**storm_id** +.. _storm_id_1: + +:ref:`storm_id ` Specify a comma-separated list of storm id's to be used: @@ -28,7 +30,9 @@ This may also be set using basin, cyclone, and timing information below. storm_id = []; -**basin** +.. _basin: + +:ref:`basin ` Specify a comma-separated list of basins to be used. Expected format is a 2-letter basin identifier. An empty list indicates that all should be used. @@ -46,8 +50,10 @@ For example: basin = []; -**cyclone** - +.. _cyclone: + +:ref:`cyclone ` + Specify a comma-separated list of cyclone numbers (01-99) to be used. An empty list indicates that all should be used. @@ -60,7 +66,9 @@ For example: cyclone = []; -**storm_name** +.. _storm_name_1: + +:ref:`storm_name ` Specify a comma-separated list of storm names to be used. An empty list indicates that all should be used. @@ -74,7 +82,9 @@ For example: storm_name = []; -**init_beg, init_end, init_inc, init_exc** +.. _init_beg end inc exc: + +:ref:`init_beg, init_end, init_inc, init_exc ` Specify a model initialization time window in YYYYMMDD[_HH[MMSS]] format or provide a list of specific initialization times to include (inc) @@ -98,8 +108,10 @@ For example: init_exc = []; -**valid_beg, valid_end** - +.. _valid_beg, valid_end_1: + +:ref:`valid_beg, valid_end ` + Specify a model valid time window in YYYYMMDD[_HH[MMSS]] format. Tracks for which all valid times fall within the time window will be used. An empty string indicates that all times should be used. @@ -116,7 +128,9 @@ For example: valid_beg = ""; valid_end = ""; -**init_hour** +.. _init_hour_1: + +:ref:`init_hour ` Specify a comma-separated list of model initialization hours to be used in HH[MMSS] format. An empty list indicates that all hours should be used. @@ -130,7 +144,9 @@ For example: init_hour = []; -**lead_req** +.. _lead_req: + +:ref:`lead_req ` Specify the required lead time in HH[MMSS] format. Tracks that contain all of these required times will be @@ -143,7 +159,9 @@ all lead times will be used. lead_req = []; -**init_mask, valid_mask** +.. _init_mask, valid_mask: + +:ref:`init_mask, valid_mask ` Specify lat/lon polylines defining masking regions to be applied. Tracks whose initial location falls within init_mask will be used. @@ -159,7 +177,9 @@ For example: init_mask = ""; valid_mask = ""; -**version** +.. _version: + +:ref:`version ` Indicate the version number for the contents of this configuration file. The value should generally not be modified. @@ -176,7 +196,9 @@ _____________________________________ TCPairsConfig_default ~~~~~~~~~~~~~~~~~~~~~ -**model** +.. _model_1: + +:ref:`model ` The "model" entry specifies an array of model names to be verified. If verifying multiple models, choose descriptive model names (no whitespace) @@ -191,8 +213,9 @@ For example: model = []; +.. _check_dup: -**check_dup** +:ref:`check_dup ` Specify whether the code should check for duplicate ATCF lines when building tracks. Setting this to FALSE makes the parsing of tracks quicker. @@ -206,8 +229,10 @@ For example: check_dup = FALSE; -**interp12** - +.. _interp12: + +:ref:`interp12 ` + Specify whether special processing should be performed for interpolated model names ending in 'I' (e.g. AHWI). Search for corresponding tracks whose model name ends in '2' (e.g. AHW2) and apply the following logic: @@ -224,8 +249,10 @@ name ends in '2' (e.g. AHW2) and apply the following logic: interp12 = REPLACE; -**consensus** - +.. _consensus: + +:ref:`consensus ` + Specify how consensus forecasts should be defined: | name = consensus model name @@ -251,8 +278,10 @@ For example: consensus = []; -**lag_time** - +.. _lag_time: + +:ref:`lag_time ` + Specify a comma-separated list of forecast lag times to be used in HH[MMSS] format. For each ADECK track identified, a lagged track will be derived for each entry listed. @@ -267,8 +296,10 @@ For example: lag_time = []; -**best_technique, best_baseline, oper_technique, oper_baseline** - +.. _best: + +:ref:`best_technique, best_baseline, oper_technique, oper_baseline ` + Specify comma-separated lists of CLIPER/SHIFOR baseline forecasts to be derived from the BEST and operational tracks, as defined by the best_technique and oper_technique settings. @@ -292,8 +323,10 @@ For example: oper_baseline = []; -**anly_track** - +.. _anly_track: + +:ref:`anly_track ` + Analysis tracks consist of multiple track points with a lead time of zero for the same storm. An analysis track may be generated by running model analysis fields through a tracking algorithm. Specify which datasets should @@ -310,8 +343,10 @@ For example: anly_track = BDECK; -**match_points** - +.. _match_points: + +:ref:`match_points ` + Specify whether only those track points common to both the ADECK and BDECK tracks should be written out. @@ -326,8 +361,10 @@ For example: match_points = FALSE; -**dland_file** - +.. _dland_file: + +:ref:`dland_file ` + Specify the NetCDF output of the gen_dland tool containing a gridded representation of the minimum distance to land. @@ -337,8 +374,10 @@ representation of the minimum distance to land. dland_file = "MET_BASE/tc_data/dland_nw_hem_tenth_degree.nc"; -**watch_warn** - +.. _watch_warn: + +:ref:`watch_warn ` + Specify watch/warning information. Specify an ASCII file containing watch/warning information to be used. At each track point, the most severe watch/warning status in effect, if any, will be written to the output. @@ -355,8 +394,10 @@ occurring 4 hours (-14400 second) prior to the watch/warning time. } -**basin_map** - +.. _basin_map: + +:ref:`basin_map ` + The basin_map entry defines a mapping of input names to output values. Whenever the basin string matches "key" in the input ATCF files, it is replaced with "val". This map can be used to modify basin names to make them @@ -395,7 +436,9 @@ parameter will result in missed matches. TCStatConfig_default ____________________ -**amodel, bmodel** +.. _amodel, bmodel: + +:ref:`amodel, bmodel ` Stratify by the AMODEL or BMODEL columns. Specify comma-separated lists of model names to be used for all analyses @@ -413,8 +456,9 @@ For example: amodel = []; bmodel = []; +.. _valid_beg end inc exc: -**valid_beg, valid_end, valid_inc, valid_exc** + ref:`valid_beg, valid_end, valid_inc, valid_exc ` Stratify by the VALID times. Define beginning and ending time windows in YYYYMMDD[_HH[MMSS]] @@ -437,8 +481,10 @@ For example: valid_inc = []; valid_exc = []; -**ini_hour, valid_hour, lead, lead_req** - +.. _ini valid_hour lead req: + +:ref:`ini_hour, valid_hour, lead, lead_req ` + Stratify by the initialization and valid hours and lead time. Specify a comma-separated list of initialization hours, valid hours, and lead times in HH[MMSS] format. @@ -461,7 +507,9 @@ For example: lead_req = []; -**line_type** +.. _line_type: + +:ref:`line_type ` Stratify by the LINE_TYPE column. May add using the "-line_type" job command option. @@ -475,8 +523,10 @@ For example: line_type = []; -**track_watch_warn** - +.. _track_watch_warn: + +:ref:`track_watch_warn ` + Stratify by checking the watch/warning status for each track point common to both the ADECK and BDECK tracks. If the watch/warning status of any of the track points appears in the list, retain the entire track. @@ -495,8 +545,10 @@ For example: track_watch_warn = []; -**column_thresh_name, column_thresh_val** - +.. _column_thresh_name_and_val: + +:ref:`column_thresh_name, column_thresh_val ` + Stratify by applying thresholds to numeric data columns. Specify a comma-separated list of columns names and thresholds to be applied. May add using the "-column_thresh name thresh" job command @@ -513,8 +565,10 @@ For example: column_thresh_name = []; column_thresh_val = []; -**column_str_name, column_str_val** - +.. _column_str_name, column_str_val: + +:ref:`column_str_name, column_str_val ` + Stratify by performing string matching on non-numeric data columns. Specify a comma-separated list of columns names and values to be included in the analysis. @@ -531,7 +585,9 @@ For example: column_str_name = []; column_str_val = []; -**column_str_exc_name, column_str_exc_val** +.. _column_str_name val: + +:ref:`column_str_exc_name, column_str_exc_val ` Stratify by performing string matching on non-numeric data columns. Specify a comma-separated list of columns names and values @@ -549,8 +605,10 @@ For example: column_str_exc_name = []; column_str_exc_val = []; -**init_thresh_name, init_thresh_val** - +.. _init_thresh_name, init_thresh_val: + +:ref:`init_thresh_name, init_thresh_val ` + Just like the column_thresh options above, but apply the threshold only when lead = 0. If lead = 0 value does not meet the threshold, discard the entire track. May add using the "-init_thresh name thresh" job command @@ -566,9 +624,10 @@ For example: init_thresh_name = []; init_thresh_val = []; +.. _init_str_name, init_str_val: + +:ref:`init_str_name, init_str_val ` -**init_str_name, init_str_val** - Just like the column_str options above, but apply the string matching only when lead = 0. If lead = 0 string does not match, discard the entire track. May add using the "-init_str name thresh" job command options. @@ -584,8 +643,10 @@ For example: init_str_name = []; init_str_val = []; -**init_str_exc_name, init_str_exc_val** - +.. _init_str_exc_name and _exc_val: + +:ref:`init_str_exc_name, init_str_exc_val ` + Just like the column_str_exc options above, but apply the string matching only when lead = 0. If lead = 0 string does match, discard the entire track. May add using the "-init_str_exc name thresh" job command options. @@ -601,7 +662,9 @@ For example: init_str_exc_name = []; init_str_exc_val = []; -**water_only** +.. _water_only: + +:ref:`water_only ` Stratify by the ADECK and BDECK distances to land. Once either the ADECK or BDECK track encounters land, discard the remainder of the track. @@ -615,7 +678,9 @@ For example: water_only = FALSE; -**rirw** +.. _rirw: + +:ref:`rirw ` Specify whether only those track points for which rapid intensification or weakening of the maximum wind speed occurred in the previous time @@ -647,7 +712,9 @@ May modify using the following job command options: bdeck = adeck; Copy settings to the BDECK or specify different logic. } -**landfall, landfall_beg, landfall_end** +.. _landfall beg end: + +:ref:`landfall, landfall_beg, landfall_end ` Specify whether only those track points occurring near landfall should be retained, and define the landfall retention window as a time string in HH[MMSS] @@ -678,8 +745,10 @@ For example: landfall_beg = "-24"; landfall_end = "00"; -**event_equal** - +.. _event_equal: + +:ref:`event_equal ` + Specify whether only those cases common to all models in the dataset should be retained. May modify using the "-event_equal" job command option. @@ -693,8 +762,10 @@ For example: event_equal = FALSE; -**event_equal_lead** - +.. _event_equal_lead: + +:ref:`event_equal_lead ` + Specify lead times that must be present for a track to be included in the event equalization logic. @@ -703,8 +774,10 @@ event equalization logic. event_equal_lead = [ "12", "24", "36" ]; -**out_int_mask** - +.. _out_int_mask: + +:ref:`out_int_mask ` + Apply polyline masking logic to the location of the ADECK track at the initialization time. If it falls outside the mask, discard the entire track. May modify using the "-out_init_mask" job command option. @@ -719,8 +792,10 @@ For example: out_init_mask = ""; -**out_valid_mask** - +.. _out_valid_mask: + +:ref:`out_valid_mask ` + Apply polyline masking logic to the location of the ADECK track at the valid time. If it falls outside the mask, discard only the current track point. May modify using the "-out_valid_mask" job command option. @@ -734,8 +809,10 @@ For example: out_valid_mask = ""; -**job** - +.. _job: + +:ref:`job ` + The "jobs" entry is an array of TCStat jobs to be performed. Each element in the array contains the specifications for a single analysis job to be performed. The format for an analysis job is as follows: @@ -920,7 +997,9 @@ Where "job_name" is set to one of the following: TCGenConfig_default ___________________ -**int_freq** +.. _int_freq: + +:ref:`int_freq ` Model initialization frequency in hours, starting at 0. @@ -928,8 +1007,10 @@ Model initialization frequency in hours, starting at 0. init_freq = 6; -**lead_window** - +.. _lead_window: + +:ref:`lead_window ` + Lead times in hours to be searched for genesis events. @@ -940,7 +1021,9 @@ Lead times in hours to be searched for genesis events. end = 120; } -**min_duration** +.. _min_duration: + +:ref:`min_duration ` Minimum track duration for genesis event in hours. @@ -948,7 +1031,9 @@ Minimum track duration for genesis event in hours. min_duration = 12; -**fcst_genesis** +.. _fcst_genesis: + +:ref:`fcst_genesis ` Forecast genesis event criteria. Defined as tracks reaching the specified intensity category, maximum wind speed threshold, and minimum sea-level @@ -963,8 +1048,10 @@ track point where all of these criteria are met. mslp_thresh = NA; } -**best_genesis** - +.. _best_genesis: + +:ref:`best_genesis ` + BEST track genesis event criteria. Defined as tracks reaching the specified intensity category, maximum wind speed threshold, and minimum sea-level pressure threshold. The BEST track genesis time is the valid time of the @@ -979,8 +1066,10 @@ first track point where all of these criteria are met. mslp_thresh = NA; } -**oper_genesis** - +.. _oper_genesis: + +:ref:`oper_genesis ` + Operational track genesis event criteria. Defined as tracks reaching the specified intensity category, maximum wind speed threshold, and minimum sea-level pressure threshold. The operational track genesis time is valid @@ -998,7 +1087,9 @@ time of the first track point where all of these criteria are met. Track filtering options which may be specified separately in each filter array entry ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -**filter** +.. _filter: + +:ref:`filter ` Filter is an array of dictionaries containing the track filtering options listed below. If empty, a single filter is defined using the top-level @@ -1008,15 +1099,19 @@ settings. filter = []; -**desc** - +.. _desc: + +:ref:`desc ` + Description written to output DESC column .. code-block:: none desc = "NA"; -**model** +.. _model_2: + +:ref:`model ` Forecast ATCF ID's If empty, all ATCF ID's found will be processed. @@ -1027,7 +1122,9 @@ Statistics will be generated separately for each ATCF ID. model = []; -**storm_id** +.. _storm_id_2: + +:ref:`storm_id ` BEST and operational track storm identifiers @@ -1035,7 +1132,9 @@ BEST and operational track storm identifiers storm_id = []; -**storm_name** +.. _storm_name_2: + +:ref:`storm_name ` BEST and operational track storm names @@ -1043,8 +1142,10 @@ BEST and operational track storm names storm_name = []; -**init_beg, init_end** - +.. _init_beg, init_end2: + +:ref:`init_beg, init_end ` + Forecast and operational initialization time window .. code-block:: none @@ -1052,8 +1153,10 @@ Forecast and operational initialization time window init_beg = ""; init_end = ""; -**valid_beg, valid_end** - +.. _valid_beg, valid_end_2: + +:ref:`valid_beg, valid_end ` + Forecast, BEST, and operational valid time window .. code-block:: none @@ -1061,7 +1164,9 @@ Forecast, BEST, and operational valid time window valid_beg = ""; valid_end = ""; -**init_hour** +.. _init_hour_2: + +:ref:`init_hour ` Forecast and operational initialization hours @@ -1069,7 +1174,9 @@ Forecast and operational initialization hours init_hour = []; -**lead** +.. _lead: + +:ref:`lead ` Forecast and operational lead times in hours @@ -1077,7 +1184,9 @@ Forecast and operational lead times in hours lead = []; -**vx_mask** +.. _vx_mask: + +:ref:`vx_mask ` Spatial masking region (path to gridded data file or polyline file) @@ -1085,7 +1194,9 @@ Spatial masking region (path to gridded data file or polyline file) vx_mask = ""; -**dland_thresh** +.. _dland_thresh: + +:ref:`dland_thresh ` Distance to land threshold @@ -1093,7 +1204,9 @@ Distance to land threshold dland_thresh = NA; -**genesis_window** +.. _genesis_window: + +:ref:`genesis_window ` Genesis matching time window, in hours relative to the forecast genesis time @@ -1104,7 +1217,9 @@ Genesis matching time window, in hours relative to the forecast genesis time end = 24; } -**genesis_radius** +.. _genesis_radius: + +:ref:`genesis_radius ` Genesis matching search radius in km. @@ -1115,7 +1230,9 @@ Genesis matching search radius in km. Global settings _______________ -**ci_alpha** +.. _ci_alpha: + +:ref:`ci_alpha ` Confidence interval alpha value @@ -1123,7 +1240,9 @@ Confidence interval alpha value ci_alpha = 0.05; -**output_flag** +.. _output_flag: + +:ref:`output_flag ` Statistical output types diff --git a/met/docs/Users_Guide/grid-stat.rst b/met/docs/Users_Guide/grid-stat.rst index ff5808df9c..123954bc47 100644 --- a/met/docs/Users_Guide/grid-stat.rst +++ b/met/docs/Users_Guide/grid-stat.rst @@ -224,6 +224,7 @@ __________________________ mpr_column = []; mpr_thresh = []; eclv_points = 0.05; + hss_ec_value = NA; rank_corr_flag = TRUE; tmp_dir = "/tmp"; output_prefix = ""; diff --git a/met/docs/Users_Guide/masking.rst b/met/docs/Users_Guide/masking.rst index 8181985f0b..08ef85727c 100644 --- a/met/docs/Users_Guide/masking.rst +++ b/met/docs/Users_Guide/masking.rst @@ -21,7 +21,7 @@ The usage statement for the Gen-Vx-Mask tool is shown below: input_grid mask_file out_file - [-type str] + -type str [-input_field string] [-mask_field string] [-complement] @@ -36,7 +36,7 @@ The usage statement for the Gen-Vx-Mask tool is shown below: [-v level] [-compress level] -gen_vx_mask has three required arguments and can take optional ones. +gen_vx_mask has four required arguments and can take optional ones. Note, -type string (masking type) was previously optional but is now required. Required arguments for gen_vx_mask ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -57,11 +57,11 @@ Required arguments for gen_vx_mask 3. The **out_file** argument is the output NetCDF mask file to be written. +4. The **-type string** is required to set the masking type. The application will give an error message and exit if "-type string" is not specified on the command line. See description of supported types below. + Optional arguments for gen_vx_mask ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -4. The **-type string** option can be used to override the default masking type (poly). See description of supported types below. - 5. The **-input_field string** option can be used to read existing mask data from “input_file”. 6. The **-mask_field string** option can be used to define the field from “mask_file” to be used for “data” masking. diff --git a/met/docs/Users_Guide/point-stat.rst b/met/docs/Users_Guide/point-stat.rst index bfbbc53fba..a1a7cdd9cf 100644 --- a/met/docs/Users_Guide/point-stat.rst +++ b/met/docs/Users_Guide/point-stat.rst @@ -337,6 +337,7 @@ ________________________ mpr_column = []; mpr_thresh = []; eclv_points = 0.05; + hss_ec_value = NA; rank_corr_flag = TRUE; sid_inc = []; sid_exc = []; @@ -873,9 +874,12 @@ The first set of header columns are common to all of the output files generated * - 26 - N_CAT - Dimension of the contingency table - * - 27 + * - 28 - Fi_Oj - Count of events in forecast category i and observation category j, with the observations incrementing first (repeated) + * - \* + - EC_VALUE + - Expected correct rate, used for MCTS HSS_EC .. role:: raw-html(raw) @@ -914,6 +918,12 @@ The first set of header columns are common to all of the output files generated * - 38-40 - GER, :raw-html:`
` GER_BCL, :raw-html:`
` GER_BCU - Gerrity Score and bootstrap confidence limits + * - 41-43 + - HSS_EC, :raw-html:`
` HSS_EC_BCL, :raw-html:`
` HSS_EC_BCU + - Heidke Skill Score with user-specific expected correct and bootstrap confidence limits + * - 44 + - EC_VALUE + - Expected correct rate, used for MCTS HSS_EC .. _table_PS_format_info_PCT: @@ -1081,7 +1091,7 @@ The first set of header columns are common to all of the output files generated * - 29 - POFD_i - Probability of false detection when forecast is greater than the ith probability thresholds (repeated) - * - * + * - \* - THRESH_n - Last probability threshold value diff --git a/met/docs/Users_Guide/refs.rst b/met/docs/Users_Guide/refs.rst index 7e02dcb6d1..a039a91ab8 100644 --- a/met/docs/Users_Guide/refs.rst +++ b/met/docs/Users_Guide/refs.rst @@ -176,6 +176,13 @@ References | verification. *Monthly Weather Review*, 115, 1330-1338. | +.. _Ou-2016: + +| Ou, M. H., Charles, M., & Collins, D. C. 2016: Sensitivity of calibrated week-2 +| probabilistic forecast skill to reforecast sampling of the NCEP global +| ensemble forecast system. *Weather and Forecasting,* 31(4), 1093-1107. +| + .. _Roberts-2008: | Roberts, N.M., and H.W. Lean, 2008: Scale-selective verification of rainfall diff --git a/met/docs/Users_Guide/release-notes.rst b/met/docs/Users_Guide/release-notes.rst index 70d1a1a028..187c21fc93 100644 --- a/met/docs/Users_Guide/release-notes.rst +++ b/met/docs/Users_Guide/release-notes.rst @@ -5,8 +5,19 @@ When applicable, release notes are followed by the GitHub issue number which describes the bugfix, enhancement, or new feature: `MET GitHub issues. `_ -MET Version |version| release notes (|release_date|) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +MET Version 10.1.0-beta1 release notes (|release_date|) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +* Add the HSS_EC statistic to the MCTS line type and a configurable option for its computation (`#1749 `_). +* Implement a common API for reading and writing the common NetCDF point observation file format (`#1402 `_ and `#1581 `_). +* Change -type for gen_vx_mask from an optional argument to a required one (`#1792 `_). +* Fix python embedding when using a named grid with MET_PYTHON_EXE set (`#1798 `_). +* Fix Fortify High finding for src/libcode/vx_data2d_nccf/nccf_file.cc (`#1795 `_). +* Modify plot_tcmpr.R script to support plotting of extra-tropical cyclone tracks not verified against BEST tracks (`#1801 `_). +* Add anchors to link directly to configuration items in the MET User's Guide (`#1811 `_). + +MET Version 10.0.0 release notes (20210510) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * Repository and build: @@ -21,8 +32,8 @@ MET Version |version| release notes (|release_date|) * Correct the time offset for tests in unit_plot_data_plane.xml (`#1677 `_). * Enhance the sample plotting R-script to read output from different versions of MET (`#1653 `_). * Update the default configuration options to compile the development code with the debug (-g) option and the production code without it (`#1788 `_). - * Update MET to compile using GCC version 10 (`#1552 https://github.com/dtcenter/MET/issues/1552`_). - * Update MET to compile using PGI version 20 (`#1317 https://github.com/dtcenter/MET/issues/1317`_). + * Update MET to compile using GCC version 10 (`#1552 `_). + * Update MET to compile using PGI version 20 (`#1317 `_). * Documentation: diff --git a/met/docs/Users_Guide/series-analysis.rst b/met/docs/Users_Guide/series-analysis.rst index bed3367d58..26e7e200ea 100644 --- a/met/docs/Users_Guide/series-analysis.rst +++ b/met/docs/Users_Guide/series-analysis.rst @@ -110,6 +110,7 @@ ____________________ boot = { interval = PCTILE; rep_prop = 1.0; n_rep = 1000; rng = "mt19937"; seed = ""; } mask = { grid = [ "FULL" ]; poly = []; } + hss_ec_value = NA; rank_corr_flag = TRUE; tmp_dir = "/tmp"; version = "VN.N"; diff --git a/met/docs/Users_Guide/stat-analysis.rst b/met/docs/Users_Guide/stat-analysis.rst index 5d3d998fb9..d12ae5746a 100644 --- a/met/docs/Users_Guide/stat-analysis.rst +++ b/met/docs/Users_Guide/stat-analysis.rst @@ -268,6 +268,7 @@ ________________________ boot = { interval = PCTILE; rep_prop = 1.0; n_rep = 1000; rng = "mt19937"; seed = ""; } + hss_ec_value = NA; rank_corr_flag = TRUE; tmp_dir = "/tmp"; version = "VN.N"; diff --git a/met/docs/conf.py b/met/docs/conf.py index 814c69634c..3fe33bf60d 100644 --- a/met/docs/conf.py +++ b/met/docs/conf.py @@ -20,11 +20,11 @@ project = 'MET' author = 'UCAR/NCAR, NOAA, CSU/CIRA, and CU/CIRES' author_list = 'Halley Gotway, J., K. Newman, H. Soh, J. Opatz, T. Jensen, J. Prestopnik, L. Goodrich, D. Fillmore, B. Brown, R. Bullock, T. Fowler' -version = 'develop' +version = '10.1.0-beta1' verinfo = version release = f'{version}' release_year = '2021' -release_date = f'{release_year}-05-10' +release_date = f'{release_year}-06-11' copyright = f'{release_year}, {author}' # -- General configuration --------------------------------------------------- diff --git a/met/scripts/config/EnsembleStatConfig b/met/scripts/config/EnsembleStatConfig index 506e5eea3b..c09cb523e8 100644 --- a/met/scripts/config/EnsembleStatConfig +++ b/met/scripts/config/EnsembleStatConfig @@ -302,6 +302,6 @@ rng = { grid_weight_flag = NONE; output_prefix = ""; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/scripts/config/GridStatConfig_APCP_12 b/met/scripts/config/GridStatConfig_APCP_12 index f4308d3bca..e63c3a3d23 100644 --- a/met/scripts/config/GridStatConfig_APCP_12 +++ b/met/scripts/config/GridStatConfig_APCP_12 @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -210,6 +211,6 @@ nc_pairs_flag = { grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = "APCP_12"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/scripts/config/GridStatConfig_APCP_24 b/met/scripts/config/GridStatConfig_APCP_24 index af2cf4f003..9ad9e8bb53 100644 --- a/met/scripts/config/GridStatConfig_APCP_24 +++ b/met/scripts/config/GridStatConfig_APCP_24 @@ -22,7 +22,7 @@ desc = "NA"; // obtype = "MC_PCP"; -//////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////////f // // Verification grid @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -220,6 +221,6 @@ nc_pairs_flag = { grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = "APCP_24"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/scripts/config/GridStatConfig_POP_12 b/met/scripts/config/GridStatConfig_POP_12 index c46f639b94..20c48f59a6 100644 --- a/met/scripts/config/GridStatConfig_POP_12 +++ b/met/scripts/config/GridStatConfig_POP_12 @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -220,6 +221,6 @@ nc_pairs_flag = { grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = "POP_12"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/scripts/config/GridStatConfig_all b/met/scripts/config/GridStatConfig_all index 9360adca0a..901ec29565 100644 --- a/met/scripts/config/GridStatConfig_all +++ b/met/scripts/config/GridStatConfig_all @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -251,6 +252,6 @@ nc_pairs_flag = { grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = ""; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/scripts/config/MODEAnalysisConfig b/met/scripts/config/MODEAnalysisConfig index f068a4161a..c305e257e4 100644 --- a/met/scripts/config/MODEAnalysisConfig +++ b/met/scripts/config/MODEAnalysisConfig @@ -186,6 +186,6 @@ simple = TRUE; //////////////////////////////////////////////////////////////////////////////// -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/scripts/config/MODEConfig_APCP_12 b/met/scripts/config/MODEConfig_APCP_12 index ae652f395a..2eed350075 100644 --- a/met/scripts/config/MODEConfig_APCP_12 +++ b/met/scripts/config/MODEConfig_APCP_12 @@ -240,6 +240,6 @@ shift_right = 0; // grid squares //////////////////////////////////////////////////////////////////////////////// output_prefix = ""; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/scripts/config/MODEConfig_APCP_24 b/met/scripts/config/MODEConfig_APCP_24 index 05f512a8b5..b9e9ee910d 100644 --- a/met/scripts/config/MODEConfig_APCP_24 +++ b/met/scripts/config/MODEConfig_APCP_24 @@ -246,6 +246,6 @@ shift_right = 0; // grid squares //////////////////////////////////////////////////////////////////////////////// output_prefix = ""; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/scripts/config/MODEConfig_RH b/met/scripts/config/MODEConfig_RH index a0f492a964..18ff0de05f 100644 --- a/met/scripts/config/MODEConfig_RH +++ b/met/scripts/config/MODEConfig_RH @@ -242,6 +242,6 @@ shift_right = 0; // grid squares //////////////////////////////////////////////////////////////////////////////// output_prefix = ""; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/scripts/config/PB2NCConfig_G212 b/met/scripts/config/PB2NCConfig_G212 index 2a5e1dce07..d5fbe9c141 100644 --- a/met/scripts/config/PB2NCConfig_G212 +++ b/met/scripts/config/PB2NCConfig_G212 @@ -94,6 +94,6 @@ event_stack_flag = TOP; //////////////////////////////////////////////////////////////////////////////// tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/scripts/config/PointStatConfig b/met/scripts/config/PointStatConfig index 159e9ae1b8..6df8e67daf 100644 --- a/met/scripts/config/PointStatConfig +++ b/met/scripts/config/PointStatConfig @@ -209,6 +209,6 @@ output_flag = { rank_corr_flag = TRUE; tmp_dir = "/tmp"; output_prefix = ""; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/scripts/config/STATAnalysisConfig b/met/scripts/config/STATAnalysisConfig index 4189ff537d..6ff87047e5 100644 --- a/met/scripts/config/STATAnalysisConfig +++ b/met/scripts/config/STATAnalysisConfig @@ -104,9 +104,10 @@ boot = { //////////////////////////////////////////////////////////////////////////////// +hss_ec_value = NA; rank_corr_flag = TRUE; vif_flag = FALSE; tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/scripts/config/WaveletStatConfig_APCP_12 b/met/scripts/config/WaveletStatConfig_APCP_12 index ce14725a80..8abdaddb57 100644 --- a/met/scripts/config/WaveletStatConfig_APCP_12 +++ b/met/scripts/config/WaveletStatConfig_APCP_12 @@ -144,6 +144,6 @@ wvlt_plot = { //////////////////////////////////////////////////////////////////////////////// output_prefix = ""; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/scripts/config/WaveletStatConfig_APCP_12_NC b/met/scripts/config/WaveletStatConfig_APCP_12_NC index d8da0a3646..2598e74883 100644 --- a/met/scripts/config/WaveletStatConfig_APCP_12_NC +++ b/met/scripts/config/WaveletStatConfig_APCP_12_NC @@ -136,6 +136,6 @@ wvlt_plot = { //////////////////////////////////////////////////////////////////////////////// output_prefix = ""; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/met/scripts/examples/test_gen_vx_mask.sh b/met/scripts/examples/test_gen_vx_mask.sh index b7730910bd..b1edab42a2 100755 --- a/met/scripts/examples/test_gen_vx_mask.sh +++ b/met/scripts/examples/test_gen_vx_mask.sh @@ -5,7 +5,8 @@ echo "*** Running Gen-Vx-Mask to generate a polyline mask file for the Continent gen_vx_mask \ ../data/sample_fcst/2005080700/wrfprs_ruc13_24.tm00_G212 \ $MET_BASE/poly/CONUS.poly \ - ${TEST_OUT_DIR}/gen_vx_mask/CONUS_poly.nc -v 2 + ${TEST_OUT_DIR}/gen_vx_mask/CONUS_poly.nc \ + -type poly -v 2 echo echo "*** Running Gen-Vx-Mask to generate a circle mask file ***" diff --git a/met/scripts/mk/gen_vx_mask.mk b/met/scripts/mk/gen_vx_mask.mk index 3020041b0b..136dadb1e5 100644 --- a/met/scripts/mk/gen_vx_mask.mk +++ b/met/scripts/mk/gen_vx_mask.mk @@ -23,7 +23,7 @@ gen_vx_mask: ${GEN_VX_MASK_EXEC} ${GEN_VX_MASK_EXEC} \ ../data/sample_fcst/2005080700/wrfprs_ruc13_24.tm00_G212 \ ../data/poly/CONUS.poly \ - ${TEST_OUT_DIR}/gen_vx_mask/CONUS_poly.nc -v 2 + ${TEST_OUT_DIR}/gen_vx_mask/CONUS_poly.nc -type poly -v 2 @ echo echo "*** Running Gen-Vx-Mask to generate a circle mask file ***" diff --git a/met/src/basic/vx_config/config_constants.h b/met/src/basic/vx_config/config_constants.h index 2bb5acbeb8..d3b8773e58 100644 --- a/met/src/basic/vx_config/config_constants.h +++ b/met/src/basic/vx_config/config_constants.h @@ -591,6 +591,7 @@ static const char conf_key_duplicate_flag[] = "duplicate_flag"; static const char conf_key_obs_summary[] = "obs_summary"; static const char conf_key_percentile[] = "obs_perc_value"; static const char conf_key_rank_corr_flag[] = "rank_corr_flag"; +static const char conf_key_hss_ec_value[] = "hss_ec_value"; static const char conf_key_tmp_dir[] = "tmp_dir"; static const char conf_key_output_prefix[] = "output_prefix"; static const char conf_key_met_data_dir[] = "met_data_dir"; diff --git a/met/src/basic/vx_util/ascii_header.cc b/met/src/basic/vx_util/ascii_header.cc index 48a967e84d..3e171cdacb 100644 --- a/met/src/basic/vx_util/ascii_header.cc +++ b/met/src/basic/vx_util/ascii_header.cc @@ -240,9 +240,18 @@ int AsciiHeaderLine::col_offset(const char *name, const int dim) const { // Fixed columns after variable ones else if(match >= (VarBegOffset + NVarCols)) { - offset = match + // Matching column offset - (dim * NVarCols) - // Plus total of variable columns - NVarCols; // Minus variable column names + + // Handle MCTC special case for dim*dim + if(is_mctc()) { + offset = match + // Matching column offset + (dim * dim * NVarCols) - // Plus total of variable columns + NVarCols; // Minus variable column names + } + else { + offset = match + // Matching column offset + (dim * NVarCols) - // Plus total of variable columns + NVarCols; // Minus variable column names + } } // Variable columns diff --git a/met/src/basic/vx_util/stat_column_defs.h b/met/src/basic/vx_util/stat_column_defs.h index 0aad50d004..d34fa22fdd 100644 --- a/met/src/basic/vx_util/stat_column_defs.h +++ b/met/src/basic/vx_util/stat_column_defs.h @@ -64,7 +64,7 @@ static const char * cts_columns [] = { }; static const char * mctc_columns [] = { - "TOTAL", "N_CAT" + "TOTAL", "N_CAT", "Fi_Oj", "EC_VALUE" }; static const char * mcts_columns [] = { @@ -72,7 +72,8 @@ static const char * mcts_columns [] = { "ACC", "ACC_NCL", "ACC_NCU", "ACC_BCL", "ACC_BCU", "HK", "HK_BCL", "HK_BCU", "HSS", "HSS_BCL", "HSS_BCU", - "GER", "GER_BCL", "GER_BCU" + "GER", "GER_BCL", "GER_BCU", + "HSS_EC", "HSS_EC_BCL", "HSS_EC_BCU", "EC_VALUE" }; static const char * cnt_columns [] = { @@ -415,11 +416,11 @@ static const int n_genmpr_columns = sizeof(genmpr_columns)/sizeof(*genmpr_ //////////////////////////////////////////////////////////////////////// -inline int get_n_mctc_columns (int n) { return(2 + n*n); } -inline int get_n_pct_columns (int n) { return(3 + 3*(max(1, n)-1)); } -inline int get_n_pstd_columns (int n) { return(17 + max(1, n) ); } -inline int get_n_pjc_columns (int n) { return(3 + 7*(max(1, n)-1)); } -inline int get_n_prc_columns (int n) { return(3 + 3*(max(1, n)-1)); } +inline int get_n_mctc_columns (int n) { return(3 + n*n); } // n = N_CAT +inline int get_n_pct_columns (int n) { return(3 + 3*(max(1, n)-1)); } // n = N_THRESH +inline int get_n_pstd_columns (int n) { return(17 + max(1, n) ); } // n = N_THRESH +inline int get_n_pjc_columns (int n) { return(3 + 7*(max(1, n)-1)); } // n = N_THRESH +inline int get_n_prc_columns (int n) { return(3 + 3*(max(1, n)-1)); } // n = N_THRESH inline int get_n_eclv_columns (int n) { return(4 + 2*n); } // n = N_PNT inline int get_n_rhist_columns (int n) { return(2 + n); } // n = N_RANK inline int get_n_phist_columns (int n) { return(3 + n); } // n = N_BINS diff --git a/met/src/basic/vx_util/util_constants.h b/met/src/basic/vx_util/util_constants.h index a83e4717a6..ade03d5840 100644 --- a/met/src/basic/vx_util/util_constants.h +++ b/met/src/basic/vx_util/util_constants.h @@ -18,6 +18,7 @@ //////////////////////////////////////////////////////////////////////// // Released versions of MET +static const char met_version_10_1_0[] = "V10.1.0"; static const char met_version_10_0_0[] = "V10.0.0"; static const char met_version_9_1[] = "V9.1"; static const char met_version_9_0[] = "V9.0"; @@ -39,7 +40,7 @@ static const char met_version_1_1[] = "V1.1"; //////////////////////////////////////////////////////////////////////// -static const char * const met_version = met_version_10_0_0; +static const char * const met_version = met_version_10_1_0; static const char default_met_data_dir[] = "MET_BASE"; static const char txt_file_ext[] = ".txt"; static const char stat_file_ext[] = ".stat"; diff --git a/met/src/libcode/vx_analysis_util/stat_job.cc b/met/src/libcode/vx_analysis_util/stat_job.cc index 826c61806d..dcd03688dc 100644 --- a/met/src/libcode/vx_analysis_util/stat_job.cc +++ b/met/src/libcode/vx_analysis_util/stat_job.cc @@ -202,6 +202,7 @@ void STATAnalysisJob::clear() { boot_interval = bad_data_int; boot_rep_prop = bad_data_double; n_boot_rep = bad_data_int; + hss_ec_value = bad_data_double; rank_corr_flag = false; vif_flag = false; @@ -344,6 +345,7 @@ void STATAnalysisJob::assign(const STATAnalysisJob & aj) { boot_rep_prop = aj.boot_rep_prop; n_boot_rep = aj.n_boot_rep; + hss_ec_value = aj.hss_ec_value; rank_corr_flag = aj.rank_corr_flag; vif_flag = aj.vif_flag; @@ -626,6 +628,9 @@ void STATAnalysisJob::dump(ostream & out, int depth) const { out << prefix << "boot_seed = " << boot_seed << "\n"; + out << prefix << "hss_ec_value = " + << hss_ec_value << "\n"; + out << prefix << "rank_corr_flag = " << rank_corr_flag << "\n"; @@ -1601,6 +1606,10 @@ void STATAnalysisJob::parse_job_command(const char *jobstring) { set_boot_seed(jc_array[i+1].c_str()); i++; } + else if(jc_array[i] == "-hss_ec_value") { + hss_ec_value = atof(jc_array[i+1].c_str()); + i++; + } else if(jc_array[i] == "-rank_corr_flag") { rank_corr_flag = atoi(jc_array[i+1].c_str()); i++; @@ -2767,6 +2776,15 @@ ConcatString STATAnalysisJob::get_jobstring() const { } } + // Jobs which write MCTC or MCTS output + if(!is_bad_data(hss_ec_value) && + (out_line_type.has(stat_mctc_str) || + out_line_type.has(stat_mcts_str))) { + + // hss_ec_value + js << "-hss_ec_value " << hss_ec_value << " "; + } + // Jobs which compute rank correlations if(out_line_type.has(stat_cnt_str)) { diff --git a/met/src/libcode/vx_analysis_util/stat_job.h b/met/src/libcode/vx_analysis_util/stat_job.h index e07b962519..72254bef5c 100644 --- a/met/src/libcode/vx_analysis_util/stat_job.h +++ b/met/src/libcode/vx_analysis_util/stat_job.h @@ -323,6 +323,11 @@ class STATAnalysisJob { char *boot_rng; char *boot_seed; + // + // MCTS HSS Expected Correct rate + // + double hss_ec_value; + // // Rank correlation flag // diff --git a/met/src/libcode/vx_stat_out/stat_columns.cc b/met/src/libcode/vx_stat_out/stat_columns.cc index 49b274da18..8c24ba7153 100644 --- a/met/src/libcode/vx_stat_out/stat_columns.cc +++ b/met/src/libcode/vx_stat_out/stat_columns.cc @@ -134,7 +134,7 @@ void write_mctc_header_row(int hdr_flag, int n_cat, AsciiTable &at, at.set_entry(r, c+1, (string)mctc_columns[1]); // Write Fi_Oj for each cell of the NxN table - for(i=0, col=c+2; i " + << "the expected correct values do not match: " + << ECvalue << " != " << t.ECvalue << "\n\n"; + + exit ( 1 ); + +} + if ( E ) { for ( int i=0; isize(); ++i ) (*E)[i] += (*t.E)[i]; } @@ -137,7 +147,8 @@ void ContingencyTable::clear() { if (E) delete E; E = new vector(); - + + ECvalue = bad_data_double; Name.clear(); Nrows = Ncols = 0; @@ -160,6 +171,7 @@ void ContingencyTable::assign(const ContingencyTable & t) if (E) delete E; E = new vector(*(t.E)); + ECvalue = t.ECvalue; Name = t.Name; // @@ -198,14 +210,14 @@ int r, c; Indent prefix(depth); ConcatString junk; -out << prefix << "Name = "; +out << prefix << "Name = "; if ( Name.length() > 0 ) out << '\"' << Name << "\"\n"; else out << "(nul)\n"; -out << prefix << "Nrows = " << Nrows << "\n"; -out << prefix << "Ncols = " << Ncols << "\n"; - +out << prefix << "Nrows = " << Nrows << "\n"; +out << prefix << "Ncols = " << Ncols << "\n"; +out << prefix << "ECvalue = " << ECvalue << "\n"; out << prefix << "\n"; if ( E->empty() ) { out.flush(); return; } @@ -497,6 +509,20 @@ return; //////////////////////////////////////////////////////////////////////// +void ContingencyTable::set_ec_value(double v) + +{ + +ECvalue = v; + +return; + +} + + +//////////////////////////////////////////////////////////////////////// + + void ContingencyTable::set_name(const char * text) { diff --git a/met/src/libcode/vx_statistics/contable.h b/met/src/libcode/vx_statistics/contable.h index dd7dd05ca5..c7b2602dd1 100644 --- a/met/src/libcode/vx_statistics/contable.h +++ b/met/src/libcode/vx_statistics/contable.h @@ -53,6 +53,8 @@ class ContingencyTable { int Nrows; int Ncols; + double ECvalue; + ConcatString Name; public: @@ -82,6 +84,7 @@ class ContingencyTable { virtual void set_size(int); virtual void set_size(int NR, int NC); + void set_ec_value(double); void set_name(const char *); // @@ -91,6 +94,7 @@ class ContingencyTable { int nrows() const; int ncols() const; + double ec_value() const; ConcatString name() const; // @@ -125,6 +129,7 @@ class ContingencyTable { virtual double gaccuracy () const; virtual double gheidke () const; + virtual double gheidke_ec(double) const; virtual double gkuiper () const; virtual double gerrity () const; @@ -137,7 +142,8 @@ class ContingencyTable { inline int ContingencyTable::nrows() const { return ( Nrows ); } inline int ContingencyTable::ncols() const { return ( Ncols ); } -inline ConcatString ContingencyTable::name() const { return ( Name ); } +inline double ContingencyTable::ec_value() const { return ( ECvalue ); } +inline ConcatString ContingencyTable::name() const { return ( Name ); } //////////////////////////////////////////////////////////////////////// diff --git a/met/src/libcode/vx_statistics/contable_stats.cc b/met/src/libcode/vx_statistics/contable_stats.cc index eb51399d43..ab06b0bc6d 100644 --- a/met/src/libcode/vx_statistics/contable_stats.cc +++ b/met/src/libcode/vx_statistics/contable_stats.cc @@ -775,7 +775,8 @@ double ContingencyTable::gaccuracy() const { if ( Nrows != Ncols ) { - mlog << Error << "\nContingencyTable::gaccuracy() -> table not square!\n\n"; + mlog << Error << "\nContingencyTable::gaccuracy() -> " + << "table not square!\n\n"; exit ( 1 ); @@ -795,13 +796,14 @@ double ContingencyTable::gaccuracy() const { //////////////////////////////////////////////////////////////////////// -double ContingencyTable::gheidke()const // Reference: Eq. 7.11, page 249 in Wilks, 1st Ed. +double ContingencyTable::gheidke() const // Reference: Eq. 7.11, page 249 in Wilks, 1st Ed. { if ( Nrows != Ncols ) { - mlog << Error << "\nContingencyTable::gheidke() -> table not square!\n\n"; + mlog << Error << "\nContingencyTable::gheidke() -> " + << "table not square!\n\n"; exit ( 1 ); @@ -811,7 +813,8 @@ const int N = total(); if ( N == 0 ) { - mlog << Error << "\nContingencyTable::gheidke() -> table empty!\n\n"; + mlog << Error << "\nContingencyTable::gheidke() -> " + << "table empty!\n\n"; exit ( 1 ); @@ -875,16 +878,98 @@ return ( ans ); } +//////////////////////////////////////////////////////////////////////// +// +// Reference: +// Ou et al., 2016: Sensitivity of Calibrated Week-2 Probabilistic +// Forecast Skill to Reforecast Sampling of the NCEP Global +// Ensemble Forecast System. +// Weather and Forecasting, 31, 1093-1107. +// +//////////////////////////////////////////////////////////////////////// + +double ContingencyTable::gheidke_ec(double ec_value) const + +{ + +if ( Nrows != Ncols ) { + + mlog << Error << "\nContingencyTable::gheidke_ec(double) -> " + << "table not square!\n\n"; + + exit ( 1 ); + +} + +if ( ec_value < 0.0 || ec_value >= 1.0 ) { + + mlog << Error << "\nContingencyTable::gheidke_ec(double) -> " + << "ec_value (" << ec_value << ") must be >=0 and <1.0!\n\n"; + + exit ( 1 ); + +} + +const int N = total(); + +if ( N == 0 ) { + + mlog << Error << "\nContingencyTable::gheidke_ec(double) -> " + << "table empty!\n\n"; + + exit ( 1 ); + +} + +int j, sum; +double num, denom, ans; + + // + // sum counts on the diagonal + // + +for (j=0, sum=0; j table not square!\n\n"; + mlog << Error << "\nContingencyTable::gkuiper() -> " + << "table not square!\n\n"; exit ( 1 ); @@ -894,7 +979,8 @@ const int N = total(); if ( N == 0 ) { - mlog << Error << "\nContingencyTable::gkuiper() -> table empty!\n\n"; + mlog << Error << "\nContingencyTable::gkuiper() -> " + << "table empty!\n\n"; exit ( 1 ); @@ -982,7 +1068,8 @@ double ContingencyTable::gerrity() const // Reference: Pages 84-91 in if ( Nrows != Ncols ) { - mlog << Error << "\nContingencyTable::gerrity() -> table not square!\n\n"; + mlog << Error << "\nContingencyTable::gerrity() -> " + << "table not square!\n\n"; exit ( 1 ); @@ -992,7 +1079,8 @@ const int N = total(); if ( N == 0 ) { - mlog << Error << "\nContingencyTable::gerrity() -> table empty!\n\n"; + mlog << Error << "\nContingencyTable::gerrity() -> " + << "table empty!\n\n"; exit ( 1 ); diff --git a/met/src/libcode/vx_statistics/met_stats.cc b/met/src/libcode/vx_statistics/met_stats.cc index a01b8a57eb..c65310d3aa 100644 --- a/met/src/libcode/vx_statistics/met_stats.cc +++ b/met/src/libcode/vx_statistics/met_stats.cc @@ -523,6 +523,7 @@ void MCTSInfo::clear() { acc.clear(); hk.clear(); hss.clear(); + hss_ec.clear(); ger.clear(); return; @@ -545,6 +546,7 @@ void MCTSInfo::assign(const MCTSInfo &c) { acc = c.acc; hk = c.hk; hss = c.hss; + hss_ec = c.hss_ec; ger = c.ger; return; @@ -569,6 +571,7 @@ void MCTSInfo::allocate_n_alpha(int i) { acc.allocate_n_alpha(n_alpha); hk.allocate_n_alpha(n_alpha); hss.allocate_n_alpha(n_alpha); + hss_ec.allocate_n_alpha(n_alpha); ger.allocate_n_alpha(n_alpha); } @@ -623,10 +626,19 @@ void MCTSInfo::add(double f, double o, double cmn, double csd) { void MCTSInfo::compute_stats() { - acc.v = cts.gaccuracy(); - hk.v = cts.gkuiper(); - hss.v = cts.gheidke(); - ger.v = cts.gerrity(); + // + // Define the HSS expected correct value, if needed. + // Default to 1 divided by the number of categories. + // + if(is_bad_data(cts.ec_value()) && cts.nrows() > 0) { + cts.set_ec_value(1.0/cts.nrows()); + } + + acc.v = cts.gaccuracy(); + hk.v = cts.gkuiper(); + hss.v = cts.gheidke(); + hss_ec.v = cts.gheidke_ec(cts.ec_value()); + ger.v = cts.gerrity(); return; } diff --git a/met/src/libcode/vx_statistics/met_stats.h b/met/src/libcode/vx_statistics/met_stats.h index 93c1c60020..38d5b3bafd 100644 --- a/met/src/libcode/vx_statistics/met_stats.h +++ b/met/src/libcode/vx_statistics/met_stats.h @@ -128,7 +128,7 @@ class MCTSInfo { ThreshArray fthresh; ThreshArray othresh; - CIInfo acc, hk, hss, ger; + CIInfo acc, hk, hss, hss_ec, ger; void clear(); void allocate_n_alpha(int); diff --git a/met/src/tools/core/grid_stat/grid_stat.cc b/met/src/tools/core/grid_stat/grid_stat.cc index 310677504d..1d75923bf3 100644 --- a/met/src/tools/core/grid_stat/grid_stat.cc +++ b/met/src/tools/core/grid_stat/grid_stat.cc @@ -108,6 +108,7 @@ // nc_pairs_var_str to nc_pairs_var_suffix. // 051 03/28/21 Halley Gotway Add mpr_column and mpr_thresh // filtering options. +// 052 05/28/21 Halley Gotway Add MCTS HSS_EC output. // //////////////////////////////////////////////////////////////////////// @@ -1896,6 +1897,7 @@ void do_mcts(MCTSInfo &mcts_info, int i_vx, // Set up the MCTSInfo size, thresholds, and alpha values // mcts_info.cts.set_size(conf_info.vx_opt[i_vx].fcat_ta.n() + 1); + mcts_info.cts.set_ec_value(conf_info.vx_opt[i_vx].hss_ec_value); mcts_info.set_fthresh(conf_info.vx_opt[i_vx].fcat_ta); mcts_info.set_othresh(conf_info.vx_opt[i_vx].ocat_ta); mcts_info.allocate_n_alpha(conf_info.vx_opt[i_vx].get_n_ci_alpha()); diff --git a/met/src/tools/core/grid_stat/grid_stat_conf_info.cc b/met/src/tools/core/grid_stat/grid_stat_conf_info.cc index 20b1dec99e..0bae27039c 100644 --- a/met/src/tools/core/grid_stat/grid_stat_conf_info.cc +++ b/met/src/tools/core/grid_stat/grid_stat_conf_info.cc @@ -529,6 +529,7 @@ void GridStatVxOpt::clear() { grad_dx.clear(); grad_dy.clear(); + hss_ec_value = bad_data_double; rank_corr_flag = false; for(i=0; i " << "unsupported column name requested \"" << c diff --git a/met/src/tools/core/series_analysis/series_analysis_conf_info.cc b/met/src/tools/core/series_analysis/series_analysis_conf_info.cc index ecd221b6ce..0920787d0f 100644 --- a/met/src/tools/core/series_analysis/series_analysis_conf_info.cc +++ b/met/src/tools/core/series_analysis/series_analysis_conf_info.cc @@ -81,6 +81,7 @@ void SeriesAnalysisConfInfo::clear() { mask_area.clear(); block_size = bad_data_int; vld_data_thresh = bad_data_double; + hss_ec_value = bad_data_double; rank_corr_flag = false; tmp_dir.clear(); version.clear(); @@ -424,6 +425,9 @@ void SeriesAnalysisConfInfo::process_config(GrdFileType ftype, boot_rng = boot_info.rng; boot_seed = boot_info.seed; + // Conf: hss_ec_value + hss_ec_value = conf.lookup_double(conf_key_hss_ec_value); + // Conf: rank_corr_flag rank_corr_flag = conf.lookup_bool(conf_key_rank_corr_flag); diff --git a/met/src/tools/core/series_analysis/series_analysis_conf_info.h b/met/src/tools/core/series_analysis/series_analysis_conf_info.h index 05ed960108..339de45ef4 100644 --- a/met/src/tools/core/series_analysis/series_analysis_conf_info.h +++ b/met/src/tools/core/series_analysis/series_analysis_conf_info.h @@ -72,6 +72,7 @@ class SeriesAnalysisConfInfo { int block_size; // Number of grid points to read concurrently double vld_data_thresh; // Minimum valid data ratio for each point + double hss_ec_value; // MCTS HSS expected correct value bool rank_corr_flag; // Flag for computing rank correlations ConcatString tmp_dir; // Directory for temporary files diff --git a/met/src/tools/core/stat_analysis/aggr_stat_line.cc b/met/src/tools/core/stat_analysis/aggr_stat_line.cc index 6d7d952956..e6f621feb0 100644 --- a/met/src/tools/core/stat_analysis/aggr_stat_line.cc +++ b/met/src/tools/core/stat_analysis/aggr_stat_line.cc @@ -3425,6 +3425,7 @@ void mpr_to_mctc(STATAnalysisJob &job, const AggrMPRInfo &info, // mcts_info.clear(); mcts_info.cts.set_size(job.out_fcst_thresh.n() + 1); + mcts_info.cts.set_ec_value(job.hss_ec_value); mcts_info.set_fthresh(job.out_fcst_thresh); mcts_info.set_othresh(job.out_obs_thresh); @@ -3447,6 +3448,7 @@ void mpr_to_mcts(STATAnalysisJob &job, const AggrMPRInfo &info, // mcts_info.clear(); mcts_info.cts.set_size(job.out_fcst_thresh.n() + 1); + mcts_info.cts.set_ec_value(job.hss_ec_value); mcts_info.set_fthresh(job.out_fcst_thresh); mcts_info.set_othresh(job.out_obs_thresh); diff --git a/met/src/tools/core/stat_analysis/parse_stat_line.cc b/met/src/tools/core/stat_analysis/parse_stat_line.cc index 6f057faf3a..c62180d9f9 100644 --- a/met/src/tools/core/stat_analysis/parse_stat_line.cc +++ b/met/src/tools/core/stat_analysis/parse_stat_line.cc @@ -113,6 +113,9 @@ void parse_mctc_ctable(STATLine &l, ContingencyTable &ct) { } } + // EC_VALUE + ct.set_ec_value(atof(l.get_item("EC_VALUE"))); + return; } diff --git a/met/src/tools/core/stat_analysis/stat_analysis_job.cc b/met/src/tools/core/stat_analysis/stat_analysis_job.cc index 4f585d9e6f..451b6d785f 100644 --- a/met/src/tools/core/stat_analysis/stat_analysis_job.cc +++ b/met/src/tools/core/stat_analysis/stat_analysis_job.cc @@ -42,6 +42,7 @@ // -out_stat, but not both. // 021 04/12/21 Halley Gotway MET #1735 Support multiple // -out_thresh and -out_line_type options. +// 022 05/28/21 Halley Gotway Add MCTS HSS_EC output. // //////////////////////////////////////////////////////////////////////// @@ -113,13 +114,14 @@ void set_job_from_config(MetConfig &c, STATAnalysisJob &job) { job.out_alpha = c.lookup_double(conf_key_out_alpha, false); - boot_info = parse_conf_boot(&c); + boot_info = parse_conf_boot(&c); job.boot_interval = boot_info.interval; job.boot_rep_prop = boot_info.rep_prop; job.n_boot_rep = boot_info.n_rep; job.set_boot_rng(boot_info.rng.c_str()); job.set_boot_seed(boot_info.seed.c_str()); + job.hss_ec_value = c.lookup_double(conf_key_hss_ec_value); job.rank_corr_flag = (int) c.lookup_bool(conf_key_rank_corr_flag); job.vif_flag = (int) c.lookup_bool(conf_key_vif_flag); diff --git a/met/src/tools/other/gen_vx_mask/gen_vx_mask.cc b/met/src/tools/other/gen_vx_mask/gen_vx_mask.cc index 85bb95d2af..18eabfd993 100644 --- a/met/src/tools/other/gen_vx_mask/gen_vx_mask.cc +++ b/met/src/tools/other/gen_vx_mask/gen_vx_mask.cc @@ -24,6 +24,7 @@ // 006 07/09/18 Bullock Add shapefile masking type. // 007 04/08/19 Halley Gotway Add percentile thresholds. // 008 04/06/20 Halley Gotway Generalize input_grid option. +// 009 06/01/21 Seth Linden Change -type from optional to required // //////////////////////////////////////////////////////////////////////// @@ -138,6 +139,17 @@ void process_command_line(int argc, char **argv) { mask_filename = cline[1]; out_filename = cline[2]; + // Check for the mask type (from -type string) + if(mask_type == MaskType_None) { + mlog << Error << "\n" << program_name << " -> " + << "the -type command line requirement must be set to a specific masking type!\n" + << "\t\t \"poly\", \"box\", \"circle\", \"track\", \"grid\", " + << "\"data\", \"solar_alt\", \"solar_azi\", \"lat\", \"lon\" " + << "or \"shape\"" + << "\n\n"; + exit(1); + } + // List the input files mlog << Debug(1) << "Input Grid:\t\t" << input_gridname << "\n" @@ -1340,7 +1352,7 @@ void usage() { << "\tinput_grid\n" << "\tmask_file\n" << "\tout_file\n" - << "\t[-type string]\n" + << "\t-type string\n" << "\t[-input_field string]\n" << "\t[-mask_field string]\n" << "\t[-complement]\n" @@ -1380,12 +1392,12 @@ void usage() { << "\t\t\"out_file\" is the output NetCDF mask file to be " << "written (required).\n" - << "\t\t\"-type string\" overrides the default masking type (" - << masktype_to_string(default_mask_type) << ") (optional)\n" + << "\t\t\"-type string\" specify the masking type " + << "(required).\n" << "\t\t \"poly\", \"box\", \"circle\", \"track\", \"grid\", " << "\"data\", \"solar_alt\", \"solar_azi\", \"lat\", \"lon\" " << "or \"shape\"\n" - + << "\t\t\"-input_field string\" reads existing mask data from " << "the \"input_grid\" gridded data file (optional).\n" @@ -1446,7 +1458,7 @@ void usage() { void set_type(const StringArray & a) { if(type_is_set) { mlog << Error << "\n" << program_name << " -> " - << "the -type command line option can only be used once!\n" + << "the -type command line requirement can only be used once!\n" << "To apply multiple masks, run this tool multiple times " << "using the output of one run as the input to the next." << "\n\n"; diff --git a/met/src/tools/other/gen_vx_mask/gen_vx_mask.h b/met/src/tools/other/gen_vx_mask/gen_vx_mask.h index d51194e5da..70181b8b4e 100644 --- a/met/src/tools/other/gen_vx_mask/gen_vx_mask.h +++ b/met/src/tools/other/gen_vx_mask/gen_vx_mask.h @@ -17,6 +17,7 @@ // 000 12/09/14 Halley Gotway New // 001 06/02/16 Halley Gotway Add box masking type. // 002 11/15/16 Halley Gotway Add solar masking types. +// 003 06/03/21 Seth Linden Changed default mask type to MaskType_None // //////////////////////////////////////////////////////////////////////// @@ -75,7 +76,7 @@ extern const char * masktype_to_string(MaskType); // //////////////////////////////////////////////////////////////////////// -static const MaskType default_mask_type = MaskType_Poly; +static const MaskType default_mask_type = MaskType_None; static const double default_mask_val = 1.0; //////////////////////////////////////////////////////////////////////// @@ -86,10 +87,10 @@ static const double default_mask_val = 1.0; // Input data file, mask file, and output NetCDF file static ConcatString input_gridname, mask_filename, out_filename; - -// Optional arguments static MaskType mask_type = default_mask_type; static bool type_is_set = false; + +// Optional arguments static ConcatString input_field_str, mask_field_str; static SetLogic set_logic = SetLogic_None; static bool complement = false; diff --git a/scripts/fortify/run_nightly.sh b/scripts/fortify/run_nightly.sh index 19be9df4c8..85a400bd81 100755 --- a/scripts/fortify/run_nightly.sh +++ b/scripts/fortify/run_nightly.sh @@ -20,7 +20,7 @@ #======================================================================= # Constants -EMAIL_LIST="johnhg@ucar.edu bullock@ucar.edu hsoh@ucar.edu fillmore@ucar.edu" +EMAIL_LIST="johnhg@ucar.edu hsoh@ucar.edu" KEEP_DAYS=5 function usage { diff --git a/scripts/regression/test_nightly.sh b/scripts/regression/test_nightly.sh index 434baea543..48d198e66b 100755 --- a/scripts/regression/test_nightly.sh +++ b/scripts/regression/test_nightly.sh @@ -21,7 +21,7 @@ #======================================================================= # Constants -EMAIL_LIST="johnhg@ucar.edu bullock@ucar.edu hsoh@ucar.edu fillmore@ucar.edu" +EMAIL_LIST="johnhg@ucar.edu hsoh@ucar.edu" KEEP_DAYS=5 # Usage statement diff --git a/test/config/Ascii2NcConfig.surfrad b/test/config/Ascii2NcConfig.surfrad index 5002c2d379..caca1df8b7 100644 --- a/test/config/Ascii2NcConfig.surfrad +++ b/test/config/Ascii2NcConfig.surfrad @@ -50,4 +50,4 @@ time_summary = { // Indicate a version number for the contents of this configuration file. // The value should generally not be modified. // -version = "V10.0.0"; +version = "V10.1.0"; diff --git a/test/config/Ascii2NcConfig_aeronet b/test/config/Ascii2NcConfig_aeronet index e435bf9eb5..76dd6954cc 100644 --- a/test/config/Ascii2NcConfig_aeronet +++ b/test/config/Ascii2NcConfig_aeronet @@ -46,4 +46,4 @@ message_type_map = [ // Indicate a version number for the contents of this configuration file. // The value should generally not be modified. // -version = "V10.0.0"; +version = "V10.1.0"; diff --git a/test/config/EnsembleStatConfig b/test/config/EnsembleStatConfig index 41e3dad62e..be1bae6735 100644 --- a/test/config/EnsembleStatConfig +++ b/test/config/EnsembleStatConfig @@ -242,6 +242,6 @@ rng = { grid_weight_flag = NONE; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/EnsembleStatConfig_MASK_SID b/test/config/EnsembleStatConfig_MASK_SID index c0b32d9244..6dd857db76 100644 --- a/test/config/EnsembleStatConfig_MASK_SID +++ b/test/config/EnsembleStatConfig_MASK_SID @@ -233,6 +233,6 @@ rng = { grid_weight_flag = NONE; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/EnsembleStatConfig_climo b/test/config/EnsembleStatConfig_climo index 583ce9dc86..d209f009c9 100644 --- a/test/config/EnsembleStatConfig_climo +++ b/test/config/EnsembleStatConfig_climo @@ -253,6 +253,6 @@ rng = { grid_weight_flag = NONE; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/EnsembleStatConfig_grid_weight b/test/config/EnsembleStatConfig_grid_weight index 9444ddfacb..3a40783171 100644 --- a/test/config/EnsembleStatConfig_grid_weight +++ b/test/config/EnsembleStatConfig_grid_weight @@ -245,6 +245,6 @@ rng = { grid_weight_flag = ${GRID_WEIGHT}; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/EnsembleStatConfig_one_cdf_bin b/test/config/EnsembleStatConfig_one_cdf_bin index 5e838940a9..3343bb6a2e 100644 --- a/test/config/EnsembleStatConfig_one_cdf_bin +++ b/test/config/EnsembleStatConfig_one_cdf_bin @@ -232,6 +232,6 @@ rng = { grid_weight_flag = NONE; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/EnsembleStatConfig_python b/test/config/EnsembleStatConfig_python index aa990d6c85..48eef201c6 100644 --- a/test/config/EnsembleStatConfig_python +++ b/test/config/EnsembleStatConfig_python @@ -273,6 +273,6 @@ rng = { grid_weight_flag = NONE; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/EnsembleStatConfig_qty b/test/config/EnsembleStatConfig_qty index e5bdb92f2f..83ecacdbb1 100644 --- a/test/config/EnsembleStatConfig_qty +++ b/test/config/EnsembleStatConfig_qty @@ -227,6 +227,6 @@ rng = { grid_weight_flag = NONE; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridDiagConfig b/test/config/GridDiagConfig index b2dc85319e..9ff8d0b81e 100644 --- a/test/config/GridDiagConfig +++ b/test/config/GridDiagConfig @@ -61,6 +61,6 @@ mask = { //////////////////////////////////////////////////////////////////////////////// -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridDiagConfig_APCP_06_FCST_OBS b/test/config/GridDiagConfig_APCP_06_FCST_OBS index ca0c00553b..9ddae92cf6 100644 --- a/test/config/GridDiagConfig_APCP_06_FCST_OBS +++ b/test/config/GridDiagConfig_APCP_06_FCST_OBS @@ -56,6 +56,6 @@ mask = { //////////////////////////////////////////////////////////////////////////////// -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridDiagConfig_TMP b/test/config/GridDiagConfig_TMP index 06978fb1ca..14a6c46b4a 100644 --- a/test/config/GridDiagConfig_TMP +++ b/test/config/GridDiagConfig_TMP @@ -67,6 +67,6 @@ mask = { //////////////////////////////////////////////////////////////////////////////// -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridStatConfig_APCP_regrid b/test/config/GridStatConfig_APCP_regrid index 7696febce9..dfcfbf73a7 100644 --- a/test/config/GridStatConfig_APCP_regrid +++ b/test/config/GridStatConfig_APCP_regrid @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -202,6 +203,6 @@ nc_pairs_flag = { grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridStatConfig_GRIB_lvl_typ_val b/test/config/GridStatConfig_GRIB_lvl_typ_val index 5e0f64d6a7..1b3a539f57 100644 --- a/test/config/GridStatConfig_GRIB_lvl_typ_val +++ b/test/config/GridStatConfig_GRIB_lvl_typ_val @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -299,6 +300,6 @@ nc_pairs_flag = { grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = "GRIB_lvl_typ_val"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridStatConfig_GRIB_set_attr b/test/config/GridStatConfig_GRIB_set_attr index d1d5dbc30d..dae59b6282 100644 --- a/test/config/GridStatConfig_GRIB_set_attr +++ b/test/config/GridStatConfig_GRIB_set_attr @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -231,6 +232,6 @@ nc_pairs_flag = { grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = "GRIB_set_attr"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridStatConfig_GTG_latlon b/test/config/GridStatConfig_GTG_latlon index 648863688e..0f18b04d2d 100644 --- a/test/config/GridStatConfig_GTG_latlon +++ b/test/config/GridStatConfig_GTG_latlon @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -210,6 +211,6 @@ nc_pairs_flag = { grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridStatConfig_GTG_lc b/test/config/GridStatConfig_GTG_lc index 846f5a2e6e..531a3bb9cf 100644 --- a/test/config/GridStatConfig_GTG_lc +++ b/test/config/GridStatConfig_GTG_lc @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -210,6 +211,6 @@ nc_pairs_flag = { grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridStatConfig_apply_mask b/test/config/GridStatConfig_apply_mask index 1bb34bb9f1..1c62a9a929 100644 --- a/test/config/GridStatConfig_apply_mask +++ b/test/config/GridStatConfig_apply_mask @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -211,6 +212,6 @@ nc_pairs_flag = { grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridStatConfig_climo_WMO b/test/config/GridStatConfig_climo_WMO index a9f4c120cf..39e64895ce 100644 --- a/test/config/GridStatConfig_climo_WMO +++ b/test/config/GridStatConfig_climo_WMO @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -271,6 +272,6 @@ nc_pairs_flag = { grid_weight_flag = COS_LAT; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridStatConfig_climo_prob b/test/config/GridStatConfig_climo_prob index 7b91e8da0f..b5f4629bf1 100644 --- a/test/config/GridStatConfig_climo_prob +++ b/test/config/GridStatConfig_climo_prob @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -281,6 +282,6 @@ nc_pairs_flag = { grid_weight_flag = COS_LAT; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridStatConfig_fourier b/test/config/GridStatConfig_fourier index a441acd51f..6b2ba521f3 100644 --- a/test/config/GridStatConfig_fourier +++ b/test/config/GridStatConfig_fourier @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -237,6 +238,6 @@ nc_pairs_flag = { grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridStatConfig_grid_weight b/test/config/GridStatConfig_grid_weight index 5ea4b6df87..af74b784c7 100644 --- a/test/config/GridStatConfig_grid_weight +++ b/test/config/GridStatConfig_grid_weight @@ -51,6 +51,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; tmp_field = [ { name = "TMP"; level = [ "P500" ]; } ]; @@ -222,6 +223,6 @@ nc_pairs_flag = { grid_weight_flag = ${GRID_WEIGHT}; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridStatConfig_interp_shape b/test/config/GridStatConfig_interp_shape index af303ec165..f6a69c5e35 100644 --- a/test/config/GridStatConfig_interp_shape +++ b/test/config/GridStatConfig_interp_shape @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -205,6 +206,6 @@ nc_pairs_flag = { grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridStatConfig_mpr_thresh b/test/config/GridStatConfig_mpr_thresh index bd28d883f2..4e95022a48 100644 --- a/test/config/GridStatConfig_mpr_thresh +++ b/test/config/GridStatConfig_mpr_thresh @@ -51,6 +51,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -269,6 +270,6 @@ nc_pairs_flag = { grid_weight_flag = COS_LAT; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridStatConfig_no_leap b/test/config/GridStatConfig_no_leap index 47ab1f474b..3b80dc0330 100644 --- a/test/config/GridStatConfig_no_leap +++ b/test/config/GridStatConfig_no_leap @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -211,6 +212,6 @@ nc_pairs_flag = { grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridStatConfig_prob_as_scalar b/test/config/GridStatConfig_prob_as_scalar index 13c6143438..f497641518 100644 --- a/test/config/GridStatConfig_prob_as_scalar +++ b/test/config/GridStatConfig_prob_as_scalar @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -232,6 +233,6 @@ nc_pairs_flag = { grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridStatConfig_python b/test/config/GridStatConfig_python index 0d5e908266..9bb128ac92 100644 --- a/test/config/GridStatConfig_python +++ b/test/config/GridStatConfig_python @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -208,6 +209,6 @@ nc_pairs_flag = { grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = "python"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridStatConfig_python_mixed b/test/config/GridStatConfig_python_mixed index b3a6c2ea2b..38a5f9fa90 100644 --- a/test/config/GridStatConfig_python_mixed +++ b/test/config/GridStatConfig_python_mixed @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -216,6 +217,6 @@ nc_pairs_flag = { grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = "python_mixed"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridStatConfig_rtma b/test/config/GridStatConfig_rtma index 77d491e5b5..b49db75a73 100644 --- a/test/config/GridStatConfig_rtma +++ b/test/config/GridStatConfig_rtma @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -212,6 +213,6 @@ nc_pairs_flag = { grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridStatConfig_rtma_perc_thresh b/test/config/GridStatConfig_rtma_perc_thresh index cabb9c13df..55b42b4456 100644 --- a/test/config/GridStatConfig_rtma_perc_thresh +++ b/test/config/GridStatConfig_rtma_perc_thresh @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -215,6 +216,6 @@ nc_pairs_flag = { grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridStatConfig_st4 b/test/config/GridStatConfig_st4 index 7ad113c13f..00dbf1d8a0 100644 --- a/test/config/GridStatConfig_st4 +++ b/test/config/GridStatConfig_st4 @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -216,6 +217,6 @@ nc_pairs_flag = { grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/GridStatConfig_st4_censor b/test/config/GridStatConfig_st4_censor index 8f088b7a6d..d0ae97d7d9 100644 --- a/test/config/GridStatConfig_st4_censor +++ b/test/config/GridStatConfig_st4_censor @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -225,6 +226,6 @@ nc_pairs_flag = { grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/MODEConfig_cut_line b/test/config/MODEConfig_cut_line index d7e96fde63..105881ad2f 100644 --- a/test/config/MODEConfig_cut_line +++ b/test/config/MODEConfig_cut_line @@ -234,6 +234,6 @@ shift_right = 50; // grid squares //////////////////////////////////////////////////////////////////////////////// output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/MODEConfig_hmt b/test/config/MODEConfig_hmt index 2e633e7385..cad4f3a3c2 100644 --- a/test/config/MODEConfig_hmt +++ b/test/config/MODEConfig_hmt @@ -234,6 +234,6 @@ ct_stats_flag = TRUE; //////////////////////////////////////////////////////////////////////////////// output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/MODEConfig_perc_thresh b/test/config/MODEConfig_perc_thresh index 386db31cfa..659137e487 100644 --- a/test/config/MODEConfig_perc_thresh +++ b/test/config/MODEConfig_perc_thresh @@ -235,6 +235,6 @@ ct_stats_flag = TRUE; //////////////////////////////////////////////////////////////////////////////// output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/MODEConfig_python b/test/config/MODEConfig_python index 109723086c..a638b6603b 100644 --- a/test/config/MODEConfig_python +++ b/test/config/MODEConfig_python @@ -239,6 +239,6 @@ ct_stats_flag = TRUE; //////////////////////////////////////////////////////////////////////////////// output_prefix = "python"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/MODEConfig_python_mixed b/test/config/MODEConfig_python_mixed index f909b4b5f7..56253f07d0 100644 --- a/test/config/MODEConfig_python_mixed +++ b/test/config/MODEConfig_python_mixed @@ -242,6 +242,6 @@ ct_stats_flag = TRUE; //////////////////////////////////////////////////////////////////////////////// output_prefix = "python_mixed"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/MODEConfig_quilt b/test/config/MODEConfig_quilt index 54b431e083..d4b2fcc341 100644 --- a/test/config/MODEConfig_quilt +++ b/test/config/MODEConfig_quilt @@ -232,6 +232,6 @@ ct_stats_flag = TRUE; //////////////////////////////////////////////////////////////////////////////// output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/MTDConfig_python b/test/config/MTDConfig_python index f3d379e7ce..ed68eb6afc 100644 --- a/test/config/MTDConfig_python +++ b/test/config/MTDConfig_python @@ -230,6 +230,6 @@ txt_output = { output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/Madis2NcConfig_time_summary b/test/config/Madis2NcConfig_time_summary index b00db1b0de..7c8c1e586b 100644 --- a/test/config/Madis2NcConfig_time_summary +++ b/test/config/Madis2NcConfig_time_summary @@ -33,4 +33,4 @@ time_summary = { // Indicate a version number for the contents of this configuration file. // The value should generally not be modified. // -version = "V10.0.0"; +version = "V10.1.0"; diff --git a/test/config/NetcdfConfig b/test/config/NetcdfConfig index 5dd9bd155c..e1b0eceaf9 100644 --- a/test/config/NetcdfConfig +++ b/test/config/NetcdfConfig @@ -12,4 +12,4 @@ nc_compression = 2; -version = "V10.0.0"; +version = "V10.1.0"; diff --git a/test/config/PB2NCConfig b/test/config/PB2NCConfig index ca99186394..fbd4b0418c 100644 --- a/test/config/PB2NCConfig +++ b/test/config/PB2NCConfig @@ -101,6 +101,6 @@ event_stack_flag = TOP; //////////////////////////////////////////////////////////////////////////////// tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PB2NCConfig_airnow b/test/config/PB2NCConfig_airnow index 2842bcebcf..f9cba2c0bb 100644 --- a/test/config/PB2NCConfig_airnow +++ b/test/config/PB2NCConfig_airnow @@ -134,6 +134,6 @@ time_summary = { //////////////////////////////////////////////////////////////////////////////// tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PB2NCConfig_all b/test/config/PB2NCConfig_all index 71f235c18e..de74b934fe 100644 --- a/test/config/PB2NCConfig_all +++ b/test/config/PB2NCConfig_all @@ -100,6 +100,6 @@ event_stack_flag = TOP; //////////////////////////////////////////////////////////////////////////////// tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PB2NCConfig_summary b/test/config/PB2NCConfig_summary index 841666ee4d..e2825f289e 100644 --- a/test/config/PB2NCConfig_summary +++ b/test/config/PB2NCConfig_summary @@ -128,6 +128,6 @@ time_summary = { //////////////////////////////////////////////////////////////////////////////// tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PB2NCConfig_vlevel b/test/config/PB2NCConfig_vlevel index eacc39f123..68a8d47925 100644 --- a/test/config/PB2NCConfig_vlevel +++ b/test/config/PB2NCConfig_vlevel @@ -101,6 +101,6 @@ event_stack_flag = TOP; //////////////////////////////////////////////////////////////////////////////// tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/Point2GridConfig_valid_time b/test/config/Point2GridConfig_valid_time index 9463d22cc1..cc93c91b86 100644 --- a/test/config/Point2GridConfig_valid_time +++ b/test/config/Point2GridConfig_valid_time @@ -77,6 +77,6 @@ valid_time = "20201022_173000"; //////////////////////////////////////////////////////////////////////////////// tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_APCP b/test/config/PointStatConfig_APCP index 920034bc27..003f9f50a0 100644 --- a/test/config/PointStatConfig_APCP +++ b/test/config/PointStatConfig_APCP @@ -131,6 +131,6 @@ duplicate_flag = NONE; rank_corr_flag = FALSE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_APCP_HIRA b/test/config/PointStatConfig_APCP_HIRA index e39d21863c..eefbcfdda0 100644 --- a/test/config/PointStatConfig_APCP_HIRA +++ b/test/config/PointStatConfig_APCP_HIRA @@ -134,6 +134,6 @@ duplicate_flag = NONE; rank_corr_flag = FALSE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_GTG_latlon b/test/config/PointStatConfig_GTG_latlon index fc5fa1eef9..7e6e2c53d2 100644 --- a/test/config/PointStatConfig_GTG_latlon +++ b/test/config/PointStatConfig_GTG_latlon @@ -153,6 +153,6 @@ duplicate_flag = NONE; rank_corr_flag = TRUE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_GTG_lc b/test/config/PointStatConfig_GTG_lc index e1c5f89ab2..4b6df47f87 100644 --- a/test/config/PointStatConfig_GTG_lc +++ b/test/config/PointStatConfig_GTG_lc @@ -161,6 +161,6 @@ duplicate_flag = NONE; rank_corr_flag = TRUE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_INTERP_OPTS b/test/config/PointStatConfig_INTERP_OPTS index 1538ce4bf9..4923dab75b 100644 --- a/test/config/PointStatConfig_INTERP_OPTS +++ b/test/config/PointStatConfig_INTERP_OPTS @@ -144,6 +144,6 @@ duplicate_flag = NONE; rank_corr_flag = FALSE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_LAND_TOPO_MASK b/test/config/PointStatConfig_LAND_TOPO_MASK index 9d9e77564e..74d7e28be1 100644 --- a/test/config/PointStatConfig_LAND_TOPO_MASK +++ b/test/config/PointStatConfig_LAND_TOPO_MASK @@ -184,6 +184,6 @@ duplicate_flag = NONE; rank_corr_flag = TRUE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_MASK_SID b/test/config/PointStatConfig_MASK_SID index b9afca5389..95c30a9d16 100644 --- a/test/config/PointStatConfig_MASK_SID +++ b/test/config/PointStatConfig_MASK_SID @@ -139,6 +139,6 @@ duplicate_flag = NONE; rank_corr_flag = TRUE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_PHYS b/test/config/PointStatConfig_PHYS index aea79c4b19..4a5640ddcb 100644 --- a/test/config/PointStatConfig_PHYS +++ b/test/config/PointStatConfig_PHYS @@ -140,6 +140,6 @@ duplicate_flag = NONE; rank_corr_flag = TRUE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_PHYS_pint b/test/config/PointStatConfig_PHYS_pint index be5abaaf6f..9102584bff 100644 --- a/test/config/PointStatConfig_PHYS_pint +++ b/test/config/PointStatConfig_PHYS_pint @@ -135,6 +135,6 @@ duplicate_flag = NONE; rank_corr_flag = TRUE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_WINDS b/test/config/PointStatConfig_WINDS index 3dc709d48c..4f17fff75a 100644 --- a/test/config/PointStatConfig_WINDS +++ b/test/config/PointStatConfig_WINDS @@ -155,6 +155,6 @@ duplicate_flag = NONE; rank_corr_flag = TRUE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_aeronet b/test/config/PointStatConfig_aeronet index a1405e9424..b36dd7f39c 100644 --- a/test/config/PointStatConfig_aeronet +++ b/test/config/PointStatConfig_aeronet @@ -205,6 +205,6 @@ duplicate_flag = NONE; rank_corr_flag = TRUE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_airnow b/test/config/PointStatConfig_airnow index eb18e2000f..cbf3c76c11 100644 --- a/test/config/PointStatConfig_airnow +++ b/test/config/PointStatConfig_airnow @@ -232,6 +232,6 @@ output_flag = { tmp_dir = "/tmp"; output_prefix = ""; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_climo b/test/config/PointStatConfig_climo index 17005f9979..cd81aa6fbf 100644 --- a/test/config/PointStatConfig_climo +++ b/test/config/PointStatConfig_climo @@ -274,6 +274,6 @@ duplicate_flag = NONE; rank_corr_flag = TRUE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_climo_WMO b/test/config/PointStatConfig_climo_WMO index 722edd4881..fa7499ab84 100644 --- a/test/config/PointStatConfig_climo_WMO +++ b/test/config/PointStatConfig_climo_WMO @@ -222,6 +222,6 @@ duplicate_flag = NONE; rank_corr_flag = TRUE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_climo_prob b/test/config/PointStatConfig_climo_prob index 53a754b87c..18ac41ccdf 100644 --- a/test/config/PointStatConfig_climo_prob +++ b/test/config/PointStatConfig_climo_prob @@ -224,6 +224,6 @@ duplicate_flag = NONE; rank_corr_flag = TRUE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_dup b/test/config/PointStatConfig_dup index e67fb84089..4dfe9f5c11 100644 --- a/test/config/PointStatConfig_dup +++ b/test/config/PointStatConfig_dup @@ -157,6 +157,6 @@ duplicate_flag = ${DUPLICATE_FLAG}; rank_corr_flag = FALSE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_mpr_thresh b/test/config/PointStatConfig_mpr_thresh index 6a33eebf2a..daf7a11d2f 100644 --- a/test/config/PointStatConfig_mpr_thresh +++ b/test/config/PointStatConfig_mpr_thresh @@ -216,6 +216,6 @@ duplicate_flag = NONE; rank_corr_flag = TRUE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_obs_summary b/test/config/PointStatConfig_obs_summary index 03b00e3438..908f86e44c 100644 --- a/test/config/PointStatConfig_obs_summary +++ b/test/config/PointStatConfig_obs_summary @@ -145,6 +145,6 @@ output_flag = { rank_corr_flag = FALSE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_obs_summary_all b/test/config/PointStatConfig_obs_summary_all index 329a3bd05f..636ed3d001 100644 --- a/test/config/PointStatConfig_obs_summary_all +++ b/test/config/PointStatConfig_obs_summary_all @@ -214,6 +214,6 @@ output_flag = { rank_corr_flag = FALSE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_prob b/test/config/PointStatConfig_prob index c1d7f8d58f..b1fe365e2b 100644 --- a/test/config/PointStatConfig_prob +++ b/test/config/PointStatConfig_prob @@ -142,6 +142,6 @@ duplicate_flag = NONE; rank_corr_flag = FALSE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_python b/test/config/PointStatConfig_python index 2b073fff61..0c66c8c4f0 100644 --- a/test/config/PointStatConfig_python +++ b/test/config/PointStatConfig_python @@ -211,7 +211,7 @@ output_flag = { rank_corr_flag = FALSE; tmp_dir = "/tmp"; output_prefix = ""; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_qty b/test/config/PointStatConfig_qty index a8255ffa70..98ad597e46 100644 --- a/test/config/PointStatConfig_qty +++ b/test/config/PointStatConfig_qty @@ -164,6 +164,6 @@ duplicate_flag = NONE; rank_corr_flag = TRUE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/PointStatConfig_sid_inc_exc b/test/config/PointStatConfig_sid_inc_exc index 70f17d7943..62e6e9b43f 100644 --- a/test/config/PointStatConfig_sid_inc_exc +++ b/test/config/PointStatConfig_sid_inc_exc @@ -148,6 +148,6 @@ obs_summary = NEAREST; rank_corr_flag = TRUE; tmp_dir = "/tmp"; output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/RMWAnalysisConfig b/test/config/RMWAnalysisConfig index 9f68709615..da5d813a30 100644 --- a/test/config/RMWAnalysisConfig +++ b/test/config/RMWAnalysisConfig @@ -64,7 +64,7 @@ valid_mask = ""; //////////////////////////////////////////////////////////////////////////////// -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/STATAnalysisConfig_APCP_HIRA b/test/config/STATAnalysisConfig_APCP_HIRA index b1ca1898d0..22faf3ae7a 100644 --- a/test/config/STATAnalysisConfig_APCP_HIRA +++ b/test/config/STATAnalysisConfig_APCP_HIRA @@ -101,6 +101,6 @@ boot = { rank_corr_flag = TRUE; vif_flag = FALSE; tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/STATAnalysisConfig_climo b/test/config/STATAnalysisConfig_climo index 969fbac88e..d316900db6 100644 --- a/test/config/STATAnalysisConfig_climo +++ b/test/config/STATAnalysisConfig_climo @@ -107,6 +107,6 @@ wmo_fisher_stats = [ "CNT:PR_CORR", "CNT:SP_CORR", rank_corr_flag = FALSE; vif_flag = FALSE; tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/STATAnalysisConfig_filter_times b/test/config/STATAnalysisConfig_filter_times index b9f296d24b..8a9d7afcb4 100644 --- a/test/config/STATAnalysisConfig_filter_times +++ b/test/config/STATAnalysisConfig_filter_times @@ -104,6 +104,6 @@ boot = { rank_corr_flag = TRUE; vif_flag = FALSE; tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/STATAnalysisConfig_grid_stat b/test/config/STATAnalysisConfig_grid_stat index b29fcbe58a..1453703dfc 100644 --- a/test/config/STATAnalysisConfig_grid_stat +++ b/test/config/STATAnalysisConfig_grid_stat @@ -97,6 +97,6 @@ boot = { rank_corr_flag = TRUE; vif_flag = FALSE; tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/STATAnalysisConfig_point_stat b/test/config/STATAnalysisConfig_point_stat index 4d1a402a26..31603edab7 100644 --- a/test/config/STATAnalysisConfig_point_stat +++ b/test/config/STATAnalysisConfig_point_stat @@ -118,6 +118,6 @@ boot = { rank_corr_flag = TRUE; vif_flag = FALSE; tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/STATAnalysisConfig_ramps b/test/config/STATAnalysisConfig_ramps index cd6ec9f268..5a5d06e424 100644 --- a/test/config/STATAnalysisConfig_ramps +++ b/test/config/STATAnalysisConfig_ramps @@ -96,6 +96,6 @@ boot = { rank_corr_flag = TRUE; vif_flag = FALSE; tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/SeriesAnalysisConfig b/test/config/SeriesAnalysisConfig index 3765058299..8c5e965230 100644 --- a/test/config/SeriesAnalysisConfig +++ b/test/config/SeriesAnalysisConfig @@ -109,8 +109,9 @@ output_stats = { //////////////////////////////////////////////////////////////////////////////// +hss_ec_value = NA; rank_corr_flag = FALSE; tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/SeriesAnalysisConfig_climo b/test/config/SeriesAnalysisConfig_climo index e3ca67d4b3..a1ceb41577 100644 --- a/test/config/SeriesAnalysisConfig_climo +++ b/test/config/SeriesAnalysisConfig_climo @@ -140,8 +140,9 @@ output_stats = { //////////////////////////////////////////////////////////////////////////////// +hss_ec_value = NA; rank_corr_flag = FALSE; tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/SeriesAnalysisConfig_conditional b/test/config/SeriesAnalysisConfig_conditional index 96318ddee9..a4b1447a1c 100644 --- a/test/config/SeriesAnalysisConfig_conditional +++ b/test/config/SeriesAnalysisConfig_conditional @@ -109,8 +109,9 @@ output_stats = { //////////////////////////////////////////////////////////////////////////////// +hss_ec_value = NA; rank_corr_flag = FALSE; tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/SeriesAnalysisConfig_python b/test/config/SeriesAnalysisConfig_python index 84dbd5cdd5..945a1a56b6 100644 --- a/test/config/SeriesAnalysisConfig_python +++ b/test/config/SeriesAnalysisConfig_python @@ -140,8 +140,9 @@ output_stats = { //////////////////////////////////////////////////////////////////////////////// +hss_ec_value = NA; rank_corr_flag = FALSE; tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/TCGenConfig_2016 b/test/config/TCGenConfig_2016 index 28ec263e85..b1d78ba8e7 100644 --- a/test/config/TCGenConfig_2016 +++ b/test/config/TCGenConfig_2016 @@ -326,4 +326,4 @@ nc_pairs_grid = "G003"; // Indicate a version number for the contents of this configuration file. // The value should generally not be modified. // -version = "V10.0.0"; +version = "V10.1.0"; diff --git a/test/config/TCPairsConfig_ALAL2010 b/test/config/TCPairsConfig_ALAL2010 index 8e8c6e8416..8468de62e7 100644 --- a/test/config/TCPairsConfig_ALAL2010 +++ b/test/config/TCPairsConfig_ALAL2010 @@ -136,4 +136,4 @@ basin_map = [ // Indicate a version number for the contents of this configuration file. // The value should generally not be modified. // -version = "V10.0.0"; +version = "V10.1.0"; diff --git a/test/config/TCPairsConfig_BASIN_MAP b/test/config/TCPairsConfig_BASIN_MAP index 794470fa31..a66e91e031 100644 --- a/test/config/TCPairsConfig_BASIN_MAP +++ b/test/config/TCPairsConfig_BASIN_MAP @@ -137,4 +137,4 @@ basin_map = [ // Indicate a version number for the contents of this configuration file. // The value should generally not be modified. // -version = "V10.0.0"; +version = "V10.1.0"; diff --git a/test/config/TCPairsConfig_INTERP12 b/test/config/TCPairsConfig_INTERP12 index e736c246d6..8183e6b73a 100644 --- a/test/config/TCPairsConfig_INTERP12 +++ b/test/config/TCPairsConfig_INTERP12 @@ -137,4 +137,4 @@ basin_map = [ // Indicate a version number for the contents of this configuration file. // The value should generally not be modified. // -version = "V10.0.0"; +version = "V10.1.0"; diff --git a/test/config/TCPairsConfig_PROBRIRW b/test/config/TCPairsConfig_PROBRIRW index 8927788054..db7d915ee7 100644 --- a/test/config/TCPairsConfig_PROBRIRW +++ b/test/config/TCPairsConfig_PROBRIRW @@ -136,4 +136,4 @@ basin_map = [ // Indicate a version number for the contents of this configuration file. // The value should generally not be modified. // -version = "V10.0.0"; +version = "V10.1.0"; diff --git a/test/config/TCRMWConfig_gonzalo b/test/config/TCRMWConfig_gonzalo index 29eb10d0a0..933bb6c153 100644 --- a/test/config/TCRMWConfig_gonzalo +++ b/test/config/TCRMWConfig_gonzalo @@ -105,6 +105,6 @@ rmw_scale = 0.2; //////////////////////////////////////////////////////////////////////////////// -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/TCRMWConfig_pressure_lev_out b/test/config/TCRMWConfig_pressure_lev_out index fae14f3330..df980f1295 100644 --- a/test/config/TCRMWConfig_pressure_lev_out +++ b/test/config/TCRMWConfig_pressure_lev_out @@ -105,6 +105,6 @@ rmw_scale = 0.2; //////////////////////////////////////////////////////////////////////////////// -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/TCStatConfig_ALAL2010 b/test/config/TCStatConfig_ALAL2010 index 8f59d36f5b..33a746fe84 100644 --- a/test/config/TCStatConfig_ALAL2010 +++ b/test/config/TCStatConfig_ALAL2010 @@ -204,4 +204,4 @@ jobs = [ // Indicate a version number for the contents of this configuration file. // The value should generally not be modified. // -version = "V10.0.0"; +version = "V10.1.0"; diff --git a/test/config/TCStatConfig_PROBRIRW b/test/config/TCStatConfig_PROBRIRW index bf443a9e66..8dd855f4f2 100644 --- a/test/config/TCStatConfig_PROBRIRW +++ b/test/config/TCStatConfig_PROBRIRW @@ -200,4 +200,4 @@ jobs = [ // Indicate a version number for the contents of this configuration file. // The value should generally not be modified. // -version = "V10.0.0"; +version = "V10.1.0"; diff --git a/test/config/WaveletStatConfig b/test/config/WaveletStatConfig index 384ccaab1f..b9a3983bdf 100644 --- a/test/config/WaveletStatConfig +++ b/test/config/WaveletStatConfig @@ -134,6 +134,6 @@ wvlt_plot = { //////////////////////////////////////////////////////////////////////////////// output_prefix = "${OUTPUT_PREFIX}"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/WaveletStatConfig_python b/test/config/WaveletStatConfig_python index 9d0d7b80a9..28df2065a8 100644 --- a/test/config/WaveletStatConfig_python +++ b/test/config/WaveletStatConfig_python @@ -125,6 +125,6 @@ wvlt_plot = { //////////////////////////////////////////////////////////////////////////////// output_prefix = "python"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/WaveletStatConfig_python_mixed b/test/config/WaveletStatConfig_python_mixed index 479f438748..a5e09298b7 100644 --- a/test/config/WaveletStatConfig_python_mixed +++ b/test/config/WaveletStatConfig_python_mixed @@ -134,6 +134,6 @@ wvlt_plot = { //////////////////////////////////////////////////////////////////////////////// output_prefix = "python_mixed"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/ref_config/GridStatConfig_03h b/test/config/ref_config/GridStatConfig_03h index ce8b0f982c..70f885dd08 100644 --- a/test/config/ref_config/GridStatConfig_03h +++ b/test/config/ref_config/GridStatConfig_03h @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -198,6 +199,6 @@ nc_pairs_flag = FALSE; grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = "${MODEL}_F${FCST_TIME}_03h"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/ref_config/GridStatConfig_24h b/test/config/ref_config/GridStatConfig_24h index 1f7fb01cda..a66ffcf276 100644 --- a/test/config/ref_config/GridStatConfig_24h +++ b/test/config/ref_config/GridStatConfig_24h @@ -52,6 +52,7 @@ wind_logic = UNION; eclv_points = 0.05; nc_pairs_var_name = ""; nc_pairs_var_suffix = ""; +hss_ec_value = NA; rank_corr_flag = FALSE; // @@ -198,6 +199,6 @@ nc_pairs_flag = FALSE; grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = "${MODEL}_F${FCST_TIME}_24h"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/ref_config/PB2NCConfig b/test/config/ref_config/PB2NCConfig index 0840d4c2aa..21bfdf4fb4 100644 --- a/test/config/ref_config/PB2NCConfig +++ b/test/config/ref_config/PB2NCConfig @@ -101,6 +101,6 @@ event_stack_flag = TOP; //////////////////////////////////////////////////////////////////////////////// tmp_dir = "/tmp"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/ref_config/PointStatConfig_ADPUPA b/test/config/ref_config/PointStatConfig_ADPUPA index a458683711..8c3be8c75e 100644 --- a/test/config/ref_config/PointStatConfig_ADPUPA +++ b/test/config/ref_config/PointStatConfig_ADPUPA @@ -182,6 +182,6 @@ duplicate_flag = NONE; rank_corr_flag = FALSE; tmp_dir = "/tmp"; output_prefix = "${MODEL}_F${FCST_TIME}_ADPUPA"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/ref_config/PointStatConfig_ONLYSF b/test/config/ref_config/PointStatConfig_ONLYSF index 9276f52a45..4dbf27b30c 100644 --- a/test/config/ref_config/PointStatConfig_ONLYSF +++ b/test/config/ref_config/PointStatConfig_ONLYSF @@ -192,6 +192,6 @@ duplicate_flag = NONE; rank_corr_flag = FALSE; tmp_dir = "/tmp"; output_prefix = "${MODEL}_F${FCST_TIME}_ONLYSF"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/config/ref_config/PointStatConfig_WINDS b/test/config/ref_config/PointStatConfig_WINDS index 5e18b2f1dc..3309419131 100644 --- a/test/config/ref_config/PointStatConfig_WINDS +++ b/test/config/ref_config/PointStatConfig_WINDS @@ -175,6 +175,6 @@ duplicate_flag = NONE; rank_corr_flag = FALSE; tmp_dir = "/tmp"; output_prefix = "${MODEL}_F${FCST_TIME}_WINDS"; -version = "V10.0.0"; +version = "V10.1.0"; //////////////////////////////////////////////////////////////////////////////// diff --git a/test/hdr/met_10_1.hdr b/test/hdr/met_10_1.hdr new file mode 100644 index 0000000000..77d4fa0053 --- /dev/null +++ b/test/hdr/met_10_1.hdr @@ -0,0 +1,36 @@ +CNT : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FBAR FBAR_NCL FBAR_NCU FBAR_BCL FBAR_BCU FSTDEV FSTDEV_NCL FSTDEV_NCU FSTDEV_BCL FSTDEV_BCU OBAR OBAR_NCL OBAR_NCU OBAR_BCL OBAR_BCU OSTDEV OSTDEV_NCL OSTDEV_NCU OSTDEV_BCL OSTDEV_BCU PR_CORR PR_CORR_NCL PR_CORR_NCU PR_CORR_BCL PR_CORR_BCU SP_CORR KT_CORR RANKS FRANK_TIES ORANK_TIES ME ME_NCL ME_NCU ME_BCL ME_BCU ESTDEV ESTDEV_NCL ESTDEV_NCU ESTDEV_BCL ESTDEV_BCU MBIAS MBIAS_BCL MBIAS_BCU MAE MAE_BCL MAE_BCU MSE MSE_BCL MSE_BCU BCMSE BCMSE_BCL BCMSE_BCU RMSE RMSE_BCL RMSE_BCU E10 E10_BCL E10_BCU E25 E25_BCL E25_BCU E50 E50_BCL E50_BCU E75 E75_BCL E75_BCU E90 E90_BCL E90_BCU EIQR EIQR_BCL EIQR_BCU MAD MAD_BCL MAD_BCU ANOM_CORR ANOM_CORR_NCL ANOM_CORR_NCU ANOM_CORR_BCL ANOM_CORR_BCU ME2 ME2_BCL ME2_BCU MSESS MSESS_BCL MSESS_BCU RMSFA RMSFA_BCL RMSFA_BCU RMSOA RMSOA_BCL RMSOA_BCU ANOM_CORR_UNCNTR ANOM_CORR_UNCNTR_BCL ANOM_CORR_UNCNTR_BCU +CTC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FY_OY FY_ON FN_OY FN_ON +CTS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL BASER BASER_NCL BASER_NCU BASER_BCL BASER_BCU FMEAN FMEAN_NCL FMEAN_NCU FMEAN_BCL FMEAN_BCU ACC ACC_NCL ACC_NCU ACC_BCL ACC_BCU FBIAS FBIAS_BCL FBIAS_BCU PODY PODY_NCL PODY_NCU PODY_BCL PODY_BCU PODN PODN_NCL PODN_NCU PODN_BCL PODN_BCU POFD POFD_NCL POFD_NCU POFD_BCL POFD_BCU FAR FAR_NCL FAR_NCU FAR_BCL FAR_BCU CSI CSI_NCL CSI_NCU CSI_BCL CSI_BCU GSS GSS_BCL GSS_BCU HK HK_NCL HK_NCU HK_BCL HK_BCU HSS HSS_BCL HSS_BCU ODDS ODDS_NCL ODDS_NCU ODDS_BCL ODDS_BCU LODDS LODDS_NCL LODDS_NCU LODDS_BCL LODDS_BCU ORSS ORSS_NCL ORSS_NCU ORSS_BCL ORSS_BCU EDS EDS_NCL EDS_NCU EDS_BCL EDS_BCU SEDS SEDS_NCL SEDS_NCU SEDS_BCL SEDS_BCU EDI EDI_NCL EDI_NCU EDI_BCL EDI_BCU SEDI SEDI_NCL SEDI_NCU SEDI_BCL SEDI_BCU BAGSS BAGSS_BCL BAGSS_BCU +FHO : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL F_RATE H_RATE O_RATE +ISC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL TILE_DIM TILE_XLL TILE_YLL NSCALE ISCALE MSE ISC FENERGY2 OENERGY2 BASER FBIAS +MCTC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL N_CAT _VAR_ +MCTS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL N_CAT ACC ACC_NCL ACC_NCU ACC_BCL ACC_BCU HK HK_BCL HK_BCU HSS HSS_BCL HSS_BCU GER GER_BCL GER_BCU HSS_EC HSS_EC_BCL HSS_EC_BCU EC_VALUE +MPR : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL INDEX OBS_SID OBS_LAT OBS_LON OBS_LVL OBS_ELV FCST OBS OBS_QC CLIMO_MEAN CLIMO_STDEV CLIMO_CDF_VAR_ +NBRCNT : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FBS FBS_BCL FBS_BCU FSS FSS_BCL FSS_BCU AFSS AFSS_BCL AFSS_BCU UFSS UFSS_BCL UFSS_BCU F_RATE F_RATE_BCL F_RATE_BCU O_RATE O_RATE_BCL O_RATE_BCU +NBRCTC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FY_OY FY_ON FN_OY FN_ON +NBRCTS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL BASER BASER_NCL BASER_NCU BASER_BCL BASER_BCU FMEAN FMEAN_NCL FMEAN_NCU FMEAN_BCL FMEAN_BCU ACC ACC_NCL ACC_NCU ACC_BCL ACC_BCU FBIAS FBIAS_BCL FBIAS_BCU PODY PODY_NCL PODY_NCU PODY_BCL PODY_BCU PODN PODN_NCL PODN_NCU PODN_BCL PODN_BCU POFD POFD_NCL POFD_NCU POFD_BCL POFD_BCU FAR FAR_NCL FAR_NCU FAR_BCL FAR_BCU CSI CSI_NCL CSI_NCU CSI_BCL CSI_BCU GSS GSS_BCL GSS_BCU HK HK_NCL HK_NCU HK_BCL HK_BCU HSS HSS_BCL HSS_BCU ODDS ODDS_NCL ODDS_NCU ODDS_BCL ODDS_BCU LODDS LODDS_NCL LODDS_NCU LODDS_BCL LODDS_BCU ORSS ORSS_NCL ORSS_NCU ORSS_BCL ORSS_BCU EDS EDS_NCL EDS_NCU EDS_BCL EDS_BCU SEDS SEDS_NCL SEDS_NCU SEDS_BCL SEDS_BCU EDI EDI_NCL EDI_NCU EDI_BCL EDI_BCU SEDI SEDI_NCL SEDI_NCU SEDI_BCL SEDI_BCU BAGSS BAGSS_BCL BAGSS_BCU +GRAD : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FGBAR OGBAR MGBAR EGBAR S1 S1_OG FGOG_RATIO DX DY +DMAP : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FY OY FBIAS BADDELEY HAUSDORFF MED_FO MED_OF MED_MIN MED_MAX MED_MEAN FOM_FO FOM_OF FOM_MIN FOM_MAX FOM_MEAN ZHU_FO ZHU_OF ZHU_MIN ZHU_MAX ZHU_MEAN +ORANK : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL INDEX OBS_SID OBS_LAT OBS_LON OBS_LVL OBS_ELV OBS PIT RANK N_ENS_VLD N_ENS _VAR_ +PCT : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL N_THRESH _VAR_ +PJC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL N_THRESH _VAR_ +PRC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL N_THRESH _VAR_ +PSTD : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL N_THRESH BASER BASER_NCL BASER_NCU RELIABILITY RESOLUTION UNCERTAINTY ROC_AUC BRIER BRIER_NCL BRIER_NCU BRIERCL BRIERCL_NCL BRIERCL_NCU BSS BSS_SMPL _VAR_ +ECLV : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL BASE N_PTS _VAR_ +ECNT : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL N_ENS CRPS CRPSS IGN ME RMSE SPREAD ME_OERR RMSE_OERR SPREAD_OERR SPREAD_PLUS_OERR CRPSCL CRPS_EMP CRPSCL_EMP CRPSS_EMP +RPS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL N_PROB RPS_REL RPS_RES RPS_UNC RPS RPSS RPSS_SMPL RPS_COMP +RHIST : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL CRPS IGN N_RANK CRPSS SPREAD _VAR_ +PHIST : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL BIN_SIZE N_BIN _VAR_ +RELP : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL N_ENS _VAR_ +SAL1L2 : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FABAR OABAR FOABAR FFABAR OOABAR MAE +SL1L2 : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FBAR OBAR FOBAR FFBAR OOBAR MAE +SSVAR : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL N_BIN BIN_i BIN_N VAR_MIN VAR_MAX VAR_MEAN FBAR OBAR FOBAR FFBAR OOBAR FBAR_NCL FBAR_NCU FSTDEV FSTDEV_NCL FSTDEV_NCU OBAR_NCL OBAR_NCU OSTDEV OSTDEV_NCL OSTDEV_NCU PR_CORR PR_CORR_NCL PR_CORR_NCU ME ME_NCL ME_NCU ESTDEV ESTDEV_NCL ESTDEV_NCU MBIAS MSE BCMSE RMSE +VL1L2 : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL UFBAR VFBAR UOBAR VOBAR UVFOBAR UVFFBAR UVOOBAR F_SPEED_BAR O_SPEED_BAR +VAL1L2 : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL UFABAR VFABAR UOABAR VOABAR UVFOABAR UVFFABAR UVOOABAR +VCNT : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FBAR FBAR_BCL FBAR_BCU OBAR OBAR_BCL OBAR_BCU FS_RMS FS_RMS_BCL FS_RMS_BCU OS_RMS OS_RMS_BCL OS_RMS_BCU MSVE MSVE_BCL MSVE_BCU RMSVE RMSVE_BCL RMSVE_BCU FSTDEV FSTDEV_BCL FSTDEV_BCU OSTDEV OSTDEV_BCL OSTDEV_BCU FDIR FDIR_BCL FDIR_BCU ODIR ODIR_BCL ODIR_BCU FBAR_SPEED FBAR_SPEED_BCL FBAR_SPEED_BCU OBAR_SPEED OBAR_SPEED_BCL OBAR_SPEED_BCU VDIFF_SPEED VDIFF_SPEED_BCL VDIFF_SPEED_BCU VDIFF_DIR VDIFF_DIR_BCL VDIFF_DIR_BCU SPEED_ERR SPEED_ERR_BCL SPEED_ERR_BCU SPEED_ABSERR SPEED_ABSERR_BCL SPEED_ABSERR_BCU DIR_ERR DIR_ERR_BCL DIR_ERR_BCU DIR_ABSERR DIR_ABSERR_BCL DIR_ABSERR_BCU +GENMPR : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL INDEX STORM_ID AGEN_INIT AGEN_FHR AGEN_LAT AGEN_LON AGEN_DLAND BGEN_LAT BGEN_LON BGEN_DLAND GEN_DIST GEN_TDIFF INIT_TDIFF DEV_CAT OPS_CAT +MODE_SOA : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE N_VALID GRID_RES OBJECT_ID OBJECT_CAT CENTROID_X CENTROID_Y CENTROID_LAT CENTROID_LON AXIS_ANG LENGTH WIDTH AREA AREA_THRESH CURVATURE CURVATURE_X CURVATURE_Y COMPLEXITY INTENSITY_10 INTENSITY_25 INTENSITY_50 INTENSITY_75 INTENSITY_90 INTENSITY_50 INTENSITY_SUM +MODE_POA : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE N_VALID GRID_RES OBJECT_ID OBJECT_CAT CENTROID_DIST BOUNDARY_DIST CONVEX_HULL_DIST ANGLE_DIFF ASPECT_DIFF AREA_RATIO INTERSECTION_AREA UNION_AREA SYMMETRIC_DIFF INTERSECTION_OVER_AREA CURVATURE_RATIO COMPLEXITY_RATIO PERCENTILE_INTENSITY_RATIO INTEREST +MODE_CTS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE N_VALID GRID_RES FIELD TOTAL FY_OY FY_ON FN_OY FN_ON BASER FMEAN ACC FBIAS PODY PODN POFD FAR CSI GSS HK HSS ODDS +TCST_TCMPR : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE AMODEL BMODEL STORM_ID BASIN CYCLONE STORM_NAME INIT_MASK VALID_MASK TOTAL INDEX LEVEL WATCH_WARN INITIALS ALAT ALON BLAT BLON TK_ERR X_ERR Y_ERR ALTK_ERR CRTK_ERR ADLAND BDLAND AMSLP BMSLP AMAX_WIND BMAX_WIND AAL_WIND_34 BAL_WIND_34 ANE_WIND_34 BNE_WIND_34 ASE_WIND_34 BSE_WIND_34 ASW_WIND_34 BSW_WIND_34 ANW_WIND_34 BNW_WIND_34 AAL_WIND_50 BAL_WIND_50 ANE_WIND_50 BNE_WIND_50 ASE_WIND_50 BSE_WIND_50 ASW_WIND_50 BSW_WIND_50 ANW_WIND_50 BNW_WIND_50 AAL_WIND_64 BAL_WIND_64 ANE_WIND_64 BNE_WIND_64 ASE_WIND_64 BSE_WIND_64 ASW_WIND_64 BSW_WIND_64 ANW_WIND_64 BNW_WIND_64 ARADP BRADP ARRP BRRP AMRD BMRD AGUSTS BGUSTS AEYE BEYE ADIR BDIR ASPEED BSPEED ADEPTH BDEPTH +TCST_PROBRIRW : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE ALAT ALON BLAT BLON INITIALS TK_ERR X_ERR Y_ERR ADLAND BDLAND RI_BEG RI_END RI_WINDOW AWIND_END BWIND_BEG BWIND_END BDELTA BDELTA_MAX BLEVEL_BEG BLEVEL_END N_THRESH _VAR_ diff --git a/test/xml/unit_gen_vx_mask.xml b/test/xml/unit_gen_vx_mask.xml index b4aac5e497..9e9faf2638 100644 --- a/test/xml/unit_gen_vx_mask.xml +++ b/test/xml/unit_gen_vx_mask.xml @@ -31,7 +31,7 @@ &DATA_DIR_MODEL;/grib1/gfs/gfs_2012040900_F012.grib \ &MET_BASE;/poly/CONUS.poly \ &OUTPUT_DIR;/gen_vx_mask/POLY_GFS_LATLON_CONUS_mask.nc \ - -v 1 + -type poly -v 1 &OUTPUT_DIR;/gen_vx_mask/POLY_GFS_LATLON_CONUS_mask.nc @@ -48,7 +48,7 @@ &DATA_DIR_MODEL;/grib1/gfs/gfs_2012040900_F012_g008.grib \ &MET_BASE;/poly/CONUS.poly \ &OUTPUT_DIR;/gen_vx_mask/POLY_GFS_MERCATOR_CONUS_mask.nc \ - -v 1 + -type poly -v 1 &OUTPUT_DIR;/gen_vx_mask/POLY_GFS_MERCATOR_CONUS_mask.nc @@ -65,7 +65,7 @@ &DATA_DIR_MODEL;/grib1/nam/nam_2012040900_F012.grib \ &MET_BASE;/poly/CONUS.poly \ &OUTPUT_DIR;/gen_vx_mask/POLY_NAM_LAMBERT_CONUS_mask.nc \ - -v 1 + -type poly -v 1 &OUTPUT_DIR;/gen_vx_mask/POLY_NAM_LAMBERT_CONUS_mask.nc @@ -82,7 +82,7 @@ &DATA_DIR_MODEL;/grib1/arw-tom-gep0/arw-tom-gep0_2012040900_F012.grib \ &MET_BASE;/poly/NWC.poly \ &OUTPUT_DIR;/gen_vx_mask/POLY_HMT_STEREO_NWC_mask.nc \ - -v 1 + -type poly -v 1 &OUTPUT_DIR;/gen_vx_mask/POLY_HMT_STEREO_NWC_mask.nc @@ -100,7 +100,7 @@ &DATA_DIR_MODEL;/grib1/gfs/gfs_2012040900_F012.grib \ &MET_BASE;/poly/NAK.poly \ &OUTPUT_DIR;/gen_vx_mask/POLY_GFS_LATLON_NAK_mask.nc \ - -v 1 + -type poly -v 1 &OUTPUT_DIR;/gen_vx_mask/POLY_GFS_LATLON_NAK_mask.nc diff --git a/test/xml/unit_met_test_scripts.xml b/test/xml/unit_met_test_scripts.xml index 1579ea8034..2812eeeaaa 100644 --- a/test/xml/unit_met_test_scripts.xml +++ b/test/xml/unit_met_test_scripts.xml @@ -32,7 +32,7 @@ &MET_DATA;/sample_fcst/2005080700/wrfprs_ruc13_24.tm00_G212 \ &MET_BASE;/poly/CONUS.poly \ &OUTPUT_DIR;/gen_vx_mask/CONUS_poly.nc \ - -v 2 + -type poly -v 2 &OUTPUT_DIR;/gen_vx_mask/CONUS_poly.nc diff --git a/test/xml/unit_ref_config.xml b/test/xml/unit_ref_config.xml index 7801efbbc6..4e7e26113b 100644 --- a/test/xml/unit_ref_config.xml +++ b/test/xml/unit_ref_config.xml @@ -26,7 +26,7 @@ &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_012.tm00 \ &MET_BASE;/poly/CONUS.poly \ &OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc \ - -v 2 + -type poly -v 2 &OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc