Feature #2036 rename (#2346)

dtcenter · Nov 15, 2022 · f72017d · f72017d
1 parent 5283e1f
commit f72017d
Show file tree

Hide file tree

Showing 11 changed files with 103 additions and 116 deletions.
diff --git a/data/table_files/met_header_columns_V11.0.txt b/data/table_files/met_header_columns_V11.0.txt
@@ -36,6 +36,6 @@ V11.0 : STAT : SSIDX    : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID
 V11.0 : MODE : OBJ      : 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 OBJECT_ID OBJECT_CAT CENTROID_X CENTROID_Y CENTROID_LAT CENTROID_LON AXIS_ANG LENGTH WIDTH AREA AREA_THRESH CURVATURE CURVATURE_X CURVATURE_Y COMPLEXITY INTENSITY_10 INTENSITY_25 INTENSITY_50 INTENSITY_75 INTENSITY_90 INTENSITY_USER INTENSITY_SUM CENTROID_DIST BOUNDARY_DIST CONVEX_HULL_DIST ANGLE_DIFF ASPECT_DIFF AREA_RATIO INTERSECTION_AREA UNION_AREA SYMMETRIC_DIFF INTERSECTION_OVER_AREA CURVATURE_RATIO COMPLEXITY_RATIO PERCENTILE_INTENSITY_RATIO INTEREST
 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 DIST_MEAN MSLP_SPREAD MAX_WIND_SPREAD
+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 : 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]*
diff --git a/docs/Users_Guide/tc-pairs.rst b/docs/Users_Guide/tc-pairs.rst
@@ -175,7 +175,7 @@ ____________________
      }
   ];
 
-The **consensus** field allows the user to generate a user-defined consensus forecasts from any number of models. All models used in the consensus forecast need to be included in the **model** field (first entry in **TCPairsConfig_default**). The name field is the desired consensus model name. The **members** field is a comma-separated list of model IDs that make up the members of the consensus. The **required** field is a comma-separated list of true/false values associated with each consensus member. If a member is designated as true, the member is required to be present in order for the consensus to be generated. If a member is false, the consensus will be generated regardless of whether the member is present. The length of the required array must be the same length as the members array. The **min_req** field is the number of members required in order for the consensus to be computed. The required and min_req field options are applied at each forecast lead time. If any member of the consensus has a non-valid position or intensity value, the consensus for that valid time will not be generated. If a consensus model is indicated in the configuration file there will be non-missing output for the consensus track variables in the output file (NUM_MEMBERS, TRACK_SPREAD, DIST_MEAN, MSLP_SPREAD, MAX_WIND_SPREAD). See the TCMPR line type definitions below.
+The **consensus** field allows the user to generate a user-defined consensus forecasts from any number of models. All models used in the consensus forecast need to be included in the **model** field (first entry in **TCPairsConfig_default**). The name field is the desired consensus model name. The **members** field is a comma-separated list of model IDs that make up the members of the consensus. The **required** field is a comma-separated list of true/false values associated with each consensus member. If a member is designated as true, the member is required to be present in order for the consensus to be generated. If a member is false, the consensus will be generated regardless of whether the member is present. The length of the required array must be the same length as the members array. The **min_req** field is the number of members required in order for the consensus to be computed. The required and min_req field options are applied at each forecast lead time. If any member of the consensus has a non-valid position or intensity value, the consensus for that valid time will not be generated. If a consensus model is indicated in the configuration file there will be non-missing output for the consensus track variables in the output file (NUM_MEMBERS, TRACK_SPREAD, TRACK_STDEV, MSLP_STDEV, MAX_WIND_STDEV). See the TCMPR line type definitions below.
 
 ____________________
 
@@ -549,15 +549,15 @@ TC-Pairs produces output in TCST format. The default output file name can be ove
     - consensus variable: number of models (or ensemble members) that were used to build the consensus track
   * - 81
     - TRACK_SPREAD
