Update develop-ref after #2326 (#2327)

Co-authored-by: Randy Bullock <bullock@seneca.rap.ucar.edu> Co-authored-by: davidfillmore <fillmore.winslow.david@gmail.com> Co-authored-by: rgbullock <bullock@ucar.edu> Co-authored-by: John Halley Gotway <johnhg@kiowa.rap.ucar.edu> Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu> Co-authored-by: johnhg <johnhg@ucar.edu> Co-authored-by: John Halley Gotway <johnhg@ucar.edu> Co-authored-by: Seth Linden <linden@seneca.rap.ucar.edu> Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com> Co-authored-by: Julie Prestopnik <jpresto@seneca.rap.ucar.edu> Co-authored-by: Seth Linden <linden@kiowa.rap.ucar.edu> Co-authored-by: j-opatz <59586397+j-opatz@users.noreply.github.com> Co-authored-by: Howard Soh <hsoh@kiowa.rap.ucar.edu> Co-authored-by: jprestop <jpresto@ucar.edu> Co-authored-by: Seth Linden <linden@ucar.edu> Co-authored-by: hsoh-u <hsoh@ucar.edu> Co-authored-by: John Halley Gotway <johnhg@seneca.rap.ucar.edu> Co-authored-by: MET Tools Test Account <met_test@seneca.rap.ucar.edu> Co-authored-by: mo-mglover <78152252+mo-mglover@users.noreply.github.com> Co-authored-by: davidalbo <dave@ucar.edu> Co-authored-by: lisagoodrich <33230218+lisagoodrich@users.noreply.github.com> Co-authored-by: Dan Adriaansen <dadriaan@ucar.edu> Co-authored-by: Dave Albo <dave@seneca.rap.ucar.edu> Co-authored-by: Lisa Goodrich <lisag@seneca.rap.ucar.edu> Co-authored-by: Molly Smith <molly.b.smith@noaa.gov> Co-authored-by: Jonathan Vigh <jvigh@ucar.edu> Co-authored-by: bikegeek <3753118+bikegeek@users.noreply.github.com>
dtcenter · Oct 31, 2022 · 1d8978d · 1d8978d
1 parent c9a5a1e
commit 1d8978d
Show file tree

Hide file tree

Showing 20 changed files with 330 additions and 218 deletions.
diff --git a/data/table_files/met_header_columns_V11.0.txt b/data/table_files/met_header_columns_V11.0.txt
@@ -19,7 +19,7 @@ V11.0 : STAT : PJC      : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID
 V11.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]*
 V11.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]*
 V11.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]*
-V11.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 CRPS_EMP_FAIR BIAS_RATIO N_GE_OBS ME_GE_OBS N_LT_OBS ME_LT_OBS
+V11.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 CRPS_EMP_FAIR MAE MAE_OERR BIAS_RATIO N_GE_OBS ME_GE_OBS N_LT_OBS ME_LT_OBS
 V11.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
 V11.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]*
 V11.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/docs/Users_Guide/appendixC.rst b/docs/Users_Guide/appendixC.rst
@@ -505,6 +505,7 @@ Root-mean-squared error (RMSE)
 ------------------------------
 
 Called "RMSE" in CNT output :numref:`table_PS_format_info_CNT`
+Called "RMSE" and "RMSE_OERR" in ECNT output :numref:`table_ES_header_info_es_out_ECNT`
 
 RMSE is simply the square root of the MSE, :math:`\text{RMSE} = \sqrt{\text{MSE}}`. 
 
@@ -540,6 +541,7 @@ Mean Absolute Error (MAE)
 -------------------------
 
 Called "MAE" in CNT output :numref:`table_PS_format_info_CNT`
+Called "MAE" and "MAE_OERR" in ECNT output :numref:`table_ES_header_info_es_out_ECNT`
 
 The Mean Absolute Error (MAE) is defined as :math:`\text{MAE} = \frac{1}{n} \sum|f_{i} - o_{i}|`.
 

