dtcenter · JohnHalleyGotway · Jun 15, 2022 · Oct 26, 2021 · Nov 3, 2021 · Nov 3, 2021
diff --git a/data/config/ConfigConstants b/data/config/ConfigConstants
@@ -35,6 +35,13 @@ F_to_K(t) = C_to_K(F_to_C(t));
 MM_to_IN(x) = x / 25.4;
 IN_to_MM(x) = x * 25.4;
 
+M_to_FT(x)   = x * 3.28084;
+FT_to_M(x)   = x / 3.28084;
+M_to_KFT(x)  = M_to_FT(x) / 1000.0;
+KFT_to_M(x)  = FT_to_M(x * 1000.0);
+KM_to_KFT(x) = M_to_KFT(1000.0 * x);
+KFT_to_KM(x) = KFT_to_M(x) / 1000.0;
+
 PA_to_HPA(p) = p / 100.0;
 HPA_to_PA(p) = p * 100.0;
 PA_to_MB(p)  = PA_to_HPA(p);

diff --git a/data/table_files/met_header_columns_V11.0.txt b/data/table_files/met_header_columns_V11.0.txt
@@ -25,9 +25,9 @@ V11.0 : STAT : RELP     : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID
 V11.0 : STAT : SAL1L2   : 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 FABAR OABAR FOABAR FFABAR OOABAR MAE
 V11.0 : STAT : SL1L2    : 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 FBAR OBAR FOBAR FFBAR OOBAR MAE
 V11.0 : STAT : SSVAR    : 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_BIN BIN_i BIN_N VAR_MIN VAR_MAX VAR_MEAN FBAR OBAR FOBAR FFBAR OOBAR FBAR_NCL FBAR_NCU FSTDEV FSTDEV_NCL FSTDEV_NCU OBAR_NCL OBAR_NCU OSTDEV OSTDEV_NCL OSTDEV_NCU PR_CORR PR_CORR_NCL PR_CORR_NCU ME ME_NCL ME_NCU ESTDEV ESTDEV_NCL ESTDEV_NCU MBIAS MSE BCMSE RMSE
-V11.0 : STAT : VAL1L2   : 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 UFABAR VFABAR UOABAR VOABAR UVFOABAR UVFFABAR UVOOABAR
+V11.0 : STAT : VAL1L2   : 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 UFABAR VFABAR UOABAR VOABAR UVFOABAR UVFFABAR UVOOABAR FA_SPEED_BAR OA_SPEED_BAR
 V11.0 : STAT : VL1L2    : 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 UFBAR VFBAR UOBAR VOBAR UVFOBAR UVFFBAR UVOOBAR F_SPEED_BAR O_SPEED_BAR
