Merge remote-tracking branch 'origin/develop' into feature_2729_tc_diag

.github/ISSUE_TEMPLATE/enhancement_request.md

@@ -39,8 +39,8 @@ Consider breaking the enhancement down into sub-issues.
 - [ ] Select **requestor(s)**
 
 ### Milestone and Projects ###
-- [ ] Select **Milestone** as the next official version or **Backlog of Development Ideas**
-- [ ] For the next official version, select the **MET-X.Y.Z Development** project
+- [ ] Select **Milestone** as a **MET-X.Y.Z** version, **Consider for Next Release**, or **Backlog of Development Ideas**
+- [ ] For a **MET-X.Y.Z** version, select the **MET-X.Y.Z Development** project
 
 ## Define Related Issue(s) ##
 Consider the impact to the other METplus components.

.github/ISSUE_TEMPLATE/new_feature_request.md

@@ -43,8 +43,8 @@ Consider breaking the new feature down into sub-issues.
 - [ ] Select **requestor(s)**
 
 ### Milestone and Projects ###
-- [ ] Select **Milestone** as the next official version or **Backlog of Development Ideas**
-- [ ] For the next official version, select the **MET-X.Y.Z Development** project
+- [ ] Select **Milestone** as a **MET-X.Y.Z** version, **Consider for Next Release**, or **Backlog of Development Ideas**
+- [ ] For a **MET-X.Y.Z** version, select the **MET-X.Y.Z Development** project
 
 ## Define Related Issue(s) ##
 Consider the impact to the other METplus components.

.github/ISSUE_TEMPLATE/sub-issue.md

@@ -29,5 +29,5 @@ This is a sub-issue of #*List the parent issue number here*.
 - [ ] Select **requestor(s)**
 
 ### Milestone and Projects ###
-- [ ] Select **Milestone** as the next official version or **Backlog of Development Ideas**
-- [ ] For the next official version, select the **MET-X.Y.Z Development** project
+- [ ] Select **Milestone** as a **MET-X.Y.Z** version, **Consider for Next Release**, or **Backlog of Development Ideas**
+- [ ] For a **MET-X.Y.Z** version, select the **MET-X.Y.Z Development** project

.github/ISSUE_TEMPLATE/task.md

@@ -39,8 +39,8 @@ Consider breaking the task down into sub-issues.
 - [ ] Select **requestor(s)**
 
 ### Milestone and Projects ###
-- [ ] Select **Milestone** as the next official version or **Backlog of Development Ideas**
-- [ ] For the next official version, select the **MET-X.Y.Z Development** project
+- [ ] Select **Milestone** as a **MET-X.Y.Z** version, **Consider for Next Release**, or **Backlog of Development Ideas**
+- [ ] For a **MET-X.Y.Z** version, select the **MET-X.Y.Z Development** project
 
 ## Define Related Issue(s) ##
 Consider the impact to the other METplus components.

.github/jobs/run_unit_tests.sh

@@ -15,7 +15,7 @@ source ${MET_REPO_DIR}/.github/jobs/test_env_vars.sh
 echo "Running MET unit tests..."
 for testname in $TESTS_TO_RUN; do
   CMD_LOGFILE=/met/logs/unit_${testname}.log
-  time_command ${MET_TEST_BASE}/perl/unit.pl ${MET_TEST_BASE}/xml/unit_${testname}.xml
+  time_command ${MET_TEST_BASE}/python/unit.py ${MET_TEST_BASE}/xml/unit_${testname}.xml
   if [ $? != 0 ]; then
       echo "ERROR: Unit test ${testname} failed"
       cat /met/logs/unit_${testname}.log

.github/jobs/set_job_controls.sh

@@ -6,7 +6,7 @@ run_unit_tests=false
 run_diff=false
 run_update_truth=false
 met_base_repo=met-base
-met_base_tag=v3.2
+met_base_tag=v3.3
 input_data_version=develop
 truth_data_version=develop
 
@@ -57,6 +57,12 @@ elif [ "${GITHUB_EVENT_NAME}" == "push" ]; then
         input_data_version=${branch_name:6}
       fi
 
