Feature #2321 tc_diag_changes (#2347)

Co-authored-by: Jonathan Vigh <jvigh@ucar.edu>
dtcenter · Nov 16, 2022 · 9fdd73b · 9fdd73b
1 parent f72017d
commit 9fdd73b
Show file tree

Hide file tree

Showing 20 changed files with 506 additions and 277 deletions.
diff --git a/data/config/TCPairsConfig_default b/data/config/TCPairsConfig_default
@@ -138,44 +138,65 @@ watch_warn = {
 }
 
 //
-// Diagnostics to be extracted
-//
-diag_name = [];
+// Metadata for diagnostic sources
+//
+diag_info_map = [
+   { 
+      diag_source    = "CIRA_DIAG_RT";
+      track_source   = "GFS";
+      field_source   = "GFS_0p50";
+      match_to_track = [ "GFS" ];
+      diag_name      = [];
+   },
+   { 
+      diag_source    = "SHIPS_DIAG_RT";
+      track_source   = "SHIPS_TRK";
+      field_source   = "GFS_0p50";
+      match_to_track = [ "OFCL" ];
+      diag_name      = [];
+   }
+];
 
 //
-// Unit conversions to be applied based on diagnostic names and units
+// Unit conversions for diagnostic sources, names, and units
 //
 diag_convert_map = [
-   { source = "TCDIAG";
-     key = [ "(10C)", "(10KT)", "(10M/S)" ];
-     convert(x) = x / 10; },
-
-   { source = "LSDIAG_RT";
-     key = [ "LAT",  "LON",  "CSST", "RSST", "DSST", "DSTA", "XDST", "XNST", "NSST", "NSTA",
-             "NTMX", "NTFR", "U200", "U20C", "V20C", "E000", "EPOS", "ENEG", "EPSS", "ENSS",
-             "T000", "TLAT", "TLON", "TWAC", "TWXC", "G150", "G200", "G250", "V000", "V850",
-             "V500", "V300", "SHDC", "SHGC", "T150", "T200", "T250", "SHRD", "SHRS", "SHRG",
-             "HE07", "HE05", "PW01", "PW02", "PW03", "PW04", "PW05", "PW06", "PW07", "PW08",
-             "PW09", "PW10", "PW11", "PW12", "PW13", "PW14", "PW15", "PW16", "PW17", "PW18",
-             "PW20", "PW21" ];
-     convert(x) = x / 10; },
-
-   { source = "LSDIAG_RT";
-     key = [ "VVAV", "VMFX", "VVAC" ];
-     convert(x) = x / 100; },
-
-   { source = "LSDIAG_RT";
-     key = [ "TADV" ];
-     convert(x) = x / 1000000; },
-
-   { source = "LSDIAG_RT";
-     key = [ "Z850", "D200", "TGRD", "DIVC" ];
-     convert(x) = x / 10000000; },
-
-   { source = "LSDIAG_RT";
-     key = [ "PENC", "PENV" ];
-     convert(x) = x / 10 + 1000; }
-
+   {
+      diag_source = "CIRA_DIAG";
+      key         = [ "(10C)", "(10KT)", "(10M/S)" ];
+      convert(x)  = x / 10;
+   },
+   {
+      diag_source = "SHIPS_DIAG";
+      key         = [ "LAT",  "LON",  "CSST", "RSST", "DSST", "DSTA", "XDST", "XNST", "NSST", "NSTA",
+                      "NTMX", "NTFR", "U200", "U20C", "V20C", "E000", "EPOS", "ENEG", "EPSS", "ENSS",
+                      "T000", "TLAT", "TLON", "TWAC", "TWXC", "G150", "G200", "G250", "V000", "V850",
+                      "V500", "V300", "SHDC", "SHGC", "T150", "T200", "T250", "SHRD", "SHRS", "SHRG",
+                      "HE07", "HE05", "PW01", "PW02", "PW03", "PW04", "PW05", "PW06", "PW07", "PW08",
+                      "PW09", "PW10", "PW11", "PW12", "PW13", "PW14", "PW15", "PW16", "PW17", "PW18",
+                      "PW20", "PW21" ];
+      convert(x)  = x / 10;
+   },
+   {
+      diag_source = "SHIPS_DIAG";
+      key         = [ "VVAV", "VMFX", "VVAC" ];
+      convert(x)  = x / 100;
+   },
+   {
+      diag_source = "SHIPS_DIAG";
+      key         = [ "TADV" ];
+      convert(x)  = x / 1000000;
+   },
+   {
+      diag_source = "SHIPS_DIAG";
+      key         = [ "Z850", "D200", "TGRD", "DIVC" ];
+      convert(x)  = x / 10000000;
+   },
+   {
+      diag_source = "SHIPS_DIAG";
+      key         = [ "PENC", "PENV" ];
+      convert(x)  = x / 10 + 1000;
+   }
 ];
 
 //

diff --git a/data/table_files/met_header_columns_V11.0.txt b/data/table_files/met_header_columns_V11.0.txt
@@ -37,5 +37,5 @@ V11.0 : MODE : OBJ      : VERSION MODEL N_VALID GRID_RES DESC FCST_LEAD FCST_VAL
 V11.0 : 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
 
 V11.0 : 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 NUM_MEMBERS TRACK_SPREAD TRACK_STDEV MSLP_STDEV MAX_WIND_STDEV
-V11.0 : TCST : TCDIAG   : VERSION AMODEL BMODEL DESC STORM_ID BASIN CYCLONE STORM_NAME INIT LEAD VALID INIT_MASK VALID_MASK LINE_TYPE TOTAL INDEX DIAG_SOURCE (N_DIAG) DIAG_[0-9]* VALUE_[0-9]*
+V11.0 : TCST : TCDIAG   : VERSION AMODEL BMODEL DESC STORM_ID BASIN CYCLONE STORM_NAME INIT LEAD VALID INIT_MASK VALID_MASK LINE_TYPE TOTAL INDEX DIAG_SOURCE TRACK_SOURCE FIELD_SOURCE (N_DIAG) DIAG_[0-9]* VALUE_[0-9]*
 V11.0 : 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]*