-    - consensus variable: the standard deviation of the distances from the member locations to the consensus track location (nm)
-  * - 82
-    - DIST_MEAN
     - consensus variable: the mean of the distances from the member location to the consensus track location (nm)
+  * - 82
+    - TRACK_STDEV
+    - consensus variable: the standard deviation of the distances from the member locations to the consensus track location (nm)
   * - 83
-    - MSLP_SPREAD
+    - MSLP_STDEV
     - consensus variable: the standard deviation of the member's mean sea level pressure values 
   * - 84
-    - MAX_WIND_SPREAD
+    - MAX_WIND_STDEV
     - consensus variable: the standard deviation of the member's maximum wind speed values 
 
 .. _TCDIAG Line Type:

diff --git a/internal/test_unit/hdr/met_11_0.hdr b/internal/test_unit/hdr/met_11_0.hdr
@@ -33,6 +33,6 @@ SSIDX         : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_L
 MODE_SOA      : 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 N_VALID GRID_RES OBJECT_ID OBJECT_CAT CENTROID_X CENTROID_Y CENTROID_LAT CENTROID_LON AXIS_ANG LENGTH WIDTH AREA AREA_THRESH CURVATURE CURVATURE_X CURVATURE_Y COMPLEXITY INTENSITY_10 INTENSITY_25 INTENSITY_50 INTENSITY_75 INTENSITY_90 INTENSITY_50 INTENSITY_SUM
 MODE_POA      : 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 N_VALID GRID_RES OBJECT_ID OBJECT_CAT CENTROID_DIST BOUNDARY_DIST CONVEX_HULL_DIST ANGLE_DIFF ASPECT_DIFF AREA_RATIO INTERSECTION_AREA UNION_AREA SYMMETRIC_DIFF INTERSECTION_OVER_AREA CURVATURE_RATIO COMPLEXITY_RATIO PERCENTILE_INTENSITY_RATIO INTEREST
 MODE_CTS      : 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 N_VALID GRID_RES FIELD TOTAL FY_OY FY_ON FN_OY FN_ON BASER FMEAN ACC FBIAS PODY PODN POFD FAR CSI GSS HK HSS ODDS
-TCST_TCMPR    : 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 AMODEL BMODEL STORM_ID BASIN CYCLONE STORM_NAME INIT_MASK VALID_MASK 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 DIST_MEAN MSLP_SPREAD MAX_WIND_SPREAD
+TCST_TCMPR    : 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 AMODEL BMODEL STORM_ID BASIN CYCLONE STORM_NAME INIT_MASK VALID_MASK 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
 TCST_TCDIAG   : 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 AMODEL BMODEL STORM_ID BASIN CYCLONE STORM_NAME INIT_MASK VALID_MASK TOTAL INDEX DIAG_SOURCE N_DIAG _VAR_
 TCST_PROBRIRW : 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 ALAT ALON BLAT BLON INITIALS TK_ERR X_ERR Y_ERR ADLAND BDLAND RI_BEG RI_END RI_WINDOW AWIND_END BWIND_BEG BWIND_END BDELTA BDELTA_MAX BLEVEL_BEG BLEVEL_END N_THRESH _VAR_
diff --git a/internal/test_unit/perl/tcst_conv.pl b/internal/test_unit/perl/tcst_conv.pl
@@ -30,7 +30,7 @@ ()
                     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 DIST_MEAN MSLP_SPREAD MAX_WIND_SPREAD);
+		    NUM_MEMBERS TRACK_SPREAD TRACK_STDEV MSLP_STDEV MAX_WIND_STDEV);
 
 my @fld_tcdiag = qw(AMODEL BMODEL DESC STORM_ID BASIN CYCLONE STORM_NAME INIT_MASK VALID_MASK
                     TOTAL INDEX LEVEL DIAG_SOURCE N_DIAG DIAG_ VALUE_);
@@ -143,9 +143,9 @@ ()
       "%15s"  . # BDEPTH
       "%15s"  . # NUM_MEMBERS
       "%15s"  . # TRACK_SPREAD
