Skip to content

Commit

Permalink
#1942 Switched the order of PF and PV
Browse files Browse the repository at this point in the history
  • Loading branch information
Howard Soh committed Sep 13, 2022
1 parent 30556aa commit 8ab1e20
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion data/table_files/met_header_columns_V11.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ V11.0 : STAT : ISC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID
V11.0 : 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
V11.0 : 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
V11.0 : 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
V11.0 : STAT : SEEPS : 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 S12 S13 S21 S23 S31 S32 PV1 PV2 PV3 PF1 PF2 PF3 MEAN_FCST MEAN_OBS SEEPS
V11.0 : STAT : SEEPS : 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 S12 S13 S21 S23 S31 S32 PF1 PF2 PF3 PV1 PV2 PV3 MEAN_FCST MEAN_OBS SEEPS
V11.0 : STAT : SEEPS_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 OBS_SID OBS_LAT OBS_LON FCST OBS OBS_QC FCST_CAT OBS_CAT P1 P2 T1 T2 SEEPS
V11.0 : 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
V11.0 : 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
Expand Down
6 changes: 3 additions & 3 deletions src/basic/vx_util/stat_column_defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -373,9 +373,9 @@ static const char * seeps_mpr_columns [] = {
static const char * seeps_columns [] = {
"TOTAL", "S12", "S13",
"S21", "S23", "S31",
"S32", "PV1", "PV2",
"PV3", "PF1", "PF2",
"PF3", "MEAN_FCST", "MEAN_OBS",
"S32", "PF1", "PF2",
"PF3", "PV1", "PV2",
"PV3", "MEAN_FCST", "MEAN_OBS",
"SEEPS"
};

Expand Down
18 changes: 9 additions & 9 deletions src/libcode/vx_stat_out/stat_columns.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4092,9 +4092,9 @@ void write_seeps_cols(const PairDataPoint *pd_ptr, int i,
// Dump out the SEEPS line:
// TOTAL S12, S13,
// S21, S23, S31,
// S32, PV1, PV2,
// PV3, PF1, PF2,
// PF3, MEAN_FCST, MEAN_OBS,
// S32, PF1, PF2,
// PF3, PV1, PV2,
// PV3, MEAN_FCST, MEAN_OBS,
// SEEPS

at.set_entry(r, c+0, pd_ptr->seeps.n_obs); // Total Number of Pairs
Expand All @@ -4106,13 +4106,13 @@ void write_seeps_cols(const PairDataPoint *pd_ptr, int i,
at.set_entry(r, c+5, bad_data_double); // pd_ptr->seeps.s31); // s31
at.set_entry(r, c+6, bad_data_double); // pd_ptr->seeps.s32); // s32

at.set_entry(r, c+7, bad_data_double); // pd_ptr->seeps.pv1); // pv1
at.set_entry(r, c+8, bad_data_double); // pd_ptr->seeps.pv2); // pv2
at.set_entry(r, c+9, bad_data_double); // pd_ptr->seeps.pv3); // pv3
at.set_entry(r, c+7, bad_data_double); // pd_ptr->seeps.pf1); // pf1
at.set_entry(r, c+8, bad_data_double); // pd_ptr->seeps.pf2); // pf2
at.set_entry(r, c+9, bad_data_double); // pd_ptr->seeps.pf3); // pf3

at.set_entry(r, c+10, bad_data_double); // pd_ptr->seeps.pf1); // pf1
at.set_entry(r, c+11, bad_data_double); // pd_ptr->seeps.pf2); // pf2
at.set_entry(r, c+12, bad_data_double); // pd_ptr->seeps.pf3); // pf3
at.set_entry(r, c+10, bad_data_double); // pd_ptr->seeps.pv1); // pv1
at.set_entry(r, c+11, bad_data_double); // pd_ptr->seeps.pv2); // pv2
at.set_entry(r, c+12, bad_data_double); // pd_ptr->seeps.pv3); // pv3

at.set_entry(r, c+13, pd_ptr->seeps.mean_fcst); // mean_fcst
at.set_entry(r, c+14, pd_ptr->seeps.mean_obs); // mean_obs
Expand Down

0 comments on commit 8ab1e20

Please sign in to comment.