Skip to content

Commit

Permalink
Per #1451, in the Ensemble-Stat ORANK line type, rename CLIMO to CLIM…
Browse files Browse the repository at this point in the history 
…O_MEAN and add a CLIMO_STDEV column.
  • Loading branch information
@JohnHalleyGotway
JohnHalleyGotway committed Feb 19, 2021
1 parent 8e5fdc1 commit 0d88369
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 26 deletions.
2 changes: 1 addition & 1 deletion met/data/table_files/met_header_columns_V10.0.txt
View file
Expand Up @@ -11,7 +11,7 @@ V10.0 : STAT : NBRCTC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID
V10.0 : 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.0 : 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.0 : 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.0 : 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 SPREAD ENS_MEAN_OERR SPREAD_OERR SPREAD_PLUS_OERR
V10.0 : 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.0 : 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.0 : 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.0 : 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]*
Expand Down
20 changes: 11 additions & 9 deletions met/docs/Users_Guide/ensemble-stat.rst
View file
Expand Up @@ -800,28 +800,30 @@ The format of the STAT and ASCII output of the Ensemble-Stat tool are described
* - 37
- ENS_i
- Value of the ith ensemble member (repeated)
* - Last-6
* - Last-7
- OBS_QC
- Quality control string for the observation
* - Last-5
* - Last-6
- ENS_MEAN
- The unperturbed ensemble mean value
* - Last-5
- CLIMO_MEAN
- Climatological mean value (named CLIMO prior to met-10.0.0)
* - Last-4
- CLIMO
- The value of the included climatology
* - Last-3
- SPREAD
- The spread (standard deviation) of the unperturbed ensemble member values
* - Last-2
* - Last-3
- ENS_MEAN _OERR
- The PERTURBED ensemble mean (e.g. with Observation Error).
* - Last-1
* - Last-2
- SPREAD_OERR
- The spread (standard deviation) of the PERTURBED ensemble member values (e.g. with Observation Error).
* - Last
* - Last-1
- SPREAD_PLUS_OERR
- The square root of the sum of the unperturbed ensemble variance and the observation error variance.

* - Last
- CLIMO_STDEV
- Climatological standard deviation value

.. role:: raw-html(raw)
:format: html
Expand Down
16 changes: 8 additions & 8 deletions met/src/basic/vx_util/stat_column_defs.h
View file
Expand Up @@ -281,13 +281,13 @@ static const char * phist_columns [] = {
};

static const char * orank_columns [] = {
"TOTAL", "INDEX", "OBS_SID",
"OBS_LAT", "OBS_LON", "OBS_LVL",
"OBS_ELV", "OBS", "PIT",
"RANK", "N_ENS_VLD", "N_ENS",
"ENS_", "OBS_QC", "ENS_MEAN",
"CLIMO", "SPREAD", "ENS_MEAN_OERR",
"SPREAD_OERR", "SPREAD_PLUS_OERR"
"TOTAL", "INDEX", "OBS_SID",
"OBS_LAT", "OBS_LON", "OBS_LVL",
"OBS_ELV", "OBS", "PIT",
"RANK", "N_ENS_VLD", "N_ENS",
"ENS_", "OBS_QC", "ENS_MEAN",
"CLIMO_MEAN", "SPREAD", "ENS_MEAN_OERR",
"SPREAD_OERR", "SPREAD_PLUS_OERR", "CLIMO_STDEV"
};

static const char * ssvar_columns [] = {
Expand Down Expand Up @@ -424,7 +424,7 @@ inline int get_n_eclv_columns (int n) { return(4 + 2*n); } // n =
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
inline int get_n_relp_columns (int n) { return(2 + n); } // n = N_ENS
inline int get_n_orank_columns (int n) { return(19 + n); } // n = N_ENS
inline int get_n_orank_columns (int n) { return(20 + n); } // n = N_ENS

////////////////////////////////////////////////////////////////////////

Expand Down
20 changes: 12 additions & 8 deletions met/src/libcode/vx_stat_out/stat_columns.cc
View file
Expand Up @@ -3822,14 +3822,14 @@ void write_orank_cols(const PairDataEnsemble *pd_ptr, int i,
//
// Ensemble Observation Rank Matched Pairs
// Dump out the ORANK line:
// TOTAL, INDEX, OBS_SID,
// OBS_LAT, OBS_LON, OBS_LVL,
// OBS_ELV, OBS, PIT,
// RANK, N_ENS_VLD, N_ENS,
// TOTAL, INDEX, OBS_SID,
// OBS_LAT, OBS_LON, OBS_LVL,
// OBS_ELV, OBS, PIT,
// RANK, N_ENS_VLD, N_ENS,
// [ENS_] (for each ensemble member)
// OBS_QC, ENS_MEAN, CLIMO,
// SPREAD, ENS_MEAN_OERR, SPREAD_OERR,
// SPREAD_PLUS_OERR
// OBS_QC, ENS_MEAN, CLIMO_MEAN,
// SPREAD, ENS_MEAN_OERR, SPREAD_OERR,
// SPREAD_PLUS_OERR, CLIMO_STDEV
//
at.set_entry(r, c+0, // Total Number of Pairs
pd_ptr->n_obs); // Use n_obs instead of n_pair to include missing data
Expand Down Expand Up @@ -3885,7 +3885,7 @@ void write_orank_cols(const PairDataEnsemble *pd_ptr, int i,
at.set_entry(r, c+13+pd_ptr->n_ens,
pd_ptr->mn_na[i]);

// Climatology values
// Climatology mean values
at.set_entry(r, c+14+pd_ptr->n_ens,
pd_ptr->cmn_na[i]);

Expand All @@ -3905,6 +3905,10 @@ void write_orank_cols(const PairDataEnsemble *pd_ptr, int i,
at.set_entry(r, c+18+pd_ptr->n_ens,
square_root(pd_ptr->var_plus_oerr_na[i]));

// Climatology standard deviation values
at.set_entry(r, c+19+pd_ptr->n_ens,
pd_ptr->csd_na[i]);

return;
}

Expand Down

0 comments on commit 0d88369

Please sign in to comment.