diff --git a/docs/Users_Guide/ensemble-stat.rst b/docs/Users_Guide/ensemble-stat.rst
@@ -624,18 +624,24 @@ The format of the STAT and ASCII output of the Ensemble-Stat tool are described
     - CRPS_EMP_FAIR
     - The Continuous Ranked Probability Skill Score (empirical distribution) adjusted by subtracting 1/2(m) times the mean absolute difference of the ensemble members (m is the ensemble size)
   * - 42
+    - MAE
+    - The Mean Absolute Error of the ensemble mean (unperturbed or supplied)
+  * - 43
+    - MAE_OERR
+    - The Mean Absolute Error of the PERTURBED ensemble mean (e.g. with Observation Error)
+  * - 44
     - BIAS_RATIO
     - The Bias Ratio
-  * - 43
+  * - 45
     - N_GE_OBS
     - The number of ensemble values greater than or equal to their observations
-  * - 44
+  * - 46
     - ME_GE_OBS
     - The Mean Error of the ensemble values greater than or equal to their observations
-  * - 45
+  * - 47
     - N_LT_OBS
     - The number of ensemble values less than their observations
-  * - 46
+  * - 48
     - ME_LT_OBS
     - The Mean Error of the ensemble values less than or equal to their observations
 

diff --git a/docs/Users_Guide/release-notes.rst b/docs/Users_Guide/release-notes.rst
@@ -9,10 +9,49 @@ When applicable, release notes are followed by the GitHub issue number which des
 enhancement, or new feature (`MET GitHub issues <https://github.com/dtcenter/MET/issues>`_).
 Important issues are listed **in bold** for emphasis.
 
-MET Version 11.0.0-beta3 release notes (20220921)
+.. warning:: **Ensemble post-processing was added to Gen-Ens-Prod in version 10.1.0 and will be removed from Ensemble-Stat in version 11.0.0!**
+
+MET Version 11.0.0-beta4 release notes (20221031)
 -------------------------------------------------
 
