Merge latest development from main_v11.1 into develop (#2623)

Co-authored-by: John Halley Gotway <johnhg@ucar.edu> Co-authored-by: Seth Linden <linden@seneca.rap.ucar.edu> Co-authored-by: jprestop <jpresto@ucar.edu> Co-authored-by: Daniel Adriaansen <dadriaan@ucar.edu> Co-authored-by: John and Cindy <halleygotway@Halleys-Mac-mini.local> Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu> Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com> Co-authored-by: hsoh-u <hsoh@ucar.edu> Co-authored-by: MET Tools Test Account <met_test@seneca.rap.ucar.edu> Co-authored-by: Seth Linden <linden@ucar.edu> Co-authored-by: lisagoodrich <33230218+lisagoodrich@users.noreply.github.com> Co-authored-by: davidalbo <dave@ucar.edu> Co-authored-by: Lisa Goodrich <lisag@ucar.edu> Co-authored-by: metplus-bot <97135045+metplus-bot@users.noreply.github.com> Co-authored-by: j-opatz <59586397+j-opatz@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Jonathan Vigh <jvigh@ucar.edu> Co-authored-by: Tracy Hertneky <39317287+hertneky@users.noreply.github.com> Co-authored-by: David Albo <dave@ucar.edu> Co-authored-by: Dan Adriaansen <dadriaan@ucar.edu> Fix Python environment issue (#2407) fix definitions of G172 and G220 based on comments in NOAA-EMC/NCEPLIBS-w3emc#157. (#2406) fix #2380 develop override (#2382) fix #2408 develop empty config (#2410) fix #2390 develop compile zlib (#2404) fix #2412 develop climo (#2422) fix #2437 develop convert (#2439) fix for develop, for #2437, forgot one reference to the search_parent for a dictionary lookup. fix #2452 develop airnow (#2454) fix #2449 develop pdf (#2464) fix #2402 develop sonarqube (#2468) fix #2426 develop buoy (#2475) fix 2518 dtypes appf docs (#2519) fix 2531 compilation errors (#2533) fix #2531 compilation_errors_configure (#2535) fix 2596 main v11.1 rpath compilation (#2614) fix #2514 main_v11.1 clang (#2628)
dtcenter · Aug 1, 2023 · 2339ad4 · 2339ad4
1 parent 10b1480
commit 2339ad4
Show file tree

Hide file tree

Showing 67 changed files with 1,418 additions and 1,223 deletions.
diff --git a/.github/jobs/build_docker_image.sh b/.github/jobs/build_docker_image.sh
@@ -17,3 +17,9 @@ if [ $? != 0 ]; then
   cat ${GITHUB_WORKSPACE}/docker_build.log
   exit 1
 fi
+
+# Copy the log directory from the image
+id=$(docker create ${DOCKERHUB_TAG})
+time_command docker cp $id:/met/logs met_logs
+mv met_logs/*.log ${GITHUB_WORKSPACE}/.
+docker rm -v $id
diff --git a/.github/jobs/free_disk_space.sh b/.github/jobs/free_disk_space.sh
@@ -0,0 +1,15 @@
+#! /bin/bash
+
+echo Checking disk usage before cleanup
+df -h
+
+printf "\nRemoving files as suggested by https://github.com/actions/virtual-environments/issues/2840"
+
+sudo rm -rf /usr/share/dotnet
+sudo rm -rf /opt/ghc
+sudo rm -rf "/usr/local/share/boost"
+sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+
+printf "\nChecking disk usage after cleanup"
+
+df -h
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -30,6 +30,6 @@ See the [METplus Workflow](https://metplus.readthedocs.io/en/latest/Contributors
 Select: **Reviewer(s)**
 Select: **Organization** level software support **Project** or **Repository** level development cycle **Project**
 Select: **Milestone** as the version that will include these changes
-- [ ] After submitting the PR, select **Development** issue with the original issue number.
+- [ ] After submitting the PR, select the :gear: icon in the **Development** section of the right hand sidebar. Search for the issue that this PR will close and select it, if it is not already selected.
 - [ ] After the PR is approved, merge your changes. If permissions do not allow this, request that the reviewer do the merge.
 - [ ] Close the linked issue and delete your feature or bugfix branch from GitHub.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -1,7 +1,7 @@
 name: Testing
 
 # Compile MET for feature branches
-# Run unit tests for pull requests
+# Run unit tests for pull requests   
 
 on:
 
@@ -88,9 +88,9 @@ jobs:
           MET_BASE_REPO: ${{ needs.job_control.outputs.met_base_repo }}
           MET_BASE_TAG: ${{ needs.job_control.outputs.met_base_tag }}
 
-      - name: Copy Docker build log into logs directory
+      - name: Copy all build log files into logs directory
         if: always()
-        run: cp ${GITHUB_WORKSPACE}/docker_build.log ${RUNNER_WORKSPACE}/logs/
+        run: cp ${GITHUB_WORKSPACE}/*.log ${RUNNER_WORKSPACE}/logs/
 
       - name: Push Docker Image
         run: .github/jobs/push_docker_image.sh
@@ -138,6 +138,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Free disk space
+        run: .github/jobs/free_disk_space.sh
+
       - name: Run Unit Tests in Docker
         run: .github/jobs/run_unit_docker.sh
         env:
@@ -173,6 +176,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Free disk space
+        run: .github/jobs/free_disk_space.sh
+
       - name: Run Unit Tests in Docker
         run: .github/jobs/run_unit_docker.sh
         env:
@@ -209,6 +215,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Free disk space
+        run: .github/jobs/free_disk_space.sh
+
       - name: Run Unit Tests in Docker
         run: .github/jobs/run_unit_docker.sh
         env:
@@ -243,6 +252,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Free disk space
+        run: .github/jobs/free_disk_space.sh
+
       - name: Download ref_config_leads output from artifact
         uses: actions/download-artifact@v3
         with:
@@ -286,6 +298,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Free disk space
+        run: .github/jobs/free_disk_space.sh
+
       - name: Download 1a output from artifact
         uses: actions/download-artifact@v3
         with:
@@ -329,6 +344,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Free disk space
+        run: .github/jobs/free_disk_space.sh
+
       - name: Download 1a output from artifact
         uses: actions/download-artifact@v3
         with:
@@ -403,6 +421,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Free disk space
+        run: .github/jobs/free_disk_space.sh
+
       - name: Download data from previous jobs
         uses: actions/download-artifact@v3
 

diff --git a/data/config/GridStatConfig_default b/data/config/GridStatConfig_default
@@ -207,6 +207,13 @@ distance_map = {
 
 ////////////////////////////////////////////////////////////////////////////////
 
+//
+// Threshold for SEEPS p1 (Probability of being dry)
+//
+seeps_p1_thresh = >=0.1&&<=0.85;
+
+////////////////////////////////////////////////////////////////////////////////
+
 //
 // Statistical output types
 // May be set separately in each "obs.field" entry
@@ -255,11 +262,6 @@ nc_pairs_flag = {
    apply_mask   = TRUE;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// Threshold for SEEPS p1 (Probability of being dry)
-
-seeps_p1_thresh = NA;
-
 ////////////////////////////////////////////////////////////////////////////////
 
 grid_weight_flag = NONE;

diff --git a/data/config/PointStatConfig_default b/data/config/PointStatConfig_default
@@ -261,6 +261,13 @@ hira = {
 
 ////////////////////////////////////////////////////////////////////////////////
 
+//
+// Threshold for SEEPS p1 (Probability of being dry)
+//
+seeps_p1_thresh = >=0.1&&<=0.85;
+
+////////////////////////////////////////////////////////////////////////////////
+
 //
 // Statistical output types
 // May be set separately in each "obs.field" entry
@@ -290,10 +297,6 @@ output_flag = {
    seeps_mpr = NONE;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// Threshold for SEEPS p1 (Probability of being dry)
-
-seeps_p1_thresh = NA;
 ////////////////////////////////////////////////////////////////////////////////
 
 tmp_dir        = "/tmp";

diff --git a/data/config/TCDiagConfig_default b/data/config/TCDiagConfig_default
@@ -79,7 +79,7 @@ domain_info = [
 
 //
 // Data censoring and conversion
-// May be set separately in each diag_data "field" entry
+// May be set separately in each data "field" array entry
 //
 // censor_thresh = [];
 // censor_val    = [];