diff --git a/.gitignore b/.gitignore index ccfcdb56aa..a9f6dd77c0 100644 --- a/.gitignore +++ b/.gitignore @@ -32,7 +32,6 @@ edexOsgi/build.edex/opt/db/replication/ # edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/styleRules/ edexOsgi/com.raytheon.uf.edex.dissemination/ edexOsgi/com.raytheon.uf.edex.ndm/ -edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/web/security/ edexOsgi/deploy.edex.awips2/esb/conf/resources/ feature.xml getRPMoutput.pl diff --git a/awips_install.sh b/awips_install.sh index b846c80992..12bab496bf 100755 --- a/awips_install.sh +++ b/awips_install.sh @@ -54,7 +54,251 @@ function check_netcdf { if [[ $(rpm -qa | grep netcdf-AWIPS) ]]; then # replaced by epel netcdf(-devel) pkgs in 17.1.1-5 so force remove yum remove netcdf-AWIPS netcdf netcdf-devel -y + fi#!/bin/bash -f +# about: AWIPS install manager +# devorg: Unidata Program Center +# author: Michael James +# maintainer: +# use: ./awips_install.sh (--cave|--edex|--database|--ingest|--help) + +dir="$( cd "$(dirname "$0")" ; pwd -P )" + +usage="$(basename "$0") [-h] (--cave|--edex|--database|--ingest) #script to install Unidata AWIPS components.\n + -h, --help show this help text\n + --cave install CAVE for x86_64 Linux\n + --edex, --server install EDEX Standaone Server x86_64 Linux\n + --database install EDEX Request/Database x86_64 Linux\n + --ingest install EDEX Ingest Node Server x86_64 Linux\n" + +function stop_edex_services { + for srvc in edex_ldm edex_camel qpidd httpd-pypies edex_postgres ; do + if [ -f /etc/init.d/$srvc ]; then + service $srvc stop + fi + done +} + +function check_yumfile { + if [ ! -f /etc/yum.repos.d/awips2.repo ]; then + if [[ $(grep "release 7" /etc/redhat-release) ]]; then + repofile=el7.repo + else + repofile=awips2.repo + fi + wget_url="https://www.unidata.ucar.edu/software/awips2/doc/${repofile}" + echo "wget -O /etc/yum.repos.d/awips2.repo ${wget_url}" + wget -O /etc/yum.repos.d/awips2.repo ${wget_url} fi + yum clean all --enablerepo=awips2repo --disablerepo="*" 1>> /dev/null 2>&1 +} + +function check_limits { + if [[ ! $(grep awips /etc/security/limits.conf) ]]; then + echo "Checking /etc/security/limits.conf for awips: Not found. Adding..." + printf "awips soft nproc 65536\nawips soft nofile 65536\n" >> /etc/security/limits.conf + fi +} + +function check_epel { + if [[ ! $(rpm -qa | grep epel-release) ]]; then + yum install epel-release -y + yum clean all + fi +} + +function check_netcdf { + if [[ $(rpm -qa | grep netcdf-AWIPS) ]]; then + # replaced by epel netcdf(-devel) pkgs in 17.1.1-5 so force remove + yum remove netcdf-AWIPS netcdf netcdf-devel -y + fi +} + +function check_cave { + if [[ $(rpm -qa | grep awips2-cave) ]]; then + echo $'\n'CAVE is currently installed and needs to be removed before installing. + pkill cave.sh + pkill -f 'cave/run.sh' + remove_cave + fi +} + +function remove_cave { + yum groupremove awips2-cave -y + + if [[ $(rpm -qa | grep awips2-cave) ]]; then + echo " + =================== FAILED =========================== + Something went wrong with the un-install of CAVE + and packages are still installed. Once the CAVE + group has been successfully uninstalled, you can try + running this script again. + Try running a \"yum grouplist\" to see if the AWIPS + CAVE group is still installed and then do a + \"yum groupremove [GROUP NAME]\". + ex. yum groupremove 'AWIPS EDEX Server' + + You may also need to run \"yum groups mark + remove [GROUP NAME]\" + ex. yum groups mark remove 'AWIPS CAVE'" + exit + else + dir=cave + echo "Removing /awips2/$dir" + rm -rf /awips2/$dir + rm -rf /home/awips/caveData + fi +} + +function check_edex { + if [[ $(rpm -qa | grep awips2-edex) ]]; then + echo "found EDEX RPMs installed. The current EDEX needs to be removed before installing." + check_remove_edex + else + if [ -d /awips2/database/data/ ]; then + echo "cleaning up /awips2/database/data/ for new install..." + rm -rf /awips2/database/data/ + fi + fi + for dir in /awips2/tmp /awips2/data_store ; do + if [ ! -d $dir ]; then + echo "creating $dir" + mkdir -p $dir + chown awips:fxalpha $dir + fi + done + if getent passwd awips &>/dev/null; then + echo -n '' + else + echo + echo "--- user awips does not exist" + echo "--- installation will continue but EDEX services may not run as intended" + fi +} + +function check_remove_edex { + while true; do + read -p "Do you wish to remove EDEX? (Please type yes or no) `echo $'\n> '`" yn + case $yn in + [Yy]* ) remove_edex; break;; + [Nn]* ) echo "Exiting..."; exit;; + * ) echo "Please answer yes or no" + esac + done +} + +function remove_edex { + while true; do + read -p "`echo $'\n'`We are going to back up some files. What location do you want your files backed up to? `echo $'\n> '`" backup_dir + if [ ! -d $backup_dir ]; then + echo "$backup_dir does not exist, enter a path that exists" + else + break; + fi + done + date=$(date +'%Y%m%d') + backup_dir=${backup_dir}/awips2_backup_${date} + echo "Backing up to $backup_dir" + + rsync -aP /awips2/database/data/pg_hba.conf $backup_dir/ + rsync -aP /awips2/edex/data/utility $backup_dir/ + rsync -aP /awips2/edex/bin/setup.env $backup_dir/ + rsync -aP /awips2/ldm $backup_dir/ + rsync -aP /awips2/edex/conf $backup_dir + + if [[ $(rpm -qa | grep awips2-cave) ]]; then + echo "CAVE is also installed, now removing EDEX and CAVE" + else + echo "Now removing EDEX" + fi + + yum groupremove awips2-server awips2-database awips2-ingest awips2-cave + + if [[ $(rpm -qa | grep awips2 | grep -v cave) ]]; then + echo " + =================== FAILED =========================== + Something went wrong with the un-install of EDEX + and packages are still installed. Once the EDEX + groups have been successfully uninstalled, you can try + running this script again. + Try running a \"yum grouplist\" to see which AWIPS + group is still installed and then do a + \"yum groupremove [GROUP NAME]\". + ex. yum groupremove 'AWIPS EDEX Server' + + You may also need to run \"yum groups mark + remove [GROUP NAME]\" + ex. yum groups mark remove 'AWIPS EDEX Server'" + exit + else + for dir in $(ls /awips2/); do + if [ $dir != cave ]; then + echo "Removing /awips2/$dir" + rm -rf /awips2/$dir + fi + done + fi +} + +function check_users { + if ! id "awips" >/dev/null 2>&1; then + groupadd fxalpha && useradd -G fxalpha awips + fi +} + +function server_prep { + check_users + check_yumfile + stop_edex_services + check_limits + check_netcdf + check_edex + check_epel +} + +function cave_prep { + check_cave + check_users + check_yumfile + check_netcdf + check_epel +} + +if [ $# -eq 0 ]; then + key="-h" +else + key="$1" +fi +case $key in + --cave) + cave_prep + yum groupinstall awips2-cave -y 2>&1 | tee -a /tmp/awips-install.log + echo "CAVE has finished installing, the install log can be found in /tmp/awips-install.log" + ;; + --server|--edex) + server_prep + yum groupinstall awips2-server -y 2>&1 | tee -a /tmp/awips-install.log + echo "EDEX server has finished installing, the install log can be found in /tmp/awips-install.log" + ;; + --database) + server_prep + yum groupinstall awips2-database -y 2>&1 | tee -a /tmp/awips-install.log + echo "EDEX database has finished installing, the install log can be found in /tmp/awips-install.log" + ;; + --ingest) + server_prep + yum groupinstall awips2-ingest -y 2>&1 | tee -a /tmp/awips-install.log + echo "EDEX ingest has finished installing, the install log can be found in /tmp/awips-install.log" + ;; + -h|--help) + echo -e $usage + exit + ;; +esac + +PATH=$PATH:/awips2/edex/bin/ +exit + + } function check_edex { diff --git a/build/repos b/build/repos index 227b011cae..c5f45d7dff 100644 --- a/build/repos +++ b/build/repos @@ -1,3 +1,4 @@ +awips2-cimss awips2-core-foss awips2-core awips2-data-delivery diff --git a/build/rsync.cave b/build/rsync.cave index 257b29735e..54e7066a15 100644 --- a/build/rsync.cave +++ b/build/rsync.cave @@ -2,6 +2,10 @@ edexOsgi/* cave/* localization/* javaUtilities/* rpms pythonPackages *.pdf ../awips2-nativelib/* +../awips2-cimss/common/* +../awips2-cimss/edex/* +../awips2-cimss/features/* +../awips2-cimss/viz/* ../awips2-core/common/* ../awips2-core/edex/* ../awips2-core/features/* diff --git a/build/rsync.dirs b/build/rsync.dirs index 3e8f472c27..52831e9bec 100644 --- a/build/rsync.dirs +++ b/build/rsync.dirs @@ -2,6 +2,10 @@ edexOsgi/* cave/* localization javaUtilities/* rpms pythonPackages *.pdf ../awips2-nativelib/* +../awips2-cimss/edex/* +../awips2-cimss/features/* +../awips2-cimss/viz/* +../awips2-cimss/common/* ../awips2-core/common/* ../awips2-core/edex/* ../awips2-core/features/* diff --git a/cave/build/features.txt b/cave/build/features.txt index 7c80b4ba65..f27ec8067d 100644 --- a/cave/build/features.txt +++ b/cave/build/features.txt @@ -44,3 +44,4 @@ gov.noaa.gsd.viz.ensemble.feature gov.noaa.nws.mdl.viz.boundaryTool.common.feature com.raytheon.uf.viz.satellite.goesr.feature com.raytheon.uf.viz.gisdatastore.feature +edu.wisc.ssec.cimss.viz.probsevere.feature diff --git a/cave/build/p2-build.xml b/cave/build/p2-build.xml index 02ec217e94..16611114b0 100644 --- a/cave/build/p2-build.xml +++ b/cave/build/p2-build.xml @@ -281,6 +281,10 @@ + + + + + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/grids/MRMS-500m-GUAM2.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/grids/MRMS-500m-GUAM2.xml new file mode 100644 index 0000000000..8e2af64634 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/grids/MRMS-500m-GUAM2.xml @@ -0,0 +1,38 @@ + + + + + + 10042 + GUAM domain for MRMS 500m products + 17.995 + 500.005004 + UpperLeft + 2000 + 1800 + 0.005 + 0.005 + degree + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/grids/MRMS-500m-HAWAII2.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/grids/MRMS-500m-HAWAII2.xml new file mode 100644 index 0000000000..721d0d4d97 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/grids/MRMS-500m-HAWAII2.xml @@ -0,0 +1,38 @@ + + + + + + 10022 + HAWAII domain for MRMS 500m products + 25.9975 + 196.0025 + UpperLeft + 2600 + 2200 + 0.005 + 0.005 + degree + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/grids/MRMS-500m-HAWAII3.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/grids/MRMS-500m-HAWAII3.xml new file mode 100644 index 0000000000..fa694ed322 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/grids/MRMS-500m-HAWAII3.xml @@ -0,0 +1,38 @@ + + + + + + 10023 + HAWAII domain for MRMS 500m products + 25.995 + 196.005004 + UpperLeft + 2600 + 2200 + 0.005 + 0.005 + degree + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/gribModels_NOAA-161.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/gribModels_NOAA-161.xml index e8cc16c9eb..74d94360d2 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/gribModels_NOAA-161.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/gribModels_NOAA-161.xml @@ -75,6 +75,24 @@ 99 + + MRMS_HI_0500 +
161
+ 0 + 10022 + + 99 + + + + MRMS_HI_0500 +
161
+ 0 + 10023 + + 99 + + MRMS_CA_1000
161
@@ -102,6 +120,15 @@ 101 + + MRMS_GU_0500 +
161
+ 0 + 10042 + + 101 + + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/postProcessModels/postProcessedModels.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/postProcessModels/postProcessedModels.xml index 881124297d..0921b8d563 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/postProcessModels/postProcessedModels.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/postProcessModels/postProcessedModels.xml @@ -131,10 +131,16 @@ + GFS229|GFS20|AK-GFS22|GFS20-.* PrecipAccumPostProcessor + + + GFS229|GFS20|AK-GFS22|GFS20-.*|GFS.* + PrecipAccumPostProcessor + + - GFS229|GFS20|AK-GFS22|GFS20-.* + GFS229|GFS20|AK-GFS22|GFS20-.*|GFS.* diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/tables/161/0/4.2.209.12.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/tables/161/0/4.2.209.12.table index 4644ed9696..d19b693801 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/tables/161/0/4.2.209.12.table +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/tables/161/0/4.2.209.12.table @@ -20,9 +20,9 @@ 18:18:12hr MRMS Radar-Only ARI:year:PRP12H 19:19:24hr MRMS Radar-Only ARI:year:PRP24H 20:20:Maximum MRMS Radar-Only ARI:year:PRPMax -26:26:1hr MRMS Radar-Only QPE-to-FFG Ratio:%:QPEFFG01H -27:27:3hr MRMS Radar-Only QPE-to-FFG Ratio:%:QPEFFG03H -28:28:6hr MRMS Radar-Only QPE-to-FFG Ratio:%:QPEFFG06H -29:29:Maximum MRMS Radar-Only QPE-to-FFG Ratio:%:QPEFFGMax +26:26:1hr MRMS Radar-Only QPE-to-FFG Ratio::QPEFFG01H +27:27:3hr MRMS Radar-Only QPE-to-FFG Ratio::QPEFFG03H +28:28:6hr MRMS Radar-Only QPE-to-FFG Ratio::QPEFFG06H +29:29:Maximum MRMS Radar-Only QPE-to-FFG Ratio::QPEFFGMax 39:39:QPE-Hydrophobic Maximum Unit Streamflow:(m^3)*(s^-1)*(km^-2):QPEHPUStreamflow 40:40:QPE-Hydrophobic Maximum Streamflow:(m^3)*(s^-1):QPEHPStreamflow diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/utility/common_static/base/distribution/radar.xml b/edexOsgi/com.raytheon.edex.plugin.radar/utility/common_static/base/distribution/radar.xml index 19589393a9..5394826e40 100644 --- a/edexOsgi/com.raytheon.edex.plugin.radar/utility/common_static/base/distribution/radar.xml +++ b/edexOsgi/com.raytheon.edex.plugin.radar/utility/common_static/base/distribution/radar.xml @@ -25,6 +25,6 @@ of the file. --> - ^SDUS[234578]. .* + ^SDUS[2345678]. .* ^Level3.* diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/mrms/mrmsAzShear.cmap b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/mrms/mrmsAzShear.cmap new file mode 100644 index 0000000000..24dab23e21 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/mrms/mrmsAzShear.cmap @@ -0,0 +1,260 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/mrms/mrmsHSRHeight.cmap b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/mrms/mrmsHSRHeight.cmap new file mode 100644 index 0000000000..a7ac2c4861 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/mrms/mrmsHSRHeight.cmap @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/mrms/mrmsVILDensity.cmap b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/mrms/mrmsVILDensity.cmap new file mode 100644 index 0000000000..0363fdfb47 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/mrms/mrmsVILDensity.cmap @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/config.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/config.xml index 8f8242112a..7aa28ad0ba 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/config.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/config.xml @@ -5,7 +5,7 @@ OMA impactSevereThunderstormWarning Tornado/impactTornadoWarning,Severe Thunderstorm/impactSevereThunderstormWarning,Severe Weather Statement/impactSevereWeatherStatement,Significant Weather Advisory/impactSignificantWeatherAdvisory,Flash Flood Warning/impactFlashFloodWarning - Flash Flood Statement/impactFlashFloodWarningFollowup,Non-Convective FFW (incl. Dam Break)/impactNonConvectiveFlashFloodWarning,Non-Convective Flash Flood Statement/impactNonConvectiveFlashFloodWarningFollowup,Areal Flood Warning/arealFloodWarning,Areal Flood Warning Followup/arealFloodWarningFollowup,Areal Flood Advisory/arealFloodAdvisory,Areal Flood Advisory Followup/arealFloodAdvisoryFollowup,Special Weather Statement/impactSpecialWeatherStatement,Short Term Forecast/shortTermForecast + Flash Flood Statement/impactFlashFloodWarningFollowup,Non-Convective FFW (incl. Dam Break)/impactNonConvectiveFlashFloodWarning,Non-Convective Flash Flood Statement/impactNonConvectiveFlashFloodWarningFollowup,Areal Flood Warning/arealFloodWarning,Areal Flood Warning Followup/arealFloodWarningFollowup,Areal Flood Advisory/arealFloodAdvisory,Areal Flood Advisory Followup/arealFloodAdvisoryFollowup,Special Weather Statement/specialWeatherStatement,Short Term Forecast/shortTermForecast 600 diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/allFamilies-GFS.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/allFamilies-GFS.xml index fc46ecb4dc..41b5c5b46d 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/allFamilies-GFS.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/allFamilies-GFS.xml @@ -26,9 +26,11 @@ + @@ -44,12 +46,14 @@ + @@ -183,4 +187,4 @@ --> - \ No newline at end of file + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/allFamilies.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/allFamilies.xml index 588dbedd8d..35c6174682 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/allFamilies.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/allFamilies.xml @@ -26,9 +26,12 @@ + @@ -44,12 +47,14 @@ + @@ -183,4 +188,4 @@ --> - \ No newline at end of file + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/index.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/index.xml index ed22c220d3..a097941baa 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/index.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/index.xml @@ -9,8 +9,8 @@ - - + + @@ -77,6 +77,7 @@ + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/AK.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/AK.xml new file mode 100644 index 0000000000..e84c57954c --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/AK.xml @@ -0,0 +1,500 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/OCONUS.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/OCONUS.xml new file mode 100644 index 0000000000..de8bf3019e --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/OCONUS.xml @@ -0,0 +1,587 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/mrms.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/mrms.xml index 61e0cf6155..4627822ab8 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/mrms.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/mrms.xml @@ -45,7 +45,7 @@ - + @@ -62,4 +62,4 @@ - \ No newline at end of file + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/mrmsProducts.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/mrmsProducts.xml index f89df62224..516a304f17 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/mrmsProducts.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/mrmsProducts.xml @@ -25,137 +25,324 @@ --> + - - - + + + - + - + + - + - + + - + - + + - + - + + - + - + + - + - + + - + - + + - + - - - - + + + + + + + + + + + + + + + + + + + + + - + + + - + - + + - + - + + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + - + + + + - + - + + - + - + + - + - + + - + - - + + - + - + + - + - - - + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -338,137 +693,11 @@ - - + menuText="Accumulation Since 12Z" id="RadarOnly12Z"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -559,444 +788,132 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - + + - + - - + + - + - - + + - + + + + + + + + + + + + + + + + - - - + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + menuText="Surface Temperature" id="SfcT"> - - + + + menuText="Surface Wet Bulb Temperature" id="SfcWBT"> - - + + + menuText="Freezing Level Height" id="FZHeight"> - - + + - - - + menuText="Brightband Top Height" id="BBT"> + + + - - - + menuText="Brightband Bottom Height" id="BBB"> + + + + menuText="Warm Rain Probability" id="WarmRainProb"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/mrmsProductsAK.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/mrmsProductsAK.xml index e84c57954c..9b4a8689c5 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/mrmsProductsAK.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/mrmsProductsAK.xml @@ -1,414 +1,125 @@ + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + menuText="Reflectivity At Lowest Altitude (RALA)" id="REFLA1km"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + menuText="Base Reflectivity" id="BaseZ"> - + + menuText="Base Reflectivity (Un-QC'd)" id="BaseZU"> - + + menuText="Base Reflectivity Hourly Max" id="BaseZMaxHourly"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/mrmsProductsCA.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/mrmsProductsCA.xml new file mode 100644 index 0000000000..2d56e104bc --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/mrmsProductsCA.xml @@ -0,0 +1,848 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/mrmsProductsOCONUS.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/mrmsProductsOCONUS.xml index de8bf3019e..887b996720 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/mrmsProductsOCONUS.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/mrms/mrmsProductsOCONUS.xml @@ -1,414 +1,125 @@ + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + menuText="Reflectivity At Lowest Altitude (RALA)" id="REFLA1km"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + menuText="Base Reflectivity" id="BaseZ"> - + + menuText="Base Reflectivity (Un-QC'd)" id="BaseZU"> - + + menuText="Base Reflectivity Hourly Max" id="BaseZMaxHourly"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -584,4 +327,522 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml index 98cd9b3f6e..a3113124d2 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml @@ -5152,7 +5152,7 @@ false - % + *1 0 500 @@ -5232,7 +5232,6 @@ EchoTop30 EchoTop50 EchoTop60 - L3EchoTop false @@ -5265,6 +5264,51 @@ + + + L3EchoTop + + + false + kft + + 0 + 70 + + mrms/mrmsEchoTops + + 10 20 30 40 50 60 70 + + + + + + + SeamlessHSRHeight + + + false + kft + + 0 + 40 + + mrms/mrmsHSRHeight + + + + + + + + + + @@ -5399,7 +5443,7 @@ false - %*100 + % 0 100 @@ -5495,11 +5539,31 @@ - MergedAzShear02kmAGL MergedAzShear36kmAGL + + + false + *1000 + + 3 + + + -.01 + .01 + + mrms/mrmsAzShear + + -.010 -.008 -.006 -.004 -.002 -.001 -.0000001 0 .0000001 .002 .004 .006 .008 .010 + + + + + + + RotationTrackLL30min RotationTrackLL60min RotationTrackLL120min @@ -5596,13 +5660,17 @@ false - in/h + in/h -0.05 12.0 mrms/mrmsSPRDP + + 1 2 3 4 5 6 7 8 12 + + @@ -5765,7 +5834,7 @@ -4 8 - Grid/gridded data + Grid/Gridded Data 1 @@ -5774,7 +5843,7 @@ - CONUSMergedRhoHV + CONUSMergedRHV @@ -6019,34 +6088,22 @@ false g*m^-3 - -34.00 - 82.00 + 0.00 + 6.00 - mrms/mrmsVIL + mrms/mrmsVILDensity - - - - - - - - - - - - + + + + + + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/bundles/npp/viirs/viirsDayNightBandImagery.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/bundles/npp/viirs/viirsDayNightBandImagery.xml index a80946f515..207c4f480d 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/bundles/npp/viirs/viirsDayNightBandImagery.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/bundles/npp/viirs/viirsDayNightBandImagery.xml @@ -45,6 +45,10 @@ + + + + diff --git a/rpms/awips2.core/Installer.localization/coords.dat b/rpms/awips2.core/Installer.localization/coords.dat index 5445e67cb2..a03d343af9 100644 --- a/rpms/awips2.core/Installer.localization/coords.dat +++ b/rpms/awips2.core/Installer.localization/coords.dat @@ -47,7 +47,7 @@ MFR,42.37695,-122.88056,0,12856,0,9999,-1.4114185984754441E7,-1.3214185984754441 AFC,61.15611,-149.98389,0,12856,0,9999,-1.7128047102625113E7,-1.6228047102625113E7,8302375.474508852,9002375.474508852 AFG,64.85972,-147.83472,0,12856,0,9999,-1.6889061712317202E7,-1.5989061712317202E7,9211151.105478805,9911151.105478805 AJK,58.37834,-134.59861,0,12856,0,9999,-1.5417220529670674E7,-1.4517220529670674E7,7688502.719640497,8388502.719640497 -GUA,13.55,144.83333,0,12856,0,9999,1.5655310375467971E7,1.6555310375467971E7,1170990.0463046187,1870990.0463046187 +GUM,13.55,144.83333,0,12856,0,9999,1.5655310375467971E7,1.6555310375467971E7,1170990.0463046187,1870990.0463046187 HFO,21.30278,-157.81945,0,12856,0,9999,-1.79993529392416E7,-1.70993529392416E7,2075388.9781386214,2775388.9781386214 ILX,40.15167,-89.33833,0,12856,0,9999,-1.0384326118690921E7,-9484326.118690921,4532713.013051357,5232713.013051357 LOT,41.60417,-88.08471999999998,0,12856,0,9999,-1.024492603626659E7,-9344926.03626659,4746343.51064794,5446343.51064794 @@ -115,6 +115,8 @@ FGF,47.92195,-97.09805,0,12856,0,9999,-1.1247198628953073E7,-1.0347198628953073E UNR,44.07278,-103.21111,0,12856,0,9999,-1.192696431992944E7,-1.102696431992944E7,5120780.283332199,5820780.283332199 PQR,45.56056,-122.53694,0,12856,0,9999,-1.407597581067905E7,-1.317597581067905E7,5354021.562282554,6054021.562282554 RLX,38.31306,-81.71861,0,12856,0,9999,-9537021.45771157,-8637021.45771157,4268737.714869391,4968737.714869391 -EYW,24.55,-81.75,0,12856,0,9999,-9540511.99191862,-8640511.99191862,2467517.7741523045,3167517.7741523045 +KEY,24.55,-81.75,0,12856,0,9999,-9540511.99191862,-8640511.99191862,2467517.7741523045,3167517.7741523045 CAR,46.8667,-68.0167,0,12856,0,9999,-8013383.816522704,-7113383.816522704,5563931.021847511,6263931.021847511 HUN,34.7244,-86.4786,0,12856,0,9999,-1.0066327221337413E7,-9166327.221337413,3772021.6934645926,4472021.693464592 +OAX,41.3203,-96.3668,0,12899,0,9999,-1.1192233342786273E7,-1.0289133852062242E7,4722572.115723002,5422662.49190982 +TBW,27.960155,-82.041994,0,9999,0,9999,-9355650.121978646,-8890359.290775528,3007815.6563320886,3473106.4642500887 diff --git a/rpms/awips2.core/Installer.localization/coords_regional.dat b/rpms/awips2.core/Installer.localization/coords_regional.dat index d5e2f70141..1d9367a292 100644 --- a/rpms/awips2.core/Installer.localization/coords_regional.dat +++ b/rpms/awips2.core/Installer.localization/coords_regional.dat @@ -47,7 +47,7 @@ MFR, 42.37695, -122.88056, 0, 12856, 0, 9999, -1.5014185984754441E7, -1.23141859 AFC, 61.15611, -149.98389, 0, 12856, 0, 9999, -1.8028047102625113E7, -1.5328047102625113E7, 7602375.474508852, 9702375.474508852 AFG, 64.85972, -147.83472, 0, 12856, 0, 9999, -1.7789061712317202E7, -1.5089061712317202E7, 8511151.105478805, 1.0611151105478805E7 AJK, 58.37834, -134.59861, 0, 12856, 0, 9999, -1.6317220529670674E7, -1.3617220529670674E7, 6988502.719640497, 9088502.719640497 -GUA, 13.55, 144.83333, 0, 12856, 0, 9999, 1.4755310375467971E7, 1.745531037546797E7, 470990.0463046187, 2570990.046304619 +GUM, 13.55, 144.83333, 0, 12856, 0, 9999, 1.4755310375467971E7, 1.745531037546797E7, 470990.0463046187, 2570990.046304619 HFO, 21.30278, -157.81945, 0, 12856, 0, 9999, -1.88993529392416E7, -1.61993529392416E7, 1375388.9781386214, 3475388.9781386214 ILX, 40.15167, -89.33833, 0, 12856, 0, 9999, -1.1284326118690921E7, -8584326.118690921, 3832713.013051357, 5932713.013051357 LOT, 41.60417, -88.08471999999998, 0, 12856, 0, 9999, -1.114492603626659E7, -8444926.03626659, 4046343.5106479404, 6146343.51064794 @@ -115,6 +115,8 @@ FGF, 47.92195, -97.09805, 0, 12856, 0, 9999, -1.2147198628953073E7, -9447198.628 UNR, 44.07278, -103.21111, 0, 12856, 0, 9999, -1.282696431992944E7, -1.012696431992944E7, 4420780.283332199, 6520780.283332199 PQR, 45.56056, -122.53694, 0, 12856, 0, 9999, -1.497597581067905E7, -1.227597581067905E7, 4654021.562282554, 6754021.562282554 RLX, 38.31306, -81.71861, 0, 12856, 0, 9999, -1.043702145771157E7, -7737021.45771157, 3568737.714869391, 5668737.714869391 -EYW, 24.55, -81.75, 0, 12856, 0, 9999, -1.044051199191862E7, -7740511.99191862, 1767517.7741523045, 3867517.7741523045 +KEY, 24.55, -81.75, 0, 12856, 0, 9999, -1.044051199191862E7, -7740511.99191862, 1767517.7741523045, 3867517.7741523045 CAR, 46.8667, -68.0167, 0, 12856, 0, 9999, -8913383.816522704, -6213383.816522704, 4863931.021847511, 6963931.021847511 HUN, 34.7244, -86.4786, 0, 12856, 0, 9999, -1.0966327221337413E7, -8266327.221337413, 3072021.6934645926, 5172021.693464592 +OAX, 41.3203, -96.3668, 0, 12856, 0, 9999, -1.2097042354531607E7, -9397042.354531607, 4012646.6556291217, 6112646.655629122 +TBW, 27.960155, -82.041994, 0, 12856, 0, 9999, -1.0476115663228374E7, -7776115.663228374, 2178936.5098254266, 4278936.509825427 diff --git a/rpms/awips2.core/Installer.localization/wfo.dat b/rpms/awips2.core/Installer.localization/wfo.dat index 7992e116c4..b9b82c3900 100644 --- a/rpms/awips2.core/Installer.localization/wfo.dat +++ b/rpms/awips2.core/Installer.localization/wfo.dat @@ -47,7 +47,7 @@ MFR 14470 WFO Medford ft 1331 MSL LL 42.376950000000001 -122.88056 Medford OR 6 AFC 23460 WFO Anchorage ft 0 MSL LL 61.156109999999998 -149.98389 Anchorage AK 8 AFG \N WFO Fairbanks ft 620 MSL LL 64.859719999999996 -147.83472 Fairbanks AK 9 AJK \N WFO Juneau ft 30 MSL LL 58.378340000000001 -134.59861000000001 Juneau AK 7 -GUA \N WFO Guam/Marianas Islands ft 361 MSL LL 13.550000000000001 144.83332999999999 Guam GU 0 +GUM \N WFO Guam/Marianas Islands ft 361 MSL LL 13.550000000000001 144.83332999999999 Guam GU 0 HFO \N WFO Honolulu ft 73 MSL LL 21.302779999999998 -157.81944999999999 Honolulu HI 0 ILX 12897 WFO Central Illinois ft 582 MSL LL 40.151670000000003 -89.338329999999999 Lincoln IL 3 LOT 13908 WFO Chicago ft 660 MSL LL 41.604170000000003 -88.084719999999976 Romeoville IL 3 @@ -115,6 +115,6 @@ FGF 10994 WFO Eastern North Dakota ft 839 MSL LL 47.921950000000002 -97.09805000 UNR 20265 WFO Rapid City ft 3376 MSL LL 44.072780000000002 -103.21111000000001 Rapid City SD 3 PQR 17465 WFO Portland ft 24 MSL LL 45.560560000000002 -122.53694 Portland OR 6 RLX 18085 WFO Charleston ft 1080 MSL LL 38.31306 -81.718609999999998 Ruthdale WV 1 -EYW 10750 WFO Key West ft 21 MSL LL 24.550000000000001 -81.75 Key West FL 2 +KEY 10750 WFO Key West ft 21 MSL LL 24.550000000000001 -81.75 Key West FL 2 CAR 8650 WFO Caribou ft 628 MSL LL 46.866700000000002 -68.0167 Caribou ME 1 HUN 12652 WFO Huntsville ft 600 MSL LL 34.724400000000003 -86.4786 Huntsville AL 4 diff --git a/rpms/awips2.core/Installer.localization/wfos.sql.txt b/rpms/awips2.core/Installer.localization/wfos.sql.txt index e9d7c6291a..58541d35cd 100644 --- a/rpms/awips2.core/Installer.localization/wfos.sql.txt +++ b/rpms/awips2.core/Installer.localization/wfos.sql.txt @@ -96,7 +96,6 @@ PBZ PDT PHI PIH -PPG PQR PSR PUB diff --git a/rpms/awips2.upc/Installer.awips/programs/edex b/rpms/awips2.upc/Installer.awips/programs/edex index a0155fc6c1..33aad378c8 100755 --- a/rpms/awips2.upc/Installer.awips/programs/edex +++ b/rpms/awips2.upc/Installer.awips/programs/edex @@ -326,13 +326,13 @@ edex_start() { elif [ "${args[1]}" == 'ingest' ]; then printf "#!/bin/bash\nexport SERVICES=( 'ingest' 'ingestGrib' )\n" > /etc/init.d/edexServiceList su -c "service edex_camel start" - ldm_start + #ldm_start elif [ "${args[1]}" == 'database' ]; then printf "#!/bin/bash\nexport SERVICES=( 'request' )\n" > /etc/init.d/edexServiceList su -c "service edex_camel start" elif [ "${args[1]}" != 'dev' ]; then su -c "service edex_camel start" - ldm_start + #ldm_start fi } diff --git a/rpms/awips2.upc/Installer.ldm/component.spec b/rpms/awips2.upc/Installer.ldm/component.spec index f0951afe82..32096fce2e 100644 --- a/rpms/awips2.upc/Installer.ldm/component.spec +++ b/rpms/awips2.upc/Installer.ldm/component.spec @@ -98,7 +98,7 @@ cd ${_Installer_ldm}/patch if [ $? -ne 0 ]; then exit 1 fi -_PATCH_DIRS=( 'bin' 'decoders' 'etc' ) +_PATCH_DIRS=( 'bin' 'decoders' 'etc' 'dev') for patchDir in ${_PATCH_DIRS[*]}; do /bin/tar -cf ${patchDir}.tar ${patchDir} @@ -183,7 +183,7 @@ if [ $? -ne 0 ]; then fi # Unpack patch tar files cd ${_ldm_dir}/SOURCES -_PATCH_DIRS=( 'decoders' 'etc' ) +_PATCH_DIRS=( 'decoders' 'etc' 'dev') for patchDir in ${_PATCH_DIRS[*]}; do /bin/tar -xf ${patchDir}.tar -C ${_ldm_dir} diff --git a/rpms/awips2.upc/Installer.ldm/patch/cron/awips b/rpms/awips2.upc/Installer.ldm/patch/cron/awips index 9504d2916f..1353bd4dde 100644 --- a/rpms/awips2.upc/Installer.ldm/patch/cron/awips +++ b/rpms/awips2.upc/Installer.ldm/patch/cron/awips @@ -7,3 +7,9 @@ # ascat grib2 #10 * * * * /awips2/ldm/bin/ascat_grib.sh >& /dev/null 2>&1 */5 * * * * /bin/perl /awips2/ldm/dev/purgeRadar.pl >>/awips2/ldm/dev/logs/purgeRadar.log 2>&1 +*/5 * * * * /bin/perl /awips2/ldm/dev/checkFileTime.pl >>/awips2/ldm/dev/logs/checkFileTime.log 2>&1 + +# LDM-6.8.1+ metrics gathering +# +* * * * * /awips2/ldm/bin/ldmadmin addmetrics > /dev/null 2>&1 +0 0 1 * * /awips2/ldm/bin/ldmadmin newmetrics > /dev/null diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf b/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf index 545f3b6864..9fbd958089 100644 --- a/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf +++ b/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf @@ -89,25 +89,27 @@ EXEC "rtstats -h rtstats.unidata.ucar.edu" # DEFAULT #REQUEST LIGHTNING ".*" idd.unidata.ucar.edu # USPLN #REQUEST LIGHTNING ".*" striker.atmos.albany.edu # NLDN -REQUEST NEXRAD3 "./p(DHR|DPR|DSP|DTA|DAA|HHC|N.P|N.Q|N.S|N.U|OHA)." idd.unidata.ucar.edu -REQUEST FNEXRAD|WMO ".*" idd.unidata.ucar.edu -REQUEST UNIWISC|NIMAGE ".*" idd.unidata.ucar.edu # AREA/GINI -REQUEST EXP "WwWind" idd.unidata.ucar.edu # ESPL/PSD Profilers -REQUEST DIFAX "GLM" idd.unidata.ucar.edu # GOES GLM -#REQUEST DIFAX "OR_ABI" idd.unidata.ucar.edu # GOES ABI netCDF4 (tiles) -#REQUEST NOTHER "^TI[PRS]... KNES" idd.unidata.ucar.edu # GOES ABI gini -REQUEST NOTHER "^TI[A-Q]... KNES" idd.unidata.ucar.edu # VIIRS -REQUEST NOTHER "^IXT[WXY]01" 10.0.0.21 #Special SBN GOES Derived products-different WMO (COD, CPS, CTP) tiffanym-20201229 +REQUEST FNEXRAD ".*" idd.unidata.ucar.edu # MRMS - Unidata feed via NCEP +REQUEST NEXRAD3 ".*" idd.unidata.ucar.edu # Radar Level3 +REQUEST HDS "^SDUS6.*" idd.unidata.ucar.edu # Radar Level3 - specific files +REQUEST FNEXRAD|WMO ".*" idd.unidata.ucar.edu # WMO Feedtype includes HDS|IDS|DDPLUS +REQUEST UNIWISC|NIMAGE ".*" idd.unidata.ucar.edu # AREA/GINI and GOES +REQUEST DIFAX "GLM" idd.unidata.ucar.edu # GOES GLM Gridded Product (Texas Tech-Eric Bruning) +#REQUEST DIFAX "OR_ABI" idd.unidata.ucar.edu # GOES ABI netCDF4 (Unidata tiles) +#REQUEST NOTHER "^TI[PRS]... KNES" idd.unidata.ucar.edu # GOES ABI gini +REQUEST NOTHER "^TI[A-W]... KNES" idd.unidata.ucar.edu # VIIRS and GOES CMI via SBN +REQUEST NOTHER "^IXT[WXY]01" idd.unidata.ucar.edu #Special SBN GOES Derived products-different WMO (COD, CPS, CTP) tiffanym-20201229 REQUEST NGRID ".*" idd.unidata.ucar.edu -REQUEST HDS ".*" idd.unidata.ucar.edu -#REQUEST CMC ".*" idd.unidata.ucar.edu +#REQUEST HDS ".*" idd.unidata.ucar.edu # Duplicate +REQUEST CMC ".*" idd.unidata.ucar.edu # CMC is an alias for GEM #REQUEST FNMOC ".*" idd.unidata.ucar.edu -REQUEST CONDUIT "nam" idd.unidata.ucar.edu # NAM12 -REQUEST CONDUIT "pgrb2" idd.unidata.ucar.edu # GFS0p25 -#REQUEST CONDUIT "nwstg" idd.unidata.ucar.edu # NDFD -#REQUEST CONDUIT "awp252" idd.unidata.ucar.edu # RAP20 -#REQUEST FSL2 "HRRR" hrrr.unidata.ucar.edu # HRRRX sub-hourly -#REQUEST NGRID "^YAU[CDLMPQS]" idd.unidata.ucar.edu # MRMS +REQUEST CONDUIT "nam" idd.unidata.ucar.edu # NAM12 +REQUEST CONDUIT "pgrb2" idd.unidata.ucar.edu # GFS +#REQUEST CONDUIT "nwstg" idd.unidata.ucar.edu # NDFD +#REQUEST CONDUIT "awp252" idd.unidata.ucar.edu # RAP20 +#REQUEST FSL2 "HRRR" hrrr.unidata.ucar.edu # HRRRX sub-hourly +REQUEST EXP "WwWind" idd.unidata.ucar.edu # ESPL/PSD Profilers +#REQUEST NGRID "^YAU[CDLMPQS]" idd.unidata.ucar.edu # MRMS-NOAAPort # ############################################################################### # Allow Entries diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf index 4313fe8586..2bb3ac76c8 100644 --- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf +++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf @@ -9,7 +9,13 @@ # 20170322 16.4.1 GOES-16(R) Experimental/Provisional Products on NOTHER # 20171010 17.1.1 Split files by feedtype, rm gridsi retired from NOAAport (DGEX-AK,GFS201,GFS80) # 20190109 18.1.1 GOES17 from NIMAGE feed -# +# 20210505 18.2.1 GFS is now 1.00deg global (previously 0.25deg) +# MRMS entries are now from Unidata's IDD NCO feed instead of NOAAPort +# GOES16/17 CMI are coming from Unidata IDD +# GOES16 Derived products coming from NOAAPort +# GOES16 GLM data coming from Unidata's IDD via Texas Tech +# CIRA RGB GOES Satellite products added + # USPLN LIGHTNING USPLN1EX FILE -close -edex /awips2/data_store/lightning/%Y%m%d%H%M.uspln @@ -138,51 +144,49 @@ IDS|DDPLUS ^(W[CSV]PN[01][1-9]) (KKCI) (..)(..)(..) # ANY ^([PQ][A-Z0-9]{3,5}) (....) (..)(..)(..) !redbook [^/]*/([^/]*)/([^/]*)/([^/]*)/([0-9]{8}) FILE -overwrite -close -edex /awips2/data_store/redbook/\4\5Z_\8_\7_\6-\1_\2.rb -# GOES 16/17 ABI via SBN -# (not using) -#NOTHER ^(TI[RSU]...) (KNES) (......) (...) -# FILE -close -edex /awips2/data_store/GOES/GINI/\1_\2_\3_\4_(seq).gini +########################## +# +# GOES Satellite Products +# +########################## +# GOES 16/17 Single Channel (ABI) via NOAAPort/SBN - (not using) +#NOTHER ^(TI[RSU]...) (KNES) (..)(..)(..) (...) +# FILE -close -edex /awips2/data_store/GOES/(\3:yyyy)(\3:mm)\3/\4/CMI-SBN/\1_\2_\3\4\5_\6_(seq) -# GOES 16/17 ABI via Unidata IDD -# (using) -NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/CloudAndMoistureImagery/([^/]*)/([^/]*)/([0-9]{8})/([^/]*).nc - FILE -close -edex /awips2/data_store/GOES/CMI/\5.nc4 +#/data/ldm/pub/native/satellite/GOES/GOES16/Products/CloudAndMoistureImagery/Mesoscale-2/Channel03/20210528/OR_ABI-L2-CMIPM2-M6C03_G16_s20211481451520_e20211481451520_c20211481451520.nc +# GOES 16/17 Single Channel (ABI) via Unidata IDD -(using) +NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/CloudAndMoistureImagery/([^/]*)/([^/]*)/([0-9]{8})/([^/]*)(c[0-9]{7})(..)(.....).nc + FILE -close -edex /awips2/data_store/GOES/\4/\7/CMI-IDD/\5\6\7\8.nc4 -# GOES 16/17 derived products via SBN -# (using) -HDS ^(IXT.[8-9]9) KNES (......) - FILE -close -edex /awips2/data_store/GOES/derived/KNES_\1_\2-(seq) -NOTHER ^(IXT[WXY]01) KNES (......) - FILE -close -edex /awips2/data_store/GOES/derived/KNES_\1_\2-(seq) +# GOES 16/17 derived products + derived motion wind via SBN - (using) +HDS ^(IXT.[8-9]9) (KNES) (..)(..)(..) + FILE -close -edex /awips2/data_store/GOES/(\3:yyyy)(\3:mm)\3/\4/derived-SBN/\1_KNES_\2\3\4\5-(seq) +NOTHER ^(IXT[WXY]01) (KNES) (..)(..)(..) + FILE -close -edex /awips2/data_store/GOES/(\3:yyyy)(\3:mm)\3/\4/derived-SBN/\1_KNES_\2\3\4\5-(seq) -# GOES 16/17 derived products via Unidata IDD -# (not using) -#NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/([^/]*)/([^/]*)/([0-9]{8})/([^/]*).nc -# FILE -close -edex /awips2/data_store/GOES/derived/\3/\2/\1.nc4 +# GOES 16/17 derived products via Unidata IDD - (not using) +#NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/([^/]*)/([^/]*)/([0-9]{7})/([^/]*)(c[0-9]{7})(..)(.....).nc +# FILE -close -edex /awips2/data_store/GOES/\4/\7/derived-IDD/\5\6\7\8.nc4 -# GOES 16/17 derived motion wind products via Unidata IDD -# (not using - getting from SBN derived products) -#NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/DerivedMotionWinds/([^/]*)/([^/]*)/([0-9]{8})/([^/]*).nc -# FILE -close -edex /awips2/data_store/GOES/derived/\5.nc4 +# GOES 16/17 derived motion wind products via Unidata IDD - (not using - getting from SBN derived products) +#NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/DerivedMotionWinds/([^/]*)/([^/]*)/([0-9]{8})/([^/]*)(c[0-9]{7})(..)(.....).nc +# FILE -close -edex /awips2/data_store/GOES/\4/\7/derived-IDD/\5\6\7\8.nc4 -# GOES 16 GLM derived products via Texas Tech-->Unidata IDD -# (using) -NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/GeostationaryLightningMapper/([^/]*)/([0-9]{8})/([^/]*).nc - FILE -close -edex /awips2/data_store/GOES/GLM/TT/\4.nc4 +# GOES 16 GLM gridded products via Texas Tech-->Unidata IDD (using) +NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/GeostationaryLightningMapper/([^/]*)/([0-9]{8})/([^/]*)(c[0-9]{7})(..)(.....).nc + FILE -close -edex /awips2/data_store/GOES/\3/\6/GLM-IDD/\4\5\6\7.nc4 -# GOES GLM Raw data -# (not using) +# GOES GLM Raw data - don't use, AWIPS does not display the raw GLM data (not using) #DIFAX ^/data/cspp-geo/(EAST|WEST|GRB-R)/OR_GLM-L2-([^/]*).nc # FILE -close -edex /awips2/data_store/GOES/GLM/\1_OR_GLM-L2-\2.nc -# GOES CIRA derived products -# -NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/GeoColor/([^/]*)/([^/]*)/([0-9]{8})/([^/]*).nc - FILE -close -edex /awips2/data_store/GOES/CIRA/GeoColor/\5.nc4 -NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/DebraDust/([^/]*)/([^/]*)/([0-9]{8})/([^/]*).nc - FILE -close -edex /awips2/data_store/GOES/CIRA/DebraDust/\5.nc4 -NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/CloudSnow/([^/]*)/([^/]*)/([0-9]{8})/([^/]*).nc - FILE -close -edex /awips2/data_store/GOES/CIRA/CloudSnow/\5.nc4 +# GOES CIRA derived products +NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/GeoColor/([^/]*)/([^/]*)/([0-9]{8})/([^/]*)(c[0-9]{7})(..)(.....).nc + FILE -close -edex /awips2/data_store/GOES/\4/\7/CIRA/GeoColor/\5\6\7\8.nc4 +NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/DebraDust/([^/]*)/([^/]*)/([0-9]{8})/([^/]*)(c[0-9]{7})(..)(.....).nc + FILE -close -edex /awips2/data_store/GOES/\4/\7/CIRA/DebraDust/\5\6\7\8.nc4 +NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/CloudSnow/([^/]*)/([^/]*)/([0-9]{8})/([^/]*)(c[0-9]{7})(..)(.....).nc + FILE -close -edex /awips2/data_store/GOES/\4/\7/CIRA/CloudSnow/\5\6\7\8.nc4 # # NPP/VIIRS # @@ -197,8 +201,8 @@ FNEXRAD ^rad/NEXRCOMP/(...)/(...)_(........)_(....) # # NEXRAD3 site products # -NEXRAD3 ^SDUS[23578]. .... (..)(..)(..).*/p(...)(...) - FILE -overwrite -close -edex /awips2/data_store/radar/\5_\4_(\1:yyyy)(\1:mm)\1_\2\3 +NEXRAD3|HDS ^SDUS[235678]. (....) (..)(..)(..).*/p(...)(...) + FILE -overwrite -close -edex /awips2/data_store/radar/(\2:yyyy)(\2:mm)\2//\3/\6/\6_\5_(\2:yyyy)(\2:mm)\2_\3\4 ## ## BUFR ## @@ -290,21 +294,27 @@ UNIWISC ^pnga2area Q. (.*) (.*) (SP_COMP) (.*)um (.*) (........) (....) # # Multi-Radar Multi-Sensor (MRMS) - NOAAport #ALL MRMS Products (changed 6/18/2020 - tmeyer) -#CONUS -NGRID ^YAU[A-Z][0-9][0-9] KWNR (..)(..)(..) !grib2/[^/]*/[^/]*/#[^/]*/([0-9]{8})([0-9]{4})(F[0-9]..)/([^/]*)/.* - FILE -edex -close /awips2/data_store/grid/(\1:yyyy)(\1:mm)\1/\2/MRMS/MRMS_\4_\5_\6_\7.grib2 +# Multi-Radar Multi-Sensor (MRMS) - Unidata via NCO +#/data/ldm/pub/native/radar/MRMS/Model/CONUS/MRMS_BrightBandTopHeight_00.00_20210430-184000.grib2 +#CONUS Domain +FNEXRAD ^/data/ldm/pub/native/radar/MRMS/.*/CONUS/MRMS(.*)([0-9]{8})-([0-9]{2})([0-9]{4}).grib2 + FILE -edex -close /awips2/data_store/grid/\2/\3/MRMS/CONUS/MRMS\1\2-\3\4.grib2 #Alaska Domain -NGRID ^YAA[A-Z][0-9][0-9] KWNR (..)(..)(..) !grib2/[^/]*/[^/]*/#[^/]*/([0-9]{8})([0-9]{4})(F[0-9]..)/([^/]*)/.* - FILE -edex -close /awips2/data_store/grid/(\1:yyyy)(\1:mm)\1/\2/MRMS/MRMS_AK_\4_\5_\6_\7.grib2 +FNEXRAD ^/data/ldm/pub/native/radar/MRMS/.*/ALASKA/MRMS(.*)([0-9]{8})-([0-9]{2})([0-9]{4}).grib2 + FILE -edex -close /awips2/data_store/grid/\2/\3/MRMS/ALASKA/MRMS\1\2-\3\4.grib2 #Hawaii Domain -NGRID ^YAH[A-Z][0-9][0-9] KWNR (..)(..)(..) !grib2/[^/]*/[^/]*/#[^/]*/([0-9]{8})([0-9]{4})(F[0-9]..)/([^/]*)/.* - FILE -edex -close /awips2/data_store/grid/(\1:yyyy)(\1:mm)\1/\2/MRMS/MRMS_HI_\4_\5_\6_\7.grib2 -#Caribbean Domain -NGRID ^YAC[A-Z][0-9][0-9] KWNR (..)(..)(..) !grib2/[^/]*/[^/]*/#[^/]*/([0-9]{8})([0-9]{4})(F[0-9]..)/([^/]*)/.* - FILE -edex -close /awips2/data_store/grid/(\1:yyyy)(\1:mm)\1/\2/MRMS/MRMS_CA_\4_\5_\6_\7.grib2 +FNEXRAD ^/data/ldm/pub/native/radar/MRMS/.*/HAWAII/MRMS(.*)([0-9]{8})-([0-9]{2})([0-9]{4}).grib2 + FILE -edex -close /awips2/data_store/grid/\2/\3/MRMS/HAWAII/MRMS\1\2-\3\4.grib2 #Guam Domain -NGRID ^YAG[A-Z][0-9][0-9] KWNR (..)(..)(..) !grib2/[^/]*/[^/]*/#[^/]*/([0-9]{8})([0-9]{4})(F[0-9]..)/([^/]*)/.* - FILE -edex -close /awips2/data_store/grid/(\1:yyyy)(\1:mm)\1/\2/MRMS/MRMS_GU_\4_\5_\6_\7.grib2 +FNEXRAD ^/data/ldm/pub/native/radar/MRMS/.*/GUAM/MRMS(.*)([0-9]{8})-([0-9]{2})([0-9]{4}).grib2 + FILE -edex -close /awips2/data_store/grid/\2/\3/MRMS/GUAM/MRMS\1\2-\3\4.grib2 +#Caribbean Domain +FNEXRAD ^/data/ldm/pub/native/radar/MRMS/.*/CARIB/MRMS(.*)([0-9]{8})-([0-9]{2})([0-9]{4}).grib2 + FILE -edex -close /awips2/data_store/grid/\2/\3/MRMS/CARIB/MRMS\1\2-\3\4.grib2 +#ProbSevere +FNEXRAD ^/data/ldm/pub/native/radar/MRMS/.*/MRMS(.*)([0-9]{8})_([0-9]{2})([0-9]{4}).json + FILE -edex -close /awips2/data_store/grid/\2/\3/MRMS/ProbSevere/MRMS\1\2-\3\4.json + # # ------------------------------------------ # - Global Ensemble Forecast System (GEFS) - @@ -320,8 +330,8 @@ NGRID ^YAG[A-Z][0-9][0-9] KWNR (..)(..)(..) !grib2/[^/]*/[^/]*/#[^/]*/([0-9]{8}) # # GFS Global 0.25 degree # -CONDUIT ^data/nccf/com/.*gfs.t[0-9][0-9]z.pgrb2.0p25.*!grib2/[^/]*.*/#[^/]*/([0-9]{8})([0-9]{2})([0-9]{2})(F[0-9]..)/([^/]*)/.*! (......) - FILE -close /awips2/data_store/grid/\1/\2/GFS0p25/staging/GFS_Global_0p25deg_\1\2\3-concat-%Y%m%d_%H%M.grib2 +#CONDUIT ^data/nccf/com/.*gfs.t[0-9][0-9]z.pgrb2.0p25.*!grib2/[^/]*.*/#[^/]*/([0-9]{8})([0-9]{2})([0-9]{2})(F[0-9]..)/([^/]*)/.*! (......) +# FILE -close /awips2/data_store/grid/\1/\2/GFS0p25/staging/GFS_Global_0p25deg_\1\2\3-concat-%Y%m%d_%H%M.grib2 # # GFS Global 0.5 degree # @@ -331,9 +341,8 @@ CONDUIT ^data/nccf/com/.*gfs.t[0-9][0-9]z.pgrb2.0p25.*!grib2/[^/]*.*/#[^/]*/([0- # # GFS Global 1.0 degree # -#CONDUIT ^data/nccf/com/.*gfs.t[0-9][0-9]z.pgrb2.1p00.*!grib2/[^/]*/.*/#[^/]*/([0-9]{8})([0-9]{4})(F[0-9]..)/([^/]*)/.*! (......) -# FILE -edex -close -# /awips2/data_store/grid/GFS1p0/GFS_Global_onedeg_\1\2\3_\4_\5-(seq).grib2 +CONDUIT ^data/nccf/com/.*gfs.t[0-9][0-9]z.pgrb2.1p00.*!grib2/[^/]*.*/#[^/]*/([0-9]{8})([0-9]{2})([0-9]{2})(F[0-9]..)/([^/]*)/.*! (......) + FILE -close /awips2/data_store/grid/\1/\2/GFS1p00/staging/GFS_Global_1p00deg_\1\2\3-concat-%Y%m%d_%H%M.grib2 # # GFS Global 2.5 degree # diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.goesr b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.goesr index 520bbd2080..569d1f856b 100644 --- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.goesr +++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.goesr @@ -1,72 +1,43 @@ -# GOES 16/17 ABI via SBN -# (not using) -#NOTHER ^(TI[RSU]...) (KNES) (......) (...) -# FILE -close -edex /awips2/data_store/GOES/GINI/\1_\2_\3_\4_(seq).gini +########################## +# +# GOES Satellite Products +# +########################## +# GOES 16/17 Single Channel (ABI) via NOAAPort/SBN - (not using) +#NOTHER ^(TI[RSU]...) (KNES) (..)(..)(..) (...) +# FILE -close -edex /awips2/data_store/GOES/(\3:yyyy)(\3:mm)\3/\4/CMI-SBN/\1_\2_\3\4\5_\6_(seq) -# GOES 16/17 ABI via Unidata IDD -# (using) -NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/CloudAndMoistureImagery/([^/]*)/([^/]*)/([0-9]{8})/([^/]*).nc - FILE -close -edex /awips2/data_store/GOES/CMI/\5.nc4 +#/data/ldm/pub/native/satellite/GOES/GOES16/Products/CloudAndMoistureImagery/Mesoscale-2/Channel03/20210528/OR_ABI-L2-CMIPM2-M6C03_G16_s20211481451520_e20211481451520_c20211481451520.nc +# GOES 16/17 Single Channel (ABI) via Unidata IDD -(using) +NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/CloudAndMoistureImagery/([^/]*)/([^/]*)/([0-9]{8})/([^/]*)(c[0-9]{7})(..)(.....).nc + FILE -close -edex /awips2/data_store/GOES/\4/\7/CMI-IDD/\5\6\7\8.nc4 -# GOES 16 derived products via SBN -# (using) -HDS ^(IXT.[8-9]9) KNES (......) - FILE -close -edex /awips2/data_store/GOES/derived/KNES_\1_\2-(seq) -NOTHER ^(IXT[WXY]01) KNES (......) - FILE -close -edex /awips2/data_store/GOES/derived/KNES_\1_\2-(seq) +# GOES 16/17 derived products + derived motion wind via SBN - (using) +HDS ^(IXT.[8-9]9) (KNES) (..)(..)(..) + FILE -close -edex /awips2/data_store/GOES/(\3:yyyy)(\3:mm)\3/\4/derived-SBN/\1_KNES_\2\3\4\5-(seq) +NOTHER ^(IXT[WXY]01) (KNES) (..)(..)(..) + FILE -close -edex /awips2/data_store/GOES/(\3:yyyy)(\3:mm)\3/\4/derived-SBN/\1_KNES_\2\3\4\5-(seq) -# GOES 16 derived products via Unidata IDD -# (not using) -#NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/([^/]*)/([^/]*)/([0-9]{8})/([^/]*).nc -# FILE -close -edex /awips2/data_store/GOES/derived/\3/\2/\1.nc4 +# GOES 16/17 derived products via Unidata IDD - (not using) +#NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/([^/]*)/([^/]*)/([0-9]{7})/([^/]*)(c[0-9]{7})(..)(.....).nc +# FILE -close -edex /awips2/data_store/GOES/\4/\7/derived-IDD/\5\6\7\8.nc4 -# GOES 16/17 derived motion wind products via Unidata IDD -# (not using - getting from SBN derived products) -#NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/DerivedMotionWinds/([^/]*)/([^/]*)/([0-9]{8})/([^/]*).nc -# FILE -close -edex /awips2/data_store/GOES/derived/\5.nc4 +# GOES 16/17 derived motion wind products via Unidata IDD - (not using - getting from SBN derived products) +#NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/DerivedMotionWinds/([^/]*)/([^/]*)/([0-9]{8})/([^/]*)(c[0-9]{7})(..)(.....).nc +# FILE -close -edex /awips2/data_store/GOES/\4/\7/derived-IDD/\5\6\7\8.nc4 -# GOES 16 GLM derived products via Texas Tech-->Unidata IDD -# (using) -NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/GeostationaryLightningMapper/([^/]*)/([0-9]{8})/([^/]*).nc - FILE -close -edex /awips2/data_store/GOES/GLM/TT/\4.nc4 +# GOES 16 GLM gridded products via Texas Tech-->Unidata IDD (using) +NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/GeostationaryLightningMapper/([^/]*)/([0-9]{8})/([^/]*)(c[0-9]{7})(..)(.....).nc + FILE -close -edex /awips2/data_store/GOES/\3/\6/GLM-IDD/\4\5\6\7.nc4 -# GOES 16/17 GLM Raw data -# (not using) +# GOES GLM Raw data - don't use, AWIPS does not display the raw GLM data (not using) #DIFAX ^/data/cspp-geo/(EAST|WEST|GRB-R)/OR_GLM-L2-([^/]*).nc # FILE -close -edex /awips2/data_store/GOES/GLM/\1_OR_GLM-L2-\2.nc -# GOES 16 CIRA derived products -# -NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/GeoColor/([^/]*)/([^/]*)/([0-9]{8})/([^/]*).nc - FILE -close -edex /awips2/data_store/GOES/CIRA/GeoColor/\5.nc4 -NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/DebraDust/([^/]*)/([^/]*)/([0-9]{8})/([^/]*).nc - FILE -close -edex /awips2/data_store/GOES/CIRA/DebraDust/\5.nc4 -NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/CloudSnow/([^/]*)/([^/]*)/([0-9]{8})/([^/]*).nc - FILE -close -edex /awips2/data_store/GOES/CIRA/CloudSnow/\5.nc4 - -# GOES East Derived Products WMO Header Regions -# --------------- ---------- ------- -# Aerosol Detection (Smoke+Dust) IXTA99 KNES F,C,M -# Aerosol Optical Depth IXTB99 KNES F,C -# Cloud Top Phase IXTD99 KNES F,C,M -# Fog and Low Stratus IXTE99 KNES C -# Rainfall Rate/QPE IXTF99 KNES F -# Cloud Top Height IXTG99 KNES F,C,M -# Clear Sky Mask IXTH99 KNES F,C,M -# Cloud Top Temperature IXTI99 KNES F,M -# Fire/Hot Spot Characterization IXTJ99 KNES F,C -# Land Surface (Skin) Temperature IXTK99 KNES F,C,M -# Sea Surface (Skin) Temperature IXTM99 KNES F -# Derived Stability Indices IXTN99 KNES F,C,M -# Total Precipitable Water IXTO99 KNES F,C,M -# Vertical Moisture Profile IXTP99 KNES C -# Vertical Temperature Profile IXTQ99 KNES C -# Geostationay Lightning Mapper IXTR99 KNES F,C -# Derived Motion Winds IXTU99 KNES C,M -# Cloud Particle Size Dist IXTW01 KNES F,C,M -# Cloud Top Pressure IXTX01 KNES F,C -# Cloud Optical Depth IXTY01 KNES F,C - -# GOES West Derived Products WMO Header Regions -# --------------- ---------- ------- -# Derived Motion Winds (West) IXTU89 KNES C +# GOES CIRA derived products +NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/GeoColor/([^/]*)/([^/]*)/([0-9]{8})/([^/]*)(c[0-9]{7})(..)(.....).nc + FILE -close -edex /awips2/data_store/GOES/\4/\7/CIRA/GeoColor/\5\6\7\8.nc4 +NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/DebraDust/([^/]*)/([^/]*)/([0-9]{8})/([^/]*)(c[0-9]{7})(..)(.....).nc + FILE -close -edex /awips2/data_store/GOES/\4/\7/CIRA/DebraDust/\5\6\7\8.nc4 +NIMAGE ^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/CloudSnow/([^/]*)/([^/]*)/([0-9]{8})/([^/]*)(c[0-9]{7})(..)(.....).nc + FILE -close -edex /awips2/data_store/GOES/\4/\7/CIRA/CloudSnow/\5\6\7\8.nc4 \ No newline at end of file diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.mrms b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.mrms index 6b5d9542bd..a9e0bd98b8 100644 --- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.mrms +++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.mrms @@ -30,7 +30,49 @@ NGRID ^YAUS0[0-4] KWNR ...... !grib2/[^/]*/[^/]*/#[^/]*/([0-9]{8})([0-9]{4})(F[0 FILE -edex -close /awips2/data_store/grid/MRMS-rotation/MRMS_\1_\2_\3_\4.grib2 # -# MRMS Mid-level Rotation Track Products (on different grid) +# MRMS Mid-l# =============================== +# = NCEP data available via IDD = +# =============================== +# +# Multi-Radar Multi-Sensor (MRMS) - Unidata via NCO +#/data/ldm/pub/native/radar/MRMS/Model/CONUS/MRMS_BrightBandTopHeight_00.00_20210430-184000.grib2 +#CONUS Domain +FNEXRAD ^/data/ldm/pub/native/radar/MRMS/.*/CONUS/MRMS(.*)([0-9]{8})-([0-9]{2})([0-9]{4}).grib2 + FILE -edex -close /awips2/data_store/grid/\2/\3/MRMS/CONUS/MRMS\1\2-\3\4.grib2 +#Alaska Domain +FNEXRAD ^/data/ldm/pub/native/radar/MRMS/.*/ALASKA/MRMS(.*)([0-9]{8})-([0-9]{2})([0-9]{4}).grib2 + FILE -edex -close /awips2/data_store/grid/\2/\3/MRMS/ALASKA/MRMS\1\2-\3\4.grib2 +#Hawaii Domain +FNEXRAD ^/data/ldm/pub/native/radar/MRMS/.*/HAWAII/MRMS(.*)([0-9]{8})-([0-9]{2})([0-9]{4}).grib2 + FILE -edex -close /awips2/data_store/grid/\2/\3/MRMS/HAWAII/MRMS\1\2-\3\4.grib2 +#Guam Domain +FNEXRAD ^/data/ldm/pub/native/radar/MRMS/.*/GUAM/MRMS(.*)([0-9]{8})-([0-9]{2})([0-9]{4}).grib2 + FILE -edex -close /awips2/data_store/grid/\2/\3/MRMS/GUAM/MRMS\1\2-\3\4.grib2 +#Caribbean Domain +FNEXRAD ^/data/ldm/pub/native/radar/MRMS/.*/CARIB/MRMS(.*)([0-9]{8})-([0-9]{2})([0-9]{4}).grib2 + FILE -edex -close /awips2/data_store/grid/\2/\3/MRMS/CARIB/MRMS\1\2-\3\4.grib2 +#ProbSevere +FNEXRAD ^/data/ldm/pub/native/radar/MRMS/.*/MRMS(.*)([0-9]{8})_([0-9]{2})([0-9]{4}).json + FILE -edex -close /awips2/data_store/grid/\2/\3/MRMS/ProbSevere/MRMS\1\2-\3\4.json + +# Multi-Radar Multi-Sensor (MRMS) - NOAAport +#ALL MRMS Products (changed 6/18/2020 - tmeyer) +#CONUS +#NGRID ^YAU[A-Z][0-9][0-9] KWNR (..)(..)(..) !grib2/[^/]*/[^/]*/#[^/]*/([0-9]{8})([0-9]{4})(F[0-9]..)/([^/]*)/.* +# FILE -edex -close /awips2/data_store/grid/(\1:yyyy)(\1:mm)\1/\2/MRMS/MRMS_\4_\5_\6_\7.grib2 +#Alaska Domain +#NGRID ^YAA[A-Z][0-9][0-9] KWNR (..)(..)(..) !grib2/[^/]*/[^/]*/#[^/]*/([0-9]{8})([0-9]{4})(F[0-9]..)/([^/]*)/.* +# FILE -edex -close /awips2/data_store/grid/(\1:yyyy)(\1:mm)\1/\2/MRMS/MRMS_AK_\4_\5_\6_\7.grib2 +#Hawaii Domain +#NGRID ^YAH[A-Z][0-9][0-9] KWNR (..)(..)(..) !grib2/[^/]*/[^/]*/#[^/]*/([0-9]{8})([0-9]{4})(F[0-9]..)/([^/]*)/.* +# FILE -edex -close /awips2/data_store/grid/(\1:yyyy)(\1:mm)\1/\2/MRMS/MRMS_HI_\4_\5_\6_\7.grib2 +#Caribbean Domain +#NGRID ^YAC[A-Z][0-9][0-9] KWNR (..)(..)(..) !grib2/[^/]*/[^/]*/#[^/]*/([0-9]{8})([0-9]{4})(F[0-9]..)/([^/]*)/.* +# FILE -edex -close /awips2/data_store/grid/(\1:yyyy)(\1:mm)\1/\2/MRMS/MRMS_CA_\4_\5_\6_\7.grib2 +#Guam Domain +#NGRID ^YAG[A-Z][0-9][0-9] KWNR (..)(..)(..) !grib2/[^/]*/[^/]*/#[^/]*/([0-9]{8})([0-9]{4})(F[0-9]..)/([^/]*)/.* +# FILE -edex -close /awips2/data_store/grid/(\1:yyyy)(\1:mm)\1/\2/MRMS/MRMS_GU_\4_\5_\6_\7.grib2 +evel Rotation Track Products (on different grid) # NGRID ^YAUS0[5-9] KWNR ...... !grib2/[^/]*/[^/]*/#[^/]*/([0-9]{8})([0-9]{4})(F[0-9]..)/([^/]*)/.* FILE -edex -close