+    # check for main_vX.Y in the branch name
+    elif [[ "${branch_name}" =~ .*(main_v)([0-9]+\.[0-9]+).* ]]; then
+
+      truth_data_version=${BASH_REMATCH[1]}${BASH_REMATCH[2]}
+      input_data_version=${BASH_REMATCH[2]}
+
     fi
 
     # check commit messages for skip or force keywords                                                                         
@@ -87,14 +93,27 @@ elif [ "${GITHUB_EVENT_NAME}" == "push" ]; then
 
 elif [ "${GITHUB_EVENT_NAME}" == "workflow_dispatch" ]; then
 
+  branch_name=`cut -d "/" -f3 <<< "${GITHUB_REF}"`
+
+  # check for main_vX.Y in the branch name
+  if [[ "${branch_name}" =~ .*(main_v)([0-9]+\.[0-9]+).* ]]; then
+
+    truth_data_version=${BASH_REMATCH[1]}${BASH_REMATCH[2]}
+    input_data_version=${BASH_REMATCH[2]}
+
+  fi
+
   if [ "${force_tests}" == "true" ]; then
+
     run_diff=true
+
   fi
 
 fi
 
 # if updating truth or running diff, run unit tests
-if [ "$run_update_truth" == "true" ] || [ "$run_diff" == "true" ]; then
+if [ "$run_update_truth" == "true" ] ||
+   [ "$run_diff" == "true" ]; then
 
   run_unit_tests=true
 

.github/workflows/build_docker_and_trigger_metplus.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - develop
     paths-ignore:
-      - 'met/docs/**'
+      - 'docs/**'
 
   workflow_dispatch:
 
@@ -29,7 +29,7 @@ jobs:
         env:
           SOURCE_BRANCH: ${{ steps.get_branch_name.outputs.branch_name }}-lite
           MET_BASE_REPO: met-base
-          MET_BASE_TAG: v3.2
+          MET_BASE_TAG: v3.3
 
       - name: Push Docker Image
         run: .github/jobs/push_docker_image.sh

.github/workflows/compilation_options.yml

@@ -63,6 +63,10 @@ jobs:
             config: '--enable-mode_graphics'
           - jobid:  'job8'
             config: '--enable-modis'
+          - jobid:  'job9'
+            config: '--enable-all MET_CXX_STANDARD=11'
+          - jobid:  'job10'
+            config: '--enable-all MET_CXX_STANDARD=14'
       fail-fast: false
     steps:
       - uses: actions/checkout@v4

.github/workflows/release-checksum.yml

@@ -9,6 +9,6 @@ jobs:
   add-checksum:
     runs-on: ubuntu-latest
     steps:
-      - uses: dtcenter/metplus-action-release-checksum@v1
+      - uses: dtcenter/metplus-action-release-checksum@v2
         with:
           token: ${{ secrets.METPLUS_BOT_TOKEN }}

.github/workflows/sonarqube.yml

@@ -61,7 +61,7 @@ jobs:
         run: .github/jobs/build_sonarqube_image.sh
         env:
           MET_BASE_REPO: met-base
-          MET_BASE_TAG: v3.2
+          MET_BASE_TAG: v3.3
           SOURCE_BRANCH: ${{ steps.get_branch_name.outputs.branch_name }}
           WD_REFERENCE_BRANCH: ${{ github.event.inputs.reference_branch }}
           SONAR_SCANNER_VERSION: 5.0.1.3006

.github/workflows/testing.yml

@@ -176,7 +176,7 @@ jobs:
           - jobid: 'job1'
             tests: 'ascii2nc_indy pb2nc_indy tc_dland tc_pairs tc_stat plot_tc tc_rmw rmw_analysis tc_diag tc_gen'
           - jobid: 'job2'
-            tests: 'met_test_scripts mode_multivar mode_graphics mtd regrid airnow gsi_tools netcdf modis series_analysis wwmca_regrid gen_vx_mask grid_weight interp_shape grid_diag grib_tables lidar2nc shift_data_plane trmm2nc aeronet wwmca_plot ioda2nc gaussian'
+            tests: 'met_test_scripts mode_multivar mode_graphics mtd regrid airnow gsi_tools netcdf modis series_analysis wwmca_regrid gen_vx_mask interp_shape grid_diag grib_tables lidar2nc shift_data_plane trmm2nc aeronet wwmca_plot ioda2nc gaussian'
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
@@ -310,6 +310,8 @@ jobs:
             tests: 'ensemble_stat stat_analysis_es'
           - jobid: 'job5'
             tests: 'ugrid'