-V11.0 : STAT : VCNT     : 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 FBAR FBAR_BCL FBAR_BCU OBAR OBAR_BCL OBAR_BCU FS_RMS FS_RMS_BCL FS_RMS_BCU OS_RMS OS_RMS_BCL OS_RMS_BCU MSVE MSVE_BCL MSVE_BCU RMSVE RMSVE_BCL RMSVE_BCU FSTDEV FSTDEV_BCL FSTDEV_BCU OSTDEV OSTDEV_BCL OSTDEV_BCU FDIR FDIR_BCL FDIR_BCU ODIR ODIR_BCL ODIR_BCU FBAR_SPEED FBAR_SPEED_BCL FBAR_SPEED_BCU OBAR_SPEED OBAR_SPEED_BCL OBAR_SPEED_BCU VDIFF_SPEED VDIFF_SPEED_BCL VDIFF_SPEED_BCU VDIFF_DIR VDIFF_DIR_BCL VDIFF_DIR_BCU SPEED_ERR SPEED_ERR_BCL SPEED_ERR_BCU SPEED_ABSERR SPEED_ABSERR_BCL SPEED_ABSERR_BCU DIR_ERR DIR_ERR_BCL DIR_ERR_BCU DIR_ABSERR DIR_ABSERR_BCL DIR_ABSERR_BCU
+V11.0 : STAT : VCNT     : 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 FBAR FBAR_BCL FBAR_BCU OBAR OBAR_BCL OBAR_BCU FS_RMS FS_RMS_BCL FS_RMS_BCU OS_RMS OS_RMS_BCL OS_RMS_BCU MSVE MSVE_BCL MSVE_BCU RMSVE RMSVE_BCL RMSVE_BCU FSTDEV FSTDEV_BCL FSTDEV_BCU OSTDEV OSTDEV_BCL OSTDEV_BCU FDIR FDIR_BCL FDIR_BCU ODIR ODIR_BCL ODIR_BCU FBAR_SPEED FBAR_SPEED_BCL FBAR_SPEED_BCU OBAR_SPEED OBAR_SPEED_BCL OBAR_SPEED_BCU VDIFF_SPEED VDIFF_SPEED_BCL VDIFF_SPEED_BCU VDIFF_DIR VDIFF_DIR_BCL VDIFF_DIR_BCU SPEED_ERR SPEED_ERR_BCL SPEED_ERR_BCU SPEED_ABSERR SPEED_ABSERR_BCL SPEED_ABSERR_BCU DIR_ERR DIR_ERR_BCL DIR_ERR_BCU DIR_ABSERR DIR_ABSERR_BCL DIR_ABSERR_BCU ANOM_CORR ANOM_CORR_NCL ANOM_CORR_NCU ANOM_CORR_BCL ANOM_CORR_BCU ANOM_CORR_UNCNTR ANOM_CORR_UNCNTR_BCL ANOM_CORR_UNCNTR_BCU
 V11.0 : STAT : GENMPR   : 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 STORM_ID PROB_LEAD PROB_VAL AGEN_INIT AGEN_FHR AGEN_LAT AGEN_LON AGEN_DLAND BGEN_LAT BGEN_LON BGEN_DLAND GEN_DIST GEN_TDIFF INIT_TDIFF DEV_CAT OPS_CAT
 V11.0 : STAT : SSIDX    : 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 FCST_MODEL REF_MODEL N_INIT N_TERM N_VLD SS_INDEX
 

diff --git a/docs/Users_Guide/point-stat.rst b/docs/Users_Guide/point-stat.rst
@@ -1297,10 +1297,16 @@ The first set of header columns are common to all of the output files generated
   * - 32
     - UVOOABAR
     - Mean((uo-uc)²+(vo-vc)²)
+  * - 33
+    - FA_SPEED_BAR
+    - Mean forecast wind speed anomaly
+  * - 34
+    - OA_SPEED_BAR
+    - Mean observed wind speed anomaly
 
 .. _table_PS_format_info_VCNT:
 
-.. list-table:: Format information for VCNT (Vector Continuous Statistics) output line type. Note that each statistic (except TOTAL) is followed by two columns giving bootstrap confidence intervals. These confidence intervals are not currently calculated for this release of MET, but will be in future releases.
+.. list-table:: Format information for VCNT (Vector Continuous Statistics) output line type. Note that the bootstrap confidence intervals columns ending with BCL and BCU are not currently calculated for this release of MET, but will be in future releases.
   :widths: auto
   :header-rows: 2
 
@@ -1317,59 +1323,65 @@ The first set of header columns are common to all of the output files generated
     - TOTAL
     - Total number of data points
   * - 26-28
-    - FBAR
-    - Mean value of forecast wind speed
+    - FBAR, :raw-html:`<br />` FBAR_BCL, :raw-html:`<br />` FBAR_BCU
+    - Mean value of forecast wind speed including bootstrap upper and lower confidence limits
   * - 29-31
-    - OBAR
-    - Mean value of observed wind speed
+    - OBAR, :raw-html:`<br />` OBAR_BCL, :raw-html:`<br />` OBAR_BCU
+    - Mean value of observed wind speed including bootstrap upper and lower confidence limits
   * - 32-34
-    - FS_RMS
-    - Root mean square forecast wind speed
+    - FS_RMS, :raw-html:`<br />` FS_RMS_BCL, :raw-html:`<br />` FS_RMS_BCU
+    - Root mean square forecast wind speed including bootstrap upper and lower confidence limits
   * - 35-37
