dtcenter · JohnHalleyGotway · Apr 11, 2022 · Oct 26, 2021 · Nov 3, 2021 · Nov 3, 2021
diff --git a/.github/jobs/set_job_controls.sh b/.github/jobs/set_job_controls.sh
@@ -17,9 +17,11 @@ if [ "${GITHUB_EVENT_NAME}" == "pull_request" ]; then
 
     run_diff=true
 
-    # if base branch starts with main_v, use that input data
+    # if pull request into main_vX.Y branch,
+    # set truth data version to branch name and set input data version to X.Y
     if [ "${GITHUB_BASE_REF:0:6}" == "main_v" ]; then
-	input_data_version=${GITHUB_BASE_REF:6}
+      truth_data_version=${GITHUB_BASE_REF}
+      input_data_version=${GITHUB_BASE_REF:6}
     fi
 
   fi
@@ -35,9 +37,9 @@ elif [ "${GITHUB_EVENT_NAME}" == "push" ]; then
     run_diff=true
     truth_data_version=${branch_name:0: -4}
 
-    # if branch starts with main_v, use that input data
+    # if main_vX.Y-ref branch, use X.Y input data
     if [ "${branch_name:0:6}" == "main_v" ]; then
-      input_data_version=${branch_name:6:-4}
+      input_data_version=${branch_name:6: -4}
     fi
 
   else
@@ -46,10 +48,10 @@ elif [ "${GITHUB_EVENT_NAME}" == "push" ]; then
     if [ "$branch_name" == "develop" ] ||
        [ "${branch_name:0:6}" == "main_v" ]; then
 
-       run_diff=true
-       truth_data_version=${branch_name}
+      run_diff=true
+      truth_data_version=${branch_name}
 
-      # if branch starts with main_v, use that input data
+      # if main_vX.Y branch, use X.Y input data
       if [ "${branch_name:0:6}" == "main_v" ]; then
         input_data_version=${branch_name:6}
       fi
@@ -59,34 +61,34 @@ elif [ "${GITHUB_EVENT_NAME}" == "push" ]; then
     # check commit messages for skip or force keywords                                                                         
     if grep -q "ci-skip-all" <<< "$commit_msg"; then
 
-       run_compile=false
-       run_push=false
-       run_unit_tests=false
-       run_diff=false
-       run_update_truth=false
+      run_compile=false
+      run_push=false
+      run_unit_tests=false
+      run_diff=false
+      run_update_truth=false
 
     fi    
 
     # check commit messages for ci-skip or ci-run keywords
     if grep -q "ci-skip-compile" <<< "$commit_msg"; then
 
-       run_compile=false
+      run_compile=false
 
     fi
 
     if grep -q "ci-run-unit" <<< "$commit_msg"; then
 
-       run_diff=true
+      run_diff=true
 
     fi
 
   fi
 
 elif [ "${GITHUB_EVENT_NAME}" == "workflow_dispatch" ]; then
 
-    if [ "${force_tests}" == "true" ]; then
-        run_diff=true
-    fi
+  if [ "${force_tests}" == "true" ]; then
+    run_diff=true
+  fi
 
 fi
 