+          - jobid: 'job6'
+            tests: 'grid_weight point_weight'
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
@@ -360,6 +362,8 @@ jobs:
           - jobid: 'job3'
             tests: 'climatology_2.5deg'
           - jobid: 'job4'
+            tests: 'climatology_mixed'
+          - jobid: 'job5'
             tests: 'python point2grid plot_data_plane mode mode_analysis perc_thresh hira plot_point_obs quality_filter obs_summary duplicate_flag'
       fail-fast: false
     steps:

.github/workflows/update_truth.yml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   update_truth:
-    name: "Update or create truth reference branch"
+    name: "Update reference branch truth data"
     runs-on: ubuntu-latest
     steps:
       - name: Check if branch is develop or main_vX.Y
@@ -31,31 +31,43 @@ jobs:
         with:
           fetch-depth: 0
           token: ${{ secrets.METPLUS_BOT_TOKEN }}
-      - name: Resolve conflicts between branch and branch-ref
+      - name: Resolve conflicts with an update branch
+        id: resolve_conflicts
         run: |
           branch_name=${{ env.branch_name }}
           cd ${GITHUB_WORKSPACE}
           if [[ -z "$(git ls-remote --heads origin ${branch_name}-ref)" ]]; then
             echo ERROR: ${branch_name}-ref does not exist
             exit 1
           fi
-          
+
           echo ${branch_name}-ref does exist -- update it
           git config --global user.name "metplus-bot"
           git config --global user.email "[email protected]"
+
+          # checkout branch (develop or main_vX.Y)
           echo git checkout ${branch_name}
           git checkout ${branch_name}
-          echo git checkout -b update_truth_for_${branch_name}
-          git checkout -b update_truth_for_${branch_name}
+
+          # create unique branch name to update *-ref branch
+          update_branch=update_${branch_name}_$(uuidgen | cut -d "-" -f1)
+          echo "update_branch=${update_branch}" >> $GITHUB_OUTPUT
+          echo git checkout -b ${update_branch}
+          git checkout -b ${update_branch}
+
+          # merge -ref branch into the update branch (favoring update branch changes)
           echo git merge -s ours origin/${branch_name}-ref
           git merge -s ours origin/${branch_name}-ref
-          echo git push origin update_truth_for_${branch_name}
-          git push origin update_truth_for_${branch_name}
+
+          # push update branch to origin
+          echo git push origin ${update_branch}
+          git push origin ${update_branch}
 
       - name: Create Pull Request
-        run: gh pr create --base $BASE --body "$BODY" --title "$TITLE"
+        run: gh pr create --head $HEAD --base $BASE --body "$BODY" --title "$TITLE"
         env:
           GH_TOKEN: ${{ github.token }}
+          HEAD: ${{ steps.resolve_conflicts.outputs.update_branch }}
           BASE: ${{ env.branch_name }}-ref
-          BODY: ${{ github.event.inputs.change_summary }}<br/>Created by @${{ github.actor}}
+          BODY: ${{ github.event.inputs.change_summary }}<br/>Created by @${{ github.actor }}
           TITLE: Update ${{ env.branch_name }}-ref after ${{ github.event.inputs.pull_requests }}

.gitignore

@@ -19,3 +19,5 @@ make.log
 make_install.log
 .idea
 cmake-build-debug
+
+__pycache__

Makefile.in

@@ -256,6 +256,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

configure

@@ -797,6 +797,7 @@ MET_ATLAS
 MET_PROJLIB
 MET_PROJINC
 MET_PROJ
+MET_CXX_STANDARD
 OPENMP_CFLAGS
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
@@ -933,6 +934,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
+MET_CXX_STANDARD
 MET_PROJ
 MET_PROJINC
 MET_PROJLIB