-.. warning:: **Ensemble post-processing was added to Gen-Ens-Prod in version 10.1.0 and will be removed from Ensemble-Stat in version 11.0.0!**
+* Repository, build, and testing:
+
+   * Enhance the MET base image to support NetCDF files using groups in the enhanced data model (`dtcenter/METbaseimage#6 <https://github.com/dtcenter/METbaseimage/issues/6>`_).
+   * Update the SonarQube version used for routine software scans (`#2270 <https://github.com/dtcenter/MET/issues/2270>`_).
+   * Create test to replicate MET-11.0.0-beta3 linker errors and fix them (`#2281 <https://github.com/dtcenter/MET/issues/2281>`_).
+   * Fix GHA documentation workflow (`#2282 <https://github.com/dtcenter/MET/issues/2282>`_).
+   * Fix GHA warnings and update the version of actions (i.e. actions/checkout@v3) (`#2297 <https://github.com/dtcenter/MET/issues/2297>`_).
+
+* Code cleanup and documentation:
+
+   * Remove namespace specification from header files (`#2227 <https://github.com/dtcenter/MET/issues/2227>`_).
+   * Move release notes into its own chapter in the User's Guide (`#2298 <https://github.com/dtcenter/MET/issues/2298>`_).
+
+* Bugfixes:
+
+   * Fix Stat-Analysis aggregation of the neighborhood statistics line types (`#2271 <https://github.com/dtcenter/MET/issues/2271>`_).
+   * Fix the ascii2nc_airnow_hourly test in unit_ascii2nc.xml (`#2306 <https://github.com/dtcenter/MET/issues/2306>`_).
+   * Fix TC-Stat parsing of TCMPR lines (`#2309 <https://github.com/dtcenter/MET/issues/2309>`_).
+   * Fix the Point-Stat and Ensemble-Stat GRIB table lookup logic for python embedding of point observations (`#2286 <https://github.com/dtcenter/MET/issues/2286>`_).
+
+* Library Enhancments:
+
+   * Add support for point-based climatologies for use in SEEPS (`#1941 <https://github.com/dtcenter/MET/issues/1941>`_).
+   * Enhance MET to handle NC strings when processing CF-Compliant NetCDF files (`#2042 <https://github.com/dtcenter/MET/issues/2042>`_).
+   * Enhance the MET library code to handle CF-compliant time strings with an offset defined in months or years (`#2155 <https://github.com/dtcenter/MET/issues/2155>`_).
+
+* Application Enhancements:
+
+   * **Enhance ASCII2NC to read NDBC buoy data** (`#2276 <https://github.com/dtcenter/MET/issues/2276>`_).
+   * **Enhance IODA2NC to support IODA v2.0 format** (`#2068 <https://github.com/dtcenter/MET/issues/2068>`_).
+   * **Add MAE to the ECNT line type from Ensemble-Stat and for HiRA** (`#2325 <https://github.com/dtcenter/MET/issues/2325>`_).
+   * **Add new bias ratio statistic to the ECNT line type from Ensemble-Stat and for HiRA** (`#2058 <https://github.com/dtcenter/MET/issues/2058>`_).
+   * **Enhance TC-Pairs consensus logic to compute the spread of the location, wind speed, and pressure** (`#2036 <https://github.com/dtcenter/MET/issues/2036>`_).
+   * **Enhance TC-Pairs to read hurricane model diagnostic files (e.g. SHIPS) and TC-Stat to filter the new data** (`#392 <https://github.com/dtcenter/MET/issues/392>`_).
+   * Refine Grid-Diag output variable names when specifying two input data sources (`#2232 <https://github.com/dtcenter/MET/issues/2232>`_).
+
+MET Version 11.0.0-beta3 release notes (20220921)
+-------------------------------------------------
 
 * Repository and build:
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -20,11 +20,11 @@
 project = 'MET'
 author = 'UCAR/NCAR, NOAA, CSU/CIRA, and CU/CIRES'
 author_list = 'Opatz, J., T. Jensen, J. Prestopnik, H. Soh, L. Goodrich, B. Brown, R. Bullock, J. Halley Gotway, K. Newman'
-version = '11.0.0-beta3'
+version = '11.0.0-beta4'
 verinfo = version
 release = f'{version}'
 release_year = '2022'
-release_date = f'{release_year}-09-21'
+release_date = f'{release_year}-10-31'
 copyright = f'{release_year}, {author}'
 
 # -- General configuration ---------------------------------------------------

diff --git a/internal/test_unit/hdr/met_11_0.hdr b/internal/test_unit/hdr/met_11_0.hdr
@@ -17,7 +17,7 @@ PJC           : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_L
 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 CRPS_EMP_FAIR BIAS_RATIO N_GE_OBS ME_GE_OBS N_LT_OBS ME_LT_OBS
+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 CRPS_EMP_FAIR MAE MAE_OERR BIAS_RATIO N_GE_OBS ME_GE_OBS N_LT_OBS ME_LT_OBS
 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_

diff --git a/internal/test_unit/perl/tcst_conv.pl b/internal/test_unit/perl/tcst_conv.pl
@@ -29,7 +29,11 @@ ()
                     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);
