From fb28cb5c98d3a0a73fd7ba17c1b73d3646d71dc8 Mon Sep 17 00:00:00 2001 From: Shay Carter Date: Mon, 21 Mar 2022 17:45:12 -0600 Subject: [PATCH 01/65] Remove duplicate (and depricated) satellite functions - these functions all exist in the goesr repo and are newer - Lee updates these functions in the other repo and that is the correct version to be using --- .../definitions/satCloudPhase.xml | 26 ------------------- .../derivedParameters/definitions/satFog.xml | 26 ------------------- .../definitions/satMoisture.xml | 26 ------------------- .../derivedParameters/definitions/satSnow.xml | 26 ------------------- .../definitions/satUpperLevelInfo.xml | 26 ------------------- .../definitions/satVegetation.xml | 26 ------------------- 6 files changed, 156 deletions(-) delete mode 100644 edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satCloudPhase.xml delete mode 100644 edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satFog.xml delete mode 100644 edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satMoisture.xml delete mode 100644 edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satSnow.xml delete mode 100644 edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satUpperLevelInfo.xml delete mode 100644 edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satVegetation.xml diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satCloudPhase.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satCloudPhase.xml deleted file mode 100644 index f915afed1c..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satCloudPhase.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satFog.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satFog.xml deleted file mode 100644 index 423d6a2e18..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satFog.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satMoisture.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satMoisture.xml deleted file mode 100644 index 43c1083b1d..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satMoisture.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satSnow.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satSnow.xml deleted file mode 100644 index 40a43b9bb2..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satSnow.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satUpperLevelInfo.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satUpperLevelInfo.xml deleted file mode 100644 index b744b3b91c..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satUpperLevelInfo.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satVegetation.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satVegetation.xml deleted file mode 100644 index 06c9b39e38..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/definitions/satVegetation.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - From e23eb85f70c7f34bae9d333e805298cffa95b44c Mon Sep 17 00:00:00 2001 From: Tiffany Meyer Date: Tue, 22 Mar 2022 13:06:19 -0400 Subject: [PATCH 02/65] Updated versions to 18.2.1-5 and added new blog post link --- docs/appendix/educational-resources.md | 1 + docs/install/install-cave.md | 14 +++++++------- docs/install/install-edex.md | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/docs/appendix/educational-resources.md b/docs/appendix/educational-resources.md index 7faf277aa7..ab2abb2dd4 100644 --- a/docs/appendix/educational-resources.md +++ b/docs/appendix/educational-resources.md @@ -107,6 +107,7 @@ A full list of all released blogs can be found below: - [Announcing AWIPS eLearning](https://www.unidata.ucar.edu/blogs/news/entry/announcing-a-new-elearning-course) - [AWIPS 18.2.1-3 Software Release](https://www.unidata.ucar.edu/blogs/news/entry/awips-18-2-1-3) - [Access Learn AWIPS CAVE from Unidata eLearning](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-access-learn-awips) +- [AWIPS 18.2.1-5 Software Release](https://www.unidata.ucar.edu/blogs/news/entry/awips-18-2-1-5) #### CAVE diff --git a/docs/install/install-cave.md b/docs/install/install-cave.md index 176d0d5c1d..8e83e068ab 100644 --- a/docs/install/install-cave.md +++ b/docs/install/install-cave.md @@ -6,9 +6,9 @@ CAVE is the **C**ommon **A**WIPS **V**isualization **E**nvironment that is used ## Latest CAVE Versions -- [**Linux: 18.2.1-4**](#linux) -- [**Windows: 18.2.1-3**](#windows) -- [**Mac: 18.2.1-3**](#macos) +- [**Linux: 18.2.1-5**](#linux) +- [**Windows: 18.2.1-5**](#windows) +- [**Mac: 18.2.1-5**](#macos) [**View release notes**](https://www.unidata.ucar.edu/blogs/news/tags/awips-release) @@ -35,7 +35,7 @@ Regardless of what Operating System CAVE is running on, these general requiremen ## Linux   -**Latest Version: 18.2.1-4** +**Latest Version: 18.2.1-5** ### System Requirements @@ -62,7 +62,7 @@ To run CAVE either: ## Windows   -**Latest Version: 18.2.1-3** +**Latest Version: 18.2.1-5** For Windows, Unidata offers two installation options: a [**Linux Virtual Machine**](#method-1-linux-virtual-machine), or a [**Direct Windows Installation**](#method-2-direct-windows-install). @@ -84,7 +84,7 @@ This method is recommended for beginners, or those with less computer knowledge 1. Download the zipped file containing the virtual machine: [**unidata_cave.zip** ](https://downloads.unidata.ucar.edu/awips2/current/windows/unidata_cave.zip) 2. Unzip the folder by right-clicking and selecting "Extract All". All files will be extracted into a new folder. -3. Open VMWare Player and go to **Player** > **File...** > **Open** and locate the folder that was created from the downloaded zipped file. Select the file called **"CentOS 7 - Unidata CAVE 18-2-1-3.vmx"**. +3. Open VMWare Player and go to **Player** > **File...** > **Open** and locate the folder that was created from the downloaded zipped file. Select the file called **"CentOS 7 - Unidata CAVE 18-2-1-5.vmx"**. 4. Run this new VM option. If it asks if it's been moved or copied, select **"I Copied It"**. - There will be a user in the Linux machine named "awips" and the password is "awips" - The root password is "unidataAWIPS" if ever needed @@ -163,7 +163,7 @@ To run CAVE, either: ## macOS   -**Latest Version: 18.2.1-3** +**Latest Version: 18.2.1-5** ### System Requirements diff --git a/docs/install/install-edex.md b/docs/install/install-edex.md index 139ef6aa7b..d0babd3e3a 100644 --- a/docs/install/install-edex.md +++ b/docs/install/install-edex.md @@ -6,7 +6,7 @@ EDEX is the **E**nvironmental **D**ata **Ex**change system that represents the b ## Latest Version -**18.2.1-4** +**18.2.1-5** [**View release notes**](https://www.unidata.ucar.edu/blogs/news/tags/awips-release) From d632577bc14c7c42a4a9b04c92f84068ffb867a0 Mon Sep 17 00:00:00 2001 From: Tiffany Meyer Date: Thu, 24 Mar 2022 09:55:11 -0400 Subject: [PATCH 03/65] Update bad radar name from MKRX to KMRX --- .../utility/common_static/site/MRX/radar/radarsInUse.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localization/utility/common_static/site/MRX/radar/radarsInUse.txt b/localization/utility/common_static/site/MRX/radar/radarsInUse.txt index ac1983374b..4417b093da 100644 --- a/localization/utility/common_static/site/MRX/radar/radarsInUse.txt +++ b/localization/utility/common_static/site/MRX/radar/radarsInUse.txt @@ -1,6 +1,6 @@ # DO NOT EDIT LINES BEGINNING WITH '#' # LOCAL_RADARS (including terminal) - MUST HAVE THIS LINE -mkrx +kmrx # DIAL_RADARS - MUST HAVE THIS LINE From b7bf6332533d4af369a236ed4f870c6b612dac06 Mon Sep 17 00:00:00 2001 From: Shay Carter Date: Mon, 28 Mar 2022 13:09:11 -0600 Subject: [PATCH 04/65] Create new GHA for updating NDM files - github action for updating ndm files to keep station information up to date with vlabs version --- .github/workflows/update_NDM.yml | 61 ++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 .github/workflows/update_NDM.yml diff --git a/.github/workflows/update_NDM.yml b/.github/workflows/update_NDM.yml new file mode 100644 index 0000000000..24aaedc3e6 --- /dev/null +++ b/.github/workflows/update_NDM.yml @@ -0,0 +1,61 @@ +name: update station info + +on: + workflow_dispatch: + schedule: + - cron: "0 6 * * *" + +jobs: + update_ndm: + runs-on: ubuntu-latest + environment: + name: VLAB + steps: +# # This may or may not be necessary, but it's what's done in the perl script +# # - name: Create awips-unidata-builds dir +# # - run: | +# # mkdir -p /home/awips/dev/ndm_local +# # cd /home/awips/dev/ndm_local +# # Could possibly just start with this? Where does it checkout the repo? /? +# - name: Checkout awips-unidata-build repo +# uses: actions/checkout@v3 +# with: +# repository: unidata/awips-unidata-builds +# ref: main +# # need to add a secret I think, because a-u-b is a private repo? +# token: '' + # Also need to checkout this repo + # this gets the latest code (and is run on the default branch) + - name: Checkout awips2 + uses: actions/checkout@v3 + ### Might need to install 'svn' command first?? +# - name: Install SVN +# run: | +# pip install svn + # Do individual pulls for all the files in the ndm text file + # I think we need some kind of SECRET for this so the pull can be made? + - name: Pull latest from vlab svn repo + run: | + cd rpms/awips2.edex/Installer.edex/ndm/ + for file in *; do + svn export --force https://vlab.noaa.gov/svn/awips-ndm/trunk/"$file" --username ${{ secrets.VLAB_UNAME }} --password ${{ secrets.VLAB_PASS }} + done + + # Get the current date/time, because it's used in auto-commit +# - name: Get current time +# id: time +# uses: Kaven-Universe/github-action-current-date-time@v1.1.0 +# with: +# format: "YYYY_MM_DD HH_mm_ss_SSS" + # Do we need to check for a change or can we just run a git add? + - name: Update existing NDM files for awips2 repo + # not sure if I have all the quotes just right for this one + # there is definitely a way to get the current default branch...do this properly? + # assume this is going to need some kind of SECRET as well?? + run: | + date=`date +%Y%m%d-%H:%M:%S` + git config user.name $GITHUB_ACTOR + git config user.email $GITHUB_ACTOR@users.noreply.github.com + git add --all + git commit -m "New NDM updates on $date - autogenerated" + git push From 893b491ee422c39979cb58f3a839c0a992844c4d Mon Sep 17 00:00:00 2001 From: Shay Carter Date: Mon, 28 Mar 2022 13:12:54 -0600 Subject: [PATCH 05/65] Clean up code in ndm GHA --- .github/workflows/update_NDM.yml | 33 +++----------------------------- 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/.github/workflows/update_NDM.yml b/.github/workflows/update_NDM.yml index 24aaedc3e6..e80f703d1d 100644 --- a/.github/workflows/update_NDM.yml +++ b/.github/workflows/update_NDM.yml @@ -11,47 +11,20 @@ jobs: environment: name: VLAB steps: -# # This may or may not be necessary, but it's what's done in the perl script -# # - name: Create awips-unidata-builds dir -# # - run: | -# # mkdir -p /home/awips/dev/ndm_local -# # cd /home/awips/dev/ndm_local -# # Could possibly just start with this? Where does it checkout the repo? /? -# - name: Checkout awips-unidata-build repo -# uses: actions/checkout@v3 -# with: -# repository: unidata/awips-unidata-builds -# ref: main -# # need to add a secret I think, because a-u-b is a private repo? -# token: '' - # Also need to checkout this repo + # Checkout this repo # this gets the latest code (and is run on the default branch) - name: Checkout awips2 uses: actions/checkout@v3 - ### Might need to install 'svn' command first?? -# - name: Install SVN -# run: | -# pip install svn - # Do individual pulls for all the files in the ndm text file - # I think we need some kind of SECRET for this so the pull can be made? + # Do individual pulls for all the files in the ndm directory - name: Pull latest from vlab svn repo run: | cd rpms/awips2.edex/Installer.edex/ndm/ for file in *; do svn export --force https://vlab.noaa.gov/svn/awips-ndm/trunk/"$file" --username ${{ secrets.VLAB_UNAME }} --password ${{ secrets.VLAB_PASS }} done - - # Get the current date/time, because it's used in auto-commit -# - name: Get current time -# id: time -# uses: Kaven-Universe/github-action-current-date-time@v1.1.0 -# with: -# format: "YYYY_MM_DD HH_mm_ss_SSS" + # Check in all the new files # Do we need to check for a change or can we just run a git add? - name: Update existing NDM files for awips2 repo - # not sure if I have all the quotes just right for this one - # there is definitely a way to get the current default branch...do this properly? - # assume this is going to need some kind of SECRET as well?? run: | date=`date +%Y%m%d-%H:%M:%S` git config user.name $GITHUB_ACTOR From 97d1dd911aa4af7bc4e059b5a54fa8d6119a3c28 Mon Sep 17 00:00:00 2001 From: tiffanycmeyer13 Date: Mon, 28 Mar 2022 19:24:47 +0000 Subject: [PATCH 06/65] New NDM updates on 20220328-19:24:47 - autogenerated --- rpms/awips2.edex/Installer.edex/ndm/afos2awips.txt | 6 +++++- rpms/awips2.edex/Installer.edex/ndm/afosMasterPIL.txt | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/rpms/awips2.edex/Installer.edex/ndm/afos2awips.txt b/rpms/awips2.edex/Installer.edex/ndm/afos2awips.txt index a2a5f166b2..041994e2e4 100644 --- a/rpms/awips2.edex/Installer.edex/ndm/afos2awips.txt +++ b/rpms/awips2.edex/Installer.edex/ndm/afos2awips.txt @@ -22536,6 +22536,7 @@ RNOCEMREV WOUS45 KREV RNOCEMVEF WOUS45 KVEF RNOCF6BIH CXUS55 KVEF RNOCF6DAG CXUS55 KVEF +RNOCF6DVF CXUS55 KVEF RNOCF6EED CXUS55 KVEF RNOCF6EKO CXUS55 KLKN RNOCF6ELY CXUS55 KLKN @@ -22544,16 +22545,20 @@ RNOCF6LAS CXUS55 KVEF RNOCF6RNO CXUS55 KREV RNOCF6TPH CXUS55 KLKN RNOCF6WMC CXUS55 KLKN +RNOCLADVF CXUS55 KVEF +RNOCLIDVF CDUS45 KVEF RNOCLIEKO CDUS45 KLKN RNOCLIELY CDUS45 KLKN RNOCLILAS CDUS45 KVEF RNOCLIRNO CDUS45 KREV RNOCLIWMC CDUS45 KLKN +RNOCLMDVF CXUS55 KVEF RNOCLMEKO CXUS55 KLKN RNOCLMELY CXUS55 KLKN RNOCLMLAS CXUS55 KVEF RNOCLMRNO CXUS55 KREV RNOCLMWMC CXUS55 KLKN +RNOCLSDVF CXUS55 KVEF RNOCMMRNO CSUS55 KREV RNOCMMTVL CSUS55 KREV RNOCMMWMC CSUS55 KLKN @@ -25808,7 +25813,6 @@ SJUTAFJBQ FTUS42 TJSJ SJUTAFJMZ FTUS42 TJSJ SJUTAFJPS FTUS42 TJSJ SJUTAFJSJ FTUS42 TJSJ -SJUTAFKPK FTUS42 TJSJ SJUTCPSP1 WTCA41 TJSJ SJUTCPSP2 WTCA42 TJSJ SJUTCPSP3 WTCA43 TJSJ diff --git a/rpms/awips2.edex/Installer.edex/ndm/afosMasterPIL.txt b/rpms/awips2.edex/Installer.edex/ndm/afosMasterPIL.txt index 651ecac79b..a18def62c3 100644 --- a/rpms/awips2.edex/Installer.edex/ndm/afosMasterPIL.txt +++ b/rpms/awips2.edex/Installer.edex/ndm/afosMasterPIL.txt @@ -38277,6 +38277,7 @@ RNOCEMREV RNOCEMVEF RNOCF6BIH RNOCF6DAG +RNOCF6DVF RNOCF6EED RNOCF6EKO RNOCF6ELY @@ -38287,6 +38288,7 @@ RNOCF6RNO RNOCF6TPH RNOCF6TVL RNOCF6WMC +RNOCLADVF RNOCLAEKO RNOCLAELY RNOCLALAS @@ -38295,6 +38297,7 @@ RNOCLARNO RNOCLATPH RNOCLATVL RNOCLAWMC +RNOCLIDVF RNOCLIEKO RNOCLIELY RNOCLILAS @@ -38303,6 +38306,7 @@ RNOCLIRNO RNOCLITPH RNOCLITVL RNOCLIWMC +RNOCLMDVF RNOCLMEKO RNOCLMELY RNOCLMLAS @@ -38311,6 +38315,7 @@ RNOCLMRNO RNOCLMTPH RNOCLMTVL RNOCLMWMC +RNOCLSDVF RNOCLSEKO RNOCLSELY RNOCLSP68 @@ -41770,7 +41775,6 @@ SJUTAFISX SJUTAFJBQ SJUTAFJMZ SJUTAFJPS -SJUTAFKPK SJUTAFSJU SJUTCPSP1 SJUTCPSP2 From b5856dd64ec691e0f3ed671db61830befbce2d5a Mon Sep 17 00:00:00 2001 From: srcarter3 Date: Mon, 28 Mar 2022 13:31:38 -0600 Subject: [PATCH 07/65] Update update_NDM.yml small change in updating ndm, if there are no changes, don't try git add/commit/push --- .github/workflows/update_NDM.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update_NDM.yml b/.github/workflows/update_NDM.yml index e80f703d1d..3c7878a6ef 100644 --- a/.github/workflows/update_NDM.yml +++ b/.github/workflows/update_NDM.yml @@ -29,6 +29,10 @@ jobs: date=`date +%Y%m%d-%H:%M:%S` git config user.name $GITHUB_ACTOR git config user.email $GITHUB_ACTOR@users.noreply.github.com - git add --all - git commit -m "New NDM updates on $date - autogenerated" - git push + change=`git diff` + if [ -z "$change" ] + then + git add --all + git commit -m "New NDM updates on $date - autogenerated" + git push + fi From 149bab777fbc4a680867dd689ea65890406d392e Mon Sep 17 00:00:00 2001 From: srcarter3 Date: Mon, 28 Mar 2022 13:44:38 -0600 Subject: [PATCH 08/65] Update update_NDM.yml only run if git diff is not empty --- .github/workflows/update_NDM.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update_NDM.yml b/.github/workflows/update_NDM.yml index 3c7878a6ef..ed3cb64bb6 100644 --- a/.github/workflows/update_NDM.yml +++ b/.github/workflows/update_NDM.yml @@ -23,14 +23,14 @@ jobs: svn export --force https://vlab.noaa.gov/svn/awips-ndm/trunk/"$file" --username ${{ secrets.VLAB_UNAME }} --password ${{ secrets.VLAB_PASS }} done # Check in all the new files - # Do we need to check for a change or can we just run a git add? + # Only do a git add/commit/push if files have changed - name: Update existing NDM files for awips2 repo run: | date=`date +%Y%m%d-%H:%M:%S` git config user.name $GITHUB_ACTOR git config user.email $GITHUB_ACTOR@users.noreply.github.com change=`git diff` - if [ -z "$change" ] + if [ "$change" -ge 1 ] then git add --all git commit -m "New NDM updates on $date - autogenerated" From 4bac7eb7e69aa55bd66c0bc8b32f4da2a0681e3c Mon Sep 17 00:00:00 2001 From: srcarter3 Date: Mon, 28 Mar 2022 13:50:30 -0600 Subject: [PATCH 09/65] Update update_NDM.yml one more change for only updating when a diff is made --- .github/workflows/update_NDM.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update_NDM.yml b/.github/workflows/update_NDM.yml index ed3cb64bb6..0d98046fa3 100644 --- a/.github/workflows/update_NDM.yml +++ b/.github/workflows/update_NDM.yml @@ -30,7 +30,7 @@ jobs: git config user.name $GITHUB_ACTOR git config user.email $GITHUB_ACTOR@users.noreply.github.com change=`git diff` - if [ "$change" -ge 1 ] + if [[ ! -z "$change" ]] then git add --all git commit -m "New NDM updates on $date - autogenerated" From 6b27297b7e13234c9187415a38a1c1761e8b7431 Mon Sep 17 00:00:00 2001 From: tiffanycmeyer13 Date: Wed, 30 Mar 2022 06:07:27 +0000 Subject: [PATCH 10/65] New NDM updates on 20220330-06:07:25 - autogenerated --- rpms/awips2.edex/Installer.edex/ndm/MTR.goodness | 2 ++ rpms/awips2.edex/Installer.edex/ndm/afosMasterPIL.txt | 2 ++ rpms/awips2.edex/Installer.edex/ndm/maritimeStationInfo.txt | 1 + rpms/awips2.edex/Installer.edex/ndm/metarStationInfo.txt | 2 ++ .../Installer.edex/ndm/national_category_table.template | 2 ++ rpms/awips2.edex/Installer.edex/ndm/textCCChelp.txt | 2 ++ 6 files changed, 11 insertions(+) diff --git a/rpms/awips2.edex/Installer.edex/ndm/MTR.goodness b/rpms/awips2.edex/Installer.edex/ndm/MTR.goodness index c53409cd5f..9ac29f014a 100644 --- a/rpms/awips2.edex/Installer.edex/ndm/MTR.goodness +++ b/rpms/awips2.edex/Installer.edex/ndm/MTR.goodness @@ -758,6 +758,7 @@ 72791 KAST 46.1570 -123.8820 7 9949 0 KASW 41.275 -85.84 259 500 0 KASX 46.55 -90.92 252 500 + 0 KATA 33.10253 -94.19503 85 500 72219 KATL 33.6600 -84.4200 315 26703 0 KATP 27.195 -90.027 -0 500 0 KATS 32.8500 -104.4700 1081 11801 @@ -2724,6 +2725,7 @@ 0 KTQE 41.7600 -96.1800 313 9745 0 KTQH 35.93 -95.00 266 500 0 KTQK 38.47503 -100.88444 905 500 + 0 KTQV 36.00704 -78.93733 157 500 0 KTRI 36.4800 -82.4000 474 22134 0 KTRK 39.3200 -120.13956 1798 2487 0 KTRL 32.7100 -96.2700 145 15592 diff --git a/rpms/awips2.edex/Installer.edex/ndm/afosMasterPIL.txt b/rpms/awips2.edex/Installer.edex/ndm/afosMasterPIL.txt index a18def62c3..952519c2a7 100644 --- a/rpms/awips2.edex/Installer.edex/ndm/afosMasterPIL.txt +++ b/rpms/awips2.edex/Installer.edex/ndm/afosMasterPIL.txt @@ -9157,6 +9157,7 @@ FTWMTRACT FTWMTRADS FTWMTRAFW FTWMTRASL +FTWMTRATA FTWMTRBKD FTWMTRBWD FTWMTRCNW @@ -37999,6 +38000,7 @@ RDUMTRSCR RDUMTRSOP RDUMTRSUT RDUMTRTDF +RDUMTRTQV RDUMTRTTA RDUMTRUDG RDUMTRVUJ diff --git a/rpms/awips2.edex/Installer.edex/ndm/maritimeStationInfo.txt b/rpms/awips2.edex/Installer.edex/ndm/maritimeStationInfo.txt index 339388d9bc..a12a837bba 100644 --- a/rpms/awips2.edex/Installer.edex/ndm/maritimeStationInfo.txt +++ b/rpms/awips2.edex/Installer.edex/ndm/maritimeStationInfo.txt @@ -521,6 +521,7 @@ 0000000000|CHDS1| 33.662| -82.200| 89|Strom Thurmond Dam, SC |US|BOY 0000000000|CHII2| 41.916| -87.572| 176|Chicago, IL (GLERL) |US|BOY 0000000000|CHNO3| 43.345|-124.329| -0|South Slough NERRS, OR |US|BOY +0000000000|CHR60| 32.536| -79.660| 0|19 NM SE Charleston, SC Harbor CORMP|US|BOY 0000000000|CHSV3| 17.748| -64.699| 0|Chr Har, St Croix, VI NOS 9751364 |US|BOY 0000000000|CHTS1| 32.78 | -79.93 | -0|Charleston, SC NOS WLOS |US|BOY 0000000000|CHYV2| 36.930| -76.007| -0|NWLON Cape Henry, VA |US|BOY diff --git a/rpms/awips2.edex/Installer.edex/ndm/metarStationInfo.txt b/rpms/awips2.edex/Installer.edex/ndm/metarStationInfo.txt index 1b7a5c99e3..a1af36537c 100644 --- a/rpms/awips2.edex/Installer.edex/ndm/metarStationInfo.txt +++ b/rpms/awips2.edex/Installer.edex/ndm/metarStationInfo.txt @@ -1366,6 +1366,7 @@ 0000072791|KAST | 46.1570|-123.8820| 7|Astoria/Clatsop, OR |US|MTR 0000000000|KASW | 41.275| -85.84 | 259|Warsaw, IN |US|MTR 0000000000|KASX | 46.55 | -90.92 | 252|Ashland/John F Kennedy Mem, WI |US|MTR +0000000000|KATA | 33.10253|-94.19503| 85|Hall-Miller Muni AP, Atlanta, TX |US|MTR 0000072219|KATL | 33.66 | -84.42 | 315|Hartsfield-Jackson IAP, Atlanta, GA |US|MTR 0000000000|KATP | 27.195| -90.027| -0|Green Canyon 787, Atlantis, LA |US|MTR 0000000000|KATS | 32.85 |-104.47 | 1081|Artesia, NM |US|MTR @@ -3474,6 +3475,7 @@ 0000000000|KTQE | 41.76 | -96.18 | 313|Tekamah, NE |US|MTR 0000000000|KTQH | 35.93 | -95.00 | 266|Tahlequah Muni, OK |US|MTR 0000000000|KTQK | 38.47503| -100.88444| 905|Scott City AP, Scott City, KS |US|MTR +0000000000|KTQV | 36.00704|-78.93733| 157|Duke Univ N Heliport, Durham, NC |US|MTR 0000000000|KTRI | 36.48 | -82.40 | 474|TRI-CITY/BRISTOL, TN |US|MTR 0000000000|KTRK | 39.32 |-120.13956 | 1798|Truckee-Tahoe AP, CA |US|MTR 0000000000|KTRL | 32.71 | -96.27 | 145|Terrell Muni, TX |US|MTR diff --git a/rpms/awips2.edex/Installer.edex/ndm/national_category_table.template b/rpms/awips2.edex/Installer.edex/ndm/national_category_table.template index 4e9c868920..b10b9d1e19 100644 --- a/rpms/awips2.edex/Installer.edex/ndm/national_category_table.template +++ b/rpms/awips2.edex/Installer.edex/ndm/national_category_table.template @@ -1278,6 +1278,7 @@ KASN BHM KAST PDX KASW IND KASX MKE +KATA FTW KATL ATL KATP NEW KATS ABQ @@ -3458,6 +3459,7 @@ KTPL FTW KTQE OMA KTQH OKC KTQK TOP +KTQV RDU KTRI MEM KTRK SFO KTRL FTW diff --git a/rpms/awips2.edex/Installer.edex/ndm/textCCChelp.txt b/rpms/awips2.edex/Installer.edex/ndm/textCCChelp.txt index 594eaf27d3..0378b45ee4 100644 --- a/rpms/awips2.edex/Installer.edex/ndm/textCCChelp.txt +++ b/rpms/awips2.edex/Installer.edex/ndm/textCCChelp.txt @@ -929,6 +929,7 @@ AT2 Atlantic #2 (B,G,L,R); Entire Atlantic (Tsunami Info) AT3 Atlantic #3 (C,H,M,S) AT4 Atlantic #4 (D,I,N,T) AT5 Atlantic #5 (E,J,O,V) +ATA Hall-Miller Municipal Airport, Atlanta, TX ATA Tanana/Calhoun Mem, AK ATC Tin City AFS, AK ATE P-Teller, AK @@ -4016,6 +4017,7 @@ TPP M-Port-Au-Prince, HA; T-Piarco Intl Arpt, TD TQE Tekamah, NE TQH Tahlequah Muni, OK TQK Scott City Airport, Scott City, KS +TQV Duke University North Heliport, Durham, NC TRI Bristol, TN TRK Truckee-Tahoe AP, CA TRL Terrell, TX From 18e76f07e20c92a1a4d0f72673d66921e0217562 Mon Sep 17 00:00:00 2001 From: Tiffany Meyer Date: Wed, 30 Mar 2022 08:48:18 -0400 Subject: [PATCH 11/65] Updated postgresql log configuration to save logs with the current date and to turn off truncate_on_rotation per Jen's suggestions --- .../Installer.database/configuration/postgresql.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpms/awips2.core/Installer.database/configuration/postgresql.conf b/rpms/awips2.core/Installer.database/configuration/postgresql.conf index c010f7802d..8b6bdd2c09 100644 --- a/rpms/awips2.core/Installer.database/configuration/postgresql.conf +++ b/rpms/awips2.core/Installer.database/configuration/postgresql.conf @@ -304,11 +304,11 @@ logging_collector = on # Enable capturing of stderr and csvlog # These are only used if logging_collector is on: log_directory = 'pg_log' # directory where log files are written, # can be absolute or relative to PGDATA -log_filename = 'postgresql-%A.log' # log file name pattern, +log_filename = 'postgresql-%F.log' # log file name pattern, # can include strftime() escapes #log_file_mode = 0600 # creation mode for log files, # begin with 0 to use octal notation -log_truncate_on_rotation = on # If on, an existing log file with the +log_truncate_on_rotation = off # If on, an existing log file with the # same name as the new log file will be # truncated rather than appended to. # But such truncation only occurs on From 672f332fc16deded56042eb180711047f69f80e8 Mon Sep 17 00:00:00 2001 From: Tiffany Meyer Date: Wed, 30 Mar 2022 13:35:13 -0400 Subject: [PATCH 12/65] Removed deprecated ldm.log rotate functionality, now we use ldmadmin newlog in the crontab --- .../Installer.ldm/patch/logrotate.d/ldm.log | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 rpms/awips2.upc/Installer.ldm/patch/logrotate.d/ldm.log diff --git a/rpms/awips2.upc/Installer.ldm/patch/logrotate.d/ldm.log b/rpms/awips2.upc/Installer.ldm/patch/logrotate.d/ldm.log deleted file mode 100644 index b4914737fa..0000000000 --- a/rpms/awips2.upc/Installer.ldm/patch/logrotate.d/ldm.log +++ /dev/null @@ -1,12 +0,0 @@ -/awips2/ldm/logs/ldmd.log /awips2/ldm/logs/edexBridge.log { - missingok - compress - notifempty - daily - rotate 5 - create 0660 root fxalpha - postrotate - /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true - endscript - -} From 1501d14daee73ec59f363eb7e177a326a58ed3c2 Mon Sep 17 00:00:00 2001 From: Shay Carter Date: Mon, 4 Apr 2022 13:30:08 -0600 Subject: [PATCH 13/65] Update install CAVE page for note about latest Monterey failure - added a warning about using MacOS 12.3 since it no longer supports python2 --- .DS_Store | Bin 0 -> 6148 bytes docs/install/install-cave.md | 2 ++ 2 files changed, 2 insertions(+) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ca2b7874ee44cef1857d5487e8c8184223131c55 GIT binary patch literal 6148 zcmeH~F$w}f3`G;&La^D=avBfd4F=H@>;(h`8(BfodXDZ-CJ2t!BJu;tpJXO1`-+{7 zi0JxuSc&u^GJ~7S(n4d3ypw~RWiQwJa2ZeM@rat$Cvn!+@Lrnz*rt#G36KB@kN^q% z5COZlVY7KvMiL+a5_l4@??Zx{=Fn2rKOG1@0zf;I-LUpq0-CG<&7q|#Dlm=dL8DcD z46(YmLsOi~p`~hV7meXV4M3`}dgXhH(h?7~0-B+w9;*1Wg-e+&OK|2Hj6Nq_|Y zjDU8VVY9|d#ohY$dRE^>)z$?L_2URHKLJSWDqg_du%B!J&7q|#Dlq;CI0gn1_$q-1 D?w=C8 literal 0 HcmV?d00001 diff --git a/docs/install/install-cave.md b/docs/install/install-cave.md index 8e83e068ab..340e66f60f 100644 --- a/docs/install/install-cave.md +++ b/docs/install/install-cave.md @@ -167,6 +167,8 @@ To run CAVE, either: ### System Requirements +!!! error "MacOS Monterey version 12.3 and above no longer supports Python2. This will cause several visualization aspects to fail in CAVE. If you update to MacOS 12.3 CAVE will not be fully functional. A potential workaround is to run a Virtual Machine with a different OS (older Mac or possibly CentOS7) and run CAVE inside of that." + - Will need admin privileges to install `awips-python.pkg` - NVIDIA Graphics card is recommended, however some Intel Graphics cards will support a majority of the functionality From 5360b618ff946f88181fd38e903ac2dcac0d570d Mon Sep 17 00:00:00 2001 From: srcarter3 Date: Mon, 4 Apr 2022 13:35:29 -0600 Subject: [PATCH 14/65] Delete .DS_Store --- .DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index ca2b7874ee44cef1857d5487e8c8184223131c55..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~F$w}f3`G;&La^D=avBfd4F=H@>;(h`8(BfodXDZ-CJ2t!BJu;tpJXO1`-+{7 zi0JxuSc&u^GJ~7S(n4d3ypw~RWiQwJa2ZeM@rat$Cvn!+@Lrnz*rt#G36KB@kN^q% z5COZlVY7KvMiL+a5_l4@??Zx{=Fn2rKOG1@0zf;I-LUpq0-CG<&7q|#Dlm=dL8DcD z46(YmLsOi~p`~hV7meXV4M3`}dgXhH(h?7~0-B+w9;*1Wg-e+&OK|2Hj6Nq_|Y zjDU8VVY9|d#ohY$dRE^>)z$?L_2URHKLJSWDqg_du%B!J&7q|#Dlq;CI0gn1_$q-1 D?w=C8 From e6e5244a50b020119b4ddc15c1971ad1d7599016 Mon Sep 17 00:00:00 2001 From: Tiffany Meyer Date: Wed, 6 Apr 2022 11:15:31 -0400 Subject: [PATCH 15/65] Added new blog to docs (Import Shapefiles) --- docs/appendix/educational-resources.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/appendix/educational-resources.md b/docs/appendix/educational-resources.md index ab2abb2dd4..7c8f452fae 100644 --- a/docs/appendix/educational-resources.md +++ b/docs/appendix/educational-resources.md @@ -123,6 +123,7 @@ A full list of all released blogs can be found below: - [Getting Started With the NSHARP Display Tool](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-using-the-nsharp) - [Explore the CAVE Volume Browser: Model Soundings](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-explore-the-cave3) - [NUCAPS Soundings](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-nucaps-soundings) +- [Import Shapefiles in CAVE](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-import-shapefiles-in) #### Python-AWIPS From def2e97db138e4ba55b27f063f2337527861aed9 Mon Sep 17 00:00:00 2001 From: Shay Carter Date: Thu, 7 Apr 2022 16:55:58 -0600 Subject: [PATCH 16/65] Update documentation for adding a New Grib Product - update the existing new grid page to only include content about grib2 - added an entirely new, hidden, page for dealing with original grib product - updated all "notes" and "warnings" with new admonition boxes - restructured some of the sections and added helpful subsection titles - added small new sections "Creating New Menu Item" and "Using wgrib2" - removed the environment version dependencies for mkdocs and mkdocs-unidata (because I'm updating the mkdocs-unidata package as well right now) - modified the mkdocs.yml file slightly to use new "nav" tag instead of "pages" --- docs/edex/new-grid-grib1-old.md | 279 +++++++++++++++++++++++++++++++ docs/edex/new-grid.md | 280 +++++++++----------------------- environment.yml | 2 - mkdocs.yml | 136 ++++++++-------- 4 files changed, 421 insertions(+), 276 deletions(-) create mode 100644 docs/edex/new-grid-grib1-old.md diff --git a/docs/edex/new-grid-grib1-old.md b/docs/edex/new-grid-grib1-old.md new file mode 100644 index 0000000000..433886e80b --- /dev/null +++ b/docs/edex/new-grid-grib1-old.md @@ -0,0 +1,279 @@ +# Ingest a New Grid Using .grib Files + +Unrecognized grids can be decoded by EDEX simply by dropping `*.grib` or `*.grib2` files into `/awips2/data_store/ingest/` + +To add support for a new grid, two edits must be made: + +* **Geospatial projection** must be defined in a [***grid navigation file***](#create-grid-projection-file) +* **Grid name**, **center**, **subcenter**, and **process ID** must be defined in a [***model definition file***](#create-model-definition) + +If the parameters in the grib file haven't been previously specified, another change *may* be needed as well: + +* **Center**, **subcenter**, **discipline**, **category**, and possibly **parameter ID** information may need to be defined in a [***table***](#adding-a-table) + +--- + +## Ingest an Unsupported Grid + +### Download Test Data + +Download an example grib1 file and rename to a `*.grib` extension, then copy to the manual ingest point `/awips2/data_store/ingest/` + + wget https://downloads.unidata.ucar.edu/awips2/current/files/14102318_nmm_d01.GrbF00600 -O wrf.grib + + cp wrf.grib /awips2/data_store/ingest/ + +Remember that the data distribution file (`/awips2/edex/data/utility/common_static/base/distribution/grib.xml`) will match filenames which have the `*.grib*` extension. + +### Check Grib Logs + +Confirm that the grib file decodes in the grib log file: + + edex log grib + + INFO [Ingest.GribDecode] /awips2/data_store/ingest/grib/20141026/14/wrf.grib processed in: 0.1200 (sec) Latency: 21.8080 (sec) + INFO [Ingest.GribDecode] /awips2/data_store/ingest/grib/20141026/14/wrf.grib processed in: 0.1180 (sec) Latency: 21.8140 (sec) + INFO [Ingest.GribDecode] /awips2/data_store/ingest/grib/20141026/14/wrf.grib processed in: 0.4230 (sec) Latency: 21.8360 (sec) + INFO [Ingest.GribDecode] /awips2/data_store/ingest/grib/20141026/14/wrf.grib processed in: 0.2240 (sec) Latency: 21.9140 (sec) + + ... + +### Check HDF5 Data + +Check that the hdf5 data directory exists for our unnamed grid + + ls -latr /awips2/edex/data/hdf5/grid/GribModel:7:0:89 + +Though the grib file has been decoded, it has been given a generic name with its center, subcenter, and process IDs (7, 0, 89, respectively). + +--- + +## Determine Grid Projection + +When the grid was ingested a record was added to the `grid_coverage` table with its navigation information: + + psql metadata + + metadata=# select nx,ny,dx,dy,majoraxis,minoraxis,la1,lo1,lov,latin1,latin2 from gridcoverage where id=(select distinct(location_id) from grid_info where datasetid='GribModel:7:0:89'); + nx | ny | dx | dy | majoraxis | minoraxis | la1 | lo1 | lov | latin1 | latin2 + -----+-----+------------------+------------------+-----------+-----------+------------------+-------------------+-------------------+------------------+------------------ + 201 | 155 | 4.29699993133545 | 4.29699993133545 | 6378160 | 6356775 | 42.2830009460449 | -72.3610000610352 | -67.0770034790039 | 45.3680000305176 | 45.3680000305176 + (1 row) + +Compare with the projection info returned by wgrib on the original file (look at the bolded sections below and make sure they match up with the corresponding entries returned from the database above): + +
+wgrib -V wrf.grib  
+rec 799:27785754:date 2014102318 ALBDO kpds5=84 kpds6=1 kpds7=0 levels=(0,0) grid=255 sfc 6hr fcst: bitmap: 736 undef
+  ALBDO=Albedo [%]
+  timerange 0 P1 6 P2 0 TimeU 1  nx 201 ny 155 GDS grid 3 num_in_ave 0 missing 0
+  center 7 subcenter 0 process 89 Table 2 scan: WE:SN winds(grid) 
+  Lambert Conf: Lat1 42.283000 Lon1 -72.361000 Lov -67.077000
+      Latin1 45.368000 Latin2 45.368000 LatSP 0.000000 LonSP 0.000000
+      North Pole (201 x 155) Dx 4.297000 Dy 4.297000 scan 64 mode 8
+  min/max data 5 21.9  num bits 8  BDS_Ref 50  DecScale 1 BinScale 0
+
+ +Notice that our grib file has a **Lambert Conformal** projection. We will need these values for the next step. + +!!! note "**There is a tolerance of +/- 0.1 degrees** to keep in mind when defining your coverage area." + +--- + +## Create Grid Projection File + +### Projection Types + +Grid projection files are stored in `/awips2/edex/data/utility/common_static/base/grib/grids/` and there are four grid coverage types available: + +1. **lambertConformalGridCoverage** (example: `RUCIcing.xml`) + + + 305 + Regional - CONUS (Lambert Conformal) + 16.322 + -125.955 + LowerLeft + 151 + 113 + 40.63525 + 40.63525 + km + 6356775.0 + 6378160.0 + -95.0 + 25.0 + 25.0 + + +2. **polarStereoGridCoverage** (example `seaice_south1_grid.xml`) + + + 405 + Sea Ice south 690X710 13km grid + -36.866 + 139.806 + LowerLeft + 690 + 710 + 12.7 + 12.7 + km + 6371229.0 + 6371229.0 + 100.0 + + +3. **latLonGridCoverage** (example `UkmetHR-SHemisphere.xml`) + + + 864162002 + UKMet HiRes combined - Southern Hemisphere + Longitude range 71.25E - 70.416E + -89.721 + 71.25 + LowerLeft + 864 + 162 + 0.833 + 0.556 + degree + -0.278 + 70.416 + + +4. **mercatorGridCoverage** (example `gridNBM_PR.xml`) + + + NBM_PR + National Blend Grid over Puerto Rico - (1.25 km) + 16.9775 + -68.0278 + LowerLeft + 339 + 225 + 1.25 + 1.25 + 19.3750032477232 + -63.984399999999994 + 20 + km + 6371200 + 6371200 + + +### Creating a New Projection File + +Copy an existing xml file with the same grid projection type (in this case **lambertConformalGridCoverage**) to a new file `wrf.xml`: + + cd /awips2/edex/data/utility/common_static/base/grib/grids/ + cp RUCIcing.xml wrf.xml + +And edit the new `wrf.xml` to define the projection values using the [output from wgrib or the database](#determine-grid-projection) (example provided): + + vi wrf.xml + + + 201155 + Regional - CONUS (Lambert Conformal) + 42.2830009460449 + -72.3610000610352 + LowerLeft + 201 + 155 + 4.29699993133545 + 4.29699993133545 + km + 6356775.0 + 6378160.0 + -67.0770034790039 + 45.3680000305176 + 45.3680000305176 + + +!!! note "Notice the `201155` tag was created by using the number of grid points (201 and 155). This name can be anything as long as it is unique and will be used to match against in the model definition." + +--- + +## Create Model Definition + +Model definition XML files are found in **/awips2/edex/data/utility/common_static/base/grib/models/**. + +Since our grib file has a center ID of 7 (NCEP) we will edit the **gribModels_NCEP-7.xml** file. + + cd /awips2/edex/data/utility/common_static/base/grib/models/ + + vi gribModels_NCEP-7.xml + +In `` add an entry: + + + WRF +
7
+ 0 + 201155 + + 89 + + + +Save the file and restart EDEX for the changes to take effect: + + sudo service edex_camel restart ingestGrib + +Now copy the `wrf.grib` file *again* to **/awips2/data_store/ingest/**. If everything is correct we will not see any persistence errors since the grid is now named **WRF** and not **GribModel:7:0:89**. + + cp wrf.grib /awips2/data_store/ingest/ + + edex log grib + +After you have confirmed that the grid was ingested with the given name, you can [edit the D2D product menus to display the new grid](../cave/d2d-edit-menus.md). + +--- + +## Adding a Table + +If you ingest a piece of data and the parameter appears as unknown in the metadata database, ensure that the correct parameter tables are in place for the center/subcenter. + +The tables are located in **/awips2/edex/data/utility/common_static/base/grib/tables/**. They are then broken into subdirectories using the following structure: **/[Center]/[Subcenter]/4.2.[Discipine].[Category].table**. + +The center and subcenter have been identified previously [here](#determine-grid-projection), as 7 and 0, respectively. So, the corresponding directory is: + + /awips2/edex/data/utility/common_static/base/grib/tables/7/0/ + +To find the **discipline** of a grib product, you need the **process** and **table** values from the grib file. These are output with the `wgrib -V` command: + +
+wgrib -V wrf.grib  
+rec 799:27785754:date 2014102318 ALBDO kpds5=84 kpds6=1 kpds7=0 levels=(0,0) grid=255 sfc 6hr fcst: bitmap: 736 undef
+  ALBDO=Albedo [%]
+  timerange 0 P1 6 P2 0 TimeU 1  nx 201 ny 155 GDS grid 3 num_in_ave 0 missing 0
+  center 7 subcenter 0 process 89 Table 2 scan: WE:SN winds(grid) 
+  Lambert Conf: Lat1 42.283000 Lon1 -72.361000 Lov -67.077000
+      Latin1 45.368000 Latin2 45.368000< LatSP 0.000000 LonSP 0.000000
+      North Pole (201 x 155) Dx 4.297000 Dy 4.297000 scan 64 mode 8
+  min/max data 5 21.9  num bits 8  BDS_Ref 50  DecScale 1 BinScale 0
+
+ +For our example, the process is **89** and table is **2**. Next, take a look in: + + /awips2/edex/data/utility/common_static/base/grid/grib1ParameterConvTable.xml + +And find the entry that has grib1 data with TableVersion 2 and Value 89: + + +
7
+ 2 + 89 + 0 + 3 + 10 + + +Here, we can see the discipline and category values (referred to as x above) are 0 and 3, respectively. + +So, the table needed for our example file is: + + /awips2/edex/data/utility/common_static/base/grib/tables/7/0/4.2.0.3.table diff --git a/docs/edex/new-grid.md b/docs/edex/new-grid.md index dcfe813c2f..a7aaa78e57 100644 --- a/docs/edex/new-grid.md +++ b/docs/edex/new-grid.md @@ -2,6 +2,8 @@ Unrecognized grids can be decoded by EDEX simply by dropping `*.grib` or `*.grib2` files into `/awips2/data_store/ingest/` +!!! note "This page explains how to ingest `.grib2` products. To view information about `.grib` products, [please see this page](/awips2/edex/new-grid-grib1-old)." + To add support for a new grid, two edits must be made: * **Geospatial projection** must be defined in a [***grid navigation file***](#create-grid-projection-file) @@ -15,105 +17,52 @@ If the parameters in the grib file haven't been previously specified, another ch ## Ingest an Unsupported Grid -### Grib Products +### Download Test Data -1. Download an example grib1 file and rename to a `*.grib` extension, then copy to the manual ingest point `/awips2/data_store/ingest/` +Download an example grib2 file (make sure the extension is `.grib2` or EDEX may not recognize it), and then copy to the manual ingest point `/awips2/data_store/ingest/` - wget https://downloads.unidata.ucar.edu/awips2/current/files/14102318_nmm_d01.GrbF00600 -O wrf.grib + wget https://downloads.unidata.ucar.edu/awips2/current/files/CPTI_00.50_20180502-000144.grib2 -O cpti.grib2 + + cp cpti.grib2 /awips2/data_store/ingest/ + +Remember that the data distribution file (`/awips2/edex/data/utility/common_static/base/distribution/grib.xml`) will match filenames which have the `*.grib*` extension. + +### Check Grib Logs + +Confirm that the grib file decodes in the grib log file: - cp wrf.grib /awips2/data_store/ingest/ + edex log grib + + INFO [Ingest.GribDecode] /awips2/data_store/ingest/cpti.grib2 processed in: 0.1200 (sec) Latency: 21.8080 (sec) + INFO [Ingest.GribDecode] /awips2/data_store/ingest/cpti.grib2 processed in: 0.1180 (sec) Latency: 21.8140 (sec) + INFO [Ingest.GribDecode] /awips2/data_store/ingest/cpti.grib2 processed in: 0.4230 (sec) Latency: 21.8360 (sec) + INFO [Ingest.GribDecode] /awips2/data_store/ingest/cpti.grib2 processed in: 0.2240 (sec) Latency: 21.9140 (sec) - Remember that the data distribution file (`/awips2/edex/data/utility/common_static/base/distribution/grib.xml`) will match filenames which have the `*.grib*` extension. - -2. Confirm that the grib file decodes in the grib log file: + ... - edex log grib +!!! warning "This step may fail if the parameter is not yet defined. The error will look like:" + +
+INFO  2020-07-20 20:34:17,710 2565 [GribPersist-1] GridDao: EDEX - Discarding record due to missing or unknown parameter mapping: /grid/2018-05-02_00:01:44.0_(0)/GribModel:161:0:97/null/null/403/Missing/FH/500.0/-999999.0
+INFO  2020-07-20 20:34:17,710 2566 [GribPersist-1] Ingest: EDEX: Ingest - grib2:: /awips2/data_store/ingest/CPTI_00.50_20180502-000144.grib2 processed in: 2.3550 (sec)
+INFO  2020-07-20 20:34:17,827 2567 [Ingest.GribDecode-6] grib: EDEX - No parameter information for center[161], subcenter[0], tableName[4.2.209.3], parameter value[61]
+
- INFO [Ingest.GribDecode] /awips2/data_store/ingest/grib/20141026/14/wrf.grib processed in: 0.1200 (sec) Latency: 21.8080 (sec) - INFO [Ingest.GribDecode] /awips2/data_store/ingest/grib/20141026/14/wrf.grib processed in: 0.1180 (sec) Latency: 21.8140 (sec) - INFO [Ingest.GribDecode] /awips2/data_store/ingest/grib/20141026/14/wrf.grib processed in: 0.4230 (sec) Latency: 21.8360 (sec) - INFO [Ingest.GribDecode] /awips2/data_store/ingest/grib/20141026/14/wrf.grib processed in: 0.2240 (sec) Latency: 21.9140 (sec) - - ... +In order to successfully ingest the example file, you must [**define the appropriate table**](#adding-a-table). -3. Check that the hdf5 data directory exists for our unnamed grid +### Check HDF5 Data - ls -latr /awips2/edex/data/hdf5/grid/GribModel:7:0:89 - - Though the grib file has been decoded, it has been given a generic name with its center, subcenter, and process IDs (7, 0, 89, respectively). - -### Grib2 Products - -1. Download an example grib2 file and rename to a `*.grib2` extension, then copy to the manual ingest point `/awips2/data_store/ingest/` - - wget https://downloads.unidata.ucar.edu/awips2/current/files/CPTI_00.50_20180502-000144.grib2 -O cpti.grib2 - - cp cpti.grib2 /awips2/data_store/ingest/ - - Remember that the data distribution file (`/awips2/edex/data/utility/common_static/base/distribution/grib.xml`) will match filenames which have the `*.grib*` extension. - -2. Confirm that the grib file decodes in the grib log file: - - edex log grib - - INFO [Ingest.GribDecode] /awips2/data_store/ingest/cpti.grib2 processed in: 0.1200 (sec) Latency: 21.8080 (sec) - INFO [Ingest.GribDecode] /awips2/data_store/ingest/cpti.grib2 processed in: 0.1180 (sec) Latency: 21.8140 (sec) - INFO [Ingest.GribDecode] /awips2/data_store/ingest/cpti.grib2 processed in: 0.4230 (sec) Latency: 21.8360 (sec) - INFO [Ingest.GribDecode] /awips2/data_store/ingest/cpti.grib2 processed in: 0.2240 (sec) Latency: 21.9140 (sec) - - ... - - **Note:** This step will likely fail, because the parameter is not yet defined. The error will look like: - - INFO 2020-07-20 20:34:17,710 2565 [GribPersist-1] GridDao: EDEX - Discarding record due to missing or unknown parameter mapping: /grid/2018-05-02_00:01:44.0_(0)/GribModel:161:0:97/null/null/403/Missing/FH/500.0/-999999.0 - INFO 2020-07-20 20:34:17,710 2566 [GribPersist-1] Ingest: EDEX: Ingest - grib2:: /awips2/data_store/ingest/CPTI_00.50_20180502-000144.grib2 processed in: 2.3550 (sec) - INFO 2020-07-20 20:34:17,827 2567 [Ingest.GribDecode-6] grib: EDEX - No parameter information for center[161], subcenter[0], tableName[4.2.209.3], parameter value[61] - - In order to successfully ingest the example file, [**define the appropriate table**](#grib2-products_4). - -3. Check that the hdf5 data directory exists for our unnamed grid +Check that the hdf5 data directory exists for our unnamed grid ls -latr /awips2/edex/data/hdf5/grid/GribModel:161:0:97 - Though the grib file has been decoded, it has been given a generic name with its center, subcenter, and process IDs (161, 0, 97, respectively). + Though the grib file has been decoded, it has been given a generic name with its **center, subcenter, and process IDs** (161, 0, 97, respectively). --- ## Determine Grid Projection -### Grib Products - -When the grid was ingested a record was added to the `grid_coverage` table with its navigation information: - - psql metadata - - metadata=# select nx,ny,dx,dy,majoraxis,minoraxis,la1,lo1,lov,latin1,latin2 from gridcoverage where id=(select distinct(location_id) from grid_info where datasetid='GribModel:7:0:89'); - nx | ny | dx | dy | majoraxis | minoraxis | la1 | lo1 | lov | latin1 | latin2 - -----+-----+------------------+------------------+-----------+-----------+------------------+-------------------+-------------------+------------------+------------------ - 201 | 155 | 4.29699993133545 | 4.29699993133545 | 6378160 | 6356775 | 42.2830009460449 | -72.3610000610352 | -67.0770034790039 | 45.3680000305176 | 45.3680000305176 - (1 row) - -Compare with the projection info returned by wgrib on the original file (look at the bolded sections below and make sure they match up with the corresponding entries returned from the database above): - -
-wgrib -V wrf.grib  
-rec 799:27785754:date 2014102318 ALBDO kpds5=84 kpds6=1 kpds7=0 levels=(0,0) grid=255 sfc 6hr fcst: bitmap: 736 undef
-  ALBDO=Albedo [%]
-  timerange 0 P1 6 P2 0 TimeU 1  nx 201 ny 155 GDS grid 3 num_in_ave 0 missing 0
-  center 7 subcenter 0 process 89 Table 2 scan: WE:SN winds(grid) 
-  Lambert Conf: Lat1 42.283000 Lon1 -72.361000 Lov -67.077000
-      Latin1 45.368000 Latin2 45.368000 LatSP 0.000000 LonSP 0.000000
-      North Pole (201 x 155) Dx 4.297000 Dy 4.297000 scan 64 mode 8
-  min/max data 5 21.9  num bits 8  BDS_Ref 50  DecScale 1 BinScale 0
-
- -Notice that our grib file has a **Lambert Conformal** projection. We will need these values for the next step. Note that **there is a tolerance of +/- 0.1 degrees** to keep in mind when defining your coverage area. - -### Grib2 Products - -When the grid was ingested a record was added to the `grid_coverage` table with its navigation information: +When a grid is ingested a record is added to the `grid_coverage` table with its navigation information: psql metadata @@ -130,12 +79,12 @@ When the grid was ingested a record was added to the `grid_coverage` table with 
 wgrib2 -grid -nxny cpti.grib2
 1:0:grid_template=0:winds(N/S):
-	lat-lon grid:(600 x 640) units 1e-06 input WE:NS output WE:SN res 48
+	lat-lon grid:(600 x 640) units 1e-06 input WE:NS output WE:SN res 48
 	lat 40.799999 to 37.599999 by 0.005000
 	lon 260.999999 to 263.999999 by 0.005000 #points=384000:(600 x 640)
   ...
-Notice that our grib2 file has a **Lat/lon Grid** projection. Where: +Notice that our grib2 file has a **Lat/lon Grid** projection, that starts in the **UpperLeft** corner (as defined by input West to East, North to South). Where: * **nx** is **600** * **ny** is **640** @@ -144,12 +93,16 @@ Notice that our grib2 file has a **Lat/lon Grid** projection. Where: * **la1** is **40.799999** * **lo1** is **261** -We will need these values for the next step. Note that **there is a tolerance of +/- 0.1 degrees** to keep in mind when defining your coverage (la1 and lo1) area. +We will need these values for the next step. + +!!! note "**There is a tolerance of +/- 0.1 degrees** to keep in mind when defining your coverage (la1 and lo1) area." --- ## Create Grid Projection File +### Projection Types + Grid projection files are stored in `/awips2/edex/data/utility/common_static/base/grib/grids/` and there are four grid coverage types available: 1. **lambertConformalGridCoverage** (example: `RUCIcing.xml`) @@ -228,45 +181,14 @@ Grid projection files are stored in `/awips2/edex/data/utility/common_static/bas 6371200 -### Grib Products - -Copy an existing xml file with the same grid projection type (in this case **lambertConformalGridCoverage**) to a new file `wrf.xml`: - - cd /awips2/edex/data/utility/common_static/base/grib/grids/ - cp RUCIcing.xml wrf.xml - -And edit the new `wrf.xml` to define the projection values using the [output from wgrib or the database](#determine-grid-projection) (example provided): - - vi wrf.xml - - - 201155 - Regional - CONUS (Lambert Conformal) - 42.2830009460449 - -72.3610000610352 - LowerLeft - 201 - 155 - 4.29699993133545 - 4.29699993133545 - km - 6356775.0 - 6378160.0 - -67.0770034790039 - 45.3680000305176 - 45.3680000305176 - - -> **Note**: Notice the `201155` tag was defined from the number of grid points (201 and 155). This value will be matched against an entry in our models file (below) to set the name of the model (e.g. WRF). - -### Grib2 Products +### Creating a New Projection File Copy an existing xml file with the same grid projection type (in this case **latLonGridCoverage**) to a new file `cpti.xml`: cd /awips2/edex/data/utility/common_static/base/grib/grids/ cp MRMS-1km.xml cpti.xml -And edit the new `cpti.xml` to define the projection values using the [output from wgrib2 or the database](#grib2-products_1) (example provided): +And edit the new `cpti.xml` to define the projection values using the [output from wgrib2 or the database](#determine-grid-projection) (example provided): vi cpti.xml @@ -283,7 +205,7 @@ And edit the new `cpti.xml` to define the projection values using the [output fr degree -> **Note**: Notice the `384000` tag was defined from the number of grid points (600 and 640). This value will be matched against an entry in our models file (below) to set the name of the model (e.g. CPTI). +!!! note "Notice the `384000` tag was created by using the number of grid points (600 and 640). This name can be anything as long as it is unique and will be used to match against in the model definition." --- @@ -291,40 +213,6 @@ And edit the new `cpti.xml` to define the projection values using the [output fr Model definition XML files are found in **/awips2/edex/data/utility/common_static/base/grib/models/**. -### Grid Prodcuts - -Since our grib file has a center ID of 7 (NCEP) we will edit the **gribModels_NCEP-7.xml** file. - - cd /awips2/edex/data/utility/common_static/base/grib/models/ - - vi gribModels_NCEP-7.xml - -In `` add an entry: - - - WRF -
7
- 0 - 201155 - - 89 - - - -Save the file and restart EDEX for the changes to take effect: - - sudo service edex_camel restart ingestGrib - -Now copy the `wrf.grib` file *again* to **/awips2/data_store/ingest/**. If everything is correct we will not see any persistence errors since the grid is now named **WRF** and not **GribModel:7:0:89**. - - cp wrf.grib /awips2/data_store/ingest/ - - edex log grib - -After you have confirmed that the grid was ingested with the given name, you can [edit the D2D product menus to display the new grid](../cave/d2d-edit-menus.md). - -### Grib2 Products - Since our grib2 file has a center of 161 (NOAA) we will edit the **gribModels_NOAA-161.xml** file. cd /awips2/edex/data/utility/common_static/base/grib/models/ @@ -357,52 +245,12 @@ If you ingest a piece of data and the parameter appears as unknown in the metada The tables are located in **/awips2/edex/data/utility/common_static/base/grib/tables/**. They are then broken into subdirectories using the following structure: **/[Center]/[Subcenter]/4.2.[Discipine].[Category].table**. -### Grib products - -The center and subcenter have been identified previously [here](#grib-products) and [here](#grib-products_1), as 7 and 0, respectively. So, the corresponding directory is: - - /awips2/edex/data/utility/common_static/base/grib/tables/7/0/ - -To find the **discipline** of a grib product, you need the **process** and **table** values from the grib file. These are output with the `wgrib -V` command: - -
-wgrib -V wrf.grib  
-rec 799:27785754:date 2014102318 ALBDO kpds5=84 kpds6=1 kpds7=0 levels=(0,0) grid=255 sfc 6hr fcst: bitmap: 736 undef
-  ALBDO=Albedo [%]
-  timerange 0 P1 6 P2 0 TimeU 1  nx 201 ny 155 GDS grid 3 num_in_ave 0 missing 0
-  center 7 subcenter 0 process 89 Table 2 scan: WE:SN winds(grid) 
-  Lambert Conf: Lat1 42.283000 Lon1 -72.361000 Lov -67.077000
-      Latin1 45.368000 Latin2 45.368000< LatSP 0.000000 LonSP 0.000000
-      North Pole (201 x 155) Dx 4.297000 Dy 4.297000 scan 64 mode 8
-  min/max data 5 21.9  num bits 8  BDS_Ref 50  DecScale 1 BinScale 0
-
- -For our example, the process is **89** and table is **2**. Next, take a look in: - - /awips2/edex/data/utility/common_static/base/grid/grib1ParameterConvTable.xml - -And find the entry that has grib1 data with TableVersion 2 and Value 89: - - -
7
- 2 - 89 - 0 - 3 - 10 - - -Here, we can see the discipline and category values (referred to as x above) are 0 and 3, respectively. - -So, the table needed for our example file is: - - /awips2/edex/data/utility/common_static/base/grib/tables/7/0/4.2.0.3.table - -### Grib2 Products - If you are using a grib2 file, then you can use either the log output or the `-center`, `-subcenter`, and `-full_name` options on `wgrib2` to get the center, subcenter, discipline, category, and parameter information: -The table would be found in the directory structure using this file's center and subcenter. The center can be found by either: +The table would be found in the directory structure using this file's center and subcenter. + +### Finding Center +The center can be found by either: * Running the following command: @@ -415,13 +263,15 @@ The table would be found in the directory structure using this file's center and **OR:** * Running the following command: -
+  
 wgrib2 -varX cpti.grib2
- 1:0:var209_255_1_161_3_61
-...
-

+1:0:var209_255_1_161_3_61
+...
+ Where the 4th argument after "var" is the center id, in this case **161**. +### Finding Subcenter + To get the subcenter, simply run: 
 wgrib2 -subcenter cpti.grib2
@@ -430,10 +280,12 @@ wgrib2 -subcenter cpti.grib2
The subcenter of this file is **0**. -So based on the center and subcenter, the corresponding directory is: +Based on the center and subcenter, the corresponding directory is: /awips2/edex/data/utility/common_static/base/grib/tables/161/0/ +### Finding Discipline and Category + To find the exact table, we need the discipline and category: 
@@ -445,8 +297,10 @@ wgrib2 -full_name cpti.grib2
 In this case the **discipline is 209** and **category is 3**, so the corresponding table is:
 
     4.2.209.3.table
-      
-So, the full path to the corresponding table would be:
+
+### Corresponding Table      
+
+The full path to the corresponding table would be:
 
     /awips2/edex/data/utility/common_static/base/grib/tables/161/0/4.2.209.3.table
 
@@ -464,10 +318,24 @@ You will have to restart ingestGrib for the changes to take place:
 
       sudo service edex_camel restart ingestGrib
       
-Now you can try [re-ingesting the grib2 file](#grib2-products).
+Now you can try [re-ingesting the grib2 file](#download-test-data).
       
 ---
 
+## Creating Menu Items
+
+After you have confirmed that the grid was ingested with the given name, you can [edit the D2D product menus to display the new grid](../cave/d2d-edit-menus.md).
+
+---
+
+## Using wgrib2
+
+Mentioned in this page are a few command parameters for `wgrib2` such as `-center`, `-subcenter`, and `-full_name`.
+
+A complete [list of all available parameters can be found here](https://www.cpc.ncep.noaa.gov/products/wesley/wgrib2/long_cmd_list.html).
+
+---
+
 ## Troubleshooting Grib Ingest
 
 * Make sure the latitude and longitude entries in your coverage specification file match those of your ingested raw grib file. There is a tolerance of +/- 0.1 degree to keep in mind when defining your coverage area.
diff --git a/environment.yml b/environment.yml
index 16af9a0daf..d4c8e7e0f4 100755
--- a/environment.yml
+++ b/environment.yml
@@ -6,6 +6,4 @@ dependencies:
   - python=3.8
   - pip
   - pip:
-    - mkdocs==0.17.5
-    - mkdocs-unidata==1.5.7
     - fontawesome_markdown
diff --git a/mkdocs.yml b/mkdocs.yml
index de485a72dd..3c36217645 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,5 +1,5 @@
 site_name: Unidata AWIPS User Manual
-site_url: http://unidata.github.io/awips2
+site_url: http://unidata.github.io/awips2/
 site_description: Documentation for all things AWIPS.
 site_author: support-awips@unidata.ucar.edu
 theme:
@@ -28,73 +28,73 @@ extra:
     - type: facebook
       link: https://facebook.com/Unidata
 
-pages:
-- Home: index.md
-- Install CAVE: install/install-cave.md
-- Install EDEX: install/install-edex.md
-- Common Problems: install/common-problems.md
-- CAVE User Manual:
-    - D2D Perspective: cave/d2d-perspective.md
-    - Maps, Views, Projections: cave/maps-views-projections.md
-    - Displays and Procedures: cave/bundles-and-procedures.md
-    - Localization Perspective: cave/localization-perspective.md
-#    - NCP Perspective: cave/ncp-perspective.md
-    - NSHARP: cave/nsharp.md
-    - WarnGen Walkthrough: cave/warngen.md
-    - GOES 16/17: cave/goes-16-17-satellite.md
-    - GIS and Shapefiles: cave/d2d-gis-shapefiles.md
-    - Volume Browser: cave/d2d-gridded-models.md
-    - Display Tools: cave/d2d-tools.md
-    - Radar Tools: cave/d2d-radar-tools.md
-    - Editing Menus: cave/d2d-edit-menus.md
-    - Change Localization: cave/cave-localization.md
-    - Import/Export: cave/import-export.md
-- EDEX User Manual:
-    - EDEX Basic Commands: install/start-edex.md
-    - EDEX Settings: edex/settings.md
-    - Distributed EDEX: edex/distributed-computing.md
-    - Docker EDEX: edex/edex-ingest-docker-container.md
-    - LDM Feeds: edex/ldm.md
-    - Data Distribution Files: edex/data-distribution-files.md
-    - Ingest a New Grid: edex/new-grid.md
-    - Purging and Retention: edex/data-purge.md
-    - Monitor Users: edex/edex-users.md
-    - Data Plugins: edex/data-plugins.md
-    - Archive Case Studies: edex/case-studies.md
-- Python-AWIPS: python/overview.md
-- Educational Resources: appendix/educational-resources.md
-#- Hazard Services:
-#    - CAVE Display: cave/hazard-services-display.md
-#    - Hazard Creation: cave/hazard-services-create.md
-#    - Hazard Alerts: cave/hazard-services-alert.md
-#    - Hazard Settings: cave/hazard-services-settings.md
-#    - Examples: cave/hazard-services-example.md
-# - Supported Data Types:
-#     - Gridded Model Display: cave/d2d-grids.md
-#     - Surface Obs: cave/d2d-pointdata-surface-obs.md
-#     - Satellite Imagery: cave/d2d-satellite.md
-#     - NEXRAD Radar: cave/d2d-radar.md
-#     - Upper Air: cave/d2d-uair.md
-#     - NCEP/Hydro: cave/d2d-hydro.md
-#     - Map Overlays: cave/d2d-map-resources.md
-- Development: dev/awips-development-environment.md
-    # - Overview: python/python-awips-data-access.md
-    # - AWIPS Grids and Cartopy: python/awips-grids-and-cartopy.md
-    # - Satellite Imagery: python/satellite-imagery.md
-    # - NEXRAD Level 3 Radar: python/nexrad-level-3-radar.md
-    # - Upper air BUFR Soundings: python/upper-air-bufr-soundings.md
-    # - Model Sounding Data: python/model-sounding-data.md
-    # - Map Resources and Topography: python/map-resources-and-topography.md
-    # - Surface Obs Plot with MetPy: python/surface-obs-plot-metpy.md
-- Appendix:
-    - AWIPS Grid Parameters: appendix/appendix-grid-parameters.md
-    - Maps Database: python/maps-database.md
-    - Acronyms and Abbreviations: appendix/appendix-acronyms.md
-    # - COTS and FOSS: appendix/appendix-cots.md
-    - WSR-88D Product Table: appendix/appendix-wsr88d.md
-    - Keyboard Shortcuts: cave/cave-keyboard-shortcuts.md
-    - "Raytheon: CAVE User's Manual": raytheon/cave_d2d.md
-    - "Raytheon: AWIPS System Manager's Manual": raytheon/smm.md
+nav:
+  - Home: index.md
+  - Install CAVE: install/install-cave.md
+  - Install EDEX: install/install-edex.md
+  - Common Problems: install/common-problems.md
+  - CAVE User Manual:
+      - D2D Perspective: cave/d2d-perspective.md
+      - Maps, Views, Projections: cave/maps-views-projections.md
+      - Displays and Procedures: cave/bundles-and-procedures.md
+      - Localization Perspective: cave/localization-perspective.md
+  #    - NCP Perspective: cave/ncp-perspective.md
+      - NSHARP: cave/nsharp.md
+      - WarnGen Walkthrough: cave/warngen.md
+      - GOES 16/17: cave/goes-16-17-satellite.md
+      - GIS and Shapefiles: cave/d2d-gis-shapefiles.md
+      - Volume Browser: cave/d2d-gridded-models.md
+      - Display Tools: cave/d2d-tools.md
+      - Radar Tools: cave/d2d-radar-tools.md
+      - Editing Menus: cave/d2d-edit-menus.md
+      - Change Localization: cave/cave-localization.md
+      - Import/Export: cave/import-export.md
+  - EDEX User Manual:
+      - EDEX Basic Commands: install/start-edex.md
+      - EDEX Settings: edex/settings.md
+      - Distributed EDEX: edex/distributed-computing.md
+      - Docker EDEX: edex/edex-ingest-docker-container.md
+      - LDM Feeds: edex/ldm.md
+      - Data Distribution Files: edex/data-distribution-files.md
+      - Ingest a New Grid: edex/new-grid.md
+      - Purging and Retention: edex/data-purge.md
+      - Monitor Users: edex/edex-users.md
+      - Data Plugins: edex/data-plugins.md
+      - Archive Case Studies: edex/case-studies.md
+  - Python-AWIPS: python/overview.md
+  - Educational Resources: appendix/educational-resources.md
+  #- Hazard Services:
+  #    - CAVE Display: cave/hazard-services-display.md
+  #    - Hazard Creation: cave/hazard-services-create.md
+  #    - Hazard Alerts: cave/hazard-services-alert.md
+  #    - Hazard Settings: cave/hazard-services-settings.md
+  #    - Examples: cave/hazard-services-example.md
+  # - Supported Data Types:
+  #     - Gridded Model Display: cave/d2d-grids.md
+  #     - Surface Obs: cave/d2d-pointdata-surface-obs.md
+  #     - Satellite Imagery: cave/d2d-satellite.md
+  #     - NEXRAD Radar: cave/d2d-radar.md
+  #     - Upper Air: cave/d2d-uair.md
+  #     - NCEP/Hydro: cave/d2d-hydro.md
+  #     - Map Overlays: cave/d2d-map-resources.md
+  - Development: dev/awips-development-environment.md
+      # - Overview: python/python-awips-data-access.md
+      # - AWIPS Grids and Cartopy: python/awips-grids-and-cartopy.md
+      # - Satellite Imagery: python/satellite-imagery.md
+      # - NEXRAD Level 3 Radar: python/nexrad-level-3-radar.md
+      # - Upper air BUFR Soundings: python/upper-air-bufr-soundings.md
+      # - Model Sounding Data: python/model-sounding-data.md
+      # - Map Resources and Topography: python/map-resources-and-topography.md
+      # - Surface Obs Plot with MetPy: python/surface-obs-plot-metpy.md
+  - Appendix:
+      - AWIPS Grid Parameters: appendix/appendix-grid-parameters.md
+      - Maps Database: python/maps-database.md
+      - Acronyms and Abbreviations: appendix/appendix-acronyms.md
+      # - COTS and FOSS: appendix/appendix-cots.md
+      - WSR-88D Product Table: appendix/appendix-wsr88d.md
+      - Keyboard Shortcuts: cave/cave-keyboard-shortcuts.md
+      - "Raytheon: CAVE User's Manual": raytheon/cave_d2d.md
+      - "Raytheon: AWIPS System Manager's Manual": raytheon/smm.md
 
 extra_css:
     - css/extra.css

From f2e3785dae09bba7e5de095b541eb3619119a870 Mon Sep 17 00:00:00 2001
From: srcarter3 
Date: Fri, 8 Apr 2022 10:02:28 -0600
Subject: [PATCH 17/65] Update deploy_docs.yml

Remove mkdocs and mkdocs version requirements, since now we can use the latest versions!
---
 .github/workflows/deploy_docs.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml
index ca467e8065..f0ae94c485 100644
--- a/.github/workflows/deploy_docs.yml
+++ b/.github/workflows/deploy_docs.yml
@@ -27,8 +27,8 @@ jobs:
 
       - name: Create mkdocs_requirements.txt
         run: |
-          echo "mkdocs==0.17.5" >> mkdocs_requirements.txt
-          echo "mkdocs-unidata==1.5.7" >> mkdocs_requirements.txt
+          echo "mkdocs" >> mkdocs_requirements.txt
+          echo "mkdocs-unidata" >> mkdocs_requirements.txt
           echo "fontawesome_markdown" >> mkdocs_requirements.txt
 
       - name: Get pip cache dir

From 8b1e1cdf18464083f28b70ba806c82a68b54ce12 Mon Sep 17 00:00:00 2001
From: Shay Carter 
Date: Fri, 8 Apr 2022 10:06:49 -0600
Subject: [PATCH 18/65] Add mkdocs and mkdocs-unidata as dependency but remove
 version restriction

---
 environment.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/environment.yml b/environment.yml
index d4c8e7e0f4..045efdab18 100755
--- a/environment.yml
+++ b/environment.yml
@@ -6,4 +6,6 @@ dependencies:
   - python=3.8
   - pip
   - pip:
+    - mkdocs
+    - mkdocs-unidata
     - fontawesome_markdown

From b2004381a583aa9a3aa2545b1458c80ec6f11e2b Mon Sep 17 00:00:00 2001
From: Shay Carter 
Date: Fri, 8 Apr 2022 13:13:25 -0600
Subject: [PATCH 19/65] Small doc changes for New Grid page, based on Tiffany's
 review

---
 docs/edex/new-grid.md | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/docs/edex/new-grid.md b/docs/edex/new-grid.md
index a7aaa78e57..d832d1a237 100644
--- a/docs/edex/new-grid.md
+++ b/docs/edex/new-grid.md
@@ -2,7 +2,7 @@
 
 Unrecognized grids can be decoded by EDEX simply by dropping `*.grib` or `*.grib2` files into `/awips2/data_store/ingest/`
 
-!!! note "This page explains how to ingest `.grib2` products.  To view information about `.grib` products, [please see this page](/awips2/edex/new-grid-grib1-old)."
+!!! note "This page explains how to ingest `.grib2` products.  To view information about `.grib` products, [please see this page](../new-grid-grib1-old)."
 
 To add support for a new grid, two edits must be made:
 
@@ -19,19 +19,17 @@ If the parameters in the grib file haven't been previously specified, another ch
 
 ### Download Test Data
 
-Download an example grib2 file (make sure the extension is `.grib2` or EDEX may not recognize it), and then copy to the manual ingest point `/awips2/data_store/ingest/` 
+Download an example grib2 file (make sure the extension is `.grib2` or the [EDEX distribution file](../data-distribution-files/#editing-an-edex-data-distribution-file) may not recognize it), and then copy to the manual ingest point `/awips2/data_store/ingest/`:
 
     wget https://downloads.unidata.ucar.edu/awips2/current/files/CPTI_00.50_20180502-000144.grib2 -O cpti.grib2
 
     cp cpti.grib2 /awips2/data_store/ingest/
 
-Remember that the data distribution file (`/awips2/edex/data/utility/common_static/base/distribution/grib.xml`) will match filenames which have the `*.grib*` extension.
-
 ### Check Grib Logs
 
-Confirm that the grib file decodes in the grib log file:
+Confirm that the grib file decodes in the grib log file.
     
-    edex log grib
+Look in the current log file (/awips2/edex/logs/edex-ingestGrib-[YYYYMMDD].log) for the following:
 
     INFO [Ingest.GribDecode] /awips2/data_store/ingest/cpti.grib2 processed in: 0.1200 (sec) Latency: 21.8080 (sec)
     INFO [Ingest.GribDecode] /awips2/data_store/ingest/cpti.grib2 processed in: 0.1180 (sec) Latency: 21.8140 (sec)
@@ -56,7 +54,7 @@ Check that the hdf5 data directory exists for our unnamed grid
 
         ls -latr /awips2/edex/data/hdf5/grid/GribModel:161:0:97
 
-    Though the grib file has been decoded, it has been given a generic name with its **center, subcenter, and process IDs** (161, 0, 97, respectively). 
+Though the grib file has been decoded, it has been given a generic name with its **center, subcenter, and process IDs** (161, 0, 97, respectively). 
     
 ---
 

From f7c74ae1c5c56d247bd1b3cf804e475e84d04772 Mon Sep 17 00:00:00 2001
From: Shay Carter 
Date: Fri, 8 Apr 2022 14:15:40 -0600
Subject: [PATCH 20/65] Small changes to New Grid doc based on Tiffany's
 review: - update the table parameter warning because our example WILL
 encounter this error - update the psql query and output with additional
 columns - add a note for projection types that not all fields are necessary -
 update the filename for our test data since it changed - update the name tag
 in the note to match the name tag example above - add a note about default
 parameter table location (.../-1/-1/) - add a few more commands to the wgrib2
 section to represent all commands used on this page

---
 docs/edex/new-grid.md | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/docs/edex/new-grid.md b/docs/edex/new-grid.md
index d832d1a237..4122022802 100644
--- a/docs/edex/new-grid.md
+++ b/docs/edex/new-grid.md
@@ -38,7 +38,7 @@ Look in the current log file (/awips2/edex/logs/edex-ingestGrib-[YYYYMMDD].log)
     
     ...
     
-!!! warning "This step may fail if the parameter is not yet defined.  The error will look like:"
+!!! warning "This step will fail for our example because the parameter is not yet defined.  The error will look like:"
 
 
 INFO  2020-07-20 20:34:17,710 2565 [GribPersist-1] GridDao: EDEX - Discarding record due to missing or unknown parameter mapping: /grid/2018-05-02_00:01:44.0_(0)/GribModel:161:0:97/null/null/403/Missing/FH/500.0/-999999.0
@@ -63,12 +63,11 @@ Though the grib file has been decoded, it has been given a generic name with its
 When a grid is ingested a record is added to the `grid_coverage` table with its navigation information:
 
     psql metadata
-    
-    metadata=# select nx,ny,dx,dy,majoraxis,minoraxis,la1,lo1,lov,latin1,latin2 from gridcoverage where id=(select distinct(location_id) from grid_info where datasetid='GribModel:161:0:97');
-    
-    nx  | ny  |  dx   |  dy   | majoraxis | minoraxis |    la1    | lo1 | lov | latin1 | latin2 
-    -----+-----+-------+-------+-----------+-----------+-----------+-----+-----+--------+--------
-    600 | 640 | 0.005 | 0.005 |           |           | 40.799999 | 261 |     |        |       
+  
+    metadata=> select nx,ny,dx,dy,majoraxis,minoraxis,la1,lo1,lov,latin1,latin2,spacingunit,lad,la2,latin,lo2,firstgridpointcorner from gridcoverage where id=(select distinct(location_id) from grid_info where datasetid='GribModel:161:0:97');
+     nx  | ny  |  dx   |  dy   | majoraxis | minoraxis |    la1    | lo1 | lov | latin1 | latin2 | spacingunit | lad | la2 | latin | lo2 | firstgridpointcorner 
+    -----+-----+-------+-------+-----------+-----------+-----------+-----+-----+--------+--------+-------------+-----+-----+-------+-----+----------------------
+     600 | 640 | 0.005 | 0.005 |           |           | 40.799999 | 261 |     |        |        | degree      |     |     |       |     | UpperLeft
     (1 row)
   Compare with the projection info returned by wgrib2 on the original file (look at the bolded sections below and make sure they match up with the corresponding entries returned from the database above):
  
+     
 	
     
 	
-    
+    --> 
 
 	
+	
+    
+    
+    
 	
+    
+    
     
 	
-    
-	
     
     
+    
+    
     
 	
     
+    
+    
 	
 	
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/phensigColors.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/phensigColors.xml
index 419b1d9d97..849f301767 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/phensigColors.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/phensigColors.xml
@@ -1,8 +1,6 @@
 
 
 	
-	  AF.W
-	  AF.Y
 	  AQ.Y
 	  AS.O
 	  AS.Y

From 4fdfc7ffa13f8ae0d1075b0c8bd2cca195501cb5 Mon Sep 17 00:00:00 2001
From: Shay Carter 
Date: Tue, 28 Jun 2022 11:10:26 -0600
Subject: [PATCH 54/65] Small update to WWAs - add a new display option for
 showing/hiding sampling for each of the WWAO records

---
 .../viz/warnings/rsc/AbstractWWAResource.java | 88 ++++++++++++++++++-
 .../warnings/ui/DrawingPropertiesDialog.java  | 39 +++++++-
 2 files changed, 123 insertions(+), 4 deletions(-)

diff --git a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
index d726332e21..7aa439aa5a 100644
--- a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
+++ b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
@@ -97,6 +97,7 @@ import com.vividsolutions.jts.geom.prep.PreparedGeometryFactory;
  * Dec 19, 2018   ----     mjames@ucar Added phensig color table lookup.
  * Mar 15, 2022			 srcarter@ucar Add support for display settings for outline, fill, text and time displays
  * Jun 24, 2022			 srcarter@ucar Add 'statement/other' display settings, set enabled for only relevant WWA types
+ * Jun 28, 2022			 srcarter@ucar Display sampling based on new 'sampling' settings
  *
  * 

  *
@@ -175,18 +176,22 @@ public abstract class AbstractWWAResource extends
     private boolean warnFill = WARN_FILL_DEFAULT;
     private boolean warnText = WARN_TEXT_DEFAULT;
     private boolean warnTime = WARN_TIME_DEFAULT;
+    private boolean warnSample = true;
     private boolean watchOutline = WATCH_OUTLINE_DEFAULT;
     private boolean watchFill = WATCH_FILL_DEFAULT;
     private boolean watchText = WATCH_TEXT_DEFAULT;
     private boolean watchTime = WATCH_TIME_DEFAULT;
+    private boolean watchSample = true;
     private boolean advOutline = ADV_OUTLINE_DEFAULT;
     private boolean advFill = ADV_FILL_DEFAULT;
     private boolean advText = ADV_TEXT_DEFAULT;
     private boolean advTime = ADV_TIME_DEFAULT;
+    private boolean advSample = true;
     private boolean otherOutline = OTHER_OUTLINE_DEFAULT;
     private boolean otherFill = OTHER_FILL_DEFAULT;
     private boolean otherText = OTHER_TEXT_DEFAULT;
     private boolean otherTime = OTHER_TIME_DEFAULT;
+    private boolean otherSample = true;
     private boolean enableWarnDisplay = false;
     private boolean enableWatchDisplay = false;
     private boolean enableAdvisoryDisplay = false;
@@ -295,7 +300,22 @@ public abstract class AbstractWWAResource extends
 
                     WarningEntry entry = entryMap.get(key);
                     AbstractWarningRecord record = entry.record;
-                    if (matchesFrame(entry, time, framePeriod, lastFrame)
+                    String sig = record.getSig();
+                    boolean samplingOn = false;
+                    if(sig.equals(WATCH_SIG)){
+                    	if(showWatchSampling())
+                    		samplingOn = true;
+                    }else if(sig.equals(WARN_SIG)){
+                    	if(showWarnSampling())
+                    		samplingOn = true;
+                    }else if(sig.equals(ADVISORY_SIG)){
+                    	if(showAdvisorySampling())
+                    		samplingOn = true;
+                    }else{
+                    	if(showOtherSampling())
+                    		samplingOn = true;
+                    }
+                    if (samplingOn && matchesFrame(entry, time, framePeriod, lastFrame)
                             && record.getGeometry() != null) {
 
                         Geometry recordGeom = record.getGeometry();
@@ -920,6 +940,15 @@ public abstract class AbstractWWAResource extends
 	public void setWarnTimeDisplay(boolean warnTime) {
 		this.warnTime = warnTime;
 	}
+	
+	/**
+	 * Set whether or not to display the sampling for warnings
+	 * @param warnSample  If true, will show the sampling output
+	 * for warnings, when sampling is enabled
+	 */
+	public void setWarnSampleDisplay(boolean warnSample) {
+		this.warnSample = warnSample;
+	}
 
 	/**
 	 * Set whether or not to display the outline for watches
@@ -952,6 +981,15 @@ public abstract class AbstractWWAResource extends
 	public void setWatchTimeDisplay(boolean watchTime) {
 		this.watchTime = watchTime;
 	}
+	
+	/**
+	 * Set whether or not to display the sampling for watches
+	 * @param watchSample  If true, will show the sampling output
+	 * for watches, when sampling is enabled
+	 */
+	public void setWatchSampleDisplay(boolean watchSample) {
+		this.watchSample = watchSample;
+	}
 
 	/**
 	 * Set whether or not to display the outline for advisories
@@ -985,6 +1023,16 @@ public abstract class AbstractWWAResource extends
 	public void setAdvisoryTimeDisplay(boolean advTime) {
 		this.advTime = advTime;
 	}
+	
+	/**
+	 * Set whether or not to display the sampling for advisories
+	 * @param advSample  If true, will show the sampling output
+	 * for advisories, when sampling is enabled
+	 */
+	public void setAdvisorySampleDisplay(boolean advSample) {
+		this.advSample = advSample;
+	}
+	
 	/**
 	 * Set whether or not to display the outline for statements
 	 * and other records
@@ -1021,6 +1069,16 @@ public abstract class AbstractWWAResource extends
 		this.otherTime = otherTime;
 	}
 	
+	/**
+	 * Set whether or not to display the sampling for statements/
+	 * other records
+	 * @param otherSample  If true, will show the sampling output
+	 * for statements/other records, when sampling is enabled
+	 */
+	public void setOtherSampleDisplay(boolean otherSample) {
+		this.otherSample = otherSample;
+	}
+	
 	/**
 	 * @return  True if the warning outline is displayed
 	 */
@@ -1049,6 +1107,13 @@ public abstract class AbstractWWAResource extends
 		return warnTime;
 	}
 	
+	/**
+	 * @return  True if the warning sampling is to be displayed
+	 */
+	public boolean showWarnSampling(){
+		return warnSample;
+	}
+	
 	/**
 	 * @return  True if the watch outline is displayed
 	 */
@@ -1077,6 +1142,13 @@ public abstract class AbstractWWAResource extends
 		return watchTime;
 	}
 	
+	/**
+	 * @return  True if the watch sampling is to be displayed
+	 */
+	public boolean showWatchSampling(){
+		return watchSample;
+	}
+	
 	/**
 	 * @return  True if the advisory outline is displayed
 	 */
@@ -1105,6 +1177,13 @@ public abstract class AbstractWWAResource extends
 		return advTime;
 	}
 	
+	/**
+	 * @return  True if the advisory sampling is to be displayed
+	 */
+	public boolean showAdvisorySampling(){
+		return advSample;
+	}
+	
 	/**
 	 * @return  True if the statement/other outline is displayed
 	 */
@@ -1133,6 +1212,13 @@ public abstract class AbstractWWAResource extends
 		return otherTime;
 	}
 	
+	/**
+	 * @return  True if the other/statement sampling is to be displayed
+	 */
+	public boolean showOtherSampling(){
+		return otherSample;
+	}
+	
 	/**
 	 * @return True if the warning display settings are to 
 	 * be enabled
diff --git a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/ui/DrawingPropertiesDialog.java b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/ui/DrawingPropertiesDialog.java
index 5dc9a42558..db0391df43 100644
--- a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/ui/DrawingPropertiesDialog.java
+++ b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/ui/DrawingPropertiesDialog.java
@@ -27,6 +27,7 @@ import com.raytheon.viz.warnings.rsc.AbstractWWAResource;
  * Mar 15, 2022            srcarter@ucar     Initial creation
  * Mar 21, 2022			   srcarter@ucar	 Set the current values every time initializeComponents is called (also called from .Open)
  * Jun 24, 2022			   srcarter@ucar	 Move Watches to top, add section for Other/Statement, add 'enabled' functionality
+ * Jun 28, 2022			   srcarter@ucar	 Add 'Sampling' options
  * 
  *
* @@ -40,18 +41,22 @@ public class DrawingPropertiesDialog extends CaveSWTDialog { private Button warnFillChk; private Button warnTextChk; private Button warnTimeChk; + private Button warnSampleChk; private Button watchOutlineChk; private Button watchFillChk; private Button watchTextChk; private Button watchTimeChk; + private Button watchSampleChk; private Button advOutlineChk; private Button advFillChk; private Button advTextChk; private Button advTimeChk; + private Button advSampleChk; private Button otherOutlineChk; private Button otherFillChk; private Button otherTextChk; private Button otherTimeChk; + private Button otherSampleChk; /** * The WWA Resource associated with this properties dialog @@ -96,6 +101,9 @@ public class DrawingPropertiesDialog extends CaveSWTDialog { watchTextChk = createButton(watchComp, "Show Text"); watchTimeChk = createButton(watchComp, "Show Time"); + //sample + watchSampleChk = createButton(watchComp, "Show Sampling"); + // --- end Watches --- // --- Warnings --- @@ -110,6 +118,8 @@ public class DrawingPropertiesDialog extends CaveSWTDialog { //text and time warnTextChk = createButton(warnComp, "Show Text"); warnTimeChk = createButton(warnComp, "Show Time"); + //sample + warnSampleChk = createButton(warnComp, "Show Sampling"); // --- end Warnings --- @@ -127,6 +137,9 @@ public class DrawingPropertiesDialog extends CaveSWTDialog { advTextChk = createButton(advComp, "Show Text"); advTimeChk = createButton(advComp, "Show Time"); + //sample + advSampleChk = createButton(advComp, "Show Sampling"); + // --- end Advisories --- // --- Other --- @@ -143,6 +156,9 @@ public class DrawingPropertiesDialog extends CaveSWTDialog { otherTextChk = createButton(otherComp, "Show Text"); otherTimeChk = createButton(otherComp, "Show Time"); + //sample + otherSampleChk = createButton(otherComp, "Show Sampling"); + // --- end Other --- // --- Bottom Buttons --- @@ -192,6 +208,7 @@ public class DrawingPropertiesDialog extends CaveSWTDialog { warnFillChk.setEnabled(isEnabled); warnTextChk.setEnabled(isEnabled); warnTimeChk.setEnabled(isEnabled); + warnSampleChk.setEnabled(isEnabled); } private void setWatchControlsEnabled(boolean isEnabled){ @@ -199,6 +216,7 @@ public class DrawingPropertiesDialog extends CaveSWTDialog { watchFillChk.setEnabled(isEnabled); watchTextChk.setEnabled(isEnabled); watchTimeChk.setEnabled(isEnabled); + watchSampleChk.setEnabled(isEnabled); } private void setAdvisoryControlsEnabled(boolean isEnabled){ @@ -206,6 +224,7 @@ public class DrawingPropertiesDialog extends CaveSWTDialog { advFillChk.setEnabled(isEnabled); advTextChk.setEnabled(isEnabled); advTimeChk.setEnabled(isEnabled); + advSampleChk.setEnabled(isEnabled); } private void setOtherControlsEnabled(boolean isEnabled){ @@ -213,6 +232,7 @@ public class DrawingPropertiesDialog extends CaveSWTDialog { otherFillChk.setEnabled(isEnabled); otherTextChk.setEnabled(isEnabled); otherTimeChk.setEnabled(isEnabled); + otherSampleChk.setEnabled(isEnabled); } /** @@ -252,21 +272,25 @@ public class DrawingPropertiesDialog extends CaveSWTDialog { myResource.setWarnFillDisplay(warnFillChk.getSelection()); myResource.setWarnTextDisplay(warnTextChk.getSelection()); myResource.setWarnTimeDisplay(warnTimeChk.getSelection()); + myResource.setWarnSampleDisplay(warnSampleChk.getSelection()); myResource.setWatchOutlineDisplay(watchOutlineChk.getSelection()); myResource.setWatchFillDisplay(watchFillChk.getSelection()); myResource.setWatchTextDisplay(watchTextChk.getSelection()); myResource.setWatchTimeDisplay(watchTimeChk.getSelection()); + myResource.setWatchSampleDisplay(watchSampleChk.getSelection()); myResource.setAdvisoryOutlineDisplay(advOutlineChk.getSelection()); myResource.setAdvisoryFillDisplay(advFillChk.getSelection()); myResource.setAdvisoryTextDisplay(advTextChk.getSelection()); myResource.setAdvisoryTimeDisplay(advTimeChk.getSelection()); + myResource.setAdvisorySampleDisplay(advSampleChk.getSelection()); myResource.setOtherOutlineDisplay(otherOutlineChk.getSelection()); myResource.setOtherFillDisplay(otherFillChk.getSelection()); myResource.setOtherTextDisplay(otherTextChk.getSelection()); - myResource.setOtherTimeDisplay(otherTimeChk.getSelection()); + myResource.setOtherTimeDisplay(otherTimeChk.getSelection()); + myResource.setOtherSampleDisplay(otherSampleChk.getSelection()); myResource.issueRefresh(); } @@ -280,22 +304,27 @@ public class DrawingPropertiesDialog extends CaveSWTDialog { warnFillChk.setSelection(AbstractWWAResource.WARN_FILL_DEFAULT); warnTextChk.setSelection(AbstractWWAResource.WARN_TEXT_DEFAULT); warnTimeChk.setSelection(AbstractWWAResource.WARN_TIME_DEFAULT); + warnSampleChk.setSelection(true); watchOutlineChk.setSelection(AbstractWWAResource.WATCH_OUTLINE_DEFAULT); watchFillChk.setSelection(AbstractWWAResource.WATCH_FILL_DEFAULT); watchTextChk.setSelection(AbstractWWAResource.WATCH_TEXT_DEFAULT); watchTimeChk.setSelection(AbstractWWAResource.WATCH_TIME_DEFAULT); + watchSampleChk.setSelection(true); advOutlineChk.setSelection(AbstractWWAResource.ADV_OUTLINE_DEFAULT); advFillChk.setSelection(AbstractWWAResource.ADV_FILL_DEFAULT); advTextChk.setSelection(AbstractWWAResource.ADV_TEXT_DEFAULT); advTimeChk.setSelection(AbstractWWAResource.ADV_TIME_DEFAULT); + advSampleChk.setSelection(true); otherOutlineChk.setSelection(AbstractWWAResource.OTHER_OUTLINE_DEFAULT); otherFillChk.setSelection(AbstractWWAResource.OTHER_FILL_DEFAULT); otherTextChk.setSelection(AbstractWWAResource.OTHER_TEXT_DEFAULT); - otherTimeChk.setSelection(AbstractWWAResource.OTHER_TIME_DEFAULT); } - + otherTimeChk.setSelection(AbstractWWAResource.OTHER_TIME_DEFAULT); + otherSampleChk.setSelection(true); + } + /** * Set all the GUI checkboxes to the current boolean values from * the associated resource @@ -305,20 +334,24 @@ public class DrawingPropertiesDialog extends CaveSWTDialog { warnFillChk.setSelection(myResource.showWarnFill()); warnTextChk.setSelection(myResource.showWarnText()); warnTimeChk.setSelection(myResource.showWarnTime()); + warnSampleChk.setSelection(myResource.showWarnSampling()); watchOutlineChk.setSelection(myResource.showWatchOutline()); watchFillChk.setSelection(myResource.showWatchFill()); watchTextChk.setSelection(myResource.showWatchText()); watchTimeChk.setSelection(myResource.showWatchTime()); + watchSampleChk.setSelection(myResource.showWatchSampling()); advOutlineChk.setSelection(myResource.showAdvisoryOutline()); advFillChk.setSelection(myResource.showAdvisoryFill()); advTextChk.setSelection(myResource.showAdvisoryText()); advTimeChk.setSelection(myResource.showAdvisoryTime()); + advSampleChk.setSelection(myResource.showAdvisorySampling()); otherOutlineChk.setSelection(myResource.showOtherOutline()); otherFillChk.setSelection(myResource.showOtherFill()); otherTextChk.setSelection(myResource.showOtherText()); otherTimeChk.setSelection(myResource.showOtherTime()); + otherSampleChk.setSelection(myResource.showOtherSampling()); } } From d7c17f111812776359b57d48562e9d7edf682f9e Mon Sep 17 00:00:00 2001 From: Shay Carter Date: Tue, 28 Jun 2022 14:12:25 -0600 Subject: [PATCH 55/65] Small WWA change for sampling -make small change to support sampling on/off for sig weather resource --- .../viz/warnings/rsc/AbstractWWAResource.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java index 7aa439aa5a..5a39d7d06a 100644 --- a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java +++ b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java @@ -302,15 +302,18 @@ public abstract class AbstractWWAResource extends AbstractWarningRecord record = entry.record; String sig = record.getSig(); boolean samplingOn = false; - if(sig.equals(WATCH_SIG)){ - if(showWatchSampling()) - samplingOn = true; - }else if(sig.equals(WARN_SIG)){ - if(showWarnSampling()) - samplingOn = true; - }else if(sig.equals(ADVISORY_SIG)){ - if(showAdvisorySampling()) - samplingOn = true; + if(sig !=null){ + if(sig.equals(WATCH_SIG) && showWatchSampling()){ + samplingOn = true; + }else if(sig.equals(WARN_SIG) && showWarnSampling()){ + samplingOn = true; + }else if(sig.equals(ADVISORY_SIG) && showAdvisorySampling()){ + samplingOn = true; + }else{ + if(showOtherSampling()){ + samplingOn = true; + } + } }else{ if(showOtherSampling()) samplingOn = true; From 280b201735d0320d141ec152421d43d780c08c52 Mon Sep 17 00:00:00 2001 From: Shay Carter Date: Tue, 28 Jun 2022 16:24:52 -0600 Subject: [PATCH 56/65] Small change to the warngen dialog - disabled (grayed out) the "UPDATE LIST" combobox, since it's not used because we don't allow sending warnings --- .../src/com/raytheon/viz/warngen/gui/WarngenDialog.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java index 11806e8329..b79c10fdc5 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java @@ -211,6 +211,7 @@ import com.vividsolutions.jts.geom.Polygon; * Dec 20, 2021 srcarter@ucar Check for null before setting layout data on tabs. Make all other components have false * for vertical expansion so the resizing only resizes the bullet list * Mar 15, 2022 srcarter@ucar Set the proper number of columns in the layout for the bottom buttons to be centered + * Jun 28, 2022 srcarter@ucar Small change to disable the "UPDATE LIST" combobox (not used in Unidata version) * * * @author chammack @@ -652,6 +653,8 @@ IWarningsArrivedListener, ISimulatedTimeChangeListener { gd.horizontalIndent = 30; updateListCbo = new Combo(productType, SWT.READ_ONLY | SWT.DROP_DOWN); + //disable the update list since we disable sending of warnings + updateListCbo.setEnabled(false); updateListCbo.setLayoutData(gd); recreateUpdates(); From 30e7806cc29de2b9366e65d3c9eb99ad4147412a Mon Sep 17 00:00:00 2001 From: Tiffany Meyer Date: Wed, 29 Jun 2022 18:09:55 -0400 Subject: [PATCH 57/65] Change wording for Other/Statements in WWA's from "Sig Wx Advisory" to "Special Weather Statements" --- cave/com.raytheon.viz.warnings/localization/bundles/AllWWA.xml | 2 +- cave/com.raytheon.viz.warnings/localization/bundles/ConvWWA.xml | 2 +- cave/com.raytheon.viz.warnings/localization/bundles/SPS.xml | 2 +- .../localization/menus/warnings/baseWarnings.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllWWA.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllWWA.xml index 3f04f0b664..078d6049c9 100644 --- a/cave/com.raytheon.viz.warnings/localization/bundles/AllWWA.xml +++ b/cave/com.raytheon.viz.warnings/localization/bundles/AllWWA.xml @@ -173,7 +173,7 @@ - + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/ConvWWA.xml b/cave/com.raytheon.viz.warnings/localization/bundles/ConvWWA.xml index 6c7f73a1cf..884f0946bb 100644 --- a/cave/com.raytheon.viz.warnings/localization/bundles/ConvWWA.xml +++ b/cave/com.raytheon.viz.warnings/localization/bundles/ConvWWA.xml @@ -43,7 +43,7 @@ - + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/SPS.xml b/cave/com.raytheon.viz.warnings/localization/bundles/SPS.xml index 090eb196e9..da60b436bc 100644 --- a/cave/com.raytheon.viz.warnings/localization/bundles/SPS.xml +++ b/cave/com.raytheon.viz.warnings/localization/bundles/SPS.xml @@ -17,7 +17,7 @@ + isRequeryNecessaryOnTimeMatch="false" name="Special Weather Statements"> diff --git a/cave/com.raytheon.viz.warnings/localization/menus/warnings/baseWarnings.xml b/cave/com.raytheon.viz.warnings/localization/menus/warnings/baseWarnings.xml index d3ebf2ee8f..1c0a4add35 100644 --- a/cave/com.raytheon.viz.warnings/localization/menus/warnings/baseWarnings.xml +++ b/cave/com.raytheon.viz.warnings/localization/menus/warnings/baseWarnings.xml @@ -41,7 +41,7 @@ menuText="Other Watches, Warnings, Advisories" id="otherWarnings"> + menuText="Special Weather Statements" id="SPS"> From c3945569a559fbbab39a48c71c3f8aa78b4f26c6 Mon Sep 17 00:00:00 2001 From: Shay Carter Date: Wed, 29 Jun 2022 16:14:02 -0600 Subject: [PATCH 58/65] Another small update for WWA layers - updated the sampling logic to only sample when it's supposed to - added a method on DrawingPropertiesDialog to update the controls enabled if new data comes into the layer - call the new update method when cycling through adding records, if the drawing dialog already exists --- .../viz/warnings/rsc/AbstractWWAResource.java | 32 +++++++++++++++---- .../warnings/ui/DrawingPropertiesDialog.java | 7 ++++ 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java index 5a39d7d06a..7df636b9ef 100644 --- a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java +++ b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java @@ -302,22 +302,35 @@ public abstract class AbstractWWAResource extends AbstractWarningRecord record = entry.record; String sig = record.getSig(); boolean samplingOn = false; + System.out.println("start: "+samplingOn+" "+sig); if(sig !=null){ - if(sig.equals(WATCH_SIG) && showWatchSampling()){ - samplingOn = true; - }else if(sig.equals(WARN_SIG) && showWarnSampling()){ - samplingOn = true; - }else if(sig.equals(ADVISORY_SIG) && showAdvisorySampling()){ - samplingOn = true; + if(sig.equals(WATCH_SIG)){ + if(showWatchSampling()){ + samplingOn = true; + } + }else if(sig.equals(WARN_SIG)){ + if(showWarnSampling()){ + samplingOn = true; + } + }else if(sig.equals(ADVISORY_SIG)){ + if(showAdvisorySampling()){ + samplingOn = true; + } }else{ if(showOtherSampling()){ + System.out.println("here4"); samplingOn = true; } } }else{ - if(showOtherSampling()) + if(showOtherSampling()){ + System.out.println("here5"); samplingOn = true; + } } + + System.out.println("sampling: "+samplingOn); + if (samplingOn && matchesFrame(entry, time, framePeriod, lastFrame) && record.getGeometry() != null) { @@ -714,6 +727,11 @@ public abstract class AbstractWWAResource extends enableOtherDisplay = true; } } + + //update display if it already exists + if(drawingDialog != null){ + drawingDialog.updateControlsEnabled(enableWatchDisplay, enableWarnDisplay, enableAdvisoryDisplay, enableOtherDisplay); + } } } } diff --git a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/ui/DrawingPropertiesDialog.java b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/ui/DrawingPropertiesDialog.java index db0391df43..a6420aebd6 100644 --- a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/ui/DrawingPropertiesDialog.java +++ b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/ui/DrawingPropertiesDialog.java @@ -203,6 +203,13 @@ public class DrawingPropertiesDialog extends CaveSWTDialog { setOtherControlsEnabled(myResource.enableOtherDisplay()); } + public void updateControlsEnabled(boolean enableWatch, boolean enableWarn, boolean enableAdv, boolean enableOther){ + setWatchControlsEnabled(enableWatch); + setWarningControlsEnabled(enableWarn); + setAdvisoryControlsEnabled(enableAdv); + setOtherControlsEnabled(enableOther); + } + private void setWarningControlsEnabled(boolean isEnabled){ warnOutlineChk.setEnabled(isEnabled); warnFillChk.setEnabled(isEnabled); From 252ff1a2218be6b0a62609b63dce45b713599f18 Mon Sep 17 00:00:00 2001 From: Shay Carter Date: Wed, 29 Jun 2022 16:19:05 -0600 Subject: [PATCH 59/65] Small WWA change: - remove print statements from last commit --- .../com/raytheon/viz/warnings/rsc/AbstractWWAResource.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java index 7df636b9ef..5bd6fd6227 100644 --- a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java +++ b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java @@ -302,7 +302,6 @@ public abstract class AbstractWWAResource extends AbstractWarningRecord record = entry.record; String sig = record.getSig(); boolean samplingOn = false; - System.out.println("start: "+samplingOn+" "+sig); if(sig !=null){ if(sig.equals(WATCH_SIG)){ if(showWatchSampling()){ @@ -318,19 +317,15 @@ public abstract class AbstractWWAResource extends } }else{ if(showOtherSampling()){ - System.out.println("here4"); samplingOn = true; } } }else{ if(showOtherSampling()){ - System.out.println("here5"); samplingOn = true; } } - System.out.println("sampling: "+samplingOn); - if (samplingOn && matchesFrame(entry, time, framePeriod, lastFrame) && record.getGeometry() != null) { From c86003fdf1287fd02815313a6b31160a1e84c2c3 Mon Sep 17 00:00:00 2001 From: Shay Carter Date: Wed, 29 Jun 2022 16:24:35 -0600 Subject: [PATCH 60/65] WWA Change: - added one more check on the drawing dialog before trying to update the enabled controls --- .../src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java index 5bd6fd6227..cc4749f2ca 100644 --- a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java +++ b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java @@ -724,7 +724,7 @@ public abstract class AbstractWWAResource extends } //update display if it already exists - if(drawingDialog != null){ + if(drawingDialog != null && !drawingDialog.isDisposed()){ drawingDialog.updateControlsEnabled(enableWatchDisplay, enableWarnDisplay, enableAdvisoryDisplay, enableOtherDisplay); } } From 85fce0d84a87cf21301d8578b516ca0f70e01502 Mon Sep 17 00:00:00 2001 From: Tiffany Meyer Date: Wed, 29 Jun 2022 18:26:08 -0400 Subject: [PATCH 61/65] Small change to resource text for Tropical/Marine WWA's --- .../localization/bundles/MarineWWA.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/MarineWWA.xml b/cave/com.raytheon.viz.warnings/localization/bundles/MarineWWA.xml index 70360c38ec..8ca823951f 100644 --- a/cave/com.raytheon.viz.warnings/localization/bundles/MarineWWA.xml +++ b/cave/com.raytheon.viz.warnings/localization/bundles/MarineWWA.xml @@ -17,7 +17,7 @@ + isRequeryNecessaryOnTimeMatch="true" name="Tropical/Marine Watches, Warnings, Advisories"> From 5eecf2a7dac7698a1930bd61fef8341a45878ef2 Mon Sep 17 00:00:00 2001 From: Shay Carter Date: Fri, 1 Jul 2022 15:52:53 -0600 Subject: [PATCH 62/65] Update Ed Resources page with latest awips tips link - add a link for the latest tip about the GLM data changes --- docs/appendix/educational-resources.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/appendix/educational-resources.md b/docs/appendix/educational-resources.md index f25c863aac..a8390282b3 100644 --- a/docs/appendix/educational-resources.md +++ b/docs/appendix/educational-resources.md @@ -108,6 +108,7 @@ A full list of all released blogs can be found below: - [AWIPS 18.2.1-3 Software Release](https://www.unidata.ucar.edu/blogs/news/entry/awips-18-2-1-3) - [Access Learn AWIPS CAVE from Unidata eLearning](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-access-learn-awips) - [AWIPS 18.2.1-5 Software Release](https://www.unidata.ucar.edu/blogs/news/entry/awips-18-2-1-5) +- [GLM DATA IDD/LDM Feed Updates](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-glm-data-idd) #### CAVE From 3f5d02245ce13c5c8b20a8eaaeaa2302089852a2 Mon Sep 17 00:00:00 2001 From: Tiffany Meyer Date: Fri, 8 Jul 2022 17:01:51 -0400 Subject: [PATCH 63/65] Uncommented the NAM12 pqact entries coming from NOAAPort --- rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf | 6 +++--- rpms/awips2.upc/Installer.ldm/patch/etc/pqact.grids | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf index 8f6e0f1eff..24348e3df4 100644 --- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf +++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf @@ -438,9 +438,9 @@ NGRID ^[LM].Q... KWBR ...... !grib2/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{2})( # # NAM CONUS 12 km (NAM12) - NOAAport # -#NGRID ^[LM].B... KWBE ...... !grib2/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) -# FILE -edex -close -# /awips2/data_store/grid/NAM12/noaaport/NAM_CONUS_12km_noaaport_\1_\3_\4Z_\5_\6-(seq).grib2 +NGRID ^[LM].B... KWBE ...... !grib2/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) + FILE -edex -close + /awips2/data_store/grid/NAM12/noaaport/NAM_CONUS_12km_noaaport_\1_\3_\4Z_\5_\6-(seq).grib2 # # NAM Alaska 11 km (AK-NAM11) # diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.grids b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.grids index 7ab8c28e51..0ff3e458e6 100644 --- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.grids +++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.grids @@ -128,9 +128,9 @@ NGRID ^[LM].Q... KWBR ...... !grib2/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{2})( # # NAM CONUS 12 km (NAM12) - NOAAport # -#NGRID ^[LM].B... KWBE ...... !grib2/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) -# FILE -edex -close -# /awips2/data_store/grid/NAM12/noaaport/NAM_CONUS_12km_noaaport_\1_\3_\4Z_\5_\6-(seq).grib2 +NGRID ^[LM].B... KWBE ...... !grib2/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) + FILE -edex -close + /awips2/data_store/grid/NAM12/noaaport/NAM_CONUS_12km_noaaport_\1_\3_\4Z_\5_\6-(seq).grib2 # # NAM Alaska 11 km (AK-NAM11) # From 7d0a2adf4fbc911564502efcbb972cf6c98cd552 Mon Sep 17 00:00:00 2001 From: Tiffany Meyer Date: Tue, 12 Jul 2022 10:23:44 -0400 Subject: [PATCH 64/65] Radar file updates -DefaultRadarDualPolBaseData.xml -When the lower resolution level3 products were removed from the SBN this also included the removal of all Spectrum Width products, which the 4 panel no longer loaded anything in the bottom left panel (even though CC was still there) -I added the option to first check for SW and then if that didn't exist then to plot CC -RadarMapMouseHandler.java -Added the full list of Velocity products to the product2 list (so if one isn't there, it will try another) --- .../localization/bundles/DefaultRadarDualPolBaseData.xml | 2 +- .../com/raytheon/viz/radar/rsc/map/RadarMapMouseHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarDualPolBaseData.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarDualPolBaseData.xml index 93f5b2e63f..89e64595b9 100644 --- a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarDualPolBaseData.xml +++ b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarDualPolBaseData.xml @@ -440,7 +440,7 @@ diff --git a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/map/RadarMapMouseHandler.java b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/map/RadarMapMouseHandler.java index 90643a01bc..68920068ae 100644 --- a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/map/RadarMapMouseHandler.java +++ b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/map/RadarMapMouseHandler.java @@ -156,7 +156,7 @@ public class RadarMapMouseHandler extends InputAdapter { Map variableSubstitutions = new HashMap<>(); // TODO: dynamically select this from some control variableSubstitutions.put("product1", "153,94,19,20"); - variableSubstitutions.put("product2", "154"); + variableSubstitutions.put("product2", "154,99,27,25"); new LoadBundleHandler("bundles/site/Radar_" + pt.getName().toLowerCase() + ".xml", variableSubstitutions, null, true).execute(null); From 00460b37d32bdc7ff7b40685cb4ec5f03b3b5f8c Mon Sep 17 00:00:00 2001 From: Tiffany Meyer Date: Tue, 12 Jul 2022 10:31:57 -0400 Subject: [PATCH 65/65] Update build version to 18.2.1-6 --- build/buildEnvironment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/buildEnvironment.sh b/build/buildEnvironment.sh index 53fe2ee5b8..812130fa99 100755 --- a/build/buildEnvironment.sh +++ b/build/buildEnvironment.sh @@ -1,7 +1,7 @@ #!/bin/bash # Version export AWIPSII_VERSION="18.2.1" -export AWIPSII_RELEASE="5" +export AWIPSII_RELEASE="6" # Author export AWIPSII_BUILD_VENDOR="UCAR" export AWIPSII_BUILD_SITE="Unidata"