From 6c50b0121a9383eb310bec396aef7a109b269972 Mon Sep 17 00:00:00 2001 From: Michael James Date: Mon, 14 Nov 2016 15:14:30 -0600 Subject: [PATCH 01/16] CAVE keybindings and logging --- cave/build/static/linux/cave/run.sh | 2 +- cave/com.raytheon.uf.viz.d2d.ui/plugin.xml | 22 ------------------- .../awips.product | 2 +- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/cave/build/static/linux/cave/run.sh b/cave/build/static/linux/cave/run.sh index 0495a82f38..f77226f8df 100644 --- a/cave/build/static/linux/cave/run.sh +++ b/cave/build/static/linux/cave/run.sh @@ -199,7 +199,7 @@ fi curTime=`date +%Y%m%d_%H%M%S` pid=$! -export LOGFILE_STARTUP_SHUTDOWN="$FULL_LOGDIR/${PROGRAM_NAME}_${pid}_${curTime}_pid_%PID%_startup-shutdown.log" +export LOGFILE_STARTUP_SHUTDOWN="$FULL_LOGDIR/${PROGRAM_NAME}_pid_%PID%_logs.log" createEclipseConfigurationDir TMP_VMARGS="--launcher.appendVmargs -vmargs -Djava.io.tmpdir=${eclipseConfigurationDir}" diff --git a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml index 606ca14615..82c0db659b 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml @@ -971,10 +971,6 @@ - - @@ -1137,12 +1133,6 @@ schemeId="com.raytheon.viz.ui.cave.scheme" sequence="NUMPAD_ENTER"> - - - - - - Date: Mon, 14 Nov 2016 15:59:01 -0600 Subject: [PATCH 02/16] mute cave start/stop logging --- build/deploy.edex/deploy-install.xml | 13 +------------ cave/build/static/linux/cave/run.sh | 11 ----------- rpms/unidata/build.sh | 2 +- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/build/deploy.edex/deploy-install.xml b/build/deploy.edex/deploy-install.xml index 1f5a52dc45..25d8c13aed 100644 --- a/build/deploy.edex/deploy-install.xml +++ b/build/deploy.edex/deploy-install.xml @@ -1,20 +1,9 @@ - - - + - - diff --git a/cave/build/static/linux/cave/run.sh b/cave/build/static/linux/cave/run.sh index f77226f8df..76865156a9 100644 --- a/cave/build/static/linux/cave/run.sh +++ b/cave/build/static/linux/cave/run.sh @@ -199,7 +199,6 @@ fi curTime=`date +%Y%m%d_%H%M%S` pid=$! -export LOGFILE_STARTUP_SHUTDOWN="$FULL_LOGDIR/${PROGRAM_NAME}_pid_%PID%_logs.log" createEclipseConfigurationDir TMP_VMARGS="--launcher.appendVmargs -vmargs -Djava.io.tmpdir=${eclipseConfigurationDir}" @@ -207,10 +206,6 @@ TMP_VMARGS="--launcher.appendVmargs -vmargs -Djava.io.tmpdir=${eclipseConfigurat # At this point fork so that log files can be set up with the process pid and # this process can log the exit status of cave. ( - # can we write to log directory - if [ -w $FULL_LOGDIR ]; then - touch ${LOGFILE_STARTUP_SHUTDOWN} - fi # remove "-noredirect" flag from command-line if set so it doesn't confuse any # commands we call later. @@ -239,9 +234,6 @@ TMP_VMARGS="--launcher.appendVmargs -vmargs -Djava.io.tmpdir=${eclipseConfigurat nohup ${CAVE_INSTALL}/monitorThreads.sh $pid >> /dev/null 2>&1 & fi - echo "Launching cave application using the following command: " >> ${LOGFILE_STARTUP_SHUTDOWN} - echo "${CAVE_INSTALL}/cave ${CAVE_INI_ARG} ${SWITCHES[@]} ${USER_ARGS[@]} ${TMP_VMARGS} ${VERSION_ARGS[@]}" >> ${LOGFILE_STARTUP_SHUTDOWN} - if [[ "${redirect}" == "true" ]] ; then # send output to /dev/null because the logback CaveConsoleAppender will capture that output exec ${CAVE_INSTALL}/cave ${CAVE_INI_ARG} "${SWITCHES[@]}" "${USER_ARGS[@]}" ${TMP_VMARGS} "${VERSION_ARGS[@]}" >> /dev/null 2>&1 @@ -251,6 +243,3 @@ TMP_VMARGS="--launcher.appendVmargs -vmargs -Djava.io.tmpdir=${eclipseConfigurat fi ) & -pid=$! -logExitStatus $pid $LOGFILE_STARTUP_SHUTDOWN - diff --git a/rpms/unidata/build.sh b/rpms/unidata/build.sh index 4d7422f208..21189be451 100755 --- a/rpms/unidata/build.sh +++ b/rpms/unidata/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -v set -xe - +rm -rf /awips2/jenkins/buildspace/workspace/AWIPS2-UPC_build/baseline/ export JENKINS_WORKSPACE=/awips2/repo/awips2-builds # determine where we are ... From 1ae275ea785b04e30cec8ecb8b40334185e699d0 Mon Sep 17 00:00:00 2001 From: Michael James Date: Mon, 14 Nov 2016 16:09:21 -0600 Subject: [PATCH 03/16] new cave rpm obsoletes alertviz --- rpms/awips2.cave/Installer.cave/component.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rpms/awips2.cave/Installer.cave/component.spec b/rpms/awips2.cave/Installer.cave/component.spec index 08cecd9c00..6f378e7cda 100644 --- a/rpms/awips2.cave/Installer.cave/component.spec +++ b/rpms/awips2.cave/Installer.cave/component.spec @@ -89,6 +89,7 @@ Obsoletes: awips2-cave-viz-thinclient Obsoletes: awips2-cave-viz-useradmin Obsoletes: awips2-cave-viz-volumebrowser Obsoletes: awips2-cave-viz-warngen +Obsoletes: awips2-alertviz %description %{_component_desc} From 9e8d11bc0d0da9701775864ae3abed1cd0366ff4 Mon Sep 17 00:00:00 2001 From: Michael James Date: Mon, 14 Nov 2016 16:55:17 -0600 Subject: [PATCH 04/16] mute gsd ensemble until it works with vb again --- cave/build/features.txt | 1 - cave/build/p2-build.xml | 3 --- .../src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java | 1 - cave/com.raytheon.viz.feature.awips.developer/feature.xml | 4 ---- cave/com.raytheon.viz.product.awips/awips.product | 1 - 5 files changed, 10 deletions(-) diff --git a/cave/build/features.txt b/cave/build/features.txt index da417f85fd..42a7a5f82c 100644 --- a/cave/build/features.txt +++ b/cave/build/features.txt @@ -47,5 +47,4 @@ com.raytheon.uf.viz.npp.sounding.feature com.raytheon.uf.viz.ncep.npp.feature com.raytheon.uf.viz.ncep.perspective.feature com.raytheon.uf.viz.d2d.skewt.feature -gov.noaa.gsd.viz.ensemble.feature com.raytheon.uf.viz.satellite.goesr.feature diff --git a/cave/build/p2-build.xml b/cave/build/p2-build.xml index bcc950c633..97d23e7004 100644 --- a/cave/build/p2-build.xml +++ b/cave/build/p2-build.xml @@ -276,9 +276,6 @@ - - - diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java index bb618afcfb..97761edead 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java +++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java @@ -81,7 +81,6 @@ public class D2D5Pane implements IPerspectiveFactory { // Get the editor area. String editorArea = layout.getEditorArea(); layout.setFixed(false); - layout.addPlaceholder("gov.noaa.gsd.viz.ensemble.tool.viewer", IPageLayout.RIGHT,0.6f, editorArea); List baseViewsToAdd = new ArrayList(); Set addedViews = new HashSet(); diff --git a/cave/com.raytheon.viz.feature.awips.developer/feature.xml b/cave/com.raytheon.viz.feature.awips.developer/feature.xml index 42f917f943..0f27e257f8 100644 --- a/cave/com.raytheon.viz.feature.awips.developer/feature.xml +++ b/cave/com.raytheon.viz.feature.awips.developer/feature.xml @@ -173,10 +173,6 @@ id="com.raytheon.uf.viz.aviation.advisory.feature" version="0.0.0"/> - - diff --git a/cave/com.raytheon.viz.product.awips/awips.product b/cave/com.raytheon.viz.product.awips/awips.product index 6ef5c9a8e9..954efa21b5 100644 --- a/cave/com.raytheon.viz.product.awips/awips.product +++ b/cave/com.raytheon.viz.product.awips/awips.product @@ -113,7 +113,6 @@ - From 09b747e006367e323dd2438d33e8f930352d4c89 Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Fri, 18 Nov 2016 09:24:02 -0700 Subject: [PATCH 05/16] remove version req from python package rpm builds --- rpms/python.site-packages/Installer.cherrypy/component.spec | 1 - rpms/python.site-packages/Installer.nose/component.spec | 1 - rpms/python.site-packages/Installer.pmw/component.spec | 3 +-- rpms/python.site-packages/Installer.pupynere/component.spec | 6 ++---- .../Installer.python-awips/component.spec | 2 +- rpms/python.site-packages/Installer.tpg/component.spec | 3 +-- rpms/python.site-packages/Installer.werkzeug/component.spec | 3 +-- 7 files changed, 6 insertions(+), 13 deletions(-) diff --git a/rpms/python.site-packages/Installer.cherrypy/component.spec b/rpms/python.site-packages/Installer.cherrypy/component.spec index 388e0b5ec1..a20e3b79fb 100644 --- a/rpms/python.site-packages/Installer.cherrypy/component.spec +++ b/rpms/python.site-packages/Installer.cherrypy/component.spec @@ -1,7 +1,6 @@ # Turn off the brp-python-bytecompile script %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') %define _build_arch %(uname -i) -%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi) # # AWIPS II Python cherrypy Site-Package Spec File diff --git a/rpms/python.site-packages/Installer.nose/component.spec b/rpms/python.site-packages/Installer.nose/component.spec index dbd46bac91..f54b92a0a0 100644 --- a/rpms/python.site-packages/Installer.nose/component.spec +++ b/rpms/python.site-packages/Installer.nose/component.spec @@ -2,7 +2,6 @@ %define _build_arch %(uname -i) %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages" %define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi) # # AWIPS II Python nose Spec File diff --git a/rpms/python.site-packages/Installer.pmw/component.spec b/rpms/python.site-packages/Installer.pmw/component.spec index 0e3cef0a88..6085935122 100644 --- a/rpms/python.site-packages/Installer.pmw/component.spec +++ b/rpms/python.site-packages/Installer.pmw/component.spec @@ -2,7 +2,6 @@ %define _build_arch %(uname -i) %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages" %define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi) # # AWIPS II Python pmw Spec File @@ -21,7 +20,7 @@ Vendor: %{_build_vendor} Packager: %{_build_site} AutoReq: no -Requires: awips2-python = %{_installed_python} +Requires: awips2-python Provides: awips2-python-pmw = %{version} BuildRequires: awips2-python diff --git a/rpms/python.site-packages/Installer.pupynere/component.spec b/rpms/python.site-packages/Installer.pupynere/component.spec index 96478351e5..0dbd370e15 100644 --- a/rpms/python.site-packages/Installer.pupynere/component.spec +++ b/rpms/python.site-packages/Installer.pupynere/component.spec @@ -2,8 +2,6 @@ %define _build_arch %(uname -i) %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages" %define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi) -%define _installed_python_numpy %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c "import numpy; print numpy.__version__"; else echo 0; fi) # # AWIPS II Python pupynere Spec File @@ -22,8 +20,8 @@ Vendor: %{_build_vendor} Packager: %{_build_site} AutoReq: no -Requires: awips2-python = %{_installed_python} -Requires: awips2-python-numpy = %{_installed_python_numpy} +Requires: awips2-python +Requires: awips2-python-numpy Provides: awips2-python-pupynere = %{version} BuildRequires: awips2-python diff --git a/rpms/python.site-packages/Installer.python-awips/component.spec b/rpms/python.site-packages/Installer.python-awips/component.spec index 9c372004fe..02f5d9ac1b 100644 --- a/rpms/python.site-packages/Installer.python-awips/component.spec +++ b/rpms/python.site-packages/Installer.python-awips/component.spec @@ -8,7 +8,7 @@ # Name: awips2-python-awips Summary: AWIPS II Python awips Distribution -Version: 0.9.5 +Version: 0.9.7 Release: 1 Group: AWIPSII BuildRoot: %{_build_root} diff --git a/rpms/python.site-packages/Installer.tpg/component.spec b/rpms/python.site-packages/Installer.tpg/component.spec index 59526aba20..f2f56d42ee 100644 --- a/rpms/python.site-packages/Installer.tpg/component.spec +++ b/rpms/python.site-packages/Installer.tpg/component.spec @@ -2,7 +2,6 @@ %define _build_arch %(uname -i) %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages" %define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi) # # AWIPS II Python tpg Spec File @@ -21,7 +20,7 @@ Vendor: %{_build_vendor} Packager: %{_build_site} AutoReq: no -requires: awips2-python = %{_installed_python} +requires: awips2-python provides: awips2-python-tpg = %{version} BuildRequires: awips2-python diff --git a/rpms/python.site-packages/Installer.werkzeug/component.spec b/rpms/python.site-packages/Installer.werkzeug/component.spec index 8df2b9f808..ddf4d4dd6b 100644 --- a/rpms/python.site-packages/Installer.werkzeug/component.spec +++ b/rpms/python.site-packages/Installer.werkzeug/component.spec @@ -2,7 +2,6 @@ %define _build_arch %(uname -i) %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages" %define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi) # # AWIPS II Python werkzeug Spec File @@ -21,7 +20,7 @@ Vendor: %{_build_vendor} Packager: %{_build_site} AutoReq: no -Requires: awips2-python = %{_installed_python} +Requires: awips2-python Provides: awips2-python-werkzeug = %{version} BuildRequires: awips2-python From d8e18307d923a3b4637ed5e23991f0b210ab83a9 Mon Sep 17 00:00:00 2001 From: Michael James Date: Sat, 19 Nov 2016 20:58:50 -0600 Subject: [PATCH 06/16] cave 16.2.2 obsoletes awips2-cave-viz-ncep-npp --- rpms/awips2.cave/Installer.cave/component.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rpms/awips2.cave/Installer.cave/component.spec b/rpms/awips2.cave/Installer.cave/component.spec index 6f378e7cda..f109ea3f5a 100644 --- a/rpms/awips2.cave/Installer.cave/component.spec +++ b/rpms/awips2.cave/Installer.cave/component.spec @@ -78,6 +78,7 @@ Obsoletes: awips2-cave-viz-ncep-dataplugins Obsoletes: awips2-cave-viz-ncep-displays Obsoletes: awips2-cave-viz-ncep-nsharp Obsoletes: awips2-cave-viz-ncep-perspective +Obsoletes: awips2-cave-viz-ncep-npp Obsoletes: awips2-cave-viz-npp Obsoletes: awips2-cave-viz-nwsauth Obsoletes: awips2-cave-viz-radar From d714be293e984baf5fd3ad1991d4d51e13e1d4b5 Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Sat, 19 Nov 2016 22:36:53 -0700 Subject: [PATCH 07/16] el7 cave install script --- installCAVE-el7.sh | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100755 installCAVE-el7.sh diff --git a/installCAVE-el7.sh b/installCAVE-el7.sh new file mode 100755 index 0000000000..91cc5df3f9 --- /dev/null +++ b/installCAVE-el7.sh @@ -0,0 +1,34 @@ +#!/bin/bash -f +# +# installCAVE-el7.sh +# +# Download awips2.repo from the Unidata web server +# +if [ ! -f /etc/yum.repos.d/awips2.repo ]; then + echo '' + echo 'Downloading awips2repo yum file to /etc/yum.repos.d/awips2.repo' + echo '' + wget -O /etc/yum.repos.d/awips2.repo http://www.unidata.ucar.edu/software/awips2/doc/el7.repo +fi + +echo "Running 'yum clean all'" +yum clean all +echo '' + +echo '' +echo "Running 'yum groupinstall awips2-cave'" +echo '' +yum groupinstall awips2-cave -y 2>&1 | tee -a /tmp/cave-install.log + +if getent passwd awips &>/dev/null; then + echo '' + echo "Setting permissions to user awips:awips" + /bin/chown -R awips:awips /awips2/cave /awips2/alertviz +else + echo '' + echo "--- user awips does not exist" + echo "--- you should set owner/group permissions for /awips2/cave and /awips2/alertviz:" + echo "tried to run 'chown -R awips:awips /awips2/cave /awips2/alertviz'" +fi +echo "" +echo "Done." From 9489055dd2a881aebf2c92195f55d3207ccbc8b0 Mon Sep 17 00:00:00 2001 From: Michael James Date: Sat, 19 Nov 2016 23:41:06 -0600 Subject: [PATCH 08/16] let's just do it with one file --- installCAVE-el7.sh | 34 ---------------------------------- installCAVE.sh | 30 ++++++++++++++++++++++-------- 2 files changed, 22 insertions(+), 42 deletions(-) delete mode 100755 installCAVE-el7.sh diff --git a/installCAVE-el7.sh b/installCAVE-el7.sh deleted file mode 100755 index 91cc5df3f9..0000000000 --- a/installCAVE-el7.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -f -# -# installCAVE-el7.sh -# -# Download awips2.repo from the Unidata web server -# -if [ ! -f /etc/yum.repos.d/awips2.repo ]; then - echo '' - echo 'Downloading awips2repo yum file to /etc/yum.repos.d/awips2.repo' - echo '' - wget -O /etc/yum.repos.d/awips2.repo http://www.unidata.ucar.edu/software/awips2/doc/el7.repo -fi - -echo "Running 'yum clean all'" -yum clean all -echo '' - -echo '' -echo "Running 'yum groupinstall awips2-cave'" -echo '' -yum groupinstall awips2-cave -y 2>&1 | tee -a /tmp/cave-install.log - -if getent passwd awips &>/dev/null; then - echo '' - echo "Setting permissions to user awips:awips" - /bin/chown -R awips:awips /awips2/cave /awips2/alertviz -else - echo '' - echo "--- user awips does not exist" - echo "--- you should set owner/group permissions for /awips2/cave and /awips2/alertviz:" - echo "tried to run 'chown -R awips:awips /awips2/cave /awips2/alertviz'" -fi -echo "" -echo "Done." diff --git a/installCAVE.sh b/installCAVE.sh index 61d20b0881..0f58791830 100755 --- a/installCAVE.sh +++ b/installCAVE.sh @@ -50,15 +50,29 @@ echo "Running 'yum groupinstall awips2-cave'" echo '' yum groupinstall awips2-cave -y 2>&1 | tee -a /tmp/cave-install.log -if getent passwd awips &>/dev/null; then - echo '' - echo "Setting permissions to user awips:fxalpha" - /bin/chown -R awips:fxalpha /awips2/cave /awips2/alertviz +if [[ $(grep "release 7" /etc/redhat-release) ]]; then + if getent passwd awips &>/dev/null; then + echo '' + echo "Setting permissions to user awips:awips" + /bin/chown -R awips:awips /awips2/cave /awips2/alertviz + else + echo '' + echo "--- user awips does not exist" + echo "--- you should set owner/group permissions for /awips2/cave and /awips2/alertviz:" + echo "tried to run 'chown -R awips:awips /awips2/cave /awips2/alertviz'" + fi + else - echo '' - echo "--- user awips does not exist" - echo "--- you should set owner/group permissions for /awips2/cave and /awips2/alertviz:" - echo "tried to run 'chown -R awips:fxalpha /awips2/cave /awips2/alertviz'" + if getent passwd awips &>/dev/null; then + echo '' + echo "Setting permissions to user awips:fxalpha" + /bin/chown -R awips:fxalpha /awips2/cave /awips2/alertviz + else + echo '' + echo "--- user awips does not exist" + echo "--- you should set owner/group permissions for /awips2/cave and /awips2/alertviz:" + echo "tried to run 'chown -R awips:fxalpha /awips2/cave /awips2/alertviz'" + fi fi echo "" echo "Done..." From 97c20ff0b24e926e7d2ad1f60b85e88c8badbc3f Mon Sep 17 00:00:00 2001 From: Michael James Date: Thu, 24 Nov 2016 15:27:20 -0600 Subject: [PATCH 09/16] EPOCH (centerID 60) grib2 support --- .../base/grib/grids/epoch360121.xml | 13 +++++ .../base/grib/grids/epoch360181.xml | 13 +++++ .../base/grib/models/gribModels_NCEP-7.xml | 29 +++++++---- .../base/grib/tables/60/0/0.0.table | 3 ++ .../base/grib/tables/60/0/1.2.table | 3 ++ .../base/grib/tables/60/0/1.3.table | 3 ++ .../base/grib/tables/60/0/1.4.table | 3 ++ .../base/grib/tables/60/0/3.0.table | 3 ++ .../base/grib/tables/60/0/3.15.table | 6 +++ .../base/grib/tables/60/0/3.2.table | 3 ++ .../base/grib/tables/60/0/3.20.table | 3 ++ .../base/grib/tables/60/0/3.21.table | 3 ++ .../base/grib/tables/60/0/3.8.table | 4 ++ .../base/grib/tables/60/0/4.1.table | 3 ++ .../base/grib/tables/60/0/4.10.table | 3 ++ .../base/grib/tables/60/0/4.12.table | 3 ++ .../base/grib/tables/60/0/4.13.table | 3 ++ .../base/grib/tables/60/0/4.14.table | 3 ++ .../base/grib/tables/60/0/4.2.0.0.table | 17 +++++++ .../base/grib/tables/60/0/4.2.0.1.table | 39 ++++++++++++++ .../base/grib/tables/60/0/4.2.0.13.table | 8 +++ .../base/grib/tables/60/0/4.2.0.14.table | 16 ++++++ .../base/grib/tables/60/0/4.2.0.15.table | 4 ++ .../base/grib/tables/60/0/4.2.0.16.table | 11 ++++ .../base/grib/tables/60/0/4.2.0.17.table | 4 ++ .../base/grib/tables/60/0/4.2.0.18.table | 4 ++ .../base/grib/tables/60/0/4.2.0.19.table | 49 ++++++++++++++++++ .../base/grib/tables/60/0/4.2.0.190.table | 4 ++ .../base/grib/tables/60/0/4.2.0.191.table | 10 ++++ .../base/grib/tables/60/0/4.2.0.192.table | 16 ++++++ .../base/grib/tables/60/0/4.2.0.2.table | 36 +++++++++++++ .../base/grib/tables/60/0/4.2.0.3.table | 24 +++++++++ .../base/grib/tables/60/0/4.2.0.4.table | 18 +++++++ .../base/grib/tables/60/0/4.2.0.5.table | 10 ++++ .../base/grib/tables/60/0/4.2.0.6.table | 14 +++++ .../base/grib/tables/60/0/4.2.0.7.table | 12 +++++ .../base/grib/tables/60/0/4.2.1.0.table | 10 ++++ .../base/grib/tables/60/0/4.2.1.1.table | 8 +++ .../base/grib/tables/60/0/4.2.10.0.table | 6 +++ .../base/grib/tables/60/0/4.2.10.1.table | 7 +++ .../base/grib/tables/60/0/4.2.10.191.table | 4 ++ .../base/grib/tables/60/0/4.2.10.2.table | 7 +++ .../base/grib/tables/60/0/4.2.10.3.table | 23 +++++++++ .../base/grib/tables/60/0/4.2.10.4.table | 10 ++++ .../base/grib/tables/60/0/4.2.2.0.table | 43 ++++++++++++++++ .../base/grib/tables/60/0/4.2.2.3.table | 16 ++++++ .../base/grib/tables/60/0/4.2.3.0.table | 4 ++ .../base/grib/tables/60/0/4.2.3.1.table | 6 +++ .../base/grib/tables/60/0/4.2.3.192.table | 51 +++++++++++++++++++ .../base/grib/tables/60/0/4.201.table | 3 ++ .../base/grib/tables/60/0/4.202.table | 3 ++ .../base/grib/tables/60/0/4.203.table | 3 ++ .../base/grib/tables/60/0/4.204.table | 3 ++ .../base/grib/tables/60/0/4.205.table | 3 ++ .../base/grib/tables/60/0/4.206.table | 3 ++ .../base/grib/tables/60/0/4.207.table | 3 ++ .../base/grib/tables/60/0/4.208.table | 3 ++ .../base/grib/tables/60/0/4.209.table | 3 ++ .../base/grib/tables/60/0/4.210.table | 3 ++ .../base/grib/tables/60/0/4.211.table | 3 ++ .../base/grib/tables/60/0/4.212.table | 3 ++ .../base/grib/tables/60/0/4.213.table | 3 ++ .../base/grib/tables/60/0/4.215.table | 3 ++ .../base/grib/tables/60/0/4.217.table | 3 ++ .../base/grib/tables/60/0/4.220.table | 3 ++ .../base/grib/tables/60/0/4.221.table | 3 ++ .../base/grib/tables/60/0/4.222.table | 3 ++ .../base/grib/tables/60/0/4.3.table | 3 ++ .../base/grib/tables/60/0/4.4.table | 3 ++ .../base/grib/tables/60/0/4.5.table | 42 +++++++++++++++ .../base/grib/tables/60/0/4.6.table | 3 ++ .../base/grib/tables/60/0/4.7.table | 3 ++ .../base/grib/tables/60/0/4.8.table | 3 ++ .../base/grib/tables/60/0/4.9.table | 3 ++ .../base/grib/tables/60/0/5.0.table | 4 ++ .../base/grib/tables/60/0/5.1.table | 3 ++ .../base/grib/tables/60/0/5.2.table | 3 ++ .../base/grib/tables/60/0/5.3.table | 3 ++ .../base/grib/tables/60/0/5.5.table | 3 ++ .../base/grib/tables/60/0/5.6.table | 3 ++ 80 files changed, 718 insertions(+), 10 deletions(-) create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/epoch360121.xml create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/epoch360181.xml create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/0.0.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/1.2.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/1.3.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/1.4.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.0.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.15.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.2.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.20.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.21.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.8.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.1.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.10.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.12.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.13.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.14.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.0.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.1.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.13.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.14.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.15.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.16.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.17.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.18.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.19.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.190.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.191.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.192.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.2.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.3.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.4.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.5.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.6.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.7.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.1.0.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.1.1.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.0.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.1.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.191.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.2.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.3.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.4.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.2.0.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.2.3.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.3.0.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.3.1.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.3.192.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.201.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.202.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.203.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.204.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.205.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.206.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.207.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.208.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.209.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.210.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.211.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.212.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.213.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.215.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.217.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.220.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.221.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.222.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.3.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.4.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.5.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.6.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.7.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.8.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.9.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.0.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.1.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.2.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.3.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.5.table create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.6.table diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/epoch360121.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/epoch360121.xml new file mode 100644 index 0000000000..62d2767886 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/epoch360121.xml @@ -0,0 +1,13 @@ + + + 360121 + EPOCH Equidistant Cylindrical Global + -60.0 + 0.0 + LowerLeft + 360 + 121 + 1.0 + 1.0 + degree + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/epoch360181.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/epoch360181.xml new file mode 100644 index 0000000000..394efa5ca9 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/epoch360181.xml @@ -0,0 +1,13 @@ + + + 360181 + EPOCH Equidistant Cylindrical Global + -60.0 + 0.0 + LowerLeft + 360 + 181 + 1.0 + 1.0 + degree + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml index 799fc23281..62b5ad3fb0 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml @@ -1,15 +1,24 @@ - - - - + + + EPOCH +
60
+ 0 + 360121 + + 0 + + + + EPOCH +
60
+ 0 + 360181 + + 1 + + HRRR
7
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/0.0.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/0.0.table new file mode 100644 index 0000000000..92717fe3d6 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/0.0.table @@ -0,0 +1,3 @@ +#Code Table 0.0: Discipline of processed data in the GRIB message, number of GRIB Master Table +# 192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/1.2.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/1.2.table new file mode 100644 index 0000000000..72ab6f4660 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/1.2.table @@ -0,0 +1,3 @@ +# CODE TABLE 1.2, Significance of Reference Time +# 192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/1.3.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/1.3.table new file mode 100644 index 0000000000..c13615473c --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/1.3.table @@ -0,0 +1,3 @@ +# CODE TABLE 1.3, Production status of data +# 192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/1.4.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/1.4.table new file mode 100644 index 0000000000..4c0f4587ea --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/1.4.table @@ -0,0 +1,3 @@ +# CODE TABLE 1.4, Type of data +# 192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.0.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.0.table new file mode 100644 index 0000000000..d4d74444d2 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.0.table @@ -0,0 +1,3 @@ +# CODE TABLE 3.0, Source of Grid Definition +# 192-254 Reserved for local use +255:255:A grid definition does not apply to this product diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.15.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.15.table new file mode 100644 index 0000000000..0beb308747 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.15.table @@ -0,0 +1,6 @@ +# CODE TABLE 3.15, Physical meaning of vertical coordinate +# 192-254 Reserved for local use +255:255:Missing +# Notes: +# (1) Negative values associated to this coordinate will indicate depth below ground surface. If values are all below surface, use of entry 106 is recommended, with positive coordinate values instead. +# (2) The Eta vertical coordinate system involves normalizing the pressure at some point on a specific level by the mean sea level pressure at that point. diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.2.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.2.table new file mode 100644 index 0000000000..ac9521f630 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.2.table @@ -0,0 +1,3 @@ +# CODE TABLE 3.2, Shape of the Earth +# 192- 254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.20.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.20.table new file mode 100644 index 0000000000..704877e111 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.20.table @@ -0,0 +1,3 @@ +# CODE TABLE 3.20, Type of horizontal line +# 192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.21.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.21.table new file mode 100644 index 0000000000..64645b71b5 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.21.table @@ -0,0 +1,3 @@ +# CODE TABLE 3.21, Vertical dimension coordinate values definition +# 192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.8.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.8.table new file mode 100644 index 0000000000..975eb7013d --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/3.8.table @@ -0,0 +1,4 @@ +# Code table 3.8: Grid point position +# 192-254 Reserved for local use +255:255:Missing + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.1.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.1.table new file mode 100644 index 0000000000..5cac0aa444 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.1.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.1, Category of parameters by product discipline +#192-254 Reserved for Local Use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.10.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.10.table new file mode 100644 index 0000000000..39e385fcee --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.10.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.10, Type of statistical processing +# 192 254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.12.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.12.table new file mode 100644 index 0000000000..bc21f6e891 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.12.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.12, Operating Mode +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.13.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.13.table new file mode 100644 index 0000000000..9dbe42e9aa --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.13.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.13, Quality Control Indicator +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.14.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.14.table new file mode 100644 index 0000000000..6d09577539 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.14.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.14, Clutter Filter Indicator +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.0.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.0.table new file mode 100644 index 0000000000..dc3e5565cf --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.0.table @@ -0,0 +1,17 @@ +# Product Discipline 0: Meteorological products, Parameter Category 0: Temperature +#192-254 Reserved for local use +192:192:Snow Phase Change Heat Flux:W/m^2:SNOHF +193:193:Temperature tendency by all radiation:K/s:TTRAD +194:194:Relative Error Variance::REV +195:195:Large Scale Condensate Heating rate:K/s:LRGHR +196:196:Deep Convective Heating rate:K/s:CNVHR +197:197:Total Downward Heat Flux at Surface:W/m^2:THFLX +198:198:Temperature Tendency By All Physics:K/s:TTDIA +199:199:Temperature Tendency By Non-radiation Physics:K/s:TTPHY +200:200:Standard Dev. of IR Temp. over 1x1 deg. area:K:TSD1D +201:201:Shallow Convective Heating rate:K/s:SHAHR +202:202:Vertical Diffusion Heating rate:K/s:VDFHR +203:203:Potential temperature at top of viscous sublayer:K:THZ0 +204:204:Tropical Cyclone Heat Potential:J/m^2*K:TCHP +255:255:Missing + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.1.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.1.table new file mode 100644 index 0000000000..5a0112bbcd --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.1.table @@ -0,0 +1,39 @@ + # Product Discipline 0: Meteorological products, Parameter Category 1: Moisture +#192-254 Reserved for local use +74:74:Total Column Integrate Graupel:kg/m^2:TCOLG +192:192:Categorical Rain::CRAIN +193:193:Categorical Freezing Rain::CFRZR +194:194:Categorical Ice Pellets::CICEP +195:195:Categorical Snow::CSNOW +196:196:Convective Precipitation Rate:mm / s:CPRAT +197:197:Horizontal Moisture Divergence:kg/kg*s:MCONV:MCon +198:198:Minimum Relative Humidity:%:MINRH +199:199:Potential Evaporation:mm:PEVAP +200:200:Potential Evaporation Rate:W/m^2:PEVPR +201:201:Snow Cover:%:SCP +202:202:Rain Fraction of Total Liquid Water::FRAIN +203:203:Rime Factor::FRIME +204:204:Total Column Integrated Rain:mm:TCOLR +205:205:Total Column Integrated Snow:mm:TCOLS +206:206:Total Icing Potential Diagnostic::TIPD +207:207:Number concentration for ice particles::NCIP +208:208:Snow Temperature:K:SNOT +209:209:Total column-integrated supercooled liquid water:mm:TCLSW +210:210:Total column-integrated melting ice:mm:TCOLM +211:211:Evaporation - Precipitation:cm/day:EMNP +212:212:Sublimation (evaporation from snow):W/m^2:SBSNO +213:213:Deep Convective Moistening Rate:kg/kg*s:CNVMR +214:214:Shallow Convective Moistening Rate:kg/kg*s:SHAMR +215:215:Vertical Diffusion Moistening Rate:kg/kg*s:VDFMR +216:216:Condensation Pressure of Parcal Lifted From Indicate Surface:Pa:CONDP +217:217:Large scale moistening rate:kg/kg/s:LRGMR +218:218:Specific humidity at top of viscous sublayer:kg/kg:QZ0 +219:219:Maximum specific humidity at 2m:kg/kg:QMAX +220:220:Minimum specific humidity at 2m:kg/kg:QMIN +221:221:Liquid precipitation (rainfall):mm:ARAIN +222:222:Snow temperature, depth-avg:K:SNOWT +223:223:Total precipitation (nearest grid point):mm:APCPN +224:224:Convective precipitation (nearest grid point):mm:ACPCPN +225:225:Freezing Rain:mm:FRZR +242:242:Relative Humidity with Respect to Precipitable Water:%:RHPW +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.13.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.13.table new file mode 100644 index 0000000000..86eb318180 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.13.table @@ -0,0 +1,8 @@ +# Product Discipline 0: Meteorological products, Parameter Category 13: Aerosols +# 192-254 Reserved for local use +192:192:Particulate matter (coarse):mm*g/m^3:PMTC +193:193:Particulate matter (fine):mm*g/m^3:PMTF +194:194:Particulate matter (fine):log10(mm*g/m^3):LPMTF +195:195:Integrated column particulate matter (fine):log10(mm*g/m^3):LIPMF +255:255:Missing + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.14.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.14.table new file mode 100644 index 0000000000..c173a9be95 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.14.table @@ -0,0 +1,16 @@ +# Product Discipline 0: Meteorological products, Parameter Category 14: Trace Gases +#192-254 Reserved for local use +192:192:Ozone Mixing Ratio:kg/kg:O3MR +193:193:Ozone Concentration (PPB):PPB:OZCON +194:194:Categorical Ozone Concentration::OZCAT +195:195:Ozone vertical diffusion:kg/kg/s:VDFOZ +196:196:Ozone production:kg/kg/s:POZ +197:197:Ozone tendency:kg/kg/s:TOZ +198:198:Ozone production from temperature term:kg/kg/s:POZT +199:199:Ozone production from col ozone term:kg/kg/s:POZO +200:200:Ozone Daily Max from 1-hour Average:ppbV:OZMAX1 +201:201:Ozone Daily Max from 8-hour Average:ppbV:OZMAX8 +202:202:PM 2.5 Daily Max from 1-hour Average:ug/m^3:PDMAX1 +203:203:PM 2.5 Daily Max from 24-hour Average:ug/m^3:PDMAX24 +255:255:Missing + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.15.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.15.table new file mode 100644 index 0000000000..10832dc85f --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.15.table @@ -0,0 +1,4 @@ +# Product Discipline 0 - Meteorological products, Parameter Category 15: Radar +# 192-254 Reserved for local use +255:255:Missing + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.16.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.16.table new file mode 100644 index 0000000000..11f8b537ef --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.16.table @@ -0,0 +1,11 @@ +# Product Discipline 0 - Meteorological products, Parameter Category 16: Forecast Radar Imagery +# 192-254 Reserved for Local Use +3:3:Echo Top:m:RETOP +192:192:Derived radar reflectivity backscatter from rain:mm^6/m^3:REFZR +193:193:Derived radar reflectivity backscatter from ice:mm^6/m^3:REFZI +194:194:Derived radar reflectivity backscatter from parameterized convection:mm^6/m^3:REFZC +195:195:Derived radar reflectivity:dB:REFD +196:196:Maximum/Composite radar reflectivity:dB:REFC +197:197:Echo Top:m:RETOP +198:198:Hourly Maximum of Simulated Reflectivity at 1 km AGL:dB:MAXREF +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.17.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.17.table new file mode 100644 index 0000000000..9c9e86f8af --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.17.table @@ -0,0 +1,4 @@ +# Product Discipline 0 - Meterological products, Paramater Category 17: Electrodynamics +# 192-254 Reserved for Local Use +192:192:Lightning::LTNG +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.18.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.18.table new file mode 100644 index 0000000000..66afde201c --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.18.table @@ -0,0 +1,4 @@ +# Product Discipline 0: Meteorological products, Parameter Category 18: Nuclear/radiology +#192-254 Reserved for local use +255:255:Missing + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.19.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.19.table new file mode 100644 index 0000000000..fca6ffb4af --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.19.table @@ -0,0 +1,49 @@ +# Product Discipline 0: Meteorological products, Parameter Category 19: Physical atmospheric properties +7:7:Icing:See Table 4.207:ICI +23:23:Supercooled Large Droplet (SLD) Probabilitysee note 1:%:SLDP +#192-254 Reserved for local use +192:192:Maximum Snow Albedo:%:MXSALB +193:193:Snow-Free Albedo:%:SNFALB +194:194:Slight risk convective outlook:categorical:SRCONO +195:195:Moderate risk convective outlook:categorical:MRCONO +196:196:High risk convective outlook:categorical:HRCONO +197:197:Tornado probability:%:PTOR +198:198:Hail probability:%:HAILPROB +199:199:Wind Probability:%:WINDPROB +200:200:Significant Tornado probability:%:SIGTRNDPROB +201:201:Significant Hail probability:%:SIGHAILPROB +202:202:Significant Wind probability:%:SIGWINDPROB +203:203:Categorical Thunderstorm (1-yes, 0-no):categorical:CTSTM +204:204:Number of mixed layers next to surface:integer:MIXLY +205:205:Flight Category::FLGHT +206:206:Confidence - Ceiling::CICEL +207:207:Confidence - Visibility::CIVIS +208:208:Confidence - Flight Category::CIFLT +209:209:Low-Level aviation interest::LAVNI +210:210:High-Level aviation interest::HAVNI +211:211:Visible, Black Sky Albedo:%:SBSALB +212:212:Visible, White Sky Albedo:%:SWSALB +213:213:Near IR, Black Sky Albedo:%:NBSALB +214:214:Near IR, White Sky Albedo:%:NWSALB +215:215:Total Probability of Severe Thunderstorms (Days 2,3):%:PRSVR +216:216:Total Probability of Extreme Severe Thunderstorms (Days 2,3):%:PRSIGSV +217:217:Mean Icing Potential:mm:MEI +218:218:Maximum Icing Potential:mm:MAIP +219:219:Mean in-Cloud Turbulence Potential:mm:MECTP +220:220:Max in-Cloud Turbulence Potential:mm:MACTP +221:221:Mean Cloud Air Turbulence Potential:mm:MECAT +222:222:Maximum Cloud Air Turbulence Potential:mm:MACAT +223:223:Cumulonimbus Horizontal Exten:%:CBHE +224:224:Pressure at Cumulonimbus Bas:Pa:PCBB +225:225:Pressure at Cumulonimbus To:Pa:PCBT +226:226:Pressure at Embedded Cumulonimbus Bas:Pa:PECBB +227:227:Pressure at Embedded Cumulonimbus To:Pa:PECBT +228:228:ICAO Height at Cumulonimbus Bas:m:HCBB +229:229:ICAO Height at Cumulonimbus To:m:HCBT +230:230:ICAO Height at Embedded Cumulonimbus Bas:m:HECBB +231:231:ICAO Height at Embedded Cumulonimbus To:m:HECBT +232:232:Volcanic Ash Forecast Transport and Dispersion:log10(kg/m^3):VAFTD +233:233:Icing probability:non-dim:ICPRB +234:234:Icing severity:non-dim:ICSEV +255:255:Missing + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.190.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.190.table new file mode 100644 index 0000000000..8e801f764a --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.190.table @@ -0,0 +1,4 @@ +# Product Discipline 0: Meteorological products, Parameter Category 190: CCITT IA5 string +# 192-254 Reserved for local use +255:255:Missing + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.191.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.191.table new file mode 100644 index 0000000000..d596dd044f --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.191.table @@ -0,0 +1,10 @@ +# Product Discipline 0: Meteorological products, Parameter Category 191: Miscellaneous +# 192-254 Reserved for local use +192:192:Latitude (-90 to +90):degrees:NLAT +193:193:East Longitude (0 - 360):degrees:ELON +194:194:Seconds prior to initial reference time:s:TSEC +195:195:Model Layer number (From bottom up)::MLYNO +196:196:Latitude (nearest neighbor) (-90 to +90):degrees:NLATN +197:197:East Longitude (nearest neighbor) (0 - 360):degrees:ELONN +255:255:Missing + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.192.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.192.table new file mode 100644 index 0000000000..04a9433c6a --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.192.table @@ -0,0 +1,16 @@ +# Product Discipline 0: Meteorological products, Parameter Category 192: Covariance + +1:1:Covariance between zonal and meridional components of the wind. Defined as [uv]-[u][v], where "[]" indicates the mean over the indicated time span.:m^2/s^2:COVMZ +2:2:Covariance between izonal component of the wind and temperature. Defined as [uT]-[u][T], where "[]" indicates the mean over the indicated time span.:K*m/s:COVTZ +3:3:Covariance between meridional component of the wind and temperature. Defined as [vT]-[v][T], where "[]" indicates the mean over the indicated time span.:K*m/s:COVTM +4:4:Covariance between temperature and vertical component of the wind. Defined as [wT]-[w][T], where "[]" indicates the mean over the indicated time span.:K*m/s:COVTW +5:5:Covariance between zonal and zonal components of the wind. Defined as [uu]-[u][u], where "[]" indicates the mean over the indicated time span.:m^2/s^2:COVZZ +6:6:Covariance between meridional and meridional components of the wind. Defined as [vv]-[v][v], where "[]" indicates the mean over the indicated time span.:m^2/s^2:COVMM +7:7:Covariance between specific humidity and zonal components of the wind. Defined as [uq]-[u][q], where "[]" indicates the mean over the indicated time span.:kg/kg*m/s:COVQZ +8:8:Covariance between specific humidity and meridional components of the wind. Defined as [vq]-[v][q], where "[]" indicates the mean over the indicated time span.:kg/kg*m/s:COVQM +9:9:Covariance between temperature and vertical components of the wind. Defined as [ΩT]-[Ω][T], where "[]" indicates the mean over the indicated time span.:K*Pa/s:COVTVV +10:10:Covariance between specific humidity and vertical components of the wind. Defined as [Ωq]-[Ω][q], where "[]" indicates the mean over the indicated time span.:kg/kg*Pa/s:COVQVV +11:11:Covariance between surface pressure and surface pressure. Defined as [Psfc]-[Psfc][Psfc], where "[]" indicates the mean over the indicated time span.:Pa*Pa:COVPSPS +12:12:Covariance between specific humidity and specific humidy. Defined as [qq]-[q][q], where "[]" indicates the mean over the indicated time span.:kg/kg*kg/kg:COVQQ +13:13:Covariance between vertical and vertical components of the wind. Defined as [ΩΩ]-[Ω][Ω], where "[]" indicates the mean over the indicated time span.:Pa^2/s^2:COVVVVV +14:14:Covariance between temperature and temperature. Defined as [TT]-[T][T], where "[]" indicates the mean over the indicated time span.:K*K:COVTT \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.2.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.2.table new file mode 100644 index 0000000000..7857c82d10 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.2.table @@ -0,0 +1,36 @@ +# Product Discipline 0: Meteorological products, Parameter Category 2: Momentum +# 192-254 Reserved for local use +192:192:Vertical speed shear:s^-1:VWSH:VSS +193:193:Horizontal Momentum Flux:N/m^2:MFLX +194:194:U-Component Storm Motion:m/s:USTM +195:195:V-Component Storm Motion:m/s:VSTM +196:196:Drag Coefficient::CD +197:197:Frictional Velocity:m/s:FRICV +198:198:Latitude of U Wind Component of Velocity:degrees:LAUV +199:199:Longitude of U Wind Component of Velocity:degrees:LOUV +200:200:Latitude of V Wind Component of Velocity:degrees:LAVV +201:201:Longitude of V Wind Component of Velocity:degrees:LOVV +202:202:Latitude of Pressure Point:degrees:LAPP +203:203:Longitude of Pressure Point:degrees:LOPP +204:204:Vertical Eddy Diffusivity Heat exchange:m^2/s:VEDH +205:205:Covariance between Meridional and Zonal Components of the wind.:m^2/s^2:COVMZ +206:206:Covariance between Temperature and Zonal Components of the wind.:K*m/s:COVTZ +207:207:Covariance between Temperature and Meridional Components of the wind.:K*m/s:COVTM +208:208:Vertical Diffusion Zonal Acceleration:m/s^2:VDFUA +209:209:Vertical Diffusion Meridional Acceleration:m/s^2:VDFVA +210:210:Gravity wave drag zonal acceleration:m/s^2:GWDU +211:211:Gravity wave drag meridional acceleration:m/s^2:GWDV +212:212:Convective zonal momentum mixing acceleration:m/s^2:CNVU +213:213:Convective meridional momentum mixing acceleration:m/s^2:CNVV +214:214:Tendency of vertical velocity:m/s^2:WTEND +215:215:Omega (Dp/Dt) divide by density:K:OMGALF +216:216:Convective Gravity wave drag zonal acceleration:m/s^2:CNGWDU +217:217:Convective Gravity wave drag meridional acceleration:m/s^2:CNGWDV +218:218:Velocity Point Model Surface::LMV +219:219:Potential Vorticity (Mass-Weighted):m/s:PVMWW +220:220:Hourly Maximum of Upward Vertical Vorticity in the lowest 400hPa:m/s:MAXUVV +221:221:Hourly Maximum of Downward Vertical Vorticity in the lowest 400hPa:m/s:MAXDVV +222:222:U Component of Hourly Maximum 10m Wind Speed:m/s:MAXUW +223:223:V Component of Hourly Maximum 10m Wind Speed:m/s:MAXVW +224:224:Ventilation Rate:m^2/s:VRATE +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.3.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.3.table new file mode 100644 index 0000000000..f8361ae908 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.3.table @@ -0,0 +1,24 @@ +# Product Discipline 0: Meteorological products, Parameter Category 3: Mass +# 192-254 Reserved for local use +192:192:MSLP (Eta model reduction):Pa:MSLET:EMSP +193:193:5-Wave Geopotential Height:gpm:5WAVH:WGH +194:194:Zonal Flux of Gravity Wave Stress:N/m^2:U-GWD +195:195:Meridional Flux of Gravity Wave Stress:N/m^2:V-GWD +196:196:Planetary Boundary Layer Height:m:HPBL +197:197:5-Wave Geopotential Height Anomaly:gpm:5WAVA +198:198:MSLP (MAPS System Reduction):Pa:MSLPM:MMSP +199:199:3-hr pressure tendency (Std. Atmos. Reduction):Pa/s:TSLSA +200:200:Pressure of level from which parcel was lifted:Pa:PLPL +201:201:X-gradient of Log Pressure:m^-1:LPS X +202:202:Y-gradient of Log Pressure:m^-1:LPS Y +203:203:X-gradient of Height:m^-1:HGT X +204:204:Y-gradient of Height:m^-1:HGT Y +205:205:Layer Thickness:m:LAYTH +206:206:Natural Log of Surface Pressure:ln(kPa):NLGSP +207:207:Convective updraft mass flux:mm/s:CNVUMF +208:208:Convective downdraft mass flux:mm/s:CNVDMF +209:209:Convective detrainment mass flux:mm/s:CNVDEMF +210:210:Mass Point Model Surface::LMH +211:211:Geopotential Height (nearest grid point):gpm:HGTN +212:212:Pressure (nearest grid point):Pa:PRESN + 255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.4.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.4.table new file mode 100644 index 0000000000..741a656a44 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.4.table @@ -0,0 +1,18 @@ +# Product Discipline 0: Meteorological products, Parameter Category 4: Short-wave Radiation +#192-254 Reserved for local use +192:192:Downward Short-Wave Rad. Flux:W/m^2:DSWRF +193:193:Upward Short-Wave Rad. Flux:W/m^2:USWRF +194:194:UV-B downward solar flux:W/m^2:DUVB +195:195:Clear sky UV-B downward solar flux:W/m^2:CDUVB +196:196:Clear sky downward solar flux:W/m^2:CSDSF +197:197:Solar Radiative Heating Rate:K/s:SWHR +198:198:Clear Sky Upward Solar Flux:W/m^2:CSUSF +199:199:Cloud Forcing Net Solar Flux:W/m^2:CFNSF +200:200:Visible Beam Downward Solar Flux:W/m^2:VBDSF +201:201:Visible Diffuse Downward Solar Flux:W/m^2:VDDSF +202:202:Near IR Beam Downward Solar Flux:W/m^2:NBDSF +203:203:Near IR Diffuse Downward Solar Flux:W/m^2:NDDSF +204:204:Downward Total radiation Flux:W/m^2:DTRF +205:205:Upward Total radiation Flux:W/m^2:UTRF +255:255:Missing + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.5.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.5.table new file mode 100644 index 0000000000..e6ee528f2e --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.5.table @@ -0,0 +1,10 @@ +# Product Discipline 0: Meteorological products, Parameter Category 5: Long-wave Radiation +#192-254 Reserved for local use +192:192:Downward Long-Wave Rad. Flux:W/m^2:DLWRF +193:193:Upward Long-Wave Rad. Flux:W/m^2:ULWRF +194:194:Long-Wave Radiative Heating Rate:K/s:LWHR +195:195:Clear Sky Upward Long Wave Flux:W/m^2:CSULF +196:196:Clear Sky Downward Long Wave Flux:W/m^2:CSDLF +197:197:Cloud Forcing Net Long Wave Flux:W/m^2:CFNLF +255:255:Missing + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.6.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.6.table new file mode 100644 index 0000000000..677e57f358 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.6.table @@ -0,0 +1,14 @@ +# Product Discipline 0: Meteorological products, Parameter Category 6: Cloud +# 192-254 Reserved for local use +192:192:Non-Convective Cloud Cover:%:CDLYR +193:193:Cloud Work Function:J/kg:CWORK +194:194:Convective Cloud Efficiency::CUEFI +195:195:Total Condensate:kg/kg:TCOND +196:196:Total Column-Integrated Cloud Water:mm:TCOLW +197:197:Total Column-Integrated Cloud Ice:mm:TCOLI +198:198:Total Column-Integrated Condensate:mm:TCOLC +199:199:Ice fraction of total condensate::FICE +200:200:Convective Cloud Mass Flux:Pa/s:MFLUX +201:201:Sunshine Duration:s:SUNSD +255:255:Missing + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.7.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.7.table new file mode 100644 index 0000000000..ac40923f9b --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.0.7.table @@ -0,0 +1,12 @@ +# Product Discipline 0: Meteorological products, Parameter Category 7: Thermodynamic Stability Indices +#192-254 Reserved for local use +192:192:Surface Lifted Index:K:LFTX:SLI +193:193:Best (4 layer) Lifted Index:K:4LFTX:BLI +194:194:Richardson Number:Numeric:RI +195:195:Convective Weather Detection Index::CWDI +196:196:Ultra Violet Index:J/m^2:UVI +197:197:Updraft Helicity:m^2/s^2:UPHL +198:198:Leaf Area Index::LAI +199:199:Hourly Maximum of Updraft Helicity over Layer 2km to 5 km AGL:m^2/s^2:MXUPHL +255:255:Missing + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.1.0.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.1.0.table new file mode 100644 index 0000000000..b0f7b99a6d --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.1.0.table @@ -0,0 +1,10 @@ +# Product Discipline 1: Hydrologic products, Parameter Category 0: Hydrology basic products +# 192-254 Reserved for local use +192:192:Baseflow-groundwater runoff:mm:BGRUN +193:193:Storm surface runoff:mm:SSRUN +255:255:Missing +# Notes: +# (1) Remotely sensed snow cover is expressed as a field of dimensionless, thematic values. The currently accepted values are for no-snow/no-cloud, 50, for clouds, 100, and for snow, 250. See code table 4.215. +# (2) A data field representing snow coverage by elevation portrays at which elevations there is a snow pack. The elevation values typically range from 0 to 90 in 100 m increments. A value of 253 is used to represent a no-snow/no-cloud data point. A value of 254 is used to represent a data point at which snow elevation could not be estimated because of clouds obscuring the remote sensor (when using aircraft or satellite measurements). +# (3) Snow water equivalent percent of normal is stored in percent of normal units. For example, a value of 110 indicates 110 percent of the normal snow water equivalent for a given depth of snow. + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.1.1.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.1.1.table new file mode 100644 index 0000000000..ee7cd51aaf --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.1.1.table @@ -0,0 +1,8 @@ +# Product Discipline 1: Hydrologic products, Parameter Category 1: Hydrology probabilities +#192-254 Reserved for local use +192:192:Probability of Freezing Precipitation:%:CPOZP +193:193:Probability of Frozen Precipitation:%:CPOFP +194:194:Probability of precipitation exceeding flash flood guidance values:%:PPFFG +195:195:Probability of Wetting Rain, exceeding in 0.10" in a given time period:%:CWR +255:255:Missing + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.0.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.0.table new file mode 100644 index 0000000000..dd8bc6605f --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.0.table @@ -0,0 +1,6 @@ +# Product Discipline 10: Oceanographic products, Parameter Category 0: Waves +# 192-254 Reserved for local use +192:192:Wave Steepness::WSTP +255:255:Missing + + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.1.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.1.table new file mode 100644 index 0000000000..3aba1f9512 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.1.table @@ -0,0 +1,7 @@ +# Product Discipline 10: Oceanographic products, Parameter Category 1: Currents +#192-254 Reserved for local use +192:192:Ocean Mixed Layer U Velocity:m/s:OMLU +193:193:Ocean Mixed Layer V Velocity:m/s:OMLV +194:194:Barotropic U Velocity:m/s:UBARO +195:195:Barotropic V Velocity:m/s:VBARO +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.191.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.191.table new file mode 100644 index 0000000000..9b1f77c4b8 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.191.table @@ -0,0 +1,4 @@ +# Product Discipline 10: Oceanographic products, Parameter Category 191: Miscallaneous +0:0:Seconds Prior To Initial Reference Time:s:TSEC +#1-191 Reserved +255:255:Missing \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.2.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.2.table new file mode 100644 index 0000000000..d4d07462da --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.2.table @@ -0,0 +1,7 @@ +# Product Discipline 10: Oceanographic products, Parameter Category 2: Ice +#192-254 Reserved for local use +192:192:Ocean Mixed Layer U Velocity:m/s:OMLU +193:193:Ocean Mixed Layer V Velocity:m/s:OMLV +194:194:Barotropic U velocity:m/s:UBARO +195:195:Barotropic V velocity:m/s:VBARO +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.3.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.3.table new file mode 100644 index 0000000000..ff7628d270 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.3.table @@ -0,0 +1,23 @@ +# Product Discipline 10: Oceanographic products, Parameter Category 3: Surface Properties +#192-254 Reserved for local use +192:192:Storm Surge:m:SURGE +193:193:Extra Tropical Storm Surge:m:ETSRG +194:194:Ocean Surface Elevation Relative to Geoid:m:ELEV +195:195:Sea Surface Height Relative to Geoid:m:SSHG +196:196:Ocean Mixed Layer Potential Density (Reference 2000m):kg/m^3:P2OMLT +197:197:Net Air-Ocean Heat Flux:W/m^2:AOHFLX +198:198:Assimilative Heat Flux:W/m^2:ASHFL +199:199:Surface Temperature Trend:degree per day:SSTT +200:200:Surface Salinity Trend:psu per day:SSST +201:201:Kinetic Energy:J/kg:KENG +202:202:Salt Flux:mm*s:SLTFL +242:242:20% Tropical Cyclone Storm Surge Exceedance:m:TCSRG20 +243:243:30% Tropical Cyclone Storm Surge Exceedance:m:TCSRG30 +244:244:40% Tropical Cyclone Storm Surge Exceedance:m:TCSRG40 +245:245:50% Tropical Cyclone Storm Surge Exceedance:m:TCSRG50 +246:246:60% Tropical Cyclone Storm Surge Exceedance:m:TCSRG60 +247:247:70% Tropical Cyclone Storm Surge Exceedance:m:TCSRG70 +248:248:80% Tropical Cyclone Storm Surge Exceedance:m:TCSRG80 +249:249:90% Tropical Cyclone Storm Surge Exceedance:m:TCSRG90 +250:250:Extra Tropical Storm Surge Combined Surge and Tide:m:ETCWL +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.4.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.4.table new file mode 100644 index 0000000000..e2234c0d40 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.10.4.table @@ -0,0 +1,10 @@ +# Product Discipline 10: Oceanographic products, Parameter Category 4: Sub-surface Properties +#192-254 Reserved for local use +192:192:3-D Temperature:℃:WTMPC +193:193:3-D Salinity::SALIN +194:194:Barotropic Kinectic Energy:J/kg:BKENG +195:195:Geometric Depth Below Sea Surface:m:DBSS +196:196:Interface Depths:m:INTFD +197:197:Ocean Heat Content:J/m^2:OHC +255:255:Missing + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.2.0.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.2.0.table new file mode 100644 index 0000000000..00a24645ff --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.2.0.table @@ -0,0 +1,43 @@ +# Product Discipline 2: Land surface products, Parameter Category 0: Vegetation/Biomass +#192-254 Reserved for local use +192:192:Volumetric soil moisture content:Proportion:SOILW +193:193:Ground heat flux:W/m^2:GFLUX +194:194:Moisture availability:%:MSTAV +195:195:Exchange coefficient:mm * s:SFEXC +196:196:Plant canopy surface water:mm:CNWAT +197:197:Blackadars mixing length scale:m:BMIXL +198:198:Vegetation Type:Integer 0-13:VGTYP +199:199:Canopy conductance:m/s:CCOND +200:200:Minimal stomatal resistance:s/m:RSMIN +201:201:Wilting point:Proportion:WILT +202:202:Solar parameter in canopy conductance:Fraction:RCS +203:203:Temperature parameter in canopy conductance:Fraction:RCT +204:204:Humidity parameterin canopy conductance:Fraction:RCQ +205:205:Soil moisture parameter in canopy conductance:Fraction:RCSOL +206:206:Rate of water dropping from canopy to ground:unknown:RDRIP +207:207:Ice-free water surface:%:ICWAT +208:208:Surface exchange coefficients for T and Q divided by delta z:m/s:AKHS +209:209:Surface exchange coefficients for U and V divided by delta z:m/s:AKMS +210:210:Vegetation canopy temperature:K:VEGT +211:211:Surface water storage:mm:SSTOR +212:212:Liquid soil moisture content (non-frozen):mm:LSOIL +213:213:Open water evaporation (standing water):W/m^2:EWATR +214:214:Groundwater recharge:mm:GWREC +215:215:Flood plain recharge:mm:QREC +216:216:Roughness length for heat:m:SFCRH +217:217:Normalized Difference Vegetation Index::NDVI +218:218:Land-sea coverage (nearest neighbor):[land=1,sea=0]:LANDN +219:219:Asymptotic mixing length scale:m:AMIXL +220:220:Water vapor added by precip assimilation:mm:WVINC +221:221:Water condensate added by precip assimilation:mm:WCINC +222:222:Water Vapor Flux Convergance (Vertical Int):mm:WVCONV +223:223:Water Condensate Flux Convergance (Vertical Int):mm:WCCONV +224:224:Water Vapor Zonal Flux (Vertical Int):mm:WVUFLX +225:225:Water Vapor Meridional Flux (Vertical Int):mm:WVVFLX +226:226:Water Condensate Zonal Flux (Vertical Int):mm:WCUFLX +227:227:Water Condensate Meridional Flux (Vertical Int):mm:WCVFLX +228:228:Aerodynamic conductance:m/s:ACOND +229:229:Canopy water evaporation:W/m^2:EVCW +230:230:Transpiration:W/m^2:TRANS +255:255:Missing + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.2.3.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.2.3.table new file mode 100644 index 0000000000..3432fa9a81 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.2.3.table @@ -0,0 +1,16 @@ +# Product Discipline 2: Land surface products, Parameter Category 3: Soil Products +#192-254 Reserved for local use +192:192:Liquid volumetric soil moisture (non-frozen):Proportion:SOILL +193:193:Number of soil layers in root zone::RLYRS +194:194:Surface Slope Type:Index:SLTYP +195:195:Transpiration stress-onset (soil moisture):Proportion:SMREF +196:196:Direct evaporation cease (soil moisture):Proportion:SMDRY +197:197:Soil porosity:Proportion:POROS +198:198:Direct evaporation from bare soil:W/m^2:EVBS +199:199:Land Surface Precipitation Accumulation:mm:LSPA +200:200:Bare soil surface skin temperature:K:BARET +201:201:Average surface skin temperature:K:AVSFT +202:202:Effective radiative skin temperature:K:RADT +203:203:Field Capacity:fraction:FLDCP +255:255:Missing + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.3.0.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.3.0.table new file mode 100644 index 0000000000..2b170ff4c7 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.3.0.table @@ -0,0 +1,4 @@ +# Product discipline 3: Space products, Parameter Category 0: Image format products +#192-254 Reserved for local use +255:255:Missing + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.3.1.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.3.1.table new file mode 100644 index 0000000000..d528d034dc --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.3.1.table @@ -0,0 +1,6 @@ +# Product Discipline 3: Space products, Parameter Category 1: Quantitative products +#192-254 Reserved for local use +192:192:Scatterometer Estimated U Wind Component:m/s:SCESTUWIND +193:193:Scatterometer Estimated V Wind Component:m/s:SCESTVWIND +255:255:Missing + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.3.192.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.3.192.table new file mode 100644 index 0000000000..0edd0b31d1 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.2.3.192.table @@ -0,0 +1,51 @@ +# Product Discipline 3: Space Products, Parameter Category 192: Forecast Satellite Imagery +# Revised 07/15/2014 +0:0:Simulated Brightness Temperature for GOES 12, Channel 2:K:SBT122 +1:1:Simulated Brightness Temperature for GOES 12, Channel 3:K:SBT123 +2:2:Simulated Brightness Temperature for GOES 12, Channel 4:K:SBT124 +3:3:Simulated Brightness Temperature for GOES 12, Channel 5:K:SBT125 +4:4:Simulated Brightness Counts for GOES 12, Channel 3:Byte:SBC123 +5:5:Simulated Brightness Counts for GOES 12, Channel 4:Byte:SBC124 +6:6:Simulated Brightness Temperature for GOES 11, Channel 2:K:SBT112 +7:7:Simulated Brightness Temperature for GOES 11, Channel 3:K:SBT113 +8:8:Simulated Brightness Temperature for GOES 11, Channel 4:K:SBT114 +9:9:Simulated Brightness Temperature for GOES 11, Channel 5:K:SBT115 +10:10:Simulated Brightness Temperature for AMSRE on Aqua, Channel 9:K:AMSRE9 +11:11:Simulated Brightness Temperature for AMSRE on Aqua, Channel 10:K:AMSRE10 +12:12:Simulated Brightness Temperature for AMSRE on Aqua, Channel 11:K:AMSRE11 +13:13:Simulated Brightness Temperature for AMSRE on Aqua, Channel 12:K:AMSRE12 +14:14:Simulated Reflectance Factor for ABI GOES-16, Band-1::SRFA161 +15:15:Simulated Reflectance Factor for ABI GOES-16, Band-2::SRFA162 +16:16:Simulated Reflectance Factor for ABI GOES-16, Band-3::SRFA163 +17:17:Simulated Reflectance Factor for ABI GOES-16, Band-4::SRFA164 +18:18:Simulated Reflectance Factor for ABI GOES-16, Band-5::SRFA165 +19:19:Simulated Reflectance Factor for ABI GOES-16, Band-6::SRFA166 +20:20:Simulated Brightness Temperature for ABI GOES-16, Band-7:K:SBTA167 +21:21:Simulated Brightness Temperature for ABI GOES-16, Band-8:K:SBTA168 +22:22:Simulated Brightness Temperature for ABI GOES-16, Band-9:K:SBTA169 +23:23:Simulated Brightness Temperature for ABI GOES-16, Band-10:K:SBTA1610 +24:24:Simulated Brightness Temperature for ABI GOES-16, Band-11:K:SBTA1611 +25:25:Simulated Brightness Temperature for ABI GOES-16, Band-12:K:SBTA1612 +26:26:Simulated Brightness Temperature for ABI GOES-16, Band-13:K:SBTA1613 +27:27:Simulated Brightness Temperature for ABI GOES-16, Band-14:K:SBTA1614 +28:28:Simulated Brightness Temperature for ABI GOES-16, Band-15:K:SBTA1615 +29:29:Simulated Brightness Temperature for ABI GOES-16, Band-16:K:SBTA1616 +30:30:Simulated Reflectance Factor for ABI GOES-17, Band-1::SRFA171 +31:31:Simulated Reflectance Factor for ABI GOES-17, Band-2::SRFA172 +32:32:Simulated Reflectance Factor for ABI GOES-17, Band-3::SRFA173 +33:33:Simulated Reflectance Factor for ABI GOES-17, Band-4::SRFA174 +34:34:Simulated Reflectance Factor for ABI GOES-17, Band-5::SRFA175 +35:35:Simulated Reflectance Factor for ABI GOES-17, Band-6::SRFA176 +36:36:Simulated Brightness Temperature for ABI GOES-17, Band-7:K:SBTA177 +37:37:Simulated Brightness Temperature for ABI GOES-17, Band-8:K:SBTA178 +38:38:Simulated Brightness Temperature for ABI GOES-17, Band-9:K:SBTA179 +39:39:Simulated Brightness Temperature for ABI GOES-17, Band-10:K:SBTA1710 +40:40:Simulated Brightness Temperature for ABI GOES-17, Band-11:K:SBTA1711 +41:41:Simulated Brightness Temperature for ABI GOES-17, Band-12:K:SBTA1712 +42:42:Simulated Brightness Temperature for ABI GOES-17, Band-13:K:SBTA1713 +43:43:Simulated Brightness Temperature for ABI GOES-17, Band-14:K:SBTA1714 +44:44:Simulated Brightness Temperature for ABI GOES-17, Band-15:K:SBTA1715 +45:45:Simulated Brightness Temperature for ABI GOES-17, Band-16:K:SBTA1716 +#46-191: Reserved +#192-254 Reserved for Local Use +255:255:Missing \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.201.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.201.table new file mode 100644 index 0000000000..ff854f8ce0 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.201.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.201, Precipitation Type +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.202.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.202.table new file mode 100644 index 0000000000..72b3e924a3 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.202.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.202, Precipitable water category +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.203.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.203.table new file mode 100644 index 0000000000..194a617dca --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.203.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.203, Cloud type +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.204.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.204.table new file mode 100644 index 0000000000..6dd8eddad0 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.204.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.204, Thunderstorm coverage +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.205.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.205.table new file mode 100644 index 0000000000..d3a10a9f42 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.205.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.205, Aerosol type +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.206.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.206.table new file mode 100644 index 0000000000..ad38ec23d8 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.206.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.206, Volcanic ash +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.207.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.207.table new file mode 100644 index 0000000000..0da827c63d --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.207.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.207, Icing +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.208.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.208.table new file mode 100644 index 0000000000..3e80d5eb91 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.208.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.208, Turbulence +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.209.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.209.table new file mode 100644 index 0000000000..be768523e3 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.209.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.209, Planetary boundary layer regime +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.210.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.210.table new file mode 100644 index 0000000000..40d3645e7c --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.210.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.210, Contrail intensity +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.211.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.211.table new file mode 100644 index 0000000000..de31f82779 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.211.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.211, Contrail engine type +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.212.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.212.table new file mode 100644 index 0000000000..3772bedb61 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.212.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.212, Land Use +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.213.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.213.table new file mode 100644 index 0000000000..772b1b17de --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.213.table @@ -0,0 +1,3 @@ +# CODE:TABLE:4.213, Soil type +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.215.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.215.table new file mode 100644 index 0000000000..210fd51310 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.215.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.215, Remotely Sensed Snow Coverage +#251-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.217.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.217.table new file mode 100644 index 0000000000..a934b4fdd3 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.217.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.217, Cloud mask type +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.220.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.220.table new file mode 100644 index 0000000000..9c8153ca5f --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.220.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.220, Horizontal dimension processed +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.221.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.221.table new file mode 100644 index 0000000000..2999590ab8 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.221.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.221, Treatment of missing data +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.222.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.222.table new file mode 100644 index 0000000000..fff52f9756 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.222.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.222, Categorical Result (NCEP) +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.3.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.3.table new file mode 100644 index 0000000000..a528a77fbe --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.3.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.3, Type of generating process +# 192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.4.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.4.table new file mode 100644 index 0000000000..f9d0db827a --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.4.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.4, Indicator of unit of time range +# 192:254:Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.5.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.5.table new file mode 100644 index 0000000000..bbb5a2f3e4 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.5.table @@ -0,0 +1,42 @@ +#Code:table:4.5: Fixed surface types and units +#192-254 Reserved for local use +200:200:Entire Atmosphere::EATM:EA +201:201:Entire Ocean::EOCN +204:204:Highest Tropospheric Freezing Level::HTFL +206:206:Grid Scale Cloud Bottom Level::GCBL +207:207:Grid Scale Cloud Top Level::GCTL +209:209:Boundary Layer Cloud Bottom Level::BCBL +210:210:Boundary Layer Cloud Top Level::BCTL +211:211:Boundary Layer Cloud Layer::BCY +212:212:Low Cloud Bottom Level::LCBL +213:213:Low Cloud Top Level::LCTL +214:214:Low Cloud Layer::LCY +215:215:Cloud Ceiling::CLG +220:220:Planetary Boundary Layer:: BLD +221:221:Layer Between Two Hybrid Levels::LBTHL +222:222:Middle Cloud Bottom Level::MCBL +223:223:Middle Cloud Top Level::MCTL +224:224:Middle Cloud Layer::MCY +232:232:High Cloud Bottom Level::HCBL +233:233:High Cloud Top Level::HCTL +234:234:High Cloud Layer::HCL +235:235:Ocean Isotherm Level:1/10 ℃:OITL +236:236:Layer Between Two Depths Below Ocean Surface::OLYR +237:237:Bottom of Ocean Mixed Layer (m):m:OBML +238:238:Bottom of Ocean Isothermal Layer:m:OBIL +239:239:Layer Ocean Surface and 26C Ocean Isothermal Level::LOS +240:240:Ocean Mixed Layer::OML +241:241:Ordered Sequence of Data::OSD +242:242:Convective Cloud Bottom Level::CCBL +243:243:Convective Cloud Top Level::CCTL +244:244:Convective Cloud::CCY +245:245:Lowest Level of the Wet Bulb Zero::WBZ +246:246:Maximum Equivalent Potential Temperature level::MTHE:MEPT +247:247:Equilibrium Level::EHLT:EL +248:248:Shallow Convective Cloud Bottom Level::SCBL +249:249:Shallow Convective Cloud Top Level::SCTL +251:251:Deep Convective Cloud Bottom Level::DCBL +252:252:Deep Convective Cloud Top Level::DCTL +253:253:Lowest Bottom Level of Supercooled Liquid Water Layer::LSCLW +254:254:Highest Top Level of Supercooled Liquid Water Layer::HSCLW +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.6.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.6.table new file mode 100644 index 0000000000..0d385dcb99 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.6.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.6, Type of ensemble forecast +# 192 254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.7.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.7.table new file mode 100644 index 0000000000..ef8484bffc --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.7.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.7, Derived forecast +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.8.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.8.table new file mode 100644 index 0000000000..25f097a5e7 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.8.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.8, Clustering Method +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.9.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.9.table new file mode 100644 index 0000000000..e1e3edd4bf --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/4.9.table @@ -0,0 +1,3 @@ +# CODE TABLE 4.9, Probability Type +#192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.0.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.0.table new file mode 100644 index 0000000000..66936885d9 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.0.table @@ -0,0 +1,4 @@ +# CODE TABLE 5.0, Data Representation Template Number +# 192-254 Reserved for local use +255:255:Missing +# 256-65535 Reserved diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.1.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.1.table new file mode 100644 index 0000000000..5dbbcbc6ad --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.1.table @@ -0,0 +1,3 @@ +# CODE TABLE 5.1, Type of original field values +# 192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.2.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.2.table new file mode 100644 index 0000000000..e280a94aa7 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.2.table @@ -0,0 +1,3 @@ +# CODE TABLE 5.2, Matrix coordinate value function definition +# 192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.3.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.3.table new file mode 100644 index 0000000000..dee18c15d0 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.3.table @@ -0,0 +1,3 @@ +# CODE TABLE 5.3, Matrix coordinate parameter +# 192-254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.5.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.5.table new file mode 100644 index 0000000000..2ffc3108c7 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.5.table @@ -0,0 +1,3 @@ +# CODE TABLE 5.5, Missing Value Management for Complex Packing +# 192 254 Reserved for local use +255:255:Missing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.6.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.6.table new file mode 100644 index 0000000000..fee1f01670 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/60/0/5.6.table @@ -0,0 +1,3 @@ +# CODE TABLE 5.6, Order of Spatial Differencing +#192-254 Reserved for local use +255:255:Missing From 5c8747280de7c5189c500c72b433c8dd23ebeabe Mon Sep 17 00:00:00 2001 From: Michael James Date: Thu, 24 Nov 2016 15:28:26 -0600 Subject: [PATCH 10/16] remove com.raytheon.uf.edex.maintenance (h5repack cron) --- .../feature.xml | 11 +- .../feature.xml | 4 +- .../feature.xml | 7 - .../.classpath | 7 - .../com.raytheon.uf.edex.maintenance/.project | 28 ---- .../META-INF/MANIFEST.MF | 15 --- .../build.properties | 6 - .../com.raytheon.uf.edex.maintenance.ecl | 0 .../res/spring/maintenance-ingest.xml | 29 ---- .../resources/maintenance.properties | 2 - .../edex/maintenance/DataStoreRepacker.java | 124 ------------------ 11 files changed, 8 insertions(+), 225 deletions(-) delete mode 100644 edexOsgi/com.raytheon.uf.edex.maintenance/.classpath delete mode 100644 edexOsgi/com.raytheon.uf.edex.maintenance/.project delete mode 100644 edexOsgi/com.raytheon.uf.edex.maintenance/META-INF/MANIFEST.MF delete mode 100644 edexOsgi/com.raytheon.uf.edex.maintenance/build.properties delete mode 100644 edexOsgi/com.raytheon.uf.edex.maintenance/com.raytheon.uf.edex.maintenance.ecl delete mode 100644 edexOsgi/com.raytheon.uf.edex.maintenance/res/spring/maintenance-ingest.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.maintenance/resources/maintenance.properties delete mode 100644 edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/DataStoreRepacker.java diff --git a/cave/com.raytheon.viz.feature.awips.developer/feature.xml b/cave/com.raytheon.viz.feature.awips.developer/feature.xml index 0f27e257f8..2402d486a8 100644 --- a/cave/com.raytheon.viz.feature.awips.developer/feature.xml +++ b/cave/com.raytheon.viz.feature.awips.developer/feature.xml @@ -116,11 +116,7 @@ - + @@ -192,10 +188,15 @@ + + + diff --git a/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml b/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml index a1c23c5a97..8c23fb3ad1 100644 --- a/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml +++ b/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml @@ -79,11 +79,11 @@ - + diff --git a/edexOsgi/com.raytheon.uf.edex.core.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.core.feature/feature.xml index ef32d9a8c0..9cf556c691 100644 --- a/edexOsgi/com.raytheon.uf.edex.core.feature/feature.xml +++ b/edexOsgi/com.raytheon.uf.edex.core.feature/feature.xml @@ -77,13 +77,6 @@ version="0.0.0" unpack="false"/> - - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.maintenance/.project b/edexOsgi/com.raytheon.uf.edex.maintenance/.project deleted file mode 100644 index c0a235af81..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.maintenance/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - com.raytheon.uf.edex.maintenance - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/edexOsgi/com.raytheon.uf.edex.maintenance/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.maintenance/META-INF/MANIFEST.MF deleted file mode 100644 index cb074f7ac8..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.maintenance/META-INF/MANIFEST.MF +++ /dev/null @@ -1,15 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Maintenance -Bundle-SymbolicName: com.raytheon.uf.edex.maintenance -Bundle-Version: 1.0.0.qualifier -Bundle-Vendor: RAYTHEON -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: com.raytheon.uf.common.dataplugin, - com.raytheon.uf.common.datastorage, - com.raytheon.uf.common.serialization, - com.raytheon.uf.common.status, - com.raytheon.uf.common.util, - com.raytheon.uf.edex.core, - com.raytheon.uf.edex.pointdata - diff --git a/edexOsgi/com.raytheon.uf.edex.maintenance/build.properties b/edexOsgi/com.raytheon.uf.edex.maintenance/build.properties deleted file mode 100644 index ad8d78badb..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.maintenance/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - res/,\ - resources/ diff --git a/edexOsgi/com.raytheon.uf.edex.maintenance/com.raytheon.uf.edex.maintenance.ecl b/edexOsgi/com.raytheon.uf.edex.maintenance/com.raytheon.uf.edex.maintenance.ecl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/edexOsgi/com.raytheon.uf.edex.maintenance/res/spring/maintenance-ingest.xml b/edexOsgi/com.raytheon.uf.edex.maintenance/res/spring/maintenance-ingest.xml deleted file mode 100644 index a4e1376efa..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.maintenance/res/spring/maintenance-ingest.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - java.lang.Throwable - - - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.maintenance/resources/maintenance.properties b/edexOsgi/com.raytheon.uf.edex.maintenance/resources/maintenance.properties deleted file mode 100644 index 4da73873b7..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.maintenance/resources/maintenance.properties +++ /dev/null @@ -1,2 +0,0 @@ -# interval at which hdf5 is repacked -repack.cron=0+20+*+*+*+? \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/DataStoreRepacker.java b/edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/DataStoreRepacker.java deleted file mode 100644 index 922264427e..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/DataStoreRepacker.java +++ /dev/null @@ -1,124 +0,0 @@ -/** - * This software was developed and / or modified by Raytheon Company, - * pursuant to Contract DG133W-05-CQ-1067 with the US Government. - * - * U.S. EXPORT CONTROLLED TECHNICAL DATA - * This software product contains export-restricted data whose - * export/transfer/disclosure is restricted by U.S. law. Dissemination - * to non-U.S. persons whether in the United States or abroad requires - * an export license or other authorization. - * - * Contractor Name: Raytheon Company - * Contractor Address: 6825 Pine Street, Suite 340 - * Mail Stop B8 - * Omaha, NE 68106 - * 402.291.0100 - * - * See the AWIPS II Master Rights File ("Master Rights File.pdf") for - * further licensing information. - **/ -package com.raytheon.uf.edex.maintenance; - -import java.io.File; -import java.util.Set; - -import com.raytheon.uf.common.dataplugin.PluginProperties; -import com.raytheon.uf.common.datastorage.DataStoreFactory; -import com.raytheon.uf.common.datastorage.IDataStore; -import com.raytheon.uf.common.datastorage.StorageException; -import com.raytheon.uf.common.datastorage.StorageProperties.Compression; -import com.raytheon.uf.common.status.IUFStatusHandler; -import com.raytheon.uf.common.status.UFStatus; -import com.raytheon.uf.common.status.UFStatus.Priority; -import com.raytheon.uf.common.time.util.TimeUtil; -import com.raytheon.uf.common.util.registry.GenericRegistry; -import com.raytheon.uf.common.util.registry.RegistryException; -import com.raytheon.uf.edex.core.dataplugin.PluginRegistry; -import com.raytheon.uf.edex.pointdata.PointDataPluginDao; - -/** - * Repacks all data hdf5 files. - * - * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Nov 1, 2011             njensen     Initial creation
- * Jan 14, 2013 1469       bkowal      Removed the hdf5 data directory
- * Mar 21, 2013 1814       rjpeter     Fixed logging of exception.
- * Feb 16, 2016 5363       dhladky     Added ability to register non-point data plugins for repack.
- * 
- *
- * - * @author njensen - * @version 1.0 - */ - -public class DataStoreRepacker extends - GenericRegistry { - - private static final transient IUFStatusHandler statusHandler = UFStatus - .getHandler(DataStoreRepacker.class); - - private boolean isScanned = false; - - private Compression compression = Compression.NONE; - - public DataStoreRepacker(String compression) { - this.compression = Compression.valueOf(compression); - } - - /** - * repack the list of registered plugins - */ - public void repack() { - if (!isScanned) { - scanForPointDataPlugins(); - } - - for (String plugin : getRegisteredObjects()) { - - IDataStore ds = DataStoreFactory.getDataStore(new File(plugin)); - try { - statusHandler.info("Starting repack of " + plugin - + " datastore"); - long time = TimeUtil.currentTimeMillis(); - ds.repack(compression); - long etime = TimeUtil.currentTimeMillis(); - statusHandler.info("Completed repack of " + plugin - + " datastore. Took: " + (etime - time) + " ms"); - } catch (StorageException e) { - statusHandler.handle(Priority.PROBLEM, - "Failed to repack datastore for plugin " + plugin, e); - } - } - } - - /** - * Finds point data plugins and adds them to the repack registry - */ - private void scanForPointDataPlugins() { - - Set plugins = PluginRegistry.getInstance() - .getRegisteredObjects(); - for (String plugin : plugins) { - PluginProperties props = PluginRegistry.getInstance() - .getRegisteredObject(plugin); - Class daoClass = props.getDao(); - if (PointDataPluginDao.class.isAssignableFrom(daoClass)) { - try { - register(plugin, props); - } catch (RegistryException e) { - statusHandler.handle(Priority.PROBLEM, - "Failed registering plugin " + plugin - + " for repack.", e); - } - } - } - - isScanned = true; - } - -} From b702a0d4dd7c57042de02064f0e206563fab67de Mon Sep 17 00:00:00 2001 From: Michael James Date: Fri, 25 Nov 2016 00:29:56 -0600 Subject: [PATCH 11/16] double dash -- causes unmarshalling error in CAVE --- .../radar/dualPol/baseRadarBestResZSRM.xml | 41 ------------------- .../menus/radar/klgx/baseRadarBestResZSRM.xml | 19 --------- 2 files changed, 60 deletions(-) diff --git a/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarBestResZSRM.xml b/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarBestResZSRM.xml index 60045b852e..46205906ac 100644 --- a/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarBestResZSRM.xml +++ b/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarBestResZSRM.xml @@ -1,46 +1,5 @@ - - - From 29e3e3c33d66e424a050b5d1554403c76bd8c353 Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Tue, 29 Nov 2016 11:55:18 -0700 Subject: [PATCH 12/16] edex rpm deltaScripts for 16.2.2 should not attempt on a new install --- .../awips2.cave/Installer.cave/component.spec | 10 - .../awips2.edex/Installer.edex/component.spec | 179 +++++++++++++++++- rpms/awips2.upc/Installer.ldm/component.spec | 1 - .../Installer.python-awips/component.spec | 2 +- 4 files changed, 176 insertions(+), 16 deletions(-) diff --git a/rpms/awips2.cave/Installer.cave/component.spec b/rpms/awips2.cave/Installer.cave/component.spec index f109ea3f5a..f4fce22bae 100644 --- a/rpms/awips2.cave/Installer.cave/component.spec +++ b/rpms/awips2.cave/Installer.cave/component.spec @@ -132,11 +132,6 @@ unzip %{_component_zip_file_name} rm -f %{_component_zip_file_name} %pre -if [ "${1}" = "2" ]; then - echo "The %{_component_name} rpm cannot be upgraded. Re-install CAVE to update to a newer version of this RPM." - exit 1 -fi - # /awips2/cave must not exist. if [ -d /awips2/cave ]; then # TODO: need to make CAVE RPMs do a better job of cleaning up files that they are @@ -251,17 +246,12 @@ rm -rf ${RPM_BUILD_ROOT} /awips2/cave/cave.ini %dir /awips2/cave/configuration /awips2/cave/configuration/* -%doc /awips2/cave/epl-v10.html %dir /awips2/cave/features /awips2/cave/features/* -%doc /awips2/cave/notice.html %dir /awips2/cave/p2 /awips2/cave/p2/* %dir /awips2/cave/plugins /awips2/cave/plugins/* -%docdir /awips2/cave/readme -%dir /awips2/cave/readme -/awips2/cave/readme/* /awips2/cave/.eclipseproduct %defattr(755,awips,fxalpha,755) diff --git a/rpms/awips2.edex/Installer.edex/component.spec b/rpms/awips2.edex/Installer.edex/component.spec index fd2a405752..a4ec37166b 100644 --- a/rpms/awips2.edex/Installer.edex/component.spec +++ b/rpms/awips2.edex/Installer.edex/component.spec @@ -174,8 +174,7 @@ else fi -echo "15.1.1 Updating radar table to include volume scan number." - +echo "Updates for 15.1.1: Checking radar table for volume scan number." SQL=" DO \$\$ BEGIN @@ -185,15 +184,187 @@ EXCEPTION END; \$\$ " -/awips2/psql/bin/psql -U ${DB_OWNER} -d metadata -c "${SQL}" +${PSQL} -U ${DB_OWNER} -d metadata -c "${SQL}" if [[ $? != 0 ]] then echo "Radar update not needed. Continuing..." else - /awips2/psql/bin/psql -U ${DB_OWNER} -d metadata -c "UPDATE radar SET volumescannumber=0 WHERE volumescannumber IS NULL;" + ${PSQL} -U ${DB_OWNER} -d metadata -c "UPDATE radar SET volumescannumber=0 WHERE volumescannumber IS NULL;" echo "Done" fi +# 16.2.2. deltaScripts +table_exists() { + ${PSQL} -U ${DB_OWNER} -Aqt -d metadata -c \ + "select 1 from information_schema.tables where table_name = '$1'" +} +# Given table name as argument, return the name of the FK constraint referencing bufrmos_location. +get_constraint_name() { + ${PSQL} -U ${DB_OWNER} -Aqt -d metadata << EOF + SELECT tc.constraint_name + FROM information_schema.table_constraints AS tc + JOIN information_schema.key_column_usage AS kcu + ON tc.constraint_name = kcu.constraint_name + JOIN information_schema.constraint_column_usage AS ccu + ON ccu.constraint_name = tc.constraint_name + WHERE constraint_type = 'FOREIGN KEY' + AND tc.table_name='$1' + and ccu.table_name = 'bufrmos_location'; +EOF +} + +# Check for existence of bufrmos_locationseq +sequence_exists() { + ${PSQL} -U ${DB_OWNER} -Aqt -d metadata << EOF + select 0 + from information_schema.sequences + where sequence_name = 'bufrmos_locationseq' +EOF +} + +get_min_pk() { + ${PSQL} -U ${DB_OWNER} -Aqt -d metadata << EOF + select min(id) id + from bufrmos_location; +EOF +} + +get_max_pk() { + ${PSQL} -U ${DB_OWNER} -Aqt -d metadata << EOF + select max(id) id + from bufrmos_location; +EOF +} + +last_bufrmos_locationseq_value() { + ${PSQL} -U ${DB_OWNER} -Aqt -d metadata -c \ + "select last_value from bufrmos_locationseq;" +} + +if [[ $(table_exists bufrmod_location) == "1" ]]; then + + if [[ "$(sequence_exists)" != "0" ]]; then + echo "INFO: bufrmos_locationseq does not exist in the database" + echo "INFO: Attempting to create bufrmos_locationseq" + ${PSQL} -U ${DB_OWNER} -d metadata -c \ + "create sequence bufrmos_locationseq increment 1 start 1;" > /dev/null + if [[ "$?" != "0" || "$(sequence_exists)" != "0" ]]; then + echo "ERROR: Failed to create bufrmos_locationseq" + exit 1 + else + echo "INFO Successfully created bufrmos_locationseq" + fi + fi + + min_pk="$(get_min_pk)" + max_pk="$(get_max_pk)" + + if [[ ("$min_pk" -gt 0) && ("$max_pk" -le "$(last_bufrmos_locationseq_value)") ]]; then + echo "INFO: bufrmos_locationseq is already updated." + fi + + all_tables=(bufrmosavn bufrmoseta bufrmosgfs bufrmoshpc bufrmoslamp bufrmosmrf) + tables= + fkeys= + + for table in "${all_tables[@]}"; do + if [[ $(table_exists $table) == "1" ]]; then + tables+=("$table") + fkeys+=("$(get_constraint_name $table)") + fi + done + + scriptfile=$(mktemp) + + if [[ "$scriptfile" == "" ]]; then + echo "ERROR: Failed to create temp file for script in /tmp" + exit 1 + fi + + echo "begin transaction;" > $scriptfile + + for i in $(seq 1 $(expr ${#tables[@]} - 1)); do + cat << EOF >> $scriptfile +alter table ${tables[$i]} +drop constraint ${fkeys[$i]}, +add constraint ${fkeys[$i]} + FOREIGN KEY (location_id) + REFERENCES bufrmos_location (id) MATCH SIMPLE + ON UPDATE CASCADE ON DELETE NO ACTION; +EOF + done + + cat << EOF >> $scriptfile +UPDATE bufrmos_location + SET id=nextval('bufrmos_locationseq'); +EOF + + for i in $(seq 1 $(expr ${#tables[@]} - 1)); do + cat << EOF >> $scriptfile +alter table ${tables[$i]} +drop constraint ${fkeys[$i]}, +add constraint ${fkeys[$i]} + FOREIGN KEY (location_id) + REFERENCES bufrmos_location (id) MATCH SIMPLE + ON UPDATE NO ACTION ON DELETE NO ACTION; +EOF + done + + echo "commit;" >> $scriptfile + + echo "INFO: Updating bufrmos_location keys. This may take a few minutes..." + + ${PSQL} -U ${DB_OWNER} -d metadata < $scriptfile + + rm -f $scriptfile + + echo "INFO: Removing bufrquikscat table if it exists." + + ${PSQL} -U ${DB_OWNER} -d metadata -c "DROP TABLE IF EXISTS bufrquikscat;" > /dev/null + ${PSQL} -U ${DB_OWNER} -d metadata -c "DROP SEQUENCE IF EXISTS bufrquikscatseq;" > /dev/null + ${PSQL} -U ${DB_OWNER} -d fxatext -q -c "DROP TABLE IF EXISTS watchwarn CASCADE;" > /dev/null + if [ $? -eq 0 ]; then + echo "INFO: watchwarn table successfully dropped." + else + echo "WARN: Unable to drop watchwarn table." + exit 1 + fi + + echo "INFO: Updating TOTSN and FRZR parameter names." + ${PSQL} -U ${DB_OWNER} -d metadata -c "UPDATE parameter SET name = '12hr ' || name WHERE abbreviation like 'TOTSN%pct12hr' AND name NOT LIKE '12hr%';" > /dev/null + ${PSQL} -U ${DB_OWNER} -d metadata -c "UPDATE parameter SET name = '12hr ' || name WHERE abbreviation like 'TOTSN%in12hr' AND name NOT LIKE '12hr%';" > /dev/null + ${PSQL} -U ${DB_OWNER} -d metadata -c "UPDATE parameter SET name = '12hr ' || name WHERE abbreviation like 'FRZR%pct12hr' AND name NOT LIKE '12hr%';" > /dev/null + ${PSQL} -U ${DB_OWNER} -d metadata -c "UPDATE parameter SET name = '12hr ' || name WHERE abbreviation like 'FRZR%in12hr' AND name NOT LIKE '12hr%';" > /dev/null + + # echo "Updating 24hr parameter names." + ${PSQL} -U ${DB_OWNER} -d metadata -c "UPDATE parameter SET name = '24hr ' || name WHERE abbreviation like 'TOTSN%pct24hr' AND name NOT LIKE '24hr%';" > /dev/null + ${PSQL} -U ${DB_OWNER} -d metadata -c "UPDATE parameter SET name = '24hr ' || name WHERE abbreviation like 'TOTSN%in24hr' AND name NOT LIKE '24hr%';" > /dev/null + ${PSQL} -U ${DB_OWNER} -d metadata -c "UPDATE parameter SET name = '24hr ' || name WHERE abbreviation like 'FRZR%pct24hr' AND name NOT LIKE '24hr%';" > /dev/null + ${PSQL} -U ${DB_OWNER} -d metadata -c "UPDATE parameter SET name = '24hr ' || name WHERE abbreviation like 'FRZR%in24hr' AND name NOT LIKE '24hr%';" > /dev/null + + #echo "Updating 48hr parameter names." + ${PSQL} -U ${DB_OWNER} -d metadata -c "UPDATE parameter SET name = '48hr ' || name WHERE abbreviation like 'TOTSN%pct48hr' AND name NOT LIKE '48hr%';" > /dev/null + ${PSQL} -U ${DB_OWNER} -d metadata -c "UPDATE parameter SET name = '48hr ' || name WHERE abbreviation like 'TOTSN%in48hr' AND name NOT LIKE '48hr%';" > /dev/null + ${PSQL} -U ${DB_OWNER} -d metadata -c "UPDATE parameter SET name = '48hr ' || name WHERE abbreviation like 'FRZR%pct48hr' AND name NOT LIKE '48hr%';" > /dev/null + ${PSQL} -U ${DB_OWNER} -d metadata -c "UPDATE parameter SET name = '48hr ' || name WHERE abbreviation like 'FRZR%in48hr' AND name NOT LIKE '48hr%';" > /dev/null + + #echo "Updating 72hr parameter names." + ${PSQL} -U ${DB_OWNER} -d metadata -c "UPDATE parameter SET name = '72hr ' || name WHERE abbreviation like 'TOTSN%pct72hr' AND name NOT LIKE '72hr%';" > /dev/null + ${PSQL} -U ${DB_OWNER} -d metadata -c "UPDATE parameter SET name = '72hr ' || name WHERE abbreviation like 'TOTSN%in72hr' AND name NOT LIKE '72hr%';" > /dev/null + ${PSQL} -U ${DB_OWNER} -d metadata -c "UPDATE parameter SET name = '72hr ' || name WHERE abbreviation like 'FRZR%pct72hr' AND name NOT LIKE '72hr%';" > /dev/null + ${PSQL} -U ${DB_OWNER} -d metadata -c "UPDATE parameter SET name = '72hr ' || name WHERE abbreviation like 'FRZR%in72hr' AND name NOT LIKE '72hr%';" > /dev/null + + echo "INFO: Attempting to drop bufrmosngm table" + + ${PSQL} -U ${DB_OWNER} -d metadata -c "DROP TABLE IF EXISTS bufrmosngm" + + echo "INFO: Attempting to remove bufrmosNGM plugin references from other tables" + + ${PSQL} -U ${DB_OWNER} -d metadata -c "DELETE FROM plugin_info where name = 'bufrmosNGM'" > /dev/null + ${PSQL} -U ${DB_OWNER} -d metadata -c "DELETE FROM purgejobs where plugin = 'bufrmosNGM'" > /dev/null + +fi + # stop PostgreSQL if we started it. if [ "${I_STARTED_POSTGRESQL}" = "YES" ]; then echo "Stopping PostgreSQL As User - ${DB_OWNER}..." diff --git a/rpms/awips2.upc/Installer.ldm/component.spec b/rpms/awips2.upc/Installer.ldm/component.spec index 645f48b6f4..baa3a1e152 100644 --- a/rpms/awips2.upc/Installer.ldm/component.spec +++ b/rpms/awips2.upc/Installer.ldm/component.spec @@ -20,7 +20,6 @@ Vendor: %{_build_vendor} Packager: %{_build_site} AutoReq: no -Requires: gempak Requires: awips2-qpid-lib Requires: awips2-python Requires: compat-gcc-34-g77 diff --git a/rpms/python.site-packages/Installer.python-awips/component.spec b/rpms/python.site-packages/Installer.python-awips/component.spec index 02f5d9ac1b..40412fefb4 100644 --- a/rpms/python.site-packages/Installer.python-awips/component.spec +++ b/rpms/python.site-packages/Installer.python-awips/component.spec @@ -9,7 +9,7 @@ Name: awips2-python-awips Summary: AWIPS II Python awips Distribution Version: 0.9.7 -Release: 1 +Release: 2 Group: AWIPSII BuildRoot: %{_build_root} BuildArch: %{_build_arch} From e0cfc3e491d9cfebc546d03e79100bb77fac2576 Mon Sep 17 00:00:00 2001 From: Michael James Date: Wed, 30 Nov 2016 14:31:16 -0600 Subject: [PATCH 13/16] remove superfluous performance logging from decoder classes --- .../com/raytheon/edex/plugin/bufrua/BufrUADecoder.java | 5 ----- .../src/com/raytheon/edex/plugin/grib/GribDecoder.java | 7 ------- .../src/com/raytheon/edex/plugin/obs/ObsDecoder.java | 6 ------ .../src/com/raytheon/edex/plugin/radar/RadarDecoder.java | 6 ------ .../com/raytheon/edex/plugin/sfcobs/SfcObsDecoder.java | 6 ------ .../raytheon/uf/edex/plugin/redbook/RedbookDecoder.java | 8 +------- .../edex/plugin/satellite/gini/GiniSatelliteDecoder.java | 6 ------ 7 files changed, 1 insertion(+), 43 deletions(-) diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java b/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java index 5f44cd2595..9cb78e48f0 100644 --- a/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java +++ b/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java @@ -36,8 +36,6 @@ import com.raytheon.uf.common.pointdata.PointDataDescription; import com.raytheon.uf.common.pointdata.PointDataView; import com.raytheon.uf.common.pointdata.spatial.ObStation; import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation; -import com.raytheon.uf.common.status.IPerformanceStatusHandler; -import com.raytheon.uf.common.status.PerformanceStatus; import com.raytheon.uf.common.time.util.ITimer; import com.raytheon.uf.common.time.util.TimeUtil; import com.raytheon.uf.common.wmo.WMOHeader; @@ -93,8 +91,6 @@ public class BufrUADecoder extends AbstractBUFRDecoder { private BUFRUAAdapterFactory adapterFactory; - private final IPerformanceStatusHandler perfLog = PerformanceStatus - .getHandler("BufrUA:"); /** * @@ -157,7 +153,6 @@ public class BufrUADecoder extends AbstractBUFRDecoder { } } timer.stop(); - perfLog.logDuration("Time to Decode", timer.getElapsedTime()); } return decodedData; } diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java index 27229ed107..036f6279a0 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java +++ b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java @@ -26,8 +26,6 @@ import org.apache.camel.Processor; import com.raytheon.edex.plugin.grib.exception.GribException; import com.raytheon.uf.common.dataplugin.grid.GridRecord; -import com.raytheon.uf.common.status.IPerformanceStatusHandler; -import com.raytheon.uf.common.status.PerformanceStatus; import com.raytheon.uf.common.time.util.ITimer; import com.raytheon.uf.common.time.util.TimeUtil; @@ -55,9 +53,6 @@ import com.raytheon.uf.common.time.util.TimeUtil; public class GribDecoder implements Processor { - private final IPerformanceStatusHandler perfLog = PerformanceStatus - .getHandler(""); - /** * @see org.apache.camel.Processor.process(Exchange) */ @@ -105,8 +100,6 @@ public class GribDecoder implements Processor { } } timer.stop(); - perfLog.logDuration("Grib" + gribEdition + ": Time to Decode", - timer.getElapsedTime()); exchange.getIn().setBody(records); } diff --git a/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDecoder.java b/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDecoder.java index 268d2f580f..d70cafc231 100644 --- a/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDecoder.java +++ b/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDecoder.java @@ -28,8 +28,6 @@ import com.raytheon.edex.exception.DecoderException; import com.raytheon.edex.plugin.AbstractDecoder; import com.raytheon.edex.plugin.obs.metar.MetarDecoder; import com.raytheon.uf.common.dataplugin.PluginDataObject; -import com.raytheon.uf.common.status.IPerformanceStatusHandler; -import com.raytheon.uf.common.status.PerformanceStatus; import com.raytheon.uf.common.time.util.ITimer; import com.raytheon.uf.common.time.util.TimeUtil; import com.raytheon.uf.common.wmo.WMOHeader; @@ -66,9 +64,6 @@ public class ObsDecoder extends AbstractDecoder { /** The logger */ private final Logger logger = LoggerFactory.getLogger(getClass()); - private final IPerformanceStatusHandler perfLog = PerformanceStatus - .getHandler("Obs:"); - private String traceId = null; /** @@ -98,7 +93,6 @@ public class ObsDecoder extends AbstractDecoder { } } timer.stop(); - perfLog.logDuration("Time to Decode", timer.getElapsedTime()); } } catch (Exception e) { logger.error(traceId + "- Error in ObsDecoder", e); diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java b/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java index 2f3ef31ec0..a111aee187 100644 --- a/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java +++ b/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java @@ -66,9 +66,7 @@ import com.raytheon.uf.common.dataplugin.radar.util.TiltAngleBin; import com.raytheon.uf.common.localization.IPathManager; import com.raytheon.uf.common.localization.LocalizationContext; import com.raytheon.uf.common.localization.PathManagerFactory; -import com.raytheon.uf.common.status.IPerformanceStatusHandler; import com.raytheon.uf.common.status.IUFStatusHandler; -import com.raytheon.uf.common.status.PerformanceStatus; import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus.Priority; import com.raytheon.uf.common.time.DataTime; @@ -154,9 +152,6 @@ public class RadarDecoder { private final String RADAR = "RADAR"; - private final IPerformanceStatusHandler perfLog = PerformanceStatus - .getHandler("Radar:"); - public RadarDecoder() throws DecoderException { String dir = ""; @@ -456,7 +451,6 @@ public class RadarDecoder { finalizeRecord(record); timer.stop(); - perfLog.logDuration("Time to Decode", timer.getElapsedTime()); recordList.add(record); } diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/SfcObsDecoder.java b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/SfcObsDecoder.java index 08611a54f5..d6c5c14976 100644 --- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/SfcObsDecoder.java +++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/SfcObsDecoder.java @@ -34,8 +34,6 @@ import com.raytheon.edex.plugin.sfcobs.decoder.ISfcObsDecoder; import com.raytheon.edex.plugin.sfcobs.decoder.SfcObsDecoderFactory; import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataplugin.sfcobs.ObsCommon; -import com.raytheon.uf.common.status.IPerformanceStatusHandler; -import com.raytheon.uf.common.status.PerformanceStatus; import com.raytheon.uf.common.time.util.ITimer; import com.raytheon.uf.common.time.util.TimeUtil; import com.raytheon.uf.common.wmo.WMOHeader; @@ -85,9 +83,6 @@ public class SfcObsDecoder extends AbstractDecoder { // Name of the plugin controlling this decoder. public static final String PLUGIN_NAME = "sfcobs"; - private final IPerformanceStatusHandler perfLog = PerformanceStatus - .getHandler("SfcObs:"); - /** The logger */ private final Logger logger = LoggerFactory.getLogger(getClass()); @@ -178,7 +173,6 @@ public class SfcObsDecoder extends AbstractDecoder { } } timer.stop(); - perfLog.logDuration("Time to Decode", timer.getElapsedTime()); return retVal.toArray(new PluginDataObject[retVal.size()]); } diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.redbook/src/com/raytheon/uf/edex/plugin/redbook/RedbookDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.redbook/src/com/raytheon/uf/edex/plugin/redbook/RedbookDecoder.java index 64f9d4cc1f..e3682c6ce5 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.redbook/src/com/raytheon/uf/edex/plugin/redbook/RedbookDecoder.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.redbook/src/com/raytheon/uf/edex/plugin/redbook/RedbookDecoder.java @@ -28,9 +28,7 @@ import com.raytheon.edex.plugin.AbstractDecoder; import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataplugin.PluginException; import com.raytheon.uf.common.dataplugin.redbook.RedbookRecord; -import com.raytheon.uf.common.status.IPerformanceStatusHandler; import com.raytheon.uf.common.status.IUFStatusHandler; -import com.raytheon.uf.common.status.PerformanceStatus; import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.time.util.ITimer; import com.raytheon.uf.common.time.util.TimeUtil; @@ -104,10 +102,7 @@ public class RedbookDecoder extends AbstractDecoder { private static final IUFStatusHandler logger = UFStatus .getHandler(RedbookDecoder.class); - - private final IPerformanceStatusHandler perfLog = PerformanceStatus - .getHandler("Redbook:"); - + private String traceId = null; /** @@ -168,7 +163,6 @@ public class RedbookDecoder extends AbstractDecoder { } } timer.stop(); - perfLog.logDuration("Time to Decode", timer.getElapsedTime()); } else { logger.error(traceId + "- No valid WMO header found in data."); } diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/src/com/raytheon/uf/edex/plugin/satellite/gini/GiniSatelliteDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/src/com/raytheon/uf/edex/plugin/satellite/gini/GiniSatelliteDecoder.java index 84bf356a6b..bc91dc7570 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/src/com/raytheon/uf/edex/plugin/satellite/gini/GiniSatelliteDecoder.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/src/com/raytheon/uf/edex/plugin/satellite/gini/GiniSatelliteDecoder.java @@ -44,9 +44,7 @@ import com.raytheon.uf.common.localization.IPathManager; import com.raytheon.uf.common.localization.LocalizationFile; import com.raytheon.uf.common.localization.PathManagerFactory; import com.raytheon.uf.common.serialization.SingleTypeJAXBManager; -import com.raytheon.uf.common.status.IPerformanceStatusHandler; import com.raytheon.uf.common.status.IUFStatusHandler; -import com.raytheon.uf.common.status.PerformanceStatus; import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.time.DataTime; import com.raytheon.uf.common.time.util.ITimer; @@ -123,9 +121,6 @@ public class GiniSatelliteDecoder { private static final int INITIAL_READ = GINI_HEADER_SIZE + 128; - private final IPerformanceStatusHandler perfLog = PerformanceStatus - .getHandler("Satellite:"); - public static final String LOOKUP_LOCALIZATION_DIR = System.getProperty( "gini.lookup.table.dir", "satellite/gini/lookuptables"); @@ -563,7 +558,6 @@ public class GiniSatelliteDecoder { record.setMessageData(dataRec); } timer.stop(); - perfLog.logDuration("Time to Decode", timer.getElapsedTime()); } catch (Throwable e) { statusHandler.error("Error decoding satellite", e); record = null; From ecd6e64d6940784d474b4b202aa3e3d92aed26cd Mon Sep 17 00:00:00 2001 From: Michael James Date: Wed, 30 Nov 2016 14:32:40 -0600 Subject: [PATCH 14/16] radar menu mosaic fix --- .../bundles/DefaultRadarMosaic.xml | 62 +++---- .../bundles/DefaultRadarMosaicDPprecip.xml | 92 ++++----- .../bundles/DefaultRadarMosaicTwoPanel.xml | 124 ++++++------- .../bundles/DefaultRadarMosaicVILCompRefl.xml | 175 ++++++++---------- .../bundles/DefaultTDWRRadarMosaic.xml | 62 +++---- .../menus/radar/baseRadarMenu.xml | 2 +- 6 files changed, 228 insertions(+), 289 deletions(-) diff --git a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaic.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaic.xml index c571fba1c3..26804da0b1 100644 --- a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaic.xml +++ b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaic.xml @@ -24,9 +24,6 @@ - - - @@ -35,38 +32,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicDPprecip.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicDPprecip.xml index 967dacc405..e9190d5c86 100755 --- a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicDPprecip.xml +++ b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicDPprecip.xml @@ -27,10 +27,6 @@ - - - @@ -44,54 +40,46 @@ constraintType="EQUALS" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicTwoPanel.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicTwoPanel.xml index ae37074d5d..431b02e157 100644 --- a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicTwoPanel.xml +++ b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicTwoPanel.xml @@ -54,9 +54,6 @@ - - - @@ -65,38 +62,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -124,9 +116,6 @@ - - - @@ -135,38 +124,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicVILCompRefl.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicVILCompRefl.xml index adcf639464..efbf17dc5e 100644 --- a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicVILCompRefl.xml +++ b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicVILCompRefl.xml @@ -42,106 +42,89 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.radar/localization/bundles/DefaultTDWRRadarMosaic.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultTDWRRadarMosaic.xml index 505dc7fb3f..baac0bff37 100644 --- a/cave/com.raytheon.viz.radar/localization/bundles/DefaultTDWRRadarMosaic.xml +++ b/cave/com.raytheon.viz.radar/localization/bundles/DefaultTDWRRadarMosaic.xml @@ -24,9 +24,6 @@ - - - @@ -35,38 +32,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml b/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml index 440c760ff1..7c0f2e5781 100755 --- a/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml +++ b/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml @@ -57,7 +57,7 @@ - From 17e6868e7c1acb32d78750450006ca259952c242 Mon Sep 17 00:00:00 2001 From: Michael James Date: Wed, 30 Nov 2016 15:03:07 -0600 Subject: [PATCH 15/16] addback RadarMenuUtil --- .../edex/plugin/radar/util/RadarMenuUtil.java | 448 ++++++++++++++++++ .../common_static/base/radar/radarsInUse.txt | 12 - 2 files changed, 448 insertions(+), 12 deletions(-) create mode 100644 edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/RadarMenuUtil.java diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/RadarMenuUtil.java b/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/RadarMenuUtil.java new file mode 100644 index 0000000000..3678166bea --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/RadarMenuUtil.java @@ -0,0 +1,448 @@ +/** + * This software was developed and / or modified by Raytheon Company, + * pursuant to Contract DG133W-05-CQ-1067 with the US Government. + * + * U.S. EXPORT CONTROLLED TECHNICAL DATA + * This software product contains export-restricted data whose + * export/transfer/disclosure is restricted by U.S. law. Dissemination + * to non-U.S. persons whether in the United States or abroad requires + * an export license or other authorization. + * + * Contractor Name: Raytheon Company + * Contractor Address: 6825 Pine Street, Suite 340 + * Mail Stop B8 + * Omaha, NE 68106 + * 402.291.0100 + * + * See the AWIPS II Master Rights File ("Master Rights File.pdf") for + * further licensing information. + **/ +package com.raytheon.edex.plugin.radar.util; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +import com.raytheon.uf.common.dataplugin.radar.util.RadarsInUseUtil; +import com.raytheon.uf.common.dataplugin.radar.util.SsssRadarUtil; +import com.raytheon.uf.common.dataplugin.radar.util.TerminalRadarUtils; +import com.raytheon.uf.common.localization.IPathManager; +import com.raytheon.uf.common.localization.LocalizationContext; +import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel; +import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType; +import com.raytheon.uf.common.localization.LocalizationFile; +import com.raytheon.uf.common.localization.PathManagerFactory; +import com.raytheon.uf.common.localization.exception.LocalizationException; +import com.raytheon.uf.common.menus.xml.CommonAbstractMenuContribution; +import com.raytheon.uf.common.menus.xml.CommonIncludeMenuContribution; +import com.raytheon.uf.common.menus.xml.CommonIncludeMenuItem; +import com.raytheon.uf.common.menus.xml.CommonMenuContributionFile; +import com.raytheon.uf.common.menus.xml.CommonSeparatorMenuContribution; +import com.raytheon.uf.common.menus.xml.CommonSubmenuContribution; +import com.raytheon.uf.common.menus.xml.MenuTemplateFile; +import com.raytheon.uf.common.menus.xml.VariableSubstitution; +import com.raytheon.uf.common.status.IUFStatusHandler; +import com.raytheon.uf.common.status.UFStatus; +import com.raytheon.uf.common.status.UFStatus.Priority; +import com.raytheon.uf.common.util.FileUtil; +import com.raytheon.uf.edex.menus.AbstractMenuUtil; +import com.raytheon.uf.edex.ndm.ingest.INationalDatasetSubscriber; + +/** + * Builds menus using JAXB + * + * 
+ * 
+ * SOFTWARE HISTORY
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Jun 30, 2010            mnash       Initial creation
+ * Feb 25, 2013 DR14418    zwang       Change radar menu to dual pol style
+ * 03/07/2013   DR15495    zwang       Handle additional elevation for ssss radars
+ * Mar 06, 2014   2876      mpduff     New NDM plugin.
+ * Sep 08, 2015 ASM #17944 D. Friedman Handle other elevation list files.
+ * 
+ *
+ * + * @author mnash + * @version 1.0 + */ + +public class RadarMenuUtil extends AbstractMenuUtil implements + INationalDatasetSubscriber { + private static final IUFStatusHandler statusHandler = UFStatus + .getHandler(RadarMenuUtil.class); + + private final int NUM_POSSIBLE_RADARS = 25; + + /** + * + */ + public RadarMenuUtil() { + setSkipParse(false); + } + + @Override + public void createMenus() { + statusHandler.info("Creating radar menus..."); + + // retrieve the local radars from + // radarsInUse.txt + RadarsInUseUtil.setParsed(false); + List radars = RadarsInUseUtil.getSite(getSite(), + RadarsInUseUtil.LOCAL_CONSTANT); + + String path = "menus" + File.separator + "radar" + File.separator; + CommonMenuContributionFile menuContributionFile = new CommonMenuContributionFile(); + CommonIncludeMenuItem includeMenuItem = null; + VariableSubstitution[] vars = null; + if (radars.size() == 0) { + menuContributionFile.contribution = new CommonIncludeMenuItem[1]; + } else { + menuContributionFile.contribution = new CommonIncludeMenuItem[radars + .size()]; + } + // loop through all the radars + Map> map = TerminalRadarUtils + .parseTerminalRadarFile(); + if (radars.size() > 0) { + for (int i = radars.size() - 1; i >= 0; i--) { + includeMenuItem = new CommonIncludeMenuItem(); + // check for terminal radars + boolean terminal = TerminalRadarUtils.isTerminalRadar(radars + .get(i).toLowerCase()); + if (terminal) { + includeMenuItem.fileName = new File(path + "dualPol" + + File.separator + "baseTerminalLocalRadarMenu.xml"); + List elevations = map.get(radars.get(i)); + vars = new VariableSubstitution[(elevations.size() + 1) + + NUM_POSSIBLE_RADARS + 1]; + vars[0] = new VariableSubstitution(); + vars[0].key = "icao"; + vars[0].value = radars.get(i); + for (int j = 1; j <= elevations.size(); j++) { + vars[j] = new VariableSubstitution(); + vars[j].key = "elev" + (j - 1); + vars[j].value = String.valueOf(elevations.get(j - 1)); + } + for (int j = 1; j <= elevations.size(); j++) { + vars[j + elevations.size()] = new VariableSubstitution(); + vars[j + elevations.size()].key = "suppressErrors" + + (j - 1); + vars[j + elevations.size()].value = "false"; + } + for (int j = elevations.size() + 1; j <= NUM_POSSIBLE_RADARS; j++) { + vars[j + elevations.size()] = new VariableSubstitution(); + vars[j + elevations.size()].key = "suppressErrors" + + (j - 1); + vars[j + elevations.size()].value = "true"; + } + includeMenuItem.substitutions = vars; + } else { + if (SsssRadarUtil.isSsssRadar(radars.get(i).toLowerCase())) { + String ssssRadar = radars.get(i).toLowerCase(); + includeMenuItem.fileName = new File(path + ssssRadar + + File.separator + "baseLocalRadarMenu.xml"); + } else { + includeMenuItem.fileName = new File(path + "dualPol" + + File.separator + "baseLocalRadarMenu.xml"); + } + vars = new VariableSubstitution[1]; + vars[0] = new VariableSubstitution(); + vars[0].key = "icao"; + vars[0].value = radars.get(i); + includeMenuItem.substitutions = vars; + } + includeMenuItem.visibleOnActionSet = new String[] { "com.raytheon.uf.viz.d2d.ui.D2DActionSet" }; + includeMenuItem.installationLocation = "menu:org.eclipse.ui.main.menu?after=satellite"; + menuContributionFile.contribution[radars.size() - 1 - i] = includeMenuItem; + } + } else { + includeMenuItem = new CommonIncludeMenuItem(); + menuContributionFile.contribution[0] = includeMenuItem; + menuContributionFile.contribution[0].fileName = new File(""); + } + + toXml(menuContributionFile, "menus" + File.separator + "radar" + + File.separator + "index.xml"); + + // now on to dial radars + radars = RadarsInUseUtil.getSite(getSite(), + RadarsInUseUtil.MOSAIC_CONSTANT); + + // create MenuTemplateFile for the dialRadars.xml + MenuTemplateFile menuTemplateFile = new MenuTemplateFile(); + menuTemplateFile.contributions = new CommonIncludeMenuContribution[radars + .size()]; + + CommonIncludeMenuContribution includeMenuContribution = null; + for (int i = radars.size() - 1; i >= 0; i--) { + includeMenuContribution = new CommonIncludeMenuContribution(); + includeMenuContribution.substitutions = vars; + + boolean terminal = TerminalRadarUtils.isTerminalRadar(radars.get(i) + .toLowerCase()); + if (terminal) { + List elevations = map.get(radars.get(i)); + includeMenuContribution.fileName = new File(path + "dualPol" + + File.separator + File.separator + + "baseTerminalLocalRadarMenu.xml"); + vars = new VariableSubstitution[(elevations.size() + 1) + + NUM_POSSIBLE_RADARS + 1]; + vars[0] = new VariableSubstitution(); + vars[0].key = "icao"; + vars[0].value = radars.get(i); + for (int j = 1; j <= elevations.size(); j++) { + vars[j] = new VariableSubstitution(); + vars[j].key = "elev" + (j - 1); + vars[j].value = String.valueOf(elevations.get(j - 1)); + } + for (int j = 1; j <= elevations.size(); j++) { + vars[j + elevations.size()] = new VariableSubstitution(); + vars[j + elevations.size()].key = "suppressErrors" + + (j - 1); + vars[j + elevations.size()].value = "false"; + } + for (int j = elevations.size() + 1; j <= NUM_POSSIBLE_RADARS; j++) { + vars[j + elevations.size()] = new VariableSubstitution(); + vars[j + elevations.size()].key = "suppressErrors" + + (j - 1); + vars[j + elevations.size()].value = "true"; + } + includeMenuContribution.substitutions = vars; + terminal = true; + } else { + if (SsssRadarUtil.isSsssRadar(radars.get(i).toLowerCase())) { + String ssssRadar = radars.get(i).toLowerCase(); + includeMenuContribution.fileName = new File(path + + ssssRadar + File.separator + + "baseLocalRadarMenu.xml"); + } else { + includeMenuContribution.fileName = new File(path + + "dualPol" + File.separator + + "baseLocalRadarMenu.xml"); + } + vars = new VariableSubstitution[1]; + vars[0] = new VariableSubstitution(); + vars[0].key = "icao"; + vars[0].value = radars.get(i); + includeMenuContribution.substitutions = vars; + } + menuTemplateFile.contributions[radars.size() - 1 - i] = includeMenuContribution; + } + + Arrays.sort(menuTemplateFile.contributions); + // only want 12 radars in the dial radar menu, otherwise put it in + // submenus + if (menuTemplateFile.contributions.length > 12) { + double numMenus = Math + .ceil(((double) menuTemplateFile.contributions.length) / 12); + int perMenu = (int) (menuTemplateFile.contributions.length + / numMenus + 1); + statusHandler.info("For " + menuTemplateFile.contributions.length + + " dial radars, menus have increased to " + (int) numMenus + + " with an average of " + perMenu + " per menu"); + List list = Arrays + .asList(menuTemplateFile.contributions); + menuTemplateFile.contributions = new CommonSubmenuContribution[(int) numMenus]; + + int count = 0; + for (int i = 0; i < numMenus; i++) { + menuTemplateFile.contributions[i] = new CommonSubmenuContribution(); + int numCount = 0; + if (list.size() - count < perMenu) { + numCount = list.size() - count; + ((CommonSubmenuContribution) menuTemplateFile.contributions[i]).contributions = new CommonIncludeMenuContribution[list + .size() - count]; + ((CommonSubmenuContribution) menuTemplateFile.contributions[i]).menuText = ((CommonIncludeMenuContribution) list + .get(count)).substitutions[0].value + + "-" + + ((CommonIncludeMenuContribution) list.get(perMenu + * i + list.size() - count - 1)).substitutions[0].value; + } else { + numCount = perMenu; + ((CommonSubmenuContribution) menuTemplateFile.contributions[i]).contributions = new CommonIncludeMenuContribution[perMenu]; + ((CommonSubmenuContribution) menuTemplateFile.contributions[i]).menuText = ((CommonIncludeMenuContribution) list + .get(count)).substitutions[0].value + + "-" + + ((CommonIncludeMenuContribution) list.get(perMenu + * (i + 1) - 1)).substitutions[0].value; + } + for (int j = 0; j < numCount; j++) { + ((CommonSubmenuContribution) menuTemplateFile.contributions[i]).contributions[j] = list + .get(count); + count++; + } + } + } + + toXml(menuTemplateFile, "menus" + File.separator + "radar" + + File.separator + "dialRadars.xml"); + + CommonSubmenuContribution submenuContribution = new CommonSubmenuContribution(); + List contributions = new ArrayList(); + + // now on to asr radars + radars = RadarsInUseUtil.getSite(getSite(), + RadarsInUseUtil.ASR_CONSTANT); + if (!radars.isEmpty()) { + submenuContribution.contributions = new CommonAbstractMenuContribution[radars + .size()]; + submenuContribution.menuText = "ASR-11 Radar"; + submenuContribution.id = "asr11radarsubmenu"; + menuTemplateFile = new MenuTemplateFile(); + for (int i = radars.size() - 1; i >= 0; i--) { + includeMenuContribution = new CommonIncludeMenuContribution(); + vars = new VariableSubstitution[1]; + vars[0] = new VariableSubstitution(); + vars[0] = new VariableSubstitution(); + vars[0].key = "icao"; + vars[0].value = radars.get(i); + includeMenuContribution.substitutions = vars; + includeMenuContribution.fileName = new File(path + "dualPol" + + File.separator + "asrRadars.xml"); + submenuContribution.contributions[i] = includeMenuContribution; + } + contributions.add(submenuContribution); + } + + // now on to arsr radars + radars = RadarsInUseUtil.getSite(getSite(), + RadarsInUseUtil.ARSR_CONSTANT); + if (!radars.isEmpty()) { + submenuContribution = new CommonSubmenuContribution(); + submenuContribution.contributions = new CommonAbstractMenuContribution[radars + .size()]; + submenuContribution.menuText = "ARSR-4 Radar"; + submenuContribution.id = "arsr4radarsubmenu"; + for (int i = radars.size() - 1; i >= 0; i--) { + includeMenuContribution = new CommonIncludeMenuContribution(); + vars = new VariableSubstitution[1]; + vars[0] = new VariableSubstitution(); + vars[0].key = "icao"; + vars[0].value = radars.get(i); + includeMenuContribution.fileName = new File(path + "dualPol" + + File.separator + "arsrRadars.xml"); + includeMenuContribution.substitutions = vars; + submenuContribution.contributions[radars.size() - 1 - i] = includeMenuContribution; + } + contributions.add(submenuContribution); + } + if (contributions.isEmpty()) { + CommonSeparatorMenuContribution separatorCont = new CommonSeparatorMenuContribution(); + separatorCont.id = "emptyAirportRadarId"; + contributions.add(separatorCont); + } + menuTemplateFile.contributions = contributions + .toArray(new CommonAbstractMenuContribution[contributions + .size()]); + + toXml(menuTemplateFile, "menus" + File.separator + "radar" + + File.separator + "airportRadars.xml"); + + menuContributionFile = new CommonMenuContributionFile(); + + menuContributionFile.contribution = new CommonIncludeMenuItem[1]; + includeMenuItem = menuContributionFile.contribution[0] = new CommonIncludeMenuItem(); + includeMenuItem.installationLocation = "menu:radar?after=RADAR_MENU_START"; + includeMenuItem.fileName = new File(path + "baseRadarMenu.xml"); + vars = includeMenuItem.substitutions = new VariableSubstitution[1]; + vars[0] = new VariableSubstitution(); + vars[0].key = "mosaicIcaoList"; + vars[0].value = ""; + for (String icao : RadarsInUseUtil.getSite(getSite(), + RadarsInUseUtil.MOSAIC_CONSTANT)) { + if (!vars[0].value.isEmpty()) { + vars[0].value += ","; + } + vars[0].value += icao; + } + toXml(menuContributionFile, "menus" + File.separator + "radar" + + File.separator + "radarindex.xml"); + + statusHandler.info("Finished processing radar menus."); + } + + public void setSkipParse(boolean rebuild) { + RadarsInUseUtil.setParsed(rebuild); + } + + @Override + public void notify(String fileName, File file) { + if ("tdwrElevations.txt".equals(fileName)) { + saveFile(file, TerminalRadarUtils.getElevationsFile()); + setSkipParse(false); + createMenus(); + } else if ("elevationLists.txt".equals(fileName) || + "ssssElevationLists.txt".equals(fileName)) { + saveFile(file, getRadarElevationLocalizationFile(fileName)); + } + statusHandler.handle(Priority.INFO, + "Successfully processed " + file.getAbsolutePath()); + } + + private LocalizationFile getRadarElevationLocalizationFile(String fileName) { + IPathManager pathMgr = PathManagerFactory.getPathManager(); + LocalizationContext context = pathMgr.getContext( + LocalizationType.COMMON_STATIC, LocalizationLevel.BASE); + return pathMgr.getLocalizationFile(context, + "radar" + File.separator + fileName); + } + + private void saveFile(File file, LocalizationFile outFile) { + if ((file != null) && file.exists()) { + InputStream fis = null; + OutputStream fos = null; + try { + fis = new FileInputStream(file); + fos = outFile.openOutputStream(); + try { + FileUtil.copy(fis, fos); + } catch (IOException e) { + statusHandler.handle(Priority.PROBLEM, + "Could not read file: " + file.getName(), e); + + } + } catch (LocalizationException e) { + statusHandler.handle(Priority.PROBLEM, + "Failed to open localization file for output: " + + outFile, e); + } catch (FileNotFoundException e) { + statusHandler.handle(Priority.PROBLEM, "Failed to find file: " + + file.getName(), e); + } finally { + if (fis != null) { + try { + fis.close(); + } catch (IOException e) { + // ignore + } + } + if (fos != null) { + try { + fos.close(); + } catch (IOException e) { + // ignore + } + } + } + } + } + + /* + * (non-Javadoc) + * + * @see com.raytheon.uf.common.menus.AbstractMenuUtil#checkCreated() + */ + @Override + public boolean checkCreated() { + return super.checkCreated("radarsInUse.txt", "radar"); + } +} diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/utility/common_static/base/radar/radarsInUse.txt b/edexOsgi/com.raytheon.edex.plugin.radar/utility/common_static/base/radar/radarsInUse.txt index 3f58b00057..f82f9597f1 100755 --- a/edexOsgi/com.raytheon.edex.plugin.radar/utility/common_static/base/radar/radarsInUse.txt +++ b/edexOsgi/com.raytheon.edex.plugin.radar/utility/common_static/base/radar/radarsInUse.txt @@ -197,15 +197,3 @@ kvnx kvtx kvwx kyux -pabc -pacg -paec -pahg -paih -pakc -papd -pgua -phki -phkm -phmo -phwa From 2056af7fffc5a20ed5bfc77f9c21a757d5e0140a Mon Sep 17 00:00:00 2001 From: Michael James Date: Wed, 30 Nov 2016 15:44:01 -0600 Subject: [PATCH 16/16] radar-request menuutil addback --- .../res/spring/radar-request.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-request.xml b/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-request.xml index 7a55368c05..75a36c1153 100644 --- a/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-request.xml +++ b/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-request.xml @@ -21,4 +21,10 @@ - + + + + + + + \ No newline at end of file