diff --git a/build/awips-ade/docker_build.sh b/build/awips-ade/docker_build.sh index 5a700518ca..d9fdcc8103 100755 --- a/build/awips-ade/docker_build.sh +++ b/build/awips-ade/docker_build.sh @@ -13,4 +13,5 @@ pushd /awips2/repo/awips2-builds/build/awips-ade sudo docker build -t unidata/awips-ade -f Dockerfile.awips-ade.${os_version} . dockerID=$(sudo docker images | grep awips-ade | grep latest | awk '{print $3}' | head -1 ) sudo docker tag $dockerID unidata/awips-ade:17.1.1-${os_version} +sudo docker rmi unidata/awips-ade:latest sudo docker push unidata/awips-ade diff --git a/build/buildEnvironment.sh b/build/buildEnvironment.sh index 4e8c76e16b..05b8890bf9 100755 --- a/build/buildEnvironment.sh +++ b/build/buildEnvironment.sh @@ -1,7 +1,7 @@ #!/bin/bash # Version export AWIPSII_VERSION="17.1.1" -export AWIPSII_RELEASE="4" +export AWIPSII_RELEASE="5" # Author export AWIPSII_BUILD_VENDOR="UCAR" export AWIPSII_BUILD_SITE="Unidata" diff --git a/build/build_rpms.sh b/build/build_rpms.sh index 88cdb97f9f..08de80407e 100755 --- a/build/build_rpms.sh +++ b/build/build_rpms.sh @@ -13,6 +13,7 @@ pushd $REPO # if not mounted to docker container, clone from github if [ ! -d awips2-ncep ]; then git clone https://github.com/Unidata/awips2-ncep.git --branch unidata_${AWIPSII_VERSION} --single-branch ;fi +if [ ! -d awips2-goesr ]; then git clone https://github.com/Unidata/awips2-goesr.git --branch unidata_${AWIPSII_VERSION} --single-branch ;fi if [ ! -d awips2-core ]; then git clone https://github.com/Unidata/awips2-core.git --branch unidata_${AWIPSII_VERSION} --single-branch ;fi if [ ! -d awips2-core-foss ]; then git clone https://github.com/Unidata/awips2-core-foss.git --branch unidata_${AWIPSII_VERSION} --single-branch ;fi if [ ! -d awips2-foss ]; then git clone https://github.com/Unidata/awips2-foss.git --branch unidata_${AWIPSII_VERSION} --single-branch ;fi @@ -35,13 +36,13 @@ if [ ! -z "$prog" ]; then su - awips -c "/bin/bash $buildsh -b $prog" else # Build all groups (in this order) - #su - awips -c "/bin/bash $buildsh -ade" - #su - awips -c "/bin/bash $buildsh -python" - #su - awips -c "/bin/bash $buildsh -qpid" - #su - awips -c "/bin/bash $buildsh -server" + su - awips -c "/bin/bash $buildsh -ade" + su - awips -c "/bin/bash $buildsh -python" + su - awips -c "/bin/bash $buildsh -qpid" + su - awips -c "/bin/bash $buildsh -server" su - awips -c "/bin/bash $buildsh -edex" - #su - awips -c "/bin/bash $buildsh -database" - #su - awips -c "/bin/bash $buildsh -cave" + su - awips -c "/bin/bash $buildsh -database" + su - awips -c "/bin/bash $buildsh -cave" fi # Manage RPMs diff --git a/build/rsync.dirs b/build/rsync.dirs index 11b4734976..6e9b0ff4a1 100644 --- a/build/rsync.dirs +++ b/build/rsync.dirs @@ -17,3 +17,5 @@ javaUtilities/* rpms pythonPackages nativeLib/* ../awips2-ncep/viz/* ../awips2-ncep/features/* ../awips2-ncep/edex/* +../awips2-goesr/edexOsgi/* +../awips2-goesr/cave/* diff --git a/build/setup.sh b/build/setup.sh index 8bf6447cdd..10dbde76fc 100755 --- a/build/setup.sh +++ b/build/setup.sh @@ -14,8 +14,9 @@ if [ -d /awips2/repo/awips2-core-foss ]; then corefoss_dir=" -v /awips2/repo/awi if [ -d /awips2/repo/awips2-foss ]; then foss_dir=" -v /awips2/repo/awips2-foss:/awips2/repo/awips2-foss " ;fi if [ -d /awips2/repo/awips2-nws ]; then nws_dir=" -v /awips2/repo/awips2-nws:/awips2/repo/awips2-nws " ;fi if [ -d /awips2/repo/awips2-ncep ]; then ncep_dir=" -v /awips2/repo/awips2-ncep:/awips2/repo/awips2-ncep " ;fi +if [ -d /awips2/repo/awips2-goesr ]; then goesr_dir=" -v /awips2/repo/awips2-goesr:/awips2/repo/awips2-goesr " ;fi if [ -d /awips2/repo/python-awips ]; then python_dir=" -v /awips2/repo/python-awips:/awips2/repo/python-awips " ;fi -dirs=$builds_dir$static_dir$rpm_dir$core_dir$corefoss_dir$foss_dir$nws_dir$ncep_dir$python_dir +dirs=$builds_dir$static_dir$rpm_dir$core_dir$corefoss_dir$foss_dir$nws_dir$ncep_dir$goesr_dir$python_dir # run sudo docker run --entrypoint=/bin/bash --privileged -d -ti -e "container=docker" $dirs unidata/awips-ade:17.1.1-$os_version diff --git a/cave/build/p2-build.xml b/cave/build/p2-build.xml index 42264c8fe2..5204e27915 100644 --- a/cave/build/p2-build.xml +++ b/cave/build/p2-build.xml @@ -199,9 +199,6 @@ - - - diff --git a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml index c70cd74782..b7b26ef254 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml @@ -377,14 +377,7 @@ - - - - - - - - + -Dfile.encoding=UTF-8 diff --git a/cave/com.raytheon.viz.product.awips/plugin.properties b/cave/com.raytheon.viz.product.awips/plugin.properties index facc9bae30..a187d7dda0 100644 --- a/cave/com.raytheon.viz.product.awips/plugin.properties +++ b/cave/com.raytheon.viz.product.awips/plugin.properties @@ -3,6 +3,5 @@ on the Raytheon viz environment, released as non-operational \ software by UCAR's Unidata Program Center\n\ http://www.unidata.ucar.edu/software/awips \ \n\n\ -\tVersion: {0}\n\ \tBuild system: {3} -caveVersion={0} \ No newline at end of file +caveVersion={0} diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesr-dmwBundleByPressure.xml b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesr-dmwBundleByPressure.xml index 90ff4175a6..7d24ce71eb 100644 --- a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesr-dmwBundleByPressure.xml +++ b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesr-dmwBundleByPressure.xml @@ -1,29 +1,4 @@ - - - - - - - - + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseSatellite.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseSatellite.xml index f746bfb0cb..90f255ea06 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseSatellite.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseSatellite.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD - - - - - - +======= + - +======= + - - + + + + + + + + + + + +>>>>>>> unidata/unidata_17.1.1 + + + + - - - - - - + menuText="Antarctica WV" id="Arctic-WV"> - - + + - - + --> + - - - - - - - - - - - - + menuText="Global Rectilinear 20km WV" id="waterVapor"> - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<<<<<<< HEAD + + + +======= + + + + + + + + + + + + + + + + + +>>>>>>> unidata/unidata_17.1.1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<<<<<<< HEAD +======= + +>>>>>>> unidata/unidata_17.1.1 diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseSounderImagery.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseSounderImagery.xml deleted file mode 100644 index 1c312f4335..0000000000 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseSounderImagery.xml +++ /dev/null @@ -1,337 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenu.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenu.xml index b062532312..ffa6c95ad1 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenu.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenu.xml @@ -1,21 +1,41 @@ +<<<<<<< HEAD +======= + + + + + + +>>>>>>> unidata/unidata_17.1.1 diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByChannel.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByChannel.xml index 75b43aa5fd..4f186ebf69 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByChannel.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByChannel.xml @@ -1,37 +1,25 @@ - - - - - +======= + menuText="0.64 μm Red Visible (Ch 02 Daytime)" id="goesr-DMW-Channel-03"> +>>>>>>> unidata/unidata_17.1.1 +======= + menuText="3.90μm Shortwave IR (Ch 07 Nighttime)" id="goesr-DMW-Channel-07"> +>>>>>>> unidata/unidata_17.1.1 diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByFilter.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByFilter.xml index d980d95122..8dba391301 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByFilter.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByFilter.xml @@ -1,5 +1,8 @@ +<<<<<<< HEAD +======= +>>>>>>> unidata/unidata_17.1.1 @@ -52,6 +55,7 @@ +<<<<<<< HEAD +======= + + + + +>>>>>>> unidata/unidata_17.1.1 - +<<<<<<< HEAD @@ -237,8 +247,14 @@ +======= + + + + + +>>>>>>> unidata/unidata_17.1.1 - diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByMandatoryLevels.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByMandatoryLevels.xml deleted file mode 100644 index d064fce61f..0000000000 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByMandatoryLevels.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByPressure.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByPressure.xml index 08d478eb14..74e0858379 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByPressure.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByPressure.xml @@ -8,14 +8,30 @@ - + + + + + + + + - + menuText="200mb (150-250mb)" id="goesr-DMW-ManWinds-200mb"> + + + + + + + + + + + + + + + + + + + + + + - @@ -99,4 +80,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrByChannel.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrByChannel.xml index 97e9928428..a27fe214a0 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrByChannel.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrByChannel.xml @@ -87,6 +87,7 @@ +<<<<<<< HEAD @@ -112,5 +113,33 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> unidata/unidata_17.1.1 \ No newline at end of file diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrMenu.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrMenu.xml index 989f792e07..7da5f3e163 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrMenu.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrMenu.xml @@ -9,12 +9,25 @@ fileName="menus/satellite/goesr/goesrLevel2.xml"> +<<<<<<< HEAD +======= + + + + + + +>>>>>>> unidata/unidata_17.1.1 +<<<<<<< HEAD +======= +>>>>>>> unidata/unidata_17.1.1 +<<<<<<< HEAD @@ -307,4 +321,8 @@ +======= + + +>>>>>>> unidata/unidata_17.1.1 diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrRGBComposites.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrRGBComposites.xml new file mode 100644 index 0000000000..6bed4f2dbe --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrRGBComposites.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/index.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/index.xml index fd6f55461a..6d6a107fc5 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/index.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/index.xml @@ -1,5 +1,6 @@ +<<<<<<< HEAD @@ -11,4 +12,12 @@ +======= + + + + +>>>>>>> unidata/unidata_17.1.1 \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java index 0f10238a50..dc0a351bc9 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java @@ -78,6 +78,7 @@ import com.raytheon.uf.edex.site.notify.SendSiteActivationNotifications; * Feb 25, 2015 #4128 dgilling Simplify activation of active table sharing. * Mar 11, 2015 #4128 dgilling Refactor activation and management of ISC services. * Dec 22, 2015 #4262 dgilling Implement EdexAsyncStartupBean. + * Dec 21, 2017 mjames@ucar Cleaner activation messages. * * * @@ -297,11 +298,9 @@ public class GFESiteActivation implements ISiteActivationListener, IFPServerConfig config = null; try { - statusHandler.info("Activating " + siteID + "..."); - - statusHandler.info("IFPServerConfigManager initializing..."); + statusHandler.info("Initializing IFPServerConfigManager for " + siteID); config = IFPServerConfigManager.initializeSite(siteID); - statusHandler.info("Activating IFPServer..."); + statusHandler.info("Activating IFPServer for " + siteID); IFPServer.activateServer(siteID, config); } finally { statusHandler diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/config/Maps.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/config/Maps.py index ca5437b4f7..5418aae763 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/config/Maps.py +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/config/Maps.py @@ -299,18 +299,6 @@ rfc.name = "RFC" rfc.editAreaName = ['ISC','site_id'] rfc.groupName = 'ISC' -# NHA ISC area -domain = ShapeTable('nhadomain') -domain.name = "TropicalISC" -domain.groupName = "ISC" -domain.editAreaName = "ISC_NHA" - -# Storm Surge Watch/Warning Area -stormsurgeww = ShapeTable('stormsurgeww') -stormsurgeww.name = "StormSurgeWW" -stormsurgeww.groupName = "SurgeCollab" -stormsurgeww.editAreaName = "StormSurgeWW_EditArea" - # Offshore Marine Zones - unfiltered offshore = ShapeTable('offshore') offshore.name = "Offshore_Marine_Zones" diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py b/edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py index b7366e5726..aec912869f 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py +++ b/edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py @@ -277,8 +277,10 @@ class GribDecoder(): data = numpy.where(data == secondaryFill, F32_GRID_FILL_VALUE, data) gridCoverage = gribDict['coverage'] - nx = gridCoverage.getNx().intValue() - ny = gridCoverage.getNy().intValue() + #nx = gridCoverage.getNx().intValue() + #ny = gridCoverage.getNy().intValue() + nx = gridCoverage.getNx() + ny = gridCoverage.getNy() # Correct the data according to the scan mode found in the gds section. scanMode = gribDict['scanMode'] diff --git a/installCAVE.sh b/installCAVE.sh index 0f58791830..ced7892f8d 100755 --- a/installCAVE.sh +++ b/installCAVE.sh @@ -32,8 +32,8 @@ echo '' # if [[ $(rpm -qa | grep awips2-cave) ]]; then echo "found CAVE installed. Checking version..." - caveVersion=$(rpm -qa | grep awips2-cave-1| cut -d"-" -f3 ) - versionMajor=$(rpm -qa | grep awips2-cave-1| cut -d"-" -f3 | cut -c -2) + caveVersion=$(rpm -qa | grep awips2-cave | head -1 | cut -d"-" -f3 ) + versionMajor=$(rpm -qa | grep awips2-cave | head -1 | cut -d"-" -f3 | cut -c -2) if [[ ${versionMajor} -lt 16 ]]; then echo "CAVE ${caveVersion} installed. Removing to update..." yum groupremove awips2-cave -y diff --git a/rpms/awips2.core/Installer.localization/component.spec b/rpms/awips2.core/Installer.localization/component.spec index cf2b4b64f3..cc8962b30c 100644 --- a/rpms/awips2.core/Installer.localization/component.spec +++ b/rpms/awips2.core/Installer.localization/component.spec @@ -249,20 +249,6 @@ function importShapefiles() return 0 fi echo "INFO: The FFMP shapefiles were successfully imported." - - static_shp_directory="${edex_utility}/edex_static/base/shapefiles" - /bin/bash ${a2_shp_script} \ - ${static_shp_directory}/NHAdomain/NHAdomain.shp mapdata nhadomain - if [ $? -ne 0 ]; then - echo "FATAL: failed to import NHAdomain." - fi - /bin/bash ${a2_shp_script} \ - ${static_shp_directory}/StormSurgeWW/StormSurgeWW.shp mapdata stormsurgeww - if [ $? -ne 0 ]; then - echo "FATAL: failed to import StormSurgeWW." - fi - echo "INFO: NHAdomain and StormSurgeWW shapefiles were successfully imported." - } function removeHydroDbDirectory() diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf b/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf index b7af07c9b1..fb19318c5f 100644 --- a/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf +++ b/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf @@ -106,8 +106,12 @@ REQUEST CONDUIT "nam" idd.unidata.ucar.edu REQUEST CONDUIT "pgrb2" idd.unidata.ucar.edu # NDFD REQUEST CONDUIT "nwstg" idd.unidata.ucar.edu -# GOES-16(R) Experimental/Provisional +# GOES-East/16(R) REQUEST NOTHER "^TI[RS]... KNES.*" idd.unidata.ucar.edu +# GOES-East GLM +REQUEST DIFAX "GLM" idd.unidata.ucar.edu +# GOES-East +REQUEST EXP ".*" lead.unidata.ucar.edu # CMC REQUEST CMC ".*" idd.unidata.ucar.edu # CONDUIT RAP40 diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf index 42366c2008..9d2babb670 100644 --- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf +++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf @@ -124,29 +124,50 @@ ANY ^([PQ][A-Z0-9]{3,5}) (....) (..)(..)(..) !redbook [^/]*/([^/]*)/([^/]*)/([^/ NIMAGE ^(sat[^/]*)/ch[0-9]/([^/]*)/([^/]*)/([^ ]*) ([^/]*)/([^/]*)/([^/]*)/ (TI.[EFNW]..) ([^ ]*) (..)(..)(..) FILE -overwrite -close -edex /awips2/data_store/sat/\(11)\(12)Z_\3_\7_\6-\8_\9.satz.gini - # -# GOES East (16/R) +# GOES-East/16(R) imagery sectors # -NOTHER ^(TIR...) (KNES) (......) (...) +NOTHER ^(TI....) (KNES) (......) (...) FILE -close -edex - /awips2/data_store/satellite/goes16/\1_\2_\3_\4_(seq).gini -# A=Alaska, H=Hawaii, P=Puerto Rico -#NOTHER ^(TIR[AHP]..) (KNES) (......) (...) -# FILE -close -edex -# /awips2/data_store/satellite/goes16/\1_\2_\3_\4_(seq).gini + /awips2/data_store/goesr/noaaport/\1_\2_\3_\4_(seq).gini # -# GOES East (16/R) mesoscale sectors +# GOES-East/16(R) imagery sectors # -#NOTHER ^(TIS...) (KNES) (......) (...) -# FILE -close -edex -# /awips2/data_store/satellite/goes16/\1_\2_\3_\4_(seq).gini +EXP ^/data/ldm/pub/native/satellite/GOES/GOES16/([^/]*)/([^/]*)/([0-9]{8})/GOES16_([^/]*).nc4 + FILE -close -edex + /awips2/data_store/goesr/exp/GOES16_\4.nc4 +# EXP 000 /data/ldm/pub/native/satellite/GOES/GOES16/Mesoscale-2/Channel05/20180118/GOES16_Mesoscale-2_20180118_234657_1.61_1km_37.8N_87.0W.nc4 # -# GOES East (16/R) Derived Products +# +# GOES-East/16(R) derived products # HDS ^(IXT.99) KNES (......) FILE -close -edex - /awips2/data_store/goesr-derived/KNES_\1_\2-(seq) + /awips2/data_store/goesr/derived/KNES_\1_\2-(seq) +# GLM +DIFAX ^/data/cspp-geo/GRB-R/OR_GLM-L2-([^/]*).nc + FILE -close -edex + /awips2/data_store/goesr/glm/OR_GLM-L2-\1.nc +# ABI +#DIFAX ^/data/cspp-geo/GRB-R/OR_ABI-L1b-([^/]*).nc +# FILE -close -edex +# /awips2/data_store/goesr/abi/OR_ABI-L1b-\1.nc +# EXIS +#DIFAX ^/data/cspp-geo/GRB-R/OR_EXIS-L1b-([^/]*).nc +# FILE -close -edex +# /awips2/data_store/goesr/exis/OR_EXIS-L1b-\1.nc +# SEIS +#DIFAX ^/data/cspp-geo/GRB-R/OR_SEIS-L1b-([^/]*).nc +# FILE -close -edex +# /awips2/data_store/goesr/seis/OR_SEIS-L1b-\1.nc +# MAG +#DIFAX ^/data/cspp-geo/GRB-R/OR_MAG-L1b-([^/]*).nc +# FILE -close -edex +# /awips2/data_store/goesr/mag/OR_MAG-L1b-\1.nc +# SUVI +#DIFAX ^/data/cspp-geo/GRB-R/OR_SUVI-L1b-([^/]*).nc +# FILE -close -edex +# /awips2/data_store/goesr/suvi/OR_SUVI-L1b-\1.nc # # NPP/VIIRS # diff --git a/rpms/awips2.upc/Installer.ldm/patch/init.d/edex_ldm b/rpms/awips2.upc/Installer.ldm/patch/init.d/edex_ldm index aab6cd461a..202fd2edb7 100755 --- a/rpms/awips2.upc/Installer.ldm/patch/init.d/edex_ldm +++ b/rpms/awips2.upc/Installer.ldm/patch/init.d/edex_ldm @@ -41,7 +41,6 @@ function clean_ldm() { case $1 in 'start') - if ! clean_ldm; then exit 1 ; fi su ${LDM_USER} -lc "ldmadmin start" ;;