dtcenter · JohnHalleyGotway · Feb 25, 2021 · Jan 28, 2021 · Feb 1, 2021 · Feb 1, 2021
diff --git a/met/.cproject b/met/.cproject
diff --git a/met/.project b/met/.project
diff --git a/met/data/config/EnsembleStatConfig_default b/met/data/config/EnsembleStatConfig_default
@@ -189,9 +189,8 @@ climo_stdev = {
 // May be set separately in each "obs.field" entry
 //
 climo_cdf = {
-   cdf_bins    = 1;
+   cdf_bins    = 10;
    center_bins = FALSE;
-   write_bins  = TRUE;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/met/data/config/STATAnalysisConfig_GO_Index b/met/data/config/STATAnalysisConfig_GO_Index
@@ -28,18 +28,26 @@ obs_lead  = [];
 
 fcst_valid_beg  = "";
 fcst_valid_end  = "";
+fcst_valid_inc  = [];
+fcst_valid_exc  = [];
 fcst_valid_hour = [];
 
 obs_valid_beg   = "";
 obs_valid_end   = "";
+obs_valid_inc   = [];
+obs_valid_exc   = [];
 obs_valid_hour  = [];
 
 fcst_init_beg   = "";
 fcst_init_end   = "";
+fcst_init_inc   = [];
+fcst_init_exc   = [];
 fcst_init_hour  = [];
 
 obs_init_beg    = "";
 obs_init_end    = "";
+obs_init_inc    = [];
+obs_init_exc    = [];
 obs_init_hour   = [];
 
 fcst_var = [ "WIND",  "WIND",  "WIND",  "WIND",

diff --git a/met/data/config/STATAnalysisConfig_default b/met/data/config/STATAnalysisConfig_default
@@ -17,18 +17,26 @@ obs_lead  = [];
 
 fcst_valid_beg  = "";
 fcst_valid_end  = "";
+fcst_valid_inc  = [];
+fcst_valid_exc  = [];
 fcst_valid_hour = [];
 
 obs_valid_beg   = "";
 obs_valid_end   = "";
+obs_valid_inc   = [];
+obs_valid_exc   = [];
 obs_valid_hour  = [];
 
 fcst_init_beg   = "";
 fcst_init_end   = "";
+fcst_init_inc   = [];
+fcst_init_exc   = [];
 fcst_init_hour  = [];
 
 obs_init_beg    = "";
 obs_init_end    = "";
+obs_init_inc    = [];
+obs_init_exc    = [];
 obs_init_hour   = [];
 
 fcst_var = [];

diff --git a/met/data/table_files/grib1_ncep_129_7.txt b/met/data/table_files/grib1_ncep_129_7.txt
@@ -234,10 +234,10 @@ GRIB1
 232 129 7 -1 "OZMAX8" "Ozone Daily Max from 8-hour Average" "ppbV"
 233 129 7 -1 "PDMAX1" "PM 2.5 Daily Max from 1-hour Average" "mcg/m^3"
 234 129 7 -1 "PDMX24" "PM 2.5 Daily Max from 24-hour Average" "mcg/m^3"
-235 129 7 -1 "MAXREF" "Hourly Maximum of Simulated Reflectivity at 1 km AGL" "dbZ"
-236 129 7 -1 "MXUPHL" "Hourly Maximum of Updraft Helicity over layer 2km to 5 km AGL" "m^2/s^2"
-237 129 7 -1 "MAXUVV" "Hourly Maximum of Upward Vertical Velocity in the lowest 400hPa" "m/s"
-238 129 7 -1 "MAXDVV" "Hourly Maximum of Downward Vertical Velocity in the lowest 400hPa" "m/s"
+235 129 7 -1 "MAXREF" "Hourly Maximum of Simulated Reflectivity" "dbZ"
+236 129 7 -1 "MXUPHL" "Hourly Maximum of Updraft Helicity" "m^2/s^2"
+237 129 7 -1 "MAXUVV" "Hourly Maximum of Upward Vertical Velocity" "m/s"
+238 129 7 -1 "MAXDVV" "Hourly Maximum of Downward Vertical Velocity" "m/s"
 239 129 7 -1 "MAXVIG" "Hourly Maximum of Column Vertical Integrated Graupel" "kg/m^2"
 240 129 7 -1 "RETOP" "Radar Echo Top (18.3 DBZ)" "m"
 241 129 7 -1 "VRATE" "Ventilation Rate" "m^2/s"

diff --git a/met/data/table_files/grib2_all.txt b/met/data/table_files/grib2_all.txt
@@ -421,11 +421,11 @@ GRIB2
 0 1 0 255 0 0 1 97  "MASSDS"  "Mass Density of Snow"  "kg/m^3"
 0 1 0 255 0 0 20 2  "MASSMR"  "Mass Mixing Ratio (Mass Fraction in Air)"  "kg/kg"
 0 1 0 255 0 0 1 28  "MAXAH"  "Maximum Absolute Humidity"  "kg/m^3"
-0 0 0 255 7 1 2 221  "MAXDVV"  "Hourly Maximum of Downward Vertical Velocity  in the lowest 400hPa"  "m/s"
+0 0 0 255 7 1 2 221  "MAXDVV"  "Hourly Maximum of Downward Vertical Velocity"  "m/s"
 0 1 0 255 0 0 2 21  "MAXGUST"  "Maximum Wind Speed"  "m/s"
-0 0 0 255 7 1 16 198  "MAXREF"  "Hourly Maximum of Simulated Reflectivity at 1 km AGL"  "dB"
+0 0 0 255 7 1 16 198  "MAXREF"  "Hourly Maximum of Simulated Reflectivity"  "dB"
 0 1 0 255 0 0 1 27  "MAXRH"  "Maximum Relative Humidity"  "%"
-0 0 0 255 7 1 2 220  "MAXUVV"  "Hourly Maximum of Upward Vertical Velocity  in the lowest 400hPa"  "m/s"
+0 0 0 255 7 1 2 220  "MAXUVV"  "Hourly Maximum of Upward Vertical Velocity"  "m/s"
 0 0 0 255 7 1 2 222  "MAXUW"  "U Component of Hourly Maximum 10m Wind Speed"  "m/s"
 0 0 0 255 7 1 2 223  "MAXVW"  "V Component of Hourly Maximum 10m Wind Speed"  "m/s"
 10 1 0 255 0 0 0 24  "MAXWH"  "Maximum Individual Wave Height"  "m"
@@ -460,7 +460,7 @@ GRIB2
 0 1 0 255 0 0 19 28  "MWTURB"  "Mountain Wave Turbulence (Eddy Dissipation Rate)"  "m2/3s-1"
 0 0 0 255 7 1 19 192  "MXSALB"  "Maximum Snow Albedo"  "%"
 0 1 0 255 0 0 19 17  "MXSALB"  "Maximum Snow Albedosee Note 1"  "%"
-0 0 0 255 7 1 7 199  "MXUPHL"  "Hourly Maximum of Updraft Helicity over Layer 2km to 5 km AGL"  "m^2/s^2"
+0 0 0 255 7 1 7 199  "MXUPHL"  "Hourly Maximum of Updraft Helicity"  "m^2/s^2"
 10 1 0 255 0 0 0 30  "MZPTSW"  "Mean Zero-Crossing Period of The Total Swell"  "s"
 10 1 0 255 0 0 0 29  "MZPWW"  "Mean Zero-Crossing Period of The Wind Waves"  "s"
 10 1 0 255 0 0 0 28  "MZWPER"  "Mean Zero-Crossing Wave Period"  "s"
@@ -1016,4 +1016,4 @@ GRIB2
 4 1 0 255 0 0 6 1  "XLONG"  "Solar X-ray Flux (XRS Long)"  "W/m^2"
 4 1 0 255 0 0 8 0  "XRAYRAD"  "X-Ray Radiance"  "W/sr/m^2"
 4 1 0 255 0 0 6 2  "XSHRT"  "Solar X-ray Flux (XRS Short)"  "W/m^2"
-10 1 0 255 0 0 2 10  "ZVCICEP"  "Zonal Vector Component of Vertically Integrated Ice Internal Pressure"  "Pa*m"
+10 1 0 255 0 0 2 10  "ZVCICEP"  "Zonal Vector Component of Vertically Integrated Ice Internal Pressure"  "Pa*m"
diff --git a/met/data/table_files/met_header_columns_V10.0.txt b/met/data/table_files/met_header_columns_V10.0.txt
@@ -11,13 +11,13 @@ 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]*
 V10.0 : 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.0 : 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.0 : 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
+V10.0 : 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.0 : 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.0 : 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.0 : 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]*

diff --git a/met/docs/Users_Guide/appendixC.rst b/met/docs/Users_Guide/appendixC.rst
@@ -887,9 +887,9 @@ ________________________________________________
 CRPS
 ~~~~
 
-Called "CRPS" in ECNT output :numref:`table_ES_header_info_es_out_ECNT`
+Called "CRPS", "CRPSCL", "CRPS_EMP", and "CRPSCL_EMP" in ECNT output :numref:`table_ES_header_info_es_out_ECNT`
 
-The continuous ranked probability score (CRPS) is the integral, over all possible thresholds, of the Brier scores (:ref:`Gneiting et al., 2004 <Gneiting-2004>`). In MET, the CRPS calculation uses a normal distribution fit to the ensemble forecasts. In many cases, use of other distributions would be better.
+The continuous ranked probability score (CRPS) is the integral, over all possible thresholds, of the Brier scores (:ref:`Gneiting et al., 2004 <Gneiting-2004>`). In MET, the CRPS is calculated two ways: using a normal distribution fit to the ensemble forecasts (CRPS and CRPSCL), and using the empirical ensemble distribution (CRPS_EMP and CRPSCL_EMP). In some cases, use of other distributions would be better.
 
 WARNING: The normal distribution is probably a good fit for temperature and pressure, and possibly a not horrible fit for winds. However, the normal approximation will not work on most precipitation forecasts and may fail for many other atmospheric variables.
 
@@ -906,12 +906,14 @@ The score can be interpreted as a continuous version of the mean absolute error
 CRPS Skill Score
 ~~~~~~~~~~~~~~~~
 
-Called "CRPSS" in ECNT output :numref:`table_ES_header_info_es_out_ECNT`
+Called "CRPSS" and "CRPSS_EMP" in ECNT output :numref:`table_ES_header_info_es_out_ECNT`
 
 The continuous ranked probability skill score (CRPSS) is similar to the MSESS and the BSS, in that it compares its namesake score to that of a reference forecast to produce a positively oriented score between 0 and 1.
 
 .. math:: \text{CRPSS} = 1 - \frac{\text{CRPS}_{fcst}}{ \text{CRPS}_{ref}}
 
+For the normal distribution fit (CRPSS), the reference CRPS is computed using the climatological mean and standard deviation. For the empirical distribution (CRPSS_EMP), the reference CRPS is computed by sampling from the assumed normal climatological distribution defined by the mean and standard deviation.  
+
 IGN
 ~~~