-    - OS_RMS
-    - Root mean square observed wind speed
+    - OS_RMS, :raw-html:`<br />` OS_RMS_BCL, :raw-html:`<br />` OS_RMS_BCU
+    - Root mean square observed wind speed including bootstrap upper and lower confidence limits
   * - 38-40
-    - MSVE
-    - Mean squared length of the vector difference between the forecast and observed winds
+    - MSVE, :raw-html:`<br />` MSVE_BCL, :raw-html:`<br />` MSVE_BCU
+    - Mean squared length of the vector difference between the forecast and observed winds including bootstrap upper and lower confidence limits
   * - 41-43
-    - RMSVE
-    - Square root of MSVE
+    - RMSVE, :raw-html:`<br />` RMSVE_BCL, :raw-html:`<br />` RMSVE_BCU
+    - Square root of MSVE including bootstrap upper and lower confidence limits
   * - 45-46
-    - FSTDEV
-    - Standard deviation of the forecast wind speed
+    - FSTDEV, :raw-html:`<br />` FSTDEV_BCL, :raw-html:`<br />` FSTDEV_BCU
+    - Standard deviation of the forecast wind speed including bootstrap upper and lower confidence limits
   * - 47-49
-    - OSTDEV
-    - Standard deviation of the observed wind field
+    - OSTDEV, :raw-html:`<br />` OSTDEV_BCL, :raw-html:`<br />` OSTDEV_BCU
+    - Standard deviation of the observed wind field including bootstrap upper and lower confidence limits
   * - 50-52
-    - FDIR
-    - Direction of the average forecast wind vector
+    - FDIR, :raw-html:`<br />` FDIR_BCL, :raw-html:`<br />` FDIR_BCU
+    - Direction of the average forecast wind vector including bootstrap upper and lower confidence limits
   * - 53-55
-    - ODIR
-    - Direction of the average observed wind vector
+    - ODIR, :raw-html:`<br />` ODIR_BCL, :raw-html:`<br />` ODIR_BCU
+    - Direction of the average observed wind vector including bootstrap upper and lower confidence limits
   * - 56-58
-    - FBAR_SPEED
-    - Length (speed) of the average forecast wind vector
+    - FBAR_SPEED, :raw-html:`<br />` FBAR_SPEED_BCL, :raw-html:`<br />` FBAR_SPEED_BCU
+    - Length (speed) of the average forecast wind vector including bootstrap upper and lower confidence limits
   * - 59-61
-    - OBAR_SPEED
-    - Length (speed) of the average observed wind vector
+    - OBAR_SPEED, :raw-html:`<br />` OBAR_SPEED_BCL, :raw-html:`<br />` OBAR_SPEED_BCU
+    - Length (speed) of the average observed wind vector including bootstrap upper and lower confidence limits
   * - 62-64
-    - VDIFF_SPEED
-    - Length (speed) of the vector difference between the average forecast and average observed wind vectors
+    - VDIFF_SPEED, :raw-html:`<br />` VDIFF_SPEED_BCL, :raw-html:`<br />` VDIFF_SPEED_BCU
+    - Length (speed) of the vector difference between the average forecast and average observed wind vectors including bootstrap upper and lower confidence limits
   * - 65-67
-    - VDIFF_DIR
-    - Direction of the vector difference between the average forecast and average wind vectors
+    - VDIFF_DIR, :raw-html:`<br />` VDIFF_DIR_BCL, :raw-html:`<br />` VDIFF_DIR_BCU
+    - Direction of the vector difference between the average forecast and average wind vectors including bootstrap upper and lower confidence limits
   * - 68-70
-    - SPEED_ERR
-    - Difference between the length of the average forecast wind vector and the average observed wind vector (in the sense F - O)
+    - SPEED_ERR, :raw-html:`<br />` SPEED_ERR_BCL, :raw-html:`<br />` SPEED_ERR_BCU
+    - Difference between the length of the average forecast wind vector and the average observed wind vector (in the sense F - O) including bootstrap upper and lower confidence limits
   * - 71-73