-      "%15s"  . # DIST_MEAN
-      "%15s"  . # MSLP_SPREAD
-      "%15s";   # MAX_WIND_SPREAD
+      "%15s"  . # TRACK_STDEV
+      "%15s"  . # MSLP_STDEV
+      "%15s";   # MAX_WIND_STDEV
 
 my $fmt_tcdiag =
       "%15s"  . # AMODEL
@@ -353,9 +353,9 @@ ()
 # 79 - BDEPTH
 # 80 - NUM_MEMBERS
 # 81 - TRACK_SPREAD
-# 82 - DIST_MEAN
-# 83 - MSLP_SPREAD
-# 84 - MAX_WIND_SPREAD
+# 82 - TRACK_STDEV
+# 83 - MSLP_STDEV
+# 84 - MAX_WIND_STDEV
 
 # TCDIAG Line Type
 # 14 - TOTAL

diff --git a/src/libcode/vx_tc_util/tc_columns.cc b/src/libcode/vx_tc_util/tc_columns.cc
@@ -342,8 +342,8 @@ void write_tc_mpr_cols(const TrackPairInfo &p, int i,
    at.set_entry(r, c++, systemsdepth_to_string(p.bdeck()[i].depth()));
 
    at.set_entry(r, c++, p.adeck()[i].num_members());
-   at.set_entry(r, c++, p.adeck()[i].spread());
-   at.set_entry(r, c++, p.adeck()[i].dist_mean());
+   at.set_entry(r, c++, p.adeck()[i].track_spread());
+   at.set_entry(r, c++, p.adeck()[i].track_stdev());
    at.set_entry(r, c++, p.adeck()[i].mslp_stdev());
    at.set_entry(r, c++, p.adeck()[i].v_max_stdev());
 

diff --git a/src/libcode/vx_tc_util/tc_columns.h b/src/libcode/vx_tc_util/tc_columns.h
@@ -70,10 +70,8 @@ static const char * tc_mpr_cols [] = {
    "ASPEED",      "BSPEED",
    "ADEPTH",      "BDEPTH",
    "NUM_MEMBERS",
-   "TRACK_SPREAD",
-   "DIST_MEAN",
-   "MSLP_SPREAD",
-   "MAX_WIND_SPREAD"
+   "TRACK_SPREAD", "TRACK_STDEV",
+   "MSLP_STDEV",  "MAX_WIND_STDEV"
 };
 
 static const int n_tc_mpr_cols = sizeof(tc_mpr_cols)/sizeof(*tc_mpr_cols);

diff --git a/src/libcode/vx_tc_util/track_info.cc b/src/libcode/vx_tc_util/track_info.cc
@@ -957,7 +957,7 @@ TrackInfo consensus(const TrackInfoArray &tracks,
    QuadInfo   wavg;
    NumArray   plon, plat, pvmax, pmslp;
    double     lon_range, lon_shift, lon_avg;
-   double     track_spread, vmax_stdev, mslp_stdev;
+   double     track_spread, track_stdev, vmax_stdev, mslp_stdev;
 
    // Check for at least one track
    if(tracks.n() == 0) {
@@ -1082,18 +1082,15 @@ TrackInfo consensus(const TrackInfoArray &tracks,
       // Save the number of members that went into the consensus
       if(pcnt > 0) pavg.set_num_members(pcnt);
 
-      // Compute track spread and distance mean, convert to nautical-miles
-      double track_spread, dist_mean;
-      compute_gc_dist_stdev(pavg.lat(), pavg.lon(), plat, plon, track_spread, dist_mean);
+      // Compute track mean and standard deviation, convert to nautical-miles
+      compute_gc_dist_stdev(pavg.lat(), pavg.lon(), plat, plon, track_spread, track_stdev);
 
       if(!is_bad_data(track_spread)) {
-         track_spread *= tc_nautical_miles_per_km;
-         pavg.set_spread(track_spread);
+         pavg.set_track_spread(track_spread*tc_nautical_miles_per_km);
       }
 
-      if(!is_bad_data(dist_mean)) {
-         dist_mean *= tc_nautical_miles_per_km;
-         pavg.set_dist_mean(dist_mean);
+      if(!is_bad_data(track_stdev)) {
+         pavg.set_track_stdev(track_stdev*tc_nautical_miles_per_km);
       }
 
       // Compute wind-speed (v_max) and pressure (mslp) standard deviation
@@ -1132,28 +1129,20 @@ TrackInfo consensus(const TrackInfoArray &tracks,
 
 ////////////////////////////////////////////////////////////////////////
 
-void compute_gc_dist_stdev(const double lat, const double lon, const NumArray &lats, const NumArray &lons, double &spread, double &mean) {
-
-   int i, count;
+void compute_gc_dist_stdev(const double lat, const double lon,
+                           const NumArray &lats, const NumArray &lons,
+                           double &mean, double &stdev) {
    NumArray dist_na;
 
    // Loop over member lat/lon track values, calculate great-circle distance between memmber values and consensus track
-   for(i=0, count=0; i<lats.n_elements(); i++) {
-      if( is_bad_data(lats[i]) || is_bad_data(lons[i]) || is_bad_data(lat) || is_bad_data(lon) ) continue;
+   for(int i=0; i<lats.n(); i++) {
+      if(is_bad_data(lat)     || is_bad_data(lon) ||
+         is_bad_data(lats[i]) || is_bad_data(lons[i])) continue;
       dist_na.add(gc_dist(lats[i], lons[i], lat, lon));
-      count++;
    }
 
-   // Compute spread (standard-deviation of the distances)
-   // and the mean of the distnaces
-   if(count == 0) {
-      spread = bad_data_double;
-      mean = bad_data_double;
-   }
-   else {
-      spread = dist_na.stdev();
-      mean = dist_na.mean();
-   }
+   // Compute the mean and standard deviation of the distances
+   dist_na.compute_mean_stdev(mean, stdev);
 
    return;
 }

diff --git a/src/libcode/vx_tc_util/track_info.h b/src/libcode/vx_tc_util/track_info.h
@@ -272,7 +272,7 @@ inline int TrackInfoArray::n() const { return(Track.size()); }
 extern TrackInfo consensus(const TrackInfoArray &, const ConcatString &, int, const StringArray &);
 extern void compute_gc_dist_stdev(const double lat, const double lon,
                                   const NumArray &lats, const NumArray &lons,
-                                  double &spread, double &mean);
+                                  double &mean, double &stdev);
 extern bool has_storm_id(const StringArray &, const ConcatString &basin,
                          const ConcatString &cyclone, unixtime init);
 extern void latlon_to_xytk_err(double alat, double alon,

diff --git a/src/libcode/vx_tc_util/track_pair_info.cc b/src/libcode/vx_tc_util/track_pair_info.cc
@@ -407,10 +407,10 @@ void TrackPairInfo::add_tcmpr_line(const TCStatLine &l) {
 
    // Set the consensus track variables
    apoint.set_num_members(atoi(l.get_item("NUM_MEMBERS")));
-   apoint.set_spread(atof(l.get_item("TRACK_SPREAD")));
-   apoint.set_dist_mean(atof(l.get_item("DIST_MEAN")));
-   apoint.set_v_max_stdev(atof(l.get_item("MAX_WIND_SPREAD")));
-   apoint.set_mslp_stdev(atof(l.get_item("MSLP_SPREAD")));
+   apoint.set_track_spread(atof(l.get_item("TRACK_SPREAD")));
+   apoint.set_track_stdev(atof(l.get_item("TRACK_STDEV")));
+   apoint.set_mslp_stdev(atof(l.get_item("MSLP_STDEV")));
+   apoint.set_v_max_stdev(atof(l.get_item("MAX_WIND_STDEV")));
 
    // Add the TrackPoints to the ADECK/BDECK tracks
    ADeck.add(apoint);