diff --git a/met/data/config/Ascii2NcConfig_default b/met/data/config/Ascii2NcConfig_default
@@ -49,4 +49,4 @@ message_type_map = [
 // Indicate a version number for the contents of this configuration file.
 // The value should generally not be modified.
 //
-version = "V10.1.0";
+version = "V11.0.0";
diff --git a/met/data/config/EnsembleStatConfig_default b/met/data/config/EnsembleStatConfig_default
@@ -314,6 +314,6 @@ rng = {
 
 grid_weight_flag = NONE;
 output_prefix    = "";
-version          = "V10.1.0";
+version          = "V11.0.0";
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/met/data/config/GenEnsProdConfig_default b/met/data/config/GenEnsProdConfig_default
@@ -144,6 +144,6 @@ ensemble_flag = {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-version = "V10.1.0";
+version = "V11.0.0";
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/met/data/config/GridDiagConfig_default b/met/data/config/GridDiagConfig_default
@@ -61,6 +61,6 @@ mask = {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-version = "V10.1.0";
+version = "V11.0.0";
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/met/data/config/GridStatConfig_default b/met/data/config/GridStatConfig_default
@@ -259,6 +259,6 @@ nc_pairs_flag = {
 grid_weight_flag = NONE;
 tmp_dir          = "/tmp";
 output_prefix    = "";
-version          = "V10.1.0";
+version          = "V11.0.0";
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/met/data/config/IODA2NCConfig_default b/met/data/config/IODA2NCConfig_default
@@ -125,6 +125,6 @@ time_summary = {
 ////////////////////////////////////////////////////////////////////////////////
 
 tmp_dir = "/tmp";
-version = "V10.1.0";
+version = "V11.0.0";
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/met/data/config/MODEAnalysisConfig_default b/met/data/config/MODEAnalysisConfig_default
@@ -188,6 +188,6 @@ unmatched = FALSE;
 
 ////////////////////////////////////////////////////////////////////////////////
 
-version = "V10.1.0";
+version = "V11.0.0";
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/met/data/config/MODEConfig_default b/met/data/config/MODEConfig_default
@@ -243,6 +243,6 @@ shift_right = 0;   //  grid squares
 ////////////////////////////////////////////////////////////////////////////////
 
 output_prefix  = "";
-version        = "V10.1.0";
+version        = "V11.0.0";
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/met/data/config/MODEMultivarConfig_default b/met/data/config/MODEMultivarConfig_default
@@ -254,6 +254,6 @@ shift_right = 0;   //  grid squares
 ////////////////////////////////////////////////////////////////////////////////
 
 output_prefix  = "";
-version        = "V10.1.0";
+version        = "V11.0.0";
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/met/data/config/MTDConfig_default b/met/data/config/MTDConfig_default
@@ -232,6 +232,6 @@ txt_output = {
 
 output_prefix  = "";
 
-version        = "V10.1.0";
+version        = "V11.0.0";
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/met/data/config/Madis2NcConfig_default b/met/data/config/Madis2NcConfig_default
@@ -34,4 +34,4 @@ time_summary = {
 // Indicate a version number for the contents of this configuration file.
 // The value should generally not be modified.
 //
-version = "V10.1.0";
+version = "V11.0.0";
diff --git a/met/data/config/PB2NCConfig_default b/met/data/config/PB2NCConfig_default
@@ -156,6 +156,6 @@ time_summary = {
 ////////////////////////////////////////////////////////////////////////////////
 
 tmp_dir = "/tmp";
-version = "V10.1.0";
+version = "V11.0.0";
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/met/data/config/Point2GridConfig_default b/met/data/config/Point2GridConfig_default
@@ -77,6 +77,6 @@ quality_mark_thresh = 2;
 ////////////////////////////////////////////////////////////////////////////////
 
 tmp_dir = "/tmp";
-version = "V10.1.0";
+version = "V11.0.0";
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/met/data/config/PointStatConfig_default b/met/data/config/PointStatConfig_default
@@ -292,6 +292,6 @@ output_flag = {
 
 tmp_dir        = "/tmp";
 output_prefix  = "";
-version        = "V10.1.0";
+version        = "V11.0.0";
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/met/data/config/RMWAnalysisConfig_default b/met/data/config/RMWAnalysisConfig_default
@@ -64,7 +64,7 @@ valid_mask = "";
 
 ////////////////////////////////////////////////////////////////////////////////
 
-version = "V10.1.0";
+version = "V11.0.0";
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/met/data/config/STATAnalysisConfig_CBS_Index b/met/data/config/STATAnalysisConfig_CBS_Index
@@ -140,6 +140,6 @@ hss_ec_value   = NA;
 rank_corr_flag = FALSE;
 vif_flag       = FALSE;
 tmp_dir        = "/tmp";
-version        = "V10.1.0";
+version        = "V11.0.0";
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/met/data/config/STATAnalysisConfig_GO_Index b/met/data/config/STATAnalysisConfig_GO_Index
@@ -148,6 +148,6 @@ hss_ec_value   = NA;
 rank_corr_flag = FALSE;
 vif_flag       = FALSE;
 tmp_dir        = "/tmp";
-version        = "V10.1.0";
+version        = "V11.0.0";
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/met/data/config/STATAnalysisConfig_default b/met/data/config/STATAnalysisConfig_default
@@ -118,6 +118,6 @@ hss_ec_value   = NA;
 rank_corr_flag = FALSE;
 vif_flag       = FALSE;
 tmp_dir        = "/tmp";
-version        = "V10.1.0";
+version        = "V11.0.0";
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/met/data/config/SeriesAnalysisConfig_default b/met/data/config/SeriesAnalysisConfig_default
@@ -153,6 +153,6 @@ output_stats = {
 hss_ec_value   = NA;
 rank_corr_flag = FALSE;
 tmp_dir        = "/tmp";
-version        = "V10.1.0";
+version        = "V11.0.0";
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/met/data/config/TCGenConfig_default b/met/data/config/TCGenConfig_default
@@ -291,4 +291,4 @@ nc_pairs_grid = "G003";
 // Indicate a version number for the contents of this configuration file.
 // The value should generally not be modified.
 //
-version = "V10.1.0";
+version = "V11.0.0";
diff --git a/met/data/config/TCPairsConfig_default b/met/data/config/TCPairsConfig_default
@@ -152,4 +152,4 @@ basin_map = [
 // Indicate a version number for the contents of this configuration file.
 // The value should generally not be modified.
 //
-version = "V10.1.0";
+version = "V11.0.0";
diff --git a/met/data/config/TCRMWConfig_default b/met/data/config/TCRMWConfig_default
@@ -104,6 +104,6 @@ rmw_scale      = 0.2;
 
 ////////////////////////////////////////////////////////////////////////////////
 
-version = "V10.1.0";
+version = "V11.0.0";
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/met/data/config/TCStatConfig_default b/met/data/config/TCStatConfig_default
@@ -202,4 +202,4 @@ jobs = [];
 // Indicate a version number for the contents of this configuration file.
 // The value should generally not be modified.
 //
-version = "V10.1.0";
+version = "V11.0.0";
diff --git a/met/data/config/WaveletStatConfig_default b/met/data/config/WaveletStatConfig_default
@@ -138,6 +138,6 @@ wvlt_plot = {
 ////////////////////////////////////////////////////////////////////////////////
 
 output_prefix = "";
-version = "V10.1.0";
+version = "V11.0.0";
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/met/data/table_files/Makefile.am b/met/data/table_files/Makefile.am
@@ -19,6 +19,7 @@
 tablefilesdir = $(pkgdatadir)/table_files
 
 tablefiles_DATA = \
+	met_header_columns_V11.0.txt \
 	met_header_columns_V10.1.txt \
 	met_header_columns_V10.0.txt \
 	met_header_columns_V9.1.txt \