@@ -1667,6 +1669,9 @@ Some influential environment variables:
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
+  MET_CXX_STANDARD
+              Specify the version of the supported C++ standard. Values may be
+              11, 14, or 17. Default value is 17.
   MET_PROJ    Where proj lib and include subdirectories are located. If they
               are installed in /usr/local, you don't have to specify them.
   MET_PROJINC Where proj include files are located. Use if the libraries and
@@ -5317,6 +5322,26 @@ printf "%s\n" "$ac_cv_prog_c_openmp" >&6; }
 CPPFLAGS="${CPPFLAGS} ${OPENMP_CFLAGS}"
 LDFLAGS="${LDFLAGS} ${OPENMP_CFLAGS}"
 
+#
+# Look for a specified C++ Standard
+#
+
+# Configure the variable. The help text will appear if the user uses "configure --help".
+
+
+
+# Set a default value
+
+if (test -z "$MET_CXX_STANDARD"); then
+  MET_CXX_STANDARD=17
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: c++17 will be used as the C++ standard" >&5
+printf "%s\n" "$as_me: c++17 will be used as the C++ standard" >&6;}
+elif (test -n "$MET_CXX_STANDARD"); then
+  MET_CXX_STANDARD=${MET_CXX_STANDARD}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: MET_CXX_STANDARD will be set" >&5
+printf "%s\n" "$as_me: MET_CXX_STANDARD will be set" >&6;}
+fi
+
 #
 # Look for the Proj library.
 #
@@ -6988,7 +7013,7 @@ fi
 CPPFLAGS=$CPPFLAGS' -DMET_BASE="\"$(pkgdatadir)\""'
 
 # Add -std=c++11 to CXXFLAGS
-CXXFLAGS=$CXXFLAGS' -std=c++11'
+CXXFLAGS=$CXXFLAGS' -std=c++'$MET_CXX_STANDARD
 
 # Define other variables for the makefiles
 

configure.ac

@@ -15,6 +15,24 @@ AC_OPENMP()
 CPPFLAGS="${CPPFLAGS} ${OPENMP_CFLAGS}"
 LDFLAGS="${LDFLAGS} ${OPENMP_CFLAGS}"
 
+#
+# Look for a specified C++ Standard
+#
+
+# Configure the variable. The help text will appear if the user uses "configure --help".
+
+AC_ARG_VAR([MET_CXX_STANDARD], [Specify the version of the supported C++ standard. Values may be 11, 14, or 17. Default value is 17.])
+
+# Set a default value
+
+if (test -z "$MET_CXX_STANDARD"); then
+  MET_CXX_STANDARD=17
+  AC_MSG_NOTICE([c++17 will be used as the C++ standard])
+elif (test -n "$MET_CXX_STANDARD"); then
+  MET_CXX_STANDARD=${MET_CXX_STANDARD}
+  AC_MSG_NOTICE([MET_CXX_STANDARD will be set])
+fi
+
 #
 # Look for the Proj library.
 #
@@ -1160,7 +1178,7 @@ AM_CONDITIONAL([ENABLE_DEVELOPMENT], [test -n "$MET_DEVELOPMENT"])
 CPPFLAGS=$CPPFLAGS' -DMET_BASE="\"$(pkgdatadir)\""'
 
 # Add -std=c++11 to CXXFLAGS                                                                                                                                                 
-CXXFLAGS=$CXXFLAGS' -std=c++11'
+CXXFLAGS=$CXXFLAGS' -std=c++'$MET_CXX_STANDARD
 
 # Define other variables for the makefiles
 

data/Makefile.in

@@ -260,6 +260,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

data/climo/Makefile.in

@@ -230,6 +230,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

data/climo/seeps/Makefile.in

@@ -202,6 +202,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

data/colortables/Makefile.in

@@ -260,6 +260,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

data/colortables/NCL_colortables/Makefile.in

@@ -202,6 +202,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

data/config/ConfigConstants

@@ -137,6 +137,10 @@ NONE           = 1;
 COS_LAT        = 2;
 AREA           = 3;
 
+// Point weight flag settings
+NONE           = 1;
+SID            = 2;
+
 // Duplicate flag settings
 NONE           = 1;
 UNIQUE         = 2;