+                    ARADP BRADP ARRP BRRP AMRD BMRD AGUSTS BGUSTS AEYE BEYE ADIR BDIR ASPEED BSPEED ADEPTH BDEPTH
+		    NUM_MEMBERS TRACK_SPREAD DIST_MEAN MSLP_SPREAD MAX_WIND_SPREAD);
+
+my @fld_tcdiag = qw(AMODEL BMODEL DESC STORM_ID BASIN CYCLONE STORM_NAME INIT_MASK VALID_MASK
+                    TOTAL INDEX LEVEL SOURCE N_DIAG DIAG_ VALUE_);
 
 my @fld_probrirw = qw(AMODEL BMODEL DESC STORM_ID BASIN CYCLONE STORM_NAME INIT_MASK VALID_MASK
                       ALAT ALON BLAT BLON INITIALS TK_ERR X_ERR Y_ERR ADLAND BDLAND RI_BEG RI_END RI_WINDOW
@@ -136,7 +140,26 @@ ()
       "%15s"  . # ASPEED
       "%15s"  . # BSPEED
       "%15s"  . # ADEPTH
-      "%15s";   # BDEPTH
+      "%15s"  . # BDEPTH
+      "%15s"  . # NUM_MEMBERS
+      "%15s"  . # TRACK_SPREAD
+      "%15s"  . # DIST_MEAN
+      "%15s"  . # MSLP_SPREAD
+      "%15s";   # MAX_WIND_SPREAD
+
+my $fmt_tcdiag =
+      "%15s"  . # AMODEL
+      "%15s"  . # BMODEL
+      "%15s"  . # STORM_ID
+      "%15s"  . # BASIN
+      "%15s"  . # CYCLONE
+      "%15s"  . # STORM_NAME
+      "%15s"  . # INIT_MASK
+      "%15s"  . # VALID_MASK
+      "%15s"  . # TOTAL
+      "%15s"  . # INDEX
+      "%15s"  . # SOURCE 
+      "%15s";   # N_DIAG 
 
 my $fmt_probrirw =
       "%15s"  . # AMODEL
@@ -215,10 +238,20 @@ ()
   # write a TCMPR line
   my $fmt_val;
   if( $vals[13] eq "TCMPR" ){
-    push @outs, (" TCST_TCMPR ", @vals[1,2,4 .. 7,11,12,14 .. 79]);
+    push @outs, (" TCST_TCMPR ", @vals[1,2,4 .. 7,11,12,14 .. 84]);
     $fmt_val = $fmt_tcmpr;
   }
 
+  # write a TCDIAG line
+  elsif( $vals[13] eq "TCDIAG" ) {
+    push @outs, (" TCST_TCDIAG ", @vals[1,2,4 .. 7,11,12,14 .. 17]);
+    $fmt_val = $fmt_tcdiag;
+    foreach my $i ( 18 .. $#vals ) {
+      $fmt_val = $fmt_val . "%15s";
+      push @outs, ($vals[$i]);
+    }
+  }
+
   # write a PROBRIRW line
   elsif( $vals[13] eq "PROBRIRW" ) {
     push @outs, (" TCST_PROBRIRW ", @vals[1,2,4 .. 7,11,12,14 .. 34]);
@@ -318,6 +351,19 @@ ()
 # 77 - BSPEED
 # 78 - ADEPTH
 # 79 - BDEPTH
+# 80 - NUM_MEMBERS
+# 81 - TRACK_SPREAD
+# 82 - DIST_MEAN
+# 83 - MSLP_SPREAD
+# 84 - MAX_WIND_SPREAD
+
+# TCDIAG Line Type
+# 14 - TOTAL
+# 15 - INDEX
+# 16 - SOURCE
+# 17 - N_DIAG
+# 18 - DIAG_i
+# 19 - VALUE_i
 
 # PROBRIRW Line Type
 # 14 - ALAT
@@ -341,13 +387,5 @@ ()
 # 32 - BLEVEL_BEG
 # 33 - BLEVEL_END
 # 34 - N_THRESH
-# 35 - THRESH_1
-# 36 - PROB_1
-# 37 - THRESH_2
-# 38 - PROB_2
-# 39 - THRESH_3
-# 40 - PROB_3
-# 41 - THRESH_4
-# 42 - PROB_4
-# 43 - THRESH_5
-# 44 - PROB_5
+# 35 - THRESH_i
+# 36 - PROB_i