-    - SPEED_ABSERR
-    - Absolute value of SPEED_ERR
+    - SPEED_ABSERR, :raw-html:`<br />` SPEED_ABSERR_BCL, :raw-html:`<br />` SPEED_ABSERR_BCU
+    - Absolute value of SPEED_ERR including bootstrap upper and lower confidence limits
   * - 74-76
-    - DIR_ERR
-    - Signed angle between the directions of the average forecast and observed wing vectors. Positive if the forecast wind vector is counterclockwise from the observed wind vector
+    - DIR_ERR, :raw-html:`<br />` DIR_ERR_BCL, :raw-html:`<br />` DIR_ERR_BCU
+    - Signed angle between the directions of the average forecast and observed wing vectors. Positive if the forecast wind vector is counterclockwise from the observed wind vector including bootstrap upper and lower confidence limits
   * - 77-79
-    - DIR_ABSERR
-    - Absolute value of DIR_ABSERR
+    - DIR_ABSERR, :raw-html:`<br />` DIR_ABSERR_BCL, :raw-html:`<br />` DIR_ABSERR_BCU
+    - Absolute value of DIR_ABSERR including bootstrap upper and lower confidence limits
+  * - 80-84
+    - ANOM_CORR, :raw-html:`<br />` ANOM_CORR_NCL, :raw-html:`<br />` ANOM_CORR_NCU, :raw-html:`<br />` ANOM_CORR_BCL, :raw-html:`<br />` ANOM_CORR_BCU
+    - Vector Anomaly Correlation including mean error with normal and bootstrap upper and lower confidence limits
+  * - 85-87
+    - ANOM_CORR_UNCNTR, :raw-html:`<br />` ANOM_CORR_UNCNTR_BCL, :raw-html:`<br />` ANOM_CORR_UNCNTR_BCU
+    - Uncentered vector Anomaly Correlation excluding mean error including bootstrap upper and lower confidence limits
 
 .. _table_PS_format_info_MPR:
 

diff --git a/docs/Users_Guide/stat-analysis.rst b/docs/Users_Guide/stat-analysis.rst
@@ -45,7 +45,7 @@ The Stat-Analysis "aggregate" job aggregates values from multiple STAT lines of
 Aggregate STAT lines and produce aggregated statistics
 ------------------------------------------------------
 
-The Stat-Analysis "aggregate-stat" job aggregates multiple STAT lines of the same type together and produces relevant statistics from the aggregated line. This may be done in the same manner listed above in :numref:`StA_Aggregated-values-from`. However, rather than writing out the aggregated STAT line itself, the relevant statistics generated from that aggregated line are provided in the output. Specifically, if a contingency table line type (FHO, CTC, PCT, MCTC, or NBRCTC) has been aggregated, contingency table statistics (CTS, ECLV, PSTD, MCTS, or NBRCTS) line types can be computed. If a partial sums line type (SL1L2 or SAL1L2) has been aggregated, the continuous statistics (CNT) line type can be computed. If a vector partial sums line type (VL1L2) has been aggregated, the vector continuous statistics (VCNT) line type can be computed. For ensembles, the ORANK line type can be accumulated into ECNT, RPS, RHIST, PHIST, RELP, or SSVAR output. If the matched pair line type (MPR) has been aggregated, may output line types (FHO, CTC, CTS, CNT, MCTC, MCTS, SL1L2, SAL1L2, VL1L2, VCNT, WDIR, PCT, PSTD, PJC, PRC, or ECLV) can be computed. Multiple output line types may be specified for each "aggregate-stat" job, as long as each output is derivable from the input.
+The Stat-Analysis "aggregate-stat" job aggregates multiple STAT lines of the same type together and produces relevant statistics from the aggregated line. This may be done in the same manner listed above in :numref:`StA_Aggregated-values-from`. However, rather than writing out the aggregated STAT line itself, the relevant statistics generated from that aggregated line are provided in the output. Specifically, if a contingency table line type (FHO, CTC, PCT, MCTC, or NBRCTC) has been aggregated, contingency table statistics (CTS, ECLV, PSTD, MCTS, or NBRCTS) line types can be computed. If a partial sums line type (SL1L2 or SAL1L2) has been aggregated, the continuous statistics (CNT) line type can be computed. If a vector partial sums line type (VL1L2 or VAL1L2) has been aggregated, the vector continuous statistics (VCNT) line type can be computed. For ensembles, the ORANK line type can be accumulated into ECNT, RPS, RHIST, PHIST, RELP, or SSVAR output. If the matched pair line type (MPR) has been aggregated, may output line types (FHO, CTC, CTS, CNT, MCTC, MCTS, SL1L2, SAL1L2, VL1L2, VCNT, WDIR, PCT, PSTD, PJC, PRC, or ECLV) can be computed. Multiple output line types may be specified for each "aggregate-stat" job, as long as each output is derivable from the input.
 
 When aggregating the matched pair line type (MPR), additional required job command options are determined by the requested output line type(s). For example, the "-out_thresh" (or "-out_fcst_thresh" and  "-out_obs_thresh" options) are required to compute contingnecy table counts (FHO, CTC) or statistics (CTS). Those same job command options can also specify filtering thresholds when computing continuous partial sums (SL1L2, SAL1L2) or statistics (CNT). Output is written for each threshold specified.
 
@@ -779,7 +779,7 @@ This job is similar to the "**aggregate**" job listed above, however the format
   * - SL1L2 or SAL1L2
     - CNT
   * - VL1L2 or VAL1L2
-    - WDIR (wind direction)
+    - WDIR (wind direction), VCNT
   * - PCT
     - PSTD, PJC, PRC
   * - NBRCTC

diff --git a/internal/scripts/sonarqube/run_sonarqube.sh b/internal/scripts/sonarqube/run_sonarqube.sh
@@ -5,7 +5,7 @@
 #
 # This run_sonarqube.sh script will check out the specified version
 # of MET and run the SonarQube Source Code Analyzer on it.  First,
-# go to the directory where you would like the SCA output written and
+# go to the directory where you would like the scanning output written and
 # then run:
 #
 #    git clone https://github.com/dtcenter/MET
@@ -121,17 +121,26 @@ run_command "./configure --prefix=`pwd` \
 # Set the build id
 #BUILD_ID="MET-${1}"
 
-# Copy sonar-project.properties
-[ ! -e "sonar-project.properties" ] && cp -p $SCRIPT_DIR/sonar-project.properties .
+SONAR_PROPERTIES=sonar-project.properties
+
+# Copy sonar-project.properties for Python code
+[ -e $SONAR_PROPERTIES ] && rm $SONAR_PROPERTIES
+cp -p $SCRIPT_DIR/python.sonar-project.properties $SONAR_PROPERTIES
+
+# Run SonarQube scan for Python code
+run_command "${SONARQUBE_SCANNER_BIN}/sonar-scanner"
+
+# Copy sonar-project.properties for C/C++ code
+[ -e $SONAR_PROPERTIES ] && rm $SONAR_PROPERTIES
+cp -p $SCRIPT_DIR/$SONAR_PROPERTIES .
 
 # Run SonarQube clean
 run_command "make clean"
 
-
 # Run SonarQube make
 run_command "${SONARQUBE_WRAPPER_BIN}/build-wrapper-linux-x86-64 --out-dir $SONARQUBE_OUT_DIR make"
 
-# Run SonarQube scan
+# Run SonarQube scan for C/C++ code
 run_command "${SONARQUBE_SCANNER_BIN}/sonar-scanner"
 
 # Run SonarQube report generator to make a PDF file

diff --git a/internal/scripts/sonarqube/sonar-project.properties b/internal/scripts/sonarqube/sonar-project.properties
@@ -1,5 +1,5 @@
 sonar.projectKey=org.sonarqube:MET_develop_NB
-sonar.projectName=MET Nightly build
+sonar.projectName=MET Nightly Build
 sonar.projectVersion=1.0
 
 sonar.sources=src