From 1900cef1569f1a88a974e8f030fdbfb9525bee67 Mon Sep 17 00:00:00 2001 From: Steve Harris Date: Wed, 28 Aug 2013 09:43:48 -0400 Subject: [PATCH] 13.5.2-1 baseline Former-commit-id: 894d2425b2e9121926d30ef03d8e812dc064f1d5 [formerly 73dd0f166c47b640ac398e6b67feac27fa4745b8] [formerly 894d2425b2e9121926d30ef03d8e812dc064f1d5 [formerly 73dd0f166c47b640ac398e6b67feac27fa4745b8] [formerly 542b2c3d18a8c1c9edbbd4078d923cb928d318ed [formerly a362ca91ee5972a1501a2842191fbe2e23feac9c]]] Former-commit-id: 542b2c3d18a8c1c9edbbd4078d923cb928d318ed Former-commit-id: 43af1b227ac77d333606a3a850e4aec5c8686074 [formerly 4ecb349ed86b77863512bca4dc3e1ace5e4811e6] Former-commit-id: 4a9a91ce2e54574fa7f3db4a760ad10080ffb4c6 --- .../cave/etc/ncep/Bundles/GeoMagPlot.xml | 118 + .../cave/etc/ncep/PredefinedAreas/ICAO-B.xml | 36 + .../etc/ncep/PredefinedAreas/S_Hemisphere.xml | 29 + .../etc/ncep/PredefinedAreas/gempak/geog.xml | 12 +- .../ncep/PredefinedAreas/menus/AreaMenus.xml | 11 +- .../ncep/ResourceDefns/OVERLAYS/88Ds/88Ds.xml | 6 +- .../ResourceDefns/OVERLAYS/88Ds/default.attr | 4 +- .../Airports/Airports.xml} | 21 +- .../OVERLAYS/Airports/default.attr | 9 + .../Buoys/Buoys.xml} | 21 +- .../ResourceDefns/OVERLAYS/Buoys/default.attr | 4 +- .../BuoysFixed/BuoysFixed.xml} | 22 +- .../OVERLAYS/BuoysFixed/default.attr | 9 + .../CMAN/CMAN.xml} | 23 +- .../ResourceDefns/OVERLAYS/CMAN/default.attr | 9 + .../ncep/ResourceDefns/OVERLAYS/CWAs/CWAs.xml | 2 + .../ResourceDefns/OVERLAYS/Cities/Cities.xml | 25 + .../OVERLAYS/Cities/default.attr | 3 +- .../OVERLAYS/DwmStns/DwmStns.xml | 5 +- .../OVERLAYS/DwmStns/default.attr | 4 +- .../OVERLAYS/FfgZones/FfgZones.xml | 21 + .../OVERLAYS/FfgZones/default.attr | 9 + .../OVERLAYS/IcaoStations/IcaoStations.xml | 21 + .../OVERLAYS/IcaoStations/default.attr | 9 + .../OVERLAYS/Locator/Locator.xml | 2 +- .../OVERLAYS/Locator/snapPoints.attr | 25 + .../OVERLAYS/MetarStations/MetarStations.xml | 19 + .../OVERLAYS/MetarStations/default.attr | 4 +- .../ResourceDefns/OVERLAYS/Nexrad/Nexrad.xml | 25 + .../OVERLAYS/Nexrad/default.attr | 4 +- .../ResourceDefns/OVERLAYS/RAOBs/RAOBs.xml | 22 + .../ResourceDefns/OVERLAYS/RAOBs/default.attr | 4 +- .../OVERLAYS/Railroads/Railroads.xml | 20 + .../OVERLAYS/RaobNames/RaobNames.xml | 22 + .../OVERLAYS/RaobNames/default.attr | 9 + .../OVERLAYS/SfcStns/SfcStns.xml | 5 +- .../OVERLAYS/SfcStns/default.attr | 4 +- .../OVERLAYS/SpcWatchName/SpcWatchName.xml | 21 + .../OVERLAYS/SpcWatchName/default.attr | 9 + .../SynopStationIds/SynopStationIds.xml | 20 + .../OVERLAYS/SynopStationIds/default.attr | 9 + .../ncep/ResourceDefns/OVERLAYS/VORs/VORs.xml | 5 +- .../ResourceDefns/OVERLAYS/VORs/default.attr | 6 +- .../OVERLAYS/VolcanoNames/VolcanoNames.xml | 5 +- .../OVERLAYS/VolcanoNames/default.attr | 4 +- .../OVERLAYS/Volcanos/Volcanos.xml | 5 +- .../OVERLAYS/Volcanos/default.attr | 4 +- .../OVERLAYS/VolcanosAll/VolcanosAll.xml | 19 + .../OVERLAYS/VolcanosAll/default.attr | 9 + .../OVERLAYS/VorNames/VorNames.xml | 21 + .../OVERLAYS/VorNames/default.attr | 9 + .../ncep/ResourceDefns/OVERLAYS/WFOs/WFOs.xml | 5 +- .../ResourceDefns/OVERLAYS/WFOs/default.attr | 4 +- .../OVERLAYS/countyCluster/countyCluster.xml | 5 +- .../OVERLAYS/countyCluster/default.attr | 6 +- .../OVERLAYS/countyNames/countyNames.xml | 5 +- .../OVERLAYS/countyNames/default.attr | 4 +- .../OVERLAYS/cpcStations/cpcStations.xml | 5 +- .../OVERLAYS/cpcStations/default.attr | 4 +- .../OVERLAYS/snapPoints/default.attr | 4 +- .../OVERLAYS/snapPoints/snapPoints.xml | 11 +- .../OVERLAYS/spcwatch/default.attr | 6 +- .../OVERLAYS/spcwatch/spcwatch.xml | 5 +- .../ResourceDefns/OVERLAYS/wrqpf/default.attr | 6 +- .../ResourceDefns/OVERLAYS/wrqpf/wrqpf.xml | 5 +- .../Atlantic_500mb/Atlantic_500mb.xml} | 26 +- .../PGEN/Atlantic_500mb/default.attr | 6 + .../Atlantic_Surface/Atlantic_Surface.xml | 25 + .../PGEN/Atlantic_Surface/default.attr | 6 + .../Atlantic_Wind_Wave/Atlantic_Wind_Wave.xml | 22 +- .../PGEN/Atlantic_Wind_Wave/default.attr | 6 + .../ResourceDefns/PGEN/CCFP-ByZ/CCFP-ByZ.xml | 25 + .../ResourceDefns/PGEN/CCFP-ByZ/default.attr | 6 + .../etc/ncep/ResourceDefns/PGEN/CCFP/CCFP.xml | 22 +- .../ncep/ResourceDefns/PGEN/CCFP/default.attr | 6 + .../PGEN/CONV_SIGMET/CONV_SIGMET.xml | 22 +- .../PGEN/CONV_SIGMET/default.attr | 6 + .../Convective_Outlook/Convective_Outlook.xml | 22 +- .../PGEN/Convective_Outlook/default.attr | 6 + .../PGEN/Extended_Range/Extended_Range.xml | 22 +- .../PGEN/Extended_Range/default.attr | 6 + .../G_AIRMET-ByLabel/G_AIRMET-ByLabel.xml | 25 + .../PGEN/G_AIRMET-ByLabel/default.attr | 6 + .../G_AIRMET-BySubType/G_AIRMET-BySubType.xml | 25 + .../PGEN/G_AIRMET-BySubType/default.attr | 6 + .../PGEN/G_AIRMET-East/G_AIRMET-East.xml | 25 + .../PGEN/G_AIRMET-East/default.attr | 6 + .../PGEN/G_AIRMET-West/G_AIRMET-West.xml | 25 + .../PGEN/G_AIRMET-West/default.attr | 6 + .../ResourceDefns/PGEN/G_AIRMET/G_AIRMET.xml | 22 +- .../ResourceDefns/PGEN/G_AIRMET/default.attr | 6 + .../PGEN/HPC_Basic_WX/HPC_Basic_WX.xml | 22 +- .../PGEN/HPC_Basic_WX/default.attr | 6 + .../ResourceDefns/PGEN/HPC_QPF/HPC_QPF.xml | 22 +- .../ResourceDefns/PGEN/HPC_QPF/default.attr | 6 + .../PGEN/Hazard_Outlook/Hazard_Outlook.xml | 22 +- .../PGEN/Hazard_Outlook/default.attr | 6 + .../International_Sigmet.xml | 22 +- .../PGEN/International_Sigmet/default.attr | 6 + .../PGEN/NONCONV_SIGMET/NONCONV_SIGMET.xml | 22 +- .../PGEN/NONCONV_SIGMET/default.attr | 6 + .../SIGWX_High-BySubType.xml | 25 + .../PGEN/SIGWX_High-BySubType/default.attr | 6 + .../SIGWX_High-North/SIGWX_High-North.xml | 25 + .../PGEN/SIGWX_High-North/default.attr | 6 + .../PGEN/SIGWX_High/SIGWX_High.xml | 24 +- .../PGEN/SIGWX_High/default.attr | 6 + .../ResourceDefns/PGEN/SIGWX_Low/SIGWX_Low | 24 +- .../ResourceDefns/PGEN/SIGWX_Low/default.attr | 6 + .../PGEN/SIGWX_Medium/SIGWX_Medium.xml | 22 +- .../PGEN/SIGWX_Medium/default.attr | 6 + .../ncep/ResourceDefns/PGEN/Sample/Sample.xml | 22 +- .../ResourceDefns/PGEN/Sample/default.attr | 6 + .../Surface_Analysis/Surface_Analysis.xml | 22 +- .../PGEN/Surface_Analysis/default.attr | 6 + .../ResourceDefns/PGEN/VOLCANO/VOLCANO.xml | 25 + .../ncep/ResourceDefns/ResourceFilters.xml | 238 +- .../ncep/ResourceDefns/SATELLITE/FYC/IR2.attr | 7 - .../ncep/ResourceDefns/SATELLITE/FYC/SW.attr | 7 - .../SATELLITE/GINI_Composite/CLOUD_WATER.attr | 7 - .../GINI_Composite/DERIVED_CAPE.attr | 7 - .../GINI_Composite/DERIVED_CONV_INH.attr | 7 - .../GINI_Composite/DERIVED_LAND_SEA_TEMP.attr | 7 - .../GINI_Composite/DERIVED_VOLCANO_IMG.attr | 7 - .../GINI_Composite/DERIVED_WINDEX.attr | 7 - .../SATELLITE/GINI_Composite/DMPI.attr | 7 - .../GINI_Composite/GRID_CLOUD_AMT.attr | 7 - .../GINI_Composite/GRID_CTOP_PRES_HGHT.attr | 7 - .../SATELLITE/GINI_Composite/ICE_CONC.attr | 7 - .../SATELLITE/GINI_Composite/ICE_EDGE.attr | 7 - .../SATELLITE/GINI_Composite/ICE_TYPE.attr | 7 - .../GINI_Composite/IMG_LIFTED_INDEX.attr | 7 - .../GINI_Composite/IMG_PRECIP_WATER.attr | 7 - .../GINI_Composite/IMG_SRFC_SKIN_TEMP.attr | 7 - .../GINI_Composite/LOW_CLOUD_IMG.attr | 7 - .../SATELLITE/GINI_Composite/MDPI.attr | 7 - .../GINI_Composite/NORMAL_TPW_PERCENT.attr | 7 - .../SATELLITE/GINI_Composite/POLAR_3.7u.attr | 7 - .../SATELLITE/GINI_Composite/POLAR_3.9u.attr | 7 - .../SATELLITE/GINI_Composite/POLAR_IR.attr | 7 - .../SATELLITE/GINI_Composite/POLAR_VIS.attr | 7 - .../SATELLITE/GINI_Composite/RAIN_RATE.attr | 7 - .../GINI_Composite/SCATTEROMETER.attr | 7 - .../SATELLITE/GINI_Composite/SFC_WETNESS.attr | 7 - .../GINI_Composite/SFC_WIND_SPD.attr | 7 - .../SATELLITE/GINI_Composite/SND_12.02.attr | 7 - .../SATELLITE/GINI_Composite/SND_12.66.attr | 7 - .../SATELLITE/GINI_Composite/SND_13.37.attr | 7 - .../SATELLITE/GINI_Composite/SND_13.64.attr | 7 - .../SATELLITE/GINI_Composite/SND_14.37.attr | 7 - .../SATELLITE/GINI_Composite/SND_14.71.attr | 7 - .../SATELLITE/GINI_Composite/SND_3.74.attr | 7 - .../SATELLITE/GINI_Composite/SND_4.13.attr | 7 - .../SATELLITE/GINI_Composite/SND_4.52.attr | 7 - .../SATELLITE/GINI_Composite/SND_4.57.attr | 7 - .../SATELLITE/GINI_Composite/SND_9.71.attr | 7 - .../GINI_Composite/SND_LIFTED_INDEX.attr | 7 - .../GINI_Composite/SND_PRECIP_WATER.attr | 7 - .../GINI_Composite/SND_SFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_Composite/SNOW_IND.attr | 7 - .../SATELLITE/GINI_Composite/SNOW_WATER.attr | 7 - .../GINI_Composite/SURFACE_TYPE.attr | 7 - .../SATELLITE/GINI_DMSP/CLOUD_WATER.attr | 7 - .../SATELLITE/GINI_DMSP/DERIVED_CAPE.attr | 7 - .../SATELLITE/GINI_DMSP/DERIVED_CONV_INH.attr | 7 - .../GINI_DMSP/DERIVED_LAND_SEA_TEMP.attr | 7 - .../GINI_DMSP/DERIVED_VOLCANO_IMG.attr | 7 - .../SATELLITE/GINI_DMSP/DERIVED_WINDEX.attr | 7 - .../SATELLITE/GINI_DMSP/DMPI.attr | 7 - .../SATELLITE/GINI_DMSP/GRID_CLOUD_AMT.attr | 7 - .../GINI_DMSP/GRID_CTOP_PRES_HGHT.attr | 7 - .../SATELLITE/GINI_DMSP/ICE_CONC.attr | 7 - .../SATELLITE/GINI_DMSP/ICE_EDGE.attr | 7 - .../SATELLITE/GINI_DMSP/ICE_TYPE.attr | 7 - .../SATELLITE/GINI_DMSP/IMG_LIFTED_INDEX.attr | 7 - .../SATELLITE/GINI_DMSP/IMG_PRECIP_WATER.attr | 7 - .../GINI_DMSP/IMG_SRFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_DMSP/IR13.attr | 8 - .../SATELLITE/GINI_DMSP/LOW_CLOUD_IMG.attr | 7 - .../SATELLITE/GINI_DMSP/MDPI.attr | 7 - .../GINI_DMSP/NORMAL_TPW_PERCENT.attr | 7 - .../SATELLITE/GINI_DMSP/POLAR_3.7u.attr | 7 - .../SATELLITE/GINI_DMSP/POLAR_3.9u.attr | 7 - .../SATELLITE/GINI_DMSP/POLAR_IR.attr | 7 - .../SATELLITE/GINI_DMSP/POLAR_VIS.attr | 7 - .../SATELLITE/GINI_DMSP/RAIN_RATE.attr | 7 - .../SATELLITE/GINI_DMSP/SCATTEROMETER.attr | 7 - .../SATELLITE/GINI_DMSP/SFC_WETNESS.attr | 7 - .../SATELLITE/GINI_DMSP/SFC_WIND_SPD.attr | 7 - .../SATELLITE/GINI_DMSP/SND_11.03.attr | 7 - .../SATELLITE/GINI_DMSP/SND_12.02.attr | 7 - .../SATELLITE/GINI_DMSP/SND_12.66.attr | 7 - .../SATELLITE/GINI_DMSP/SND_13.37.attr | 7 - .../SATELLITE/GINI_DMSP/SND_13.64.attr | 7 - .../SATELLITE/GINI_DMSP/SND_14.06.attr | 7 - .../SATELLITE/GINI_DMSP/SND_14.37.attr | 7 - .../SATELLITE/GINI_DMSP/SND_14.71.attr | 7 - .../SATELLITE/GINI_DMSP/SND_3.74.attr | 7 - .../SATELLITE/GINI_DMSP/SND_3.98.attr | 7 - .../SATELLITE/GINI_DMSP/SND_4.13.attr | 7 - .../SATELLITE/GINI_DMSP/SND_4.45.attr | 7 - .../SATELLITE/GINI_DMSP/SND_4.52.attr | 7 - .../SATELLITE/GINI_DMSP/SND_4.57.attr | 7 - .../SATELLITE/GINI_DMSP/SND_6.51.attr | 7 - .../SATELLITE/GINI_DMSP/SND_7.02.attr | 7 - .../SATELLITE/GINI_DMSP/SND_7.43.attr | 7 - .../SATELLITE/GINI_DMSP/SND_9.71.attr | 7 - .../SATELLITE/GINI_DMSP/SND_LIFTED_INDEX.attr | 7 - .../SATELLITE/GINI_DMSP/SND_PRECIP_WATER.attr | 7 - .../GINI_DMSP/SND_SFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_DMSP/SND_VIS.attr | 7 - .../SATELLITE/GINI_DMSP/SNOW_IND.attr | 7 - .../SATELLITE/GINI_DMSP/SNOW_WATER.attr | 7 - .../SATELLITE/GINI_DMSP/SURFACE_TYPE.attr | 7 - .../SATELLITE/GINI_DMSP/default.attr | 7 - .../CLOUD_WATER.attr | 7 - .../DERIVED_CAPE.attr | 7 - .../DERIVED_CONV_INH.attr | 7 - .../DERIVED_LAND_SEA_TEMP.attr | 7 - .../DERIVED_VOLCANO_IMG.attr | 7 - .../DERIVED_WINDEX.attr | 7 - .../DMPI.attr | 7 - .../GINI_ERS-QuickSCAT-Scatterometer.xml | 21 - .../GRID_CLOUD_AMT.attr | 7 - .../GRID_CTOP_PRES_HGHT.attr | 7 - .../ICE_CONC.attr | 7 - .../ICE_EDGE.attr | 7 - .../ICE_TYPE.attr | 7 - .../IMG_LIFTED_INDEX.attr | 7 - .../IMG_PRECIP_WATER.attr | 7 - .../IMG_SRFC_SKIN_TEMP.attr | 7 - .../GINI_ERS-QuickSCAT-Scatterometer/IR.attr | 8 - .../IR13.attr | 8 - .../LOW_CLOUD_IMG.attr | 7 - .../MDPI.attr | 7 - .../NORMAL_TPW_PERCENT.attr | 7 - .../POLAR_3.7u.attr | 7 - .../POLAR_3.9u.attr | 7 - .../POLAR_IR.attr | 7 - .../POLAR_VIS.attr | 7 - .../RAIN_RATE.attr | 7 - .../SCATTEROMETER.attr | 7 - .../SFC_WETNESS.attr | 7 - .../SFC_WIND_SPD.attr | 7 - .../SND_11.03.attr | 7 - .../SND_12.02.attr | 7 - .../SND_12.66.attr | 7 - .../SND_13.37.attr | 7 - .../SND_13.64.attr | 7 - .../SND_14.06.attr | 7 - .../SND_14.37.attr | 7 - .../SND_14.71.attr | 7 - .../SND_3.74.attr | 7 - .../SND_3.98.attr | 7 - .../SND_4.13.attr | 7 - .../SND_4.45.attr | 7 - .../SND_4.52.attr | 7 - .../SND_4.57.attr | 7 - .../SND_6.51.attr | 7 - .../SND_7.02.attr | 7 - .../SND_7.43.attr | 7 - .../SND_9.71.attr | 7 - .../SND_LIFTED_INDEX.attr | 7 - .../SND_PRECIP_WATER.attr | 7 - .../SND_SFC_SKIN_TEMP.attr | 7 - .../SND_VIS.attr | 7 - .../SNOW_IND.attr | 7 - .../SNOW_WATER.attr | 7 - .../SURFACE_TYPE.attr | 7 - .../GINI_ERS-QuickSCAT-Scatterometer/VIS.attr | 8 - .../GINI_ERS-QuickSCAT-Scatterometer/WV.attr | 8 - .../default.attr | 7 - .../SATELLITE/GINI_GMS/CLOUD_WATER.attr | 7 - .../SATELLITE/GINI_GMS/DERIVED_CAPE.attr | 7 - .../SATELLITE/GINI_GMS/DERIVED_CONV_INH.attr | 7 - .../GINI_GMS/DERIVED_LAND_SEA_TEMP.attr | 7 - .../GINI_GMS/DERIVED_VOLCANO_IMG.attr | 7 - .../SATELLITE/GINI_GMS/DERIVED_WINDEX.attr | 7 - .../SATELLITE/GINI_GMS/DMPI.attr | 7 - .../SATELLITE/GINI_GMS/GRID_CLOUD_AMT.attr | 7 - .../GINI_GMS/GRID_CTOP_PRES_HGHT.attr | 7 - .../SATELLITE/GINI_GMS/ICE_CONC.attr | 7 - .../SATELLITE/GINI_GMS/ICE_EDGE.attr | 7 - .../SATELLITE/GINI_GMS/ICE_TYPE.attr | 7 - .../SATELLITE/GINI_GMS/IMG_LIFTED_INDEX.attr | 7 - .../SATELLITE/GINI_GMS/IMG_PRECIP_WATER.attr | 7 - .../GINI_GMS/IMG_SRFC_SKIN_TEMP.attr | 7 - .../ResourceDefns/SATELLITE/GINI_GMS/IR.attr | 8 - .../SATELLITE/GINI_GMS/IR13.attr | 8 - .../SATELLITE/GINI_GMS/LOW_CLOUD_IMG.attr | 7 - .../SATELLITE/GINI_GMS/MDPI.attr | 7 - .../GINI_GMS/NORMAL_TPW_PERCENT.attr | 7 - .../SATELLITE/GINI_GMS/POLAR_3.7u.attr | 7 - .../SATELLITE/GINI_GMS/POLAR_3.9u.attr | 7 - .../SATELLITE/GINI_GMS/POLAR_IR.attr | 7 - .../SATELLITE/GINI_GMS/POLAR_VIS.attr | 7 - .../SATELLITE/GINI_GMS/RAIN_RATE.attr | 7 - .../SATELLITE/GINI_GMS/SCATTEROMETER.attr | 7 - .../SATELLITE/GINI_GMS/SFC_WETNESS.attr | 7 - .../SATELLITE/GINI_GMS/SFC_WIND_SPD.attr | 7 - .../SATELLITE/GINI_GMS/SND_11.03.attr | 7 - .../SATELLITE/GINI_GMS/SND_12.02.attr | 7 - .../SATELLITE/GINI_GMS/SND_12.66.attr | 7 - .../SATELLITE/GINI_GMS/SND_13.37.attr | 7 - .../SATELLITE/GINI_GMS/SND_13.64.attr | 7 - .../SATELLITE/GINI_GMS/SND_14.06.attr | 7 - .../SATELLITE/GINI_GMS/SND_14.37.attr | 7 - .../SATELLITE/GINI_GMS/SND_14.71.attr | 7 - .../SATELLITE/GINI_GMS/SND_3.74.attr | 7 - .../SATELLITE/GINI_GMS/SND_3.98.attr | 7 - .../SATELLITE/GINI_GMS/SND_4.13.attr | 7 - .../SATELLITE/GINI_GMS/SND_4.45.attr | 7 - .../SATELLITE/GINI_GMS/SND_4.52.attr | 7 - .../SATELLITE/GINI_GMS/SND_4.57.attr | 7 - .../SATELLITE/GINI_GMS/SND_6.51.attr | 7 - .../SATELLITE/GINI_GMS/SND_7.02.attr | 7 - .../SATELLITE/GINI_GMS/SND_7.43.attr | 7 - .../SATELLITE/GINI_GMS/SND_9.71.attr | 7 - .../SATELLITE/GINI_GMS/SND_LIFTED_INDEX.attr | 7 - .../SATELLITE/GINI_GMS/SND_PRECIP_WATER.attr | 7 - .../SATELLITE/GINI_GMS/SND_SFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_GMS/SND_VIS.attr | 7 - .../SATELLITE/GINI_GMS/SNOW_IND.attr | 7 - .../SATELLITE/GINI_GMS/SNOW_WATER.attr | 7 - .../SATELLITE/GINI_GMS/SURFACE_TYPE.attr | 7 - .../ResourceDefns/SATELLITE/GINI_GMS/VIS.attr | 8 - .../ResourceDefns/SATELLITE/GINI_GMS/WV.attr | 8 - .../SATELLITE/GINI_GMS/default.attr | 7 - .../SATELLITE/GINI_GOES11/CLOUD_WATER.attr | 7 - .../SATELLITE/GINI_GOES11/DERIVED_CAPE.attr | 7 - .../GINI_GOES11/DERIVED_CONV_INH.attr | 7 - .../GINI_GOES11/DERIVED_LAND_SEA_TEMP.attr | 7 - .../GINI_GOES11/DERIVED_VOLCANO_IMG.attr | 7 - .../SATELLITE/GINI_GOES11/DERIVED_WINDEX.attr | 7 - .../SATELLITE/GINI_GOES11/DMPI.attr | 7 - .../SATELLITE/GINI_GOES11/GRID_CLOUD_AMT.attr | 7 - .../GINI_GOES11/GRID_CTOP_PRES_HGHT.attr | 7 - .../SATELLITE/GINI_GOES11/ICE_CONC.attr | 7 - .../SATELLITE/GINI_GOES11/ICE_EDGE.attr | 7 - .../SATELLITE/GINI_GOES11/ICE_TYPE.attr | 7 - .../GINI_GOES11/IMG_LIFTED_INDEX.attr | 7 - .../GINI_GOES11/IMG_PRECIP_WATER.attr | 7 - .../GINI_GOES11/IMG_SRFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_GOES11/IR.attr | 8 - .../SATELLITE/GINI_GOES11/IR13.attr | 8 - .../SATELLITE/GINI_GOES11/MDPI.attr | 7 - .../GINI_GOES11/NORMAL_TPW_PERCENT.attr | 7 - .../SATELLITE/GINI_GOES11/POLAR_3.7u.attr | 7 - .../SATELLITE/GINI_GOES11/POLAR_3.9u.attr | 7 - .../SATELLITE/GINI_GOES11/POLAR_IR.attr | 7 - .../SATELLITE/GINI_GOES11/POLAR_VIS.attr | 7 - .../SATELLITE/GINI_GOES11/RAIN_RATE.attr | 7 - .../SATELLITE/GINI_GOES11/SCATTEROMETER.attr | 7 - .../SATELLITE/GINI_GOES11/SFC_WETNESS.attr | 7 - .../SATELLITE/GINI_GOES11/SFC_WIND_SPD.attr | 7 - .../SATELLITE/GINI_GOES11/SND_11.03.attr | 7 - .../SATELLITE/GINI_GOES11/SND_12.02.attr | 7 - .../SATELLITE/GINI_GOES11/SND_12.66.attr | 7 - .../SATELLITE/GINI_GOES11/SND_13.37.attr | 7 - .../SATELLITE/GINI_GOES11/SND_13.64.attr | 7 - .../SATELLITE/GINI_GOES11/SND_14.06.attr | 7 - .../SATELLITE/GINI_GOES11/SND_14.37.attr | 7 - .../SATELLITE/GINI_GOES11/SND_14.71.attr | 7 - .../SATELLITE/GINI_GOES11/SND_3.74.attr | 7 - .../SATELLITE/GINI_GOES11/SND_3.98.attr | 7 - .../SATELLITE/GINI_GOES11/SND_4.13.attr | 7 - .../SATELLITE/GINI_GOES11/SND_4.45.attr | 7 - .../SATELLITE/GINI_GOES11/SND_4.52.attr | 7 - .../SATELLITE/GINI_GOES11/SND_4.57.attr | 7 - .../SATELLITE/GINI_GOES11/SND_6.51.attr | 7 - .../SATELLITE/GINI_GOES11/SND_7.02.attr | 7 - .../SATELLITE/GINI_GOES11/SND_7.43.attr | 7 - .../SATELLITE/GINI_GOES11/SND_9.71.attr | 7 - .../GINI_GOES11/SND_LIFTED_INDEX.attr | 7 - .../GINI_GOES11/SND_PRECIP_WATER.attr | 7 - .../GINI_GOES11/SND_SFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_GOES11/SND_VIS.attr | 7 - .../SATELLITE/GINI_GOES11/SNOW_IND.attr | 7 - .../SATELLITE/GINI_GOES11/SNOW_WATER.attr | 7 - .../SATELLITE/GINI_GOES11/SURFACE_TYPE.attr | 7 - .../SATELLITE/GINI_GOES11/VIS.attr | 8 - .../SATELLITE/GINI_GOES11/WV.attr | 8 - .../SATELLITE/GINI_GOES11/default.attr | 7 - .../SATELLITE/GINI_GOES12/CLOUD_WATER.attr | 7 - .../SATELLITE/GINI_GOES12/DERIVED_CAPE.attr | 7 - .../GINI_GOES12/DERIVED_CONV_INH.attr | 7 - .../GINI_GOES12/DERIVED_LAND_SEA_TEMP.attr | 7 - .../GINI_GOES12/DERIVED_VOLCANO_IMG.attr | 7 - .../SATELLITE/GINI_GOES12/DERIVED_WINDEX.attr | 7 - .../SATELLITE/GINI_GOES12/DMPI.attr | 7 - .../SATELLITE/GINI_GOES12/GRID_CLOUD_AMT.attr | 7 - .../GINI_GOES12/GRID_CTOP_PRES_HGHT.attr | 7 - .../SATELLITE/GINI_GOES12/ICE_CONC.attr | 7 - .../SATELLITE/GINI_GOES12/ICE_EDGE.attr | 7 - .../SATELLITE/GINI_GOES12/ICE_TYPE.attr | 7 - .../GINI_GOES12/IMG_LIFTED_INDEX.attr | 7 - .../GINI_GOES12/IMG_PRECIP_WATER.attr | 7 - .../GINI_GOES12/IMG_SRFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_GOES12/IR.attr | 8 - .../SATELLITE/GINI_GOES12/IR13.attr | 8 - .../SATELLITE/GINI_GOES12/MDPI.attr | 7 - .../GINI_GOES12/NORMAL_TPW_PERCENT.attr | 7 - .../SATELLITE/GINI_GOES12/POLAR_3.7u.attr | 7 - .../SATELLITE/GINI_GOES12/POLAR_3.9u.attr | 7 - .../SATELLITE/GINI_GOES12/POLAR_IR.attr | 7 - .../SATELLITE/GINI_GOES12/POLAR_VIS.attr | 7 - .../SATELLITE/GINI_GOES12/RAIN_RATE.attr | 7 - .../SATELLITE/GINI_GOES12/SCATTEROMETER.attr | 7 - .../SATELLITE/GINI_GOES12/SFC_WETNESS.attr | 7 - .../SATELLITE/GINI_GOES12/SFC_WIND_SPD.attr | 7 - .../SATELLITE/GINI_GOES12/SND_11.03.attr | 7 - .../SATELLITE/GINI_GOES12/SND_12.02.attr | 7 - .../SATELLITE/GINI_GOES12/SND_12.66.attr | 7 - .../SATELLITE/GINI_GOES12/SND_13.37.attr | 7 - .../SATELLITE/GINI_GOES12/SND_13.64.attr | 7 - .../SATELLITE/GINI_GOES12/SND_14.06.attr | 7 - .../SATELLITE/GINI_GOES12/SND_14.37.attr | 7 - .../SATELLITE/GINI_GOES12/SND_14.71.attr | 7 - .../SATELLITE/GINI_GOES12/SND_3.74.attr | 7 - .../SATELLITE/GINI_GOES12/SND_3.98.attr | 7 - .../SATELLITE/GINI_GOES12/SND_4.13.attr | 7 - .../SATELLITE/GINI_GOES12/SND_4.45.attr | 7 - .../SATELLITE/GINI_GOES12/SND_4.52.attr | 7 - .../SATELLITE/GINI_GOES12/SND_4.57.attr | 7 - .../SATELLITE/GINI_GOES12/SND_6.51.attr | 7 - .../SATELLITE/GINI_GOES12/SND_7.02.attr | 7 - .../SATELLITE/GINI_GOES12/SND_7.43.attr | 7 - .../SATELLITE/GINI_GOES12/SND_9.71.attr | 7 - .../GINI_GOES12/SND_LIFTED_INDEX.attr | 7 - .../GINI_GOES12/SND_PRECIP_WATER.attr | 7 - .../GINI_GOES12/SND_SFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_GOES12/SND_VIS.attr | 7 - .../SATELLITE/GINI_GOES12/SNOW_IND.attr | 7 - .../SATELLITE/GINI_GOES12/SNOW_WATER.attr | 7 - .../SATELLITE/GINI_GOES12/SURFACE_TYPE.attr | 7 - .../SATELLITE/GINI_GOES12/VIS.attr | 8 - .../SATELLITE/GINI_GOES12/WV.attr | 8 - .../SATELLITE/GINI_GOES13/CLOUD_WATER.attr | 7 - .../SATELLITE/GINI_GOES13/DERIVED_CAPE.attr | 7 - .../GINI_GOES13/DERIVED_CONV_INH.attr | 7 - .../GINI_GOES13/DERIVED_LAND_SEA_TEMP.attr | 7 - .../GINI_GOES13/DERIVED_VOLCANO_IMG.attr | 7 - .../SATELLITE/GINI_GOES13/DERIVED_WINDEX.attr | 7 - .../SATELLITE/GINI_GOES13/DMPI.attr | 7 - .../SATELLITE/GINI_GOES13/GRID_CLOUD_AMT.attr | 7 - .../GINI_GOES13/GRID_CTOP_PRES_HGHT.attr | 7 - .../SATELLITE/GINI_GOES13/ICE_CONC.attr | 7 - .../SATELLITE/GINI_GOES13/ICE_EDGE.attr | 7 - .../SATELLITE/GINI_GOES13/ICE_TYPE.attr | 7 - .../GINI_GOES13/IMG_LIFTED_INDEX.attr | 7 - .../GINI_GOES13/IMG_PRECIP_WATER.attr | 7 - .../GINI_GOES13/IMG_SRFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_GOES13/LOW_CLOUD_IMG.attr | 7 - .../SATELLITE/GINI_GOES13/MDPI.attr | 7 - .../GINI_GOES13/NORMAL_TPW_PERCENT.attr | 7 - .../SATELLITE/GINI_GOES13/POLAR_3.7u.attr | 7 - .../SATELLITE/GINI_GOES13/POLAR_3.9u.attr | 7 - .../SATELLITE/GINI_GOES13/POLAR_IR.attr | 7 - .../SATELLITE/GINI_GOES13/POLAR_VIS.attr | 7 - .../SATELLITE/GINI_GOES13/RAIN_RATE.attr | 7 - .../SATELLITE/GINI_GOES13/SCATTEROMETER.attr | 7 - .../SATELLITE/GINI_GOES13/SFC_WETNESS.attr | 7 - .../SATELLITE/GINI_GOES13/SFC_WIND_SPD.attr | 7 - .../SATELLITE/GINI_GOES13/SND_12.02.attr | 7 - .../SATELLITE/GINI_GOES13/SND_12.66.attr | 7 - .../SATELLITE/GINI_GOES13/SND_13.37.attr | 7 - .../SATELLITE/GINI_GOES13/SND_13.64.attr | 7 - .../SATELLITE/GINI_GOES13/SND_14.37.attr | 7 - .../SATELLITE/GINI_GOES13/SND_14.71.attr | 7 - .../SATELLITE/GINI_GOES13/SND_3.74.attr | 7 - .../SATELLITE/GINI_GOES13/SND_4.13.attr | 7 - .../SATELLITE/GINI_GOES13/SND_4.52.attr | 7 - .../SATELLITE/GINI_GOES13/SND_4.57.attr | 7 - .../SATELLITE/GINI_GOES13/SND_9.71.attr | 7 - .../GINI_GOES13/SND_LIFTED_INDEX.attr | 7 - .../GINI_GOES13/SND_PRECIP_WATER.attr | 7 - .../GINI_GOES13/SND_SFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_GOES13/SNOW_IND.attr | 7 - .../SATELLITE/GINI_GOES13/SNOW_WATER.attr | 7 - .../SATELLITE/GINI_GOES13/SURFACE_TYPE.attr | 7 - .../GINI_GOES14.xml} | 4 +- .../{GINI_DMSP => GINI_GOES14}/IR.attr | 0 .../{GINI_Composite => GINI_GOES14}/IR13.attr | 0 .../SND_11.03.attr | 0 .../SND_14.06.attr | 0 .../SND_3.98.attr | 0 .../SND_4.45.attr | 0 .../SND_6.51.attr | 0 .../SND_7.02.attr | 0 .../SND_7.43.attr | 0 .../SND_VIS.attr | 0 .../{GINI_DMSP => GINI_GOES14}/VIS.attr | 0 .../{GINI_DMSP => GINI_GOES14}/WV.attr | 0 .../{GINI_GOES12 => GINI_GOES14}/default.attr | 0 .../SATELLITE/GINI_GOES15/CLOUD_WATER.attr | 7 - .../SATELLITE/GINI_GOES15/DERIVED_CAPE.attr | 7 - .../GINI_GOES15/DERIVED_CONV_INH.attr | 7 - .../GINI_GOES15/DERIVED_LAND_SEA_TEMP.attr | 7 - .../GINI_GOES15/DERIVED_VOLCANO_IMG.attr | 7 - .../SATELLITE/GINI_GOES15/DERIVED_WINDEX.attr | 7 - .../SATELLITE/GINI_GOES15/DMPI.attr | 7 - .../SATELLITE/GINI_GOES15/GRID_CLOUD_AMT.attr | 7 - .../GINI_GOES15/GRID_CTOP_PRES_HGHT.attr | 7 - .../SATELLITE/GINI_GOES15/ICE_CONC.attr | 7 - .../SATELLITE/GINI_GOES15/ICE_EDGE.attr | 7 - .../SATELLITE/GINI_GOES15/ICE_TYPE.attr | 7 - .../GINI_GOES15/IMG_LIFTED_INDEX.attr | 7 - .../GINI_GOES15/IMG_PRECIP_WATER.attr | 7 - .../GINI_GOES15/IMG_SRFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_GOES15/LOW_CLOUD_IMG.attr | 7 - .../SATELLITE/GINI_GOES15/MDPI.attr | 7 - .../GINI_GOES15/NORMAL_TPW_PERCENT.attr | 7 - .../SATELLITE/GINI_GOES15/POLAR_3.7u.attr | 7 - .../SATELLITE/GINI_GOES15/POLAR_3.9u.attr | 7 - .../SATELLITE/GINI_GOES15/POLAR_IR.attr | 7 - .../SATELLITE/GINI_GOES15/POLAR_VIS.attr | 7 - .../SATELLITE/GINI_GOES15/RAIN_RATE.attr | 7 - .../SATELLITE/GINI_GOES15/SCATTEROMETER.attr | 7 - .../SATELLITE/GINI_GOES15/SFC_WETNESS.attr | 7 - .../SATELLITE/GINI_GOES15/SFC_WIND_SPD.attr | 7 - .../SATELLITE/GINI_GOES15/SND_12.02.attr | 7 - .../SATELLITE/GINI_GOES15/SND_12.66.attr | 7 - .../SATELLITE/GINI_GOES15/SND_13.37.attr | 7 - .../SATELLITE/GINI_GOES15/SND_13.64.attr | 7 - .../SATELLITE/GINI_GOES15/SND_14.37.attr | 7 - .../SATELLITE/GINI_GOES15/SND_14.71.attr | 7 - .../SATELLITE/GINI_GOES15/SND_3.74.attr | 7 - .../SATELLITE/GINI_GOES15/SND_4.13.attr | 7 - .../SATELLITE/GINI_GOES15/SND_4.52.attr | 7 - .../SATELLITE/GINI_GOES15/SND_4.57.attr | 7 - .../SATELLITE/GINI_GOES15/SND_9.71.attr | 7 - .../GINI_GOES15/SND_LIFTED_INDEX.attr | 7 - .../GINI_GOES15/SND_PRECIP_WATER.attr | 7 - .../GINI_GOES15/SND_SFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_GOES15/SNOW_IND.attr | 7 - .../SATELLITE/GINI_GOES15/SNOW_WATER.attr | 7 - .../SATELLITE/GINI_GOES15/SURFACE_TYPE.attr | 7 - .../SATELLITE/GINI_GOES7/CLOUD_WATER.attr | 7 - .../SATELLITE/GINI_GOES7/DERIVED_CAPE.attr | 7 - .../GINI_GOES7/DERIVED_CONV_INH.attr | 7 - .../GINI_GOES7/DERIVED_LAND_SEA_TEMP.attr | 7 - .../GINI_GOES7/DERIVED_VOLCANO_IMG.attr | 7 - .../SATELLITE/GINI_GOES7/DERIVED_WINDEX.attr | 7 - .../SATELLITE/GINI_GOES7/DMPI.attr | 7 - .../SATELLITE/GINI_GOES7/GRID_CLOUD_AMT.attr | 7 - .../GINI_GOES7/GRID_CTOP_PRES_HGHT.attr | 7 - .../SATELLITE/GINI_GOES7/ICE_CONC.attr | 7 - .../SATELLITE/GINI_GOES7/ICE_EDGE.attr | 7 - .../SATELLITE/GINI_GOES7/ICE_TYPE.attr | 7 - .../GINI_GOES7/IMG_LIFTED_INDEX.attr | 7 - .../GINI_GOES7/IMG_PRECIP_WATER.attr | 7 - .../GINI_GOES7/IMG_SRFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_GOES7/IR.attr | 8 - .../SATELLITE/GINI_GOES7/IR13.attr | 8 - .../SATELLITE/GINI_GOES7/LOW_CLOUD_IMG.attr | 7 - .../SATELLITE/GINI_GOES7/MDPI.attr | 7 - .../GINI_GOES7/NORMAL_TPW_PERCENT.attr | 7 - .../SATELLITE/GINI_GOES7/POLAR_3.7u.attr | 7 - .../SATELLITE/GINI_GOES7/POLAR_3.9u.attr | 7 - .../SATELLITE/GINI_GOES7/POLAR_IR.attr | 7 - .../SATELLITE/GINI_GOES7/POLAR_VIS.attr | 7 - .../SATELLITE/GINI_GOES7/RAIN_RATE.attr | 7 - .../SATELLITE/GINI_GOES7/SCATTEROMETER.attr | 7 - .../SATELLITE/GINI_GOES7/SFC_WETNESS.attr | 7 - .../SATELLITE/GINI_GOES7/SFC_WIND_SPD.attr | 7 - .../SATELLITE/GINI_GOES7/SND_11.03.attr | 7 - .../SATELLITE/GINI_GOES7/SND_12.02.attr | 7 - .../SATELLITE/GINI_GOES7/SND_12.66.attr | 7 - .../SATELLITE/GINI_GOES7/SND_13.37.attr | 7 - .../SATELLITE/GINI_GOES7/SND_13.64.attr | 7 - .../SATELLITE/GINI_GOES7/SND_14.06.attr | 7 - .../SATELLITE/GINI_GOES7/SND_14.37.attr | 7 - .../SATELLITE/GINI_GOES7/SND_14.71.attr | 7 - .../SATELLITE/GINI_GOES7/SND_3.74.attr | 7 - .../SATELLITE/GINI_GOES7/SND_3.98.attr | 7 - .../SATELLITE/GINI_GOES7/SND_4.13.attr | 7 - .../SATELLITE/GINI_GOES7/SND_4.45.attr | 7 - .../SATELLITE/GINI_GOES7/SND_4.52.attr | 7 - .../SATELLITE/GINI_GOES7/SND_4.57.attr | 7 - .../SATELLITE/GINI_GOES7/SND_6.51.attr | 7 - .../SATELLITE/GINI_GOES7/SND_7.02.attr | 7 - .../SATELLITE/GINI_GOES7/SND_7.43.attr | 7 - .../SATELLITE/GINI_GOES7/SND_9.71.attr | 7 - .../GINI_GOES7/SND_LIFTED_INDEX.attr | 7 - .../GINI_GOES7/SND_PRECIP_WATER.attr | 7 - .../GINI_GOES7/SND_SFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_GOES7/SND_VIS.attr | 7 - .../SATELLITE/GINI_GOES7/SNOW_IND.attr | 7 - .../SATELLITE/GINI_GOES7/SNOW_WATER.attr | 7 - .../SATELLITE/GINI_GOES7/SURFACE_TYPE.attr | 7 - .../SATELLITE/GINI_GOES7/VIS.attr | 8 - .../SATELLITE/GINI_GOES7/WV.attr | 8 - .../SATELLITE/GINI_GOES7/default.attr | 7 - .../SATELLITE/GINI_GOES8/CLOUD_WATER.attr | 7 - .../SATELLITE/GINI_GOES8/DERIVED_CAPE.attr | 7 - .../GINI_GOES8/DERIVED_CONV_INH.attr | 7 - .../GINI_GOES8/DERIVED_LAND_SEA_TEMP.attr | 7 - .../GINI_GOES8/DERIVED_VOLCANO_IMG.attr | 7 - .../SATELLITE/GINI_GOES8/DERIVED_WINDEX.attr | 7 - .../SATELLITE/GINI_GOES8/DMPI.attr | 7 - .../SATELLITE/GINI_GOES8/GRID_CLOUD_AMT.attr | 7 - .../GINI_GOES8/GRID_CTOP_PRES_HGHT.attr | 7 - .../SATELLITE/GINI_GOES8/ICE_CONC.attr | 7 - .../SATELLITE/GINI_GOES8/ICE_EDGE.attr | 7 - .../SATELLITE/GINI_GOES8/ICE_TYPE.attr | 7 - .../GINI_GOES8/IMG_LIFTED_INDEX.attr | 7 - .../GINI_GOES8/IMG_PRECIP_WATER.attr | 7 - .../GINI_GOES8/IMG_SRFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_GOES8/IR.attr | 8 - .../SATELLITE/GINI_GOES8/IR13.attr | 8 - .../SATELLITE/GINI_GOES8/LOW_CLOUD_IMG.attr | 7 - .../SATELLITE/GINI_GOES8/MDPI.attr | 7 - .../GINI_GOES8/NORMAL_TPW_PERCENT.attr | 7 - .../SATELLITE/GINI_GOES8/POLAR_3.7u.attr | 7 - .../SATELLITE/GINI_GOES8/POLAR_3.9u.attr | 7 - .../SATELLITE/GINI_GOES8/POLAR_IR.attr | 7 - .../SATELLITE/GINI_GOES8/POLAR_VIS.attr | 7 - .../SATELLITE/GINI_GOES8/RAIN_RATE.attr | 7 - .../SATELLITE/GINI_GOES8/SCATTEROMETER.attr | 7 - .../SATELLITE/GINI_GOES8/SFC_WETNESS.attr | 7 - .../SATELLITE/GINI_GOES8/SFC_WIND_SPD.attr | 7 - .../SATELLITE/GINI_GOES8/SND_11.03.attr | 7 - .../SATELLITE/GINI_GOES8/SND_12.02.attr | 7 - .../SATELLITE/GINI_GOES8/SND_12.66.attr | 7 - .../SATELLITE/GINI_GOES8/SND_13.37.attr | 7 - .../SATELLITE/GINI_GOES8/SND_13.64.attr | 7 - .../SATELLITE/GINI_GOES8/SND_14.06.attr | 7 - .../SATELLITE/GINI_GOES8/SND_14.37.attr | 7 - .../SATELLITE/GINI_GOES8/SND_14.71.attr | 7 - .../SATELLITE/GINI_GOES8/SND_3.74.attr | 7 - .../SATELLITE/GINI_GOES8/SND_3.98.attr | 7 - .../SATELLITE/GINI_GOES8/SND_4.13.attr | 7 - .../SATELLITE/GINI_GOES8/SND_4.45.attr | 7 - .../SATELLITE/GINI_GOES8/SND_4.52.attr | 7 - .../SATELLITE/GINI_GOES8/SND_4.57.attr | 7 - .../SATELLITE/GINI_GOES8/SND_6.51.attr | 7 - .../SATELLITE/GINI_GOES8/SND_7.02.attr | 7 - .../SATELLITE/GINI_GOES8/SND_7.43.attr | 7 - .../SATELLITE/GINI_GOES8/SND_9.71.attr | 7 - .../GINI_GOES8/SND_LIFTED_INDEX.attr | 7 - .../GINI_GOES8/SND_PRECIP_WATER.attr | 7 - .../GINI_GOES8/SND_SFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_GOES8/SND_VIS.attr | 7 - .../SATELLITE/GINI_GOES8/SNOW_IND.attr | 7 - .../SATELLITE/GINI_GOES8/SNOW_WATER.attr | 7 - .../SATELLITE/GINI_GOES8/SURFACE_TYPE.attr | 7 - .../SATELLITE/GINI_GOES8/VIS.attr | 8 - .../SATELLITE/GINI_GOES8/WV.attr | 8 - .../SATELLITE/GINI_GOES8/default.attr | 7 - .../SATELLITE/GINI_GOES9/CLOUD_WATER.attr | 7 - .../SATELLITE/GINI_GOES9/DERIVED_CAPE.attr | 7 - .../GINI_GOES9/DERIVED_CONV_INH.attr | 7 - .../GINI_GOES9/DERIVED_LAND_SEA_TEMP.attr | 7 - .../GINI_GOES9/DERIVED_VOLCANO_IMG.attr | 7 - .../SATELLITE/GINI_GOES9/DERIVED_WINDEX.attr | 7 - .../SATELLITE/GINI_GOES9/DMPI.attr | 7 - .../SATELLITE/GINI_GOES9/GINI_GOES9.xml | 21 - .../SATELLITE/GINI_GOES9/GRID_CLOUD_AMT.attr | 7 - .../GINI_GOES9/GRID_CTOP_PRES_HGHT.attr | 7 - .../SATELLITE/GINI_GOES9/ICE_CONC.attr | 7 - .../SATELLITE/GINI_GOES9/ICE_EDGE.attr | 7 - .../SATELLITE/GINI_GOES9/ICE_TYPE.attr | 7 - .../GINI_GOES9/IMG_LIFTED_INDEX.attr | 7 - .../GINI_GOES9/IMG_PRECIP_WATER.attr | 7 - .../GINI_GOES9/IMG_SRFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_GOES9/IR.attr | 8 - .../SATELLITE/GINI_GOES9/IR13.attr | 8 - .../SATELLITE/GINI_GOES9/LOW_CLOUD_IMG.attr | 7 - .../SATELLITE/GINI_GOES9/MDPI.attr | 7 - .../GINI_GOES9/NORMAL_TPW_PERCENT.attr | 7 - .../SATELLITE/GINI_GOES9/POLAR_3.7u.attr | 7 - .../SATELLITE/GINI_GOES9/POLAR_3.9u.attr | 7 - .../SATELLITE/GINI_GOES9/POLAR_IR.attr | 7 - .../SATELLITE/GINI_GOES9/POLAR_VIS.attr | 7 - .../SATELLITE/GINI_GOES9/RAIN_RATE.attr | 7 - .../SATELLITE/GINI_GOES9/SCATTEROMETER.attr | 7 - .../SATELLITE/GINI_GOES9/SFC_WETNESS.attr | 7 - .../SATELLITE/GINI_GOES9/SFC_WIND_SPD.attr | 7 - .../SATELLITE/GINI_GOES9/SND_11.03.attr | 7 - .../SATELLITE/GINI_GOES9/SND_12.02.attr | 7 - .../SATELLITE/GINI_GOES9/SND_12.66.attr | 7 - .../SATELLITE/GINI_GOES9/SND_13.37.attr | 7 - .../SATELLITE/GINI_GOES9/SND_13.64.attr | 7 - .../SATELLITE/GINI_GOES9/SND_14.06.attr | 7 - .../SATELLITE/GINI_GOES9/SND_14.37.attr | 7 - .../SATELLITE/GINI_GOES9/SND_14.71.attr | 7 - .../SATELLITE/GINI_GOES9/SND_3.74.attr | 7 - .../SATELLITE/GINI_GOES9/SND_3.98.attr | 7 - .../SATELLITE/GINI_GOES9/SND_4.13.attr | 7 - .../SATELLITE/GINI_GOES9/SND_4.45.attr | 7 - .../SATELLITE/GINI_GOES9/SND_4.52.attr | 7 - .../SATELLITE/GINI_GOES9/SND_4.57.attr | 7 - .../SATELLITE/GINI_GOES9/SND_6.51.attr | 7 - .../SATELLITE/GINI_GOES9/SND_7.02.attr | 7 - .../SATELLITE/GINI_GOES9/SND_7.43.attr | 7 - .../SATELLITE/GINI_GOES9/SND_9.71.attr | 7 - .../GINI_GOES9/SND_LIFTED_INDEX.attr | 7 - .../GINI_GOES9/SND_PRECIP_WATER.attr | 7 - .../GINI_GOES9/SND_SFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_GOES9/SND_VIS.attr | 7 - .../SATELLITE/GINI_GOES9/SNOW_IND.attr | 7 - .../SATELLITE/GINI_GOES9/SNOW_WATER.attr | 7 - .../SATELLITE/GINI_GOES9/SURFACE_TYPE.attr | 7 - .../SATELLITE/GINI_GOES9/VIS.attr | 8 - .../SATELLITE/GINI_GOES9/WV.attr | 8 - .../SATELLITE/GINI_GOES9/default.attr | 7 - .../SATELLITE/GINI_JERS/CLOUD_WATER.attr | 7 - .../SATELLITE/GINI_JERS/DERIVED_CAPE.attr | 7 - .../SATELLITE/GINI_JERS/DERIVED_CONV_INH.attr | 7 - .../GINI_JERS/DERIVED_LAND_SEA_TEMP.attr | 7 - .../GINI_JERS/DERIVED_VOLCANO_IMG.attr | 7 - .../SATELLITE/GINI_JERS/DERIVED_WINDEX.attr | 7 - .../SATELLITE/GINI_JERS/DMPI.attr | 7 - .../SATELLITE/GINI_JERS/GRID_CLOUD_AMT.attr | 7 - .../GINI_JERS/GRID_CTOP_PRES_HGHT.attr | 7 - .../SATELLITE/GINI_JERS/ICE_CONC.attr | 7 - .../SATELLITE/GINI_JERS/ICE_EDGE.attr | 7 - .../SATELLITE/GINI_JERS/ICE_TYPE.attr | 7 - .../SATELLITE/GINI_JERS/IMG_LIFTED_INDEX.attr | 7 - .../SATELLITE/GINI_JERS/IMG_PRECIP_WATER.attr | 7 - .../GINI_JERS/IMG_SRFC_SKIN_TEMP.attr | 7 - .../ResourceDefns/SATELLITE/GINI_JERS/IR.attr | 8 - .../SATELLITE/GINI_JERS/IR13.attr | 8 - .../SATELLITE/GINI_JERS/LOW_CLOUD_IMG.attr | 7 - .../SATELLITE/GINI_JERS/MDPI.attr | 7 - .../GINI_JERS/NORMAL_TPW_PERCENT.attr | 7 - .../SATELLITE/GINI_JERS/POLAR_3.7u.attr | 7 - .../SATELLITE/GINI_JERS/POLAR_3.9u.attr | 7 - .../SATELLITE/GINI_JERS/POLAR_IR.attr | 7 - .../SATELLITE/GINI_JERS/POLAR_VIS.attr | 7 - .../SATELLITE/GINI_JERS/RAIN_RATE.attr | 7 - .../SATELLITE/GINI_JERS/SCATTEROMETER.attr | 7 - .../SATELLITE/GINI_JERS/SFC_WETNESS.attr | 7 - .../SATELLITE/GINI_JERS/SFC_WIND_SPD.attr | 7 - .../SATELLITE/GINI_JERS/SND_11.03.attr | 7 - .../SATELLITE/GINI_JERS/SND_12.02.attr | 7 - .../SATELLITE/GINI_JERS/SND_12.66.attr | 7 - .../SATELLITE/GINI_JERS/SND_13.37.attr | 7 - .../SATELLITE/GINI_JERS/SND_13.64.attr | 7 - .../SATELLITE/GINI_JERS/SND_14.06.attr | 7 - .../SATELLITE/GINI_JERS/SND_14.37.attr | 7 - .../SATELLITE/GINI_JERS/SND_14.71.attr | 7 - .../SATELLITE/GINI_JERS/SND_3.74.attr | 7 - .../SATELLITE/GINI_JERS/SND_3.98.attr | 7 - .../SATELLITE/GINI_JERS/SND_4.13.attr | 7 - .../SATELLITE/GINI_JERS/SND_4.45.attr | 7 - .../SATELLITE/GINI_JERS/SND_4.52.attr | 7 - .../SATELLITE/GINI_JERS/SND_4.57.attr | 7 - .../SATELLITE/GINI_JERS/SND_6.51.attr | 7 - .../SATELLITE/GINI_JERS/SND_7.02.attr | 7 - .../SATELLITE/GINI_JERS/SND_7.43.attr | 7 - .../SATELLITE/GINI_JERS/SND_9.71.attr | 7 - .../SATELLITE/GINI_JERS/SND_LIFTED_INDEX.attr | 7 - .../SATELLITE/GINI_JERS/SND_PRECIP_WATER.attr | 7 - .../GINI_JERS/SND_SFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_JERS/SND_VIS.attr | 7 - .../SATELLITE/GINI_JERS/SNOW_IND.attr | 7 - .../SATELLITE/GINI_JERS/SNOW_WATER.attr | 7 - .../SATELLITE/GINI_JERS/SURFACE_TYPE.attr | 7 - .../SATELLITE/GINI_JERS/VIS.attr | 8 - .../ResourceDefns/SATELLITE/GINI_JERS/WV.attr | 8 - .../SATELLITE/GINI_JERS/default.attr | 7 - .../SATELLITE/GINI_METEOSAT/CLOUD_WATER.attr | 7 - .../SATELLITE/GINI_METEOSAT/DERIVED_CAPE.attr | 7 - .../GINI_METEOSAT/DERIVED_CONV_INH.attr | 7 - .../GINI_METEOSAT/DERIVED_LAND_SEA_TEMP.attr | 7 - .../GINI_METEOSAT/DERIVED_VOLCANO_IMG.attr | 7 - .../GINI_METEOSAT/DERIVED_WINDEX.attr | 7 - .../SATELLITE/GINI_METEOSAT/DMPI.attr | 7 - .../SATELLITE/GINI_METEOSAT/GINI_METEOSAT.xml | 21 - .../GINI_METEOSAT/GRID_CLOUD_AMT.attr | 7 - .../GINI_METEOSAT/GRID_CTOP_PRES_HGHT.attr | 7 - .../SATELLITE/GINI_METEOSAT/ICE_CONC.attr | 7 - .../SATELLITE/GINI_METEOSAT/ICE_EDGE.attr | 7 - .../SATELLITE/GINI_METEOSAT/ICE_TYPE.attr | 7 - .../GINI_METEOSAT/IMG_LIFTED_INDEX.attr | 7 - .../GINI_METEOSAT/IMG_PRECIP_WATER.attr | 7 - .../GINI_METEOSAT/IMG_SRFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_METEOSAT/IR.attr | 8 - .../SATELLITE/GINI_METEOSAT/IR13.attr | 8 - .../GINI_METEOSAT/LOW_CLOUD_IMG.attr | 7 - .../SATELLITE/GINI_METEOSAT/MDPI.attr | 7 - .../GINI_METEOSAT/NORMAL_TPW_PERCENT.attr | 7 - .../SATELLITE/GINI_METEOSAT/POLAR_3.7u.attr | 7 - .../SATELLITE/GINI_METEOSAT/POLAR_3.9u.attr | 7 - .../SATELLITE/GINI_METEOSAT/POLAR_IR.attr | 7 - .../SATELLITE/GINI_METEOSAT/POLAR_VIS.attr | 7 - .../SATELLITE/GINI_METEOSAT/RAIN_RATE.attr | 7 - .../GINI_METEOSAT/SCATTEROMETER.attr | 7 - .../SATELLITE/GINI_METEOSAT/SFC_WETNESS.attr | 7 - .../SATELLITE/GINI_METEOSAT/SFC_WIND_SPD.attr | 7 - .../SATELLITE/GINI_METEOSAT/SND_11.03.attr | 7 - .../SATELLITE/GINI_METEOSAT/SND_12.02.attr | 7 - .../SATELLITE/GINI_METEOSAT/SND_12.66.attr | 7 - .../SATELLITE/GINI_METEOSAT/SND_13.37.attr | 7 - .../SATELLITE/GINI_METEOSAT/SND_13.64.attr | 7 - .../SATELLITE/GINI_METEOSAT/SND_14.06.attr | 7 - .../SATELLITE/GINI_METEOSAT/SND_14.37.attr | 7 - .../SATELLITE/GINI_METEOSAT/SND_14.71.attr | 7 - .../SATELLITE/GINI_METEOSAT/SND_3.74.attr | 7 - .../SATELLITE/GINI_METEOSAT/SND_3.98.attr | 7 - .../SATELLITE/GINI_METEOSAT/SND_4.13.attr | 7 - .../SATELLITE/GINI_METEOSAT/SND_4.45.attr | 7 - .../SATELLITE/GINI_METEOSAT/SND_4.52.attr | 7 - .../SATELLITE/GINI_METEOSAT/SND_4.57.attr | 7 - .../SATELLITE/GINI_METEOSAT/SND_6.51.attr | 7 - .../SATELLITE/GINI_METEOSAT/SND_7.02.attr | 7 - .../SATELLITE/GINI_METEOSAT/SND_7.43.attr | 7 - .../SATELLITE/GINI_METEOSAT/SND_9.71.attr | 7 - .../GINI_METEOSAT/SND_LIFTED_INDEX.attr | 7 - .../GINI_METEOSAT/SND_PRECIP_WATER.attr | 7 - .../GINI_METEOSAT/SND_SFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_METEOSAT/SND_VIS.attr | 7 - .../SATELLITE/GINI_METEOSAT/SNOW_IND.attr | 7 - .../SATELLITE/GINI_METEOSAT/SNOW_WATER.attr | 7 - .../SATELLITE/GINI_METEOSAT/SURFACE_TYPE.attr | 7 - .../SATELLITE/GINI_METEOSAT/VIS.attr | 8 - .../SATELLITE/GINI_METEOSAT/WV.attr | 8 - .../SATELLITE/GINI_METEOSAT/default.attr | 7 - .../GINI_Miscellaneous/CLOUD_WATER.attr | 7 - .../GINI_Miscellaneous/DERIVED_CAPE.attr | 7 - .../GINI_Miscellaneous/DERIVED_CONV_INH.attr | 7 - .../DERIVED_LAND_SEA_TEMP.attr | 7 - .../DERIVED_VOLCANO_IMG.attr | 7 - .../GINI_Miscellaneous/DERIVED_WINDEX.attr | 7 - .../SATELLITE/GINI_Miscellaneous/DMPI.attr | 7 - .../GINI_Miscellaneous/GRID_CLOUD_AMT.attr | 7 - .../GRID_CTOP_PRES_HGHT.attr | 7 - .../GINI_Miscellaneous/ICE_CONC.attr | 7 - .../GINI_Miscellaneous/ICE_EDGE.attr | 7 - .../GINI_Miscellaneous/ICE_TYPE.attr | 7 - .../GINI_Miscellaneous/IMG_LIFTED_INDEX.attr | 7 - .../GINI_Miscellaneous/IMG_PRECIP_WATER.attr | 7 - .../IMG_SRFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_Miscellaneous/IR.attr | 8 - .../SATELLITE/GINI_Miscellaneous/IR13.attr | 8 - .../GINI_Miscellaneous/LOW_CLOUD_IMG.attr | 7 - .../SATELLITE/GINI_Miscellaneous/MDPI.attr | 7 - .../GINI_Miscellaneous/POLAR_3.7u.attr | 7 - .../GINI_Miscellaneous/POLAR_3.9u.attr | 7 - .../GINI_Miscellaneous/POLAR_IR.attr | 7 - .../GINI_Miscellaneous/POLAR_VIS.attr | 7 - .../GINI_Miscellaneous/RAIN_RATE.attr | 7 - .../GINI_Miscellaneous/SCATTEROMETER.attr | 7 - .../GINI_Miscellaneous/SFC_WETNESS.attr | 7 - .../GINI_Miscellaneous/SFC_WIND_SPD.attr | 7 - .../GINI_Miscellaneous/SND_11.03.attr | 7 - .../GINI_Miscellaneous/SND_12.02.attr | 7 - .../GINI_Miscellaneous/SND_12.66.attr | 7 - .../GINI_Miscellaneous/SND_13.37.attr | 7 - .../GINI_Miscellaneous/SND_13.64.attr | 7 - .../GINI_Miscellaneous/SND_14.06.attr | 7 - .../GINI_Miscellaneous/SND_14.37.attr | 7 - .../GINI_Miscellaneous/SND_14.71.attr | 7 - .../GINI_Miscellaneous/SND_3.74.attr | 7 - .../GINI_Miscellaneous/SND_3.98.attr | 7 - .../GINI_Miscellaneous/SND_4.13.attr | 7 - .../GINI_Miscellaneous/SND_4.45.attr | 7 - .../GINI_Miscellaneous/SND_4.52.attr | 7 - .../GINI_Miscellaneous/SND_4.57.attr | 7 - .../GINI_Miscellaneous/SND_6.51.attr | 7 - .../GINI_Miscellaneous/SND_7.02.attr | 7 - .../GINI_Miscellaneous/SND_7.43.attr | 7 - .../GINI_Miscellaneous/SND_9.71.attr | 7 - .../GINI_Miscellaneous/SND_LIFTED_INDEX.attr | 7 - .../GINI_Miscellaneous/SND_SFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_Miscellaneous/SND_VIS.attr | 7 - .../GINI_Miscellaneous/SNOW_IND.attr | 7 - .../GINI_Miscellaneous/SNOW_WATER.attr | 7 - .../GINI_Miscellaneous/SURFACE_TYPE.attr | 7 - .../SATELLITE/GINI_Miscellaneous/VIS.attr | 8 - .../SATELLITE/GINI_Miscellaneous/WV.attr | 8 - .../SATELLITE/GINI_Miscellaneous/default.attr | 7 - .../SATELLITE/GINI_NOAA16/CLOUD_WATER.attr | 7 - .../SATELLITE/GINI_NOAA16/DERIVED_CAPE.attr | 7 - .../GINI_NOAA16/DERIVED_CONV_INH.attr | 7 - .../GINI_NOAA16/DERIVED_LAND_SEA_TEMP.attr | 7 - .../GINI_NOAA16/DERIVED_VOLCANO_IMG.attr | 7 - .../SATELLITE/GINI_NOAA16/DERIVED_WINDEX.attr | 7 - .../SATELLITE/GINI_NOAA16/DMPI.attr | 7 - .../SATELLITE/GINI_NOAA16/GRID_CLOUD_AMT.attr | 7 - .../GINI_NOAA16/GRID_CTOP_PRES_HGHT.attr | 7 - .../SATELLITE/GINI_NOAA16/ICE_CONC.attr | 7 - .../SATELLITE/GINI_NOAA16/ICE_EDGE.attr | 7 - .../SATELLITE/GINI_NOAA16/ICE_TYPE.attr | 7 - .../GINI_NOAA16/IMG_LIFTED_INDEX.attr | 7 - .../GINI_NOAA16/IMG_PRECIP_WATER.attr | 7 - .../GINI_NOAA16/IMG_SRFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_NOAA16/IR.attr | 8 - .../SATELLITE/GINI_NOAA16/IR13.attr | 8 - .../SATELLITE/GINI_NOAA16/LOW_CLOUD_IMG.attr | 7 - .../SATELLITE/GINI_NOAA16/MDPI.attr | 7 - .../GINI_NOAA16/NORMAL_TPW_PERCENT.attr | 7 - .../SATELLITE/GINI_NOAA16/POLAR_3.7u.attr | 7 - .../SATELLITE/GINI_NOAA16/POLAR_3.9u.attr | 7 - .../SATELLITE/GINI_NOAA16/POLAR_IR.attr | 7 - .../SATELLITE/GINI_NOAA16/POLAR_VIS.attr | 7 - .../SATELLITE/GINI_NOAA16/RAIN_RATE.attr | 7 - .../SATELLITE/GINI_NOAA16/SCATTEROMETER.attr | 7 - .../SATELLITE/GINI_NOAA16/SFC_WETNESS.attr | 7 - .../SATELLITE/GINI_NOAA16/SFC_WIND_SPD.attr | 7 - .../SATELLITE/GINI_NOAA16/SND_11.03.attr | 7 - .../SATELLITE/GINI_NOAA16/SND_12.02.attr | 7 - .../SATELLITE/GINI_NOAA16/SND_12.66.attr | 7 - .../SATELLITE/GINI_NOAA16/SND_13.37.attr | 7 - .../SATELLITE/GINI_NOAA16/SND_13.64.attr | 7 - .../SATELLITE/GINI_NOAA16/SND_14.06.attr | 7 - .../SATELLITE/GINI_NOAA16/SND_14.37.attr | 7 - .../SATELLITE/GINI_NOAA16/SND_14.71.attr | 7 - .../SATELLITE/GINI_NOAA16/SND_3.74.attr | 7 - .../SATELLITE/GINI_NOAA16/SND_3.98.attr | 7 - .../SATELLITE/GINI_NOAA16/SND_4.13.attr | 7 - .../SATELLITE/GINI_NOAA16/SND_4.45.attr | 7 - .../SATELLITE/GINI_NOAA16/SND_4.52.attr | 7 - .../SATELLITE/GINI_NOAA16/SND_4.57.attr | 7 - .../SATELLITE/GINI_NOAA16/SND_6.51.attr | 7 - .../SATELLITE/GINI_NOAA16/SND_7.02.attr | 7 - .../SATELLITE/GINI_NOAA16/SND_7.43.attr | 7 - .../SATELLITE/GINI_NOAA16/SND_9.71.attr | 7 - .../GINI_NOAA16/SND_LIFTED_INDEX.attr | 7 - .../GINI_NOAA16/SND_PRECIP_WATER.attr | 7 - .../GINI_NOAA16/SND_SFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_NOAA16/SND_VIS.attr | 7 - .../SATELLITE/GINI_NOAA16/SNOW_IND.attr | 7 - .../SATELLITE/GINI_NOAA16/SNOW_WATER.attr | 7 - .../SATELLITE/GINI_NOAA16/SURFACE_TYPE.attr | 7 - .../SATELLITE/GINI_NOAA16/VIS.attr | 8 - .../SATELLITE/GINI_NOAA16/WV.attr | 8 - .../SATELLITE/GINI_NOAA16/default.attr | 7 - .../SATELLITE/GINI_NOAA17/CLOUD_WATER.attr | 7 - .../SATELLITE/GINI_NOAA17/DERIVED_CAPE.attr | 7 - .../GINI_NOAA17/DERIVED_CONV_INH.attr | 7 - .../GINI_NOAA17/DERIVED_LAND_SEA_TEMP.attr | 7 - .../GINI_NOAA17/DERIVED_VOLCANO_IMG.attr | 7 - .../SATELLITE/GINI_NOAA17/DERIVED_WINDEX.attr | 7 - .../SATELLITE/GINI_NOAA17/DMPI.attr | 7 - .../SATELLITE/GINI_NOAA17/GINI_NOAA17.xml | 21 - .../SATELLITE/GINI_NOAA17/GRID_CLOUD_AMT.attr | 7 - .../GINI_NOAA17/GRID_CTOP_PRES_HGHT.attr | 7 - .../SATELLITE/GINI_NOAA17/ICE_CONC.attr | 7 - .../SATELLITE/GINI_NOAA17/ICE_EDGE.attr | 7 - .../SATELLITE/GINI_NOAA17/ICE_TYPE.attr | 7 - .../GINI_NOAA17/IMG_LIFTED_INDEX.attr | 7 - .../GINI_NOAA17/IMG_PRECIP_WATER.attr | 7 - .../GINI_NOAA17/IMG_SRFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_NOAA17/IR.attr | 8 - .../SATELLITE/GINI_NOAA17/IR13.attr | 8 - .../SATELLITE/GINI_NOAA17/LOW_CLOUD_IMG.attr | 7 - .../SATELLITE/GINI_NOAA17/MDPI.attr | 7 - .../GINI_NOAA17/NORMAL_TPW_PERCENT.attr | 7 - .../SATELLITE/GINI_NOAA17/POLAR_3.7u.attr | 7 - .../SATELLITE/GINI_NOAA17/POLAR_3.9u.attr | 7 - .../SATELLITE/GINI_NOAA17/POLAR_IR.attr | 7 - .../SATELLITE/GINI_NOAA17/POLAR_VIS.attr | 7 - .../SATELLITE/GINI_NOAA17/RAIN_RATE.attr | 7 - .../SATELLITE/GINI_NOAA17/SCATTEROMETER.attr | 7 - .../SATELLITE/GINI_NOAA17/SFC_WETNESS.attr | 7 - .../SATELLITE/GINI_NOAA17/SFC_WIND_SPD.attr | 7 - .../SATELLITE/GINI_NOAA17/SND_11.03.attr | 7 - .../SATELLITE/GINI_NOAA17/SND_12.02.attr | 7 - .../SATELLITE/GINI_NOAA17/SND_12.66.attr | 7 - .../SATELLITE/GINI_NOAA17/SND_13.37.attr | 7 - .../SATELLITE/GINI_NOAA17/SND_13.64.attr | 7 - .../SATELLITE/GINI_NOAA17/SND_14.06.attr | 7 - .../SATELLITE/GINI_NOAA17/SND_14.37.attr | 7 - .../SATELLITE/GINI_NOAA17/SND_14.71.attr | 7 - .../SATELLITE/GINI_NOAA17/SND_3.74.attr | 7 - .../SATELLITE/GINI_NOAA17/SND_3.98.attr | 7 - .../SATELLITE/GINI_NOAA17/SND_4.13.attr | 7 - .../SATELLITE/GINI_NOAA17/SND_4.45.attr | 7 - .../SATELLITE/GINI_NOAA17/SND_4.52.attr | 7 - .../SATELLITE/GINI_NOAA17/SND_4.57.attr | 7 - .../SATELLITE/GINI_NOAA17/SND_6.51.attr | 7 - .../SATELLITE/GINI_NOAA17/SND_7.02.attr | 7 - .../SATELLITE/GINI_NOAA17/SND_7.43.attr | 7 - .../SATELLITE/GINI_NOAA17/SND_9.71.attr | 7 - .../GINI_NOAA17/SND_LIFTED_INDEX.attr | 7 - .../GINI_NOAA17/SND_PRECIP_WATER.attr | 7 - .../GINI_NOAA17/SND_SFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_NOAA17/SND_VIS.attr | 7 - .../SATELLITE/GINI_NOAA17/SNOW_IND.attr | 7 - .../SATELLITE/GINI_NOAA17/SNOW_WATER.attr | 7 - .../SATELLITE/GINI_NOAA17/SURFACE_TYPE.attr | 7 - .../SATELLITE/GINI_NOAA17/VIS.attr | 8 - .../SATELLITE/GINI_NOAA17/WV.attr | 8 - .../SATELLITE/GINI_NOAA17/default.attr | 7 - .../SATELLITE/GINI_NOAA18/CLOUD_WATER.attr | 7 - .../SATELLITE/GINI_NOAA18/DERIVED_CAPE.attr | 7 - .../GINI_NOAA18/DERIVED_CONV_INH.attr | 7 - .../GINI_NOAA18/DERIVED_LAND_SEA_TEMP.attr | 7 - .../GINI_NOAA18/DERIVED_VOLCANO_IMG.attr | 7 - .../SATELLITE/GINI_NOAA18/DERIVED_WINDEX.attr | 7 - .../SATELLITE/GINI_NOAA18/DMPI.attr | 7 - .../SATELLITE/GINI_NOAA18/GINI_NOAA18.xml | 21 - .../SATELLITE/GINI_NOAA18/GRID_CLOUD_AMT.attr | 7 - .../GINI_NOAA18/GRID_CTOP_PRES_HGHT.attr | 7 - .../SATELLITE/GINI_NOAA18/ICE_CONC.attr | 7 - .../SATELLITE/GINI_NOAA18/ICE_EDGE.attr | 7 - .../SATELLITE/GINI_NOAA18/ICE_TYPE.attr | 7 - .../GINI_NOAA18/IMG_LIFTED_INDEX.attr | 7 - .../GINI_NOAA18/IMG_PRECIP_WATER.attr | 7 - .../GINI_NOAA18/IMG_SRFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_NOAA18/IR.attr | 8 - .../SATELLITE/GINI_NOAA18/IR13.attr | 8 - .../SATELLITE/GINI_NOAA18/LOW_CLOUD_IMG.attr | 7 - .../SATELLITE/GINI_NOAA18/MDPI.attr | 7 - .../GINI_NOAA18/NORMAL_TPW_PERCENT.attr | 7 - .../SATELLITE/GINI_NOAA18/POLAR_3.7u.attr | 7 - .../SATELLITE/GINI_NOAA18/POLAR_3.9u.attr | 7 - .../SATELLITE/GINI_NOAA18/POLAR_IR.attr | 7 - .../SATELLITE/GINI_NOAA18/POLAR_VIS.attr | 7 - .../SATELLITE/GINI_NOAA18/RAIN_RATE.attr | 7 - .../SATELLITE/GINI_NOAA18/SCATTEROMETER.attr | 7 - .../SATELLITE/GINI_NOAA18/SFC_WETNESS.attr | 7 - .../SATELLITE/GINI_NOAA18/SFC_WIND_SPD.attr | 7 - .../SATELLITE/GINI_NOAA18/SND_11.03.attr | 7 - .../SATELLITE/GINI_NOAA18/SND_12.02.attr | 7 - .../SATELLITE/GINI_NOAA18/SND_12.66.attr | 7 - .../SATELLITE/GINI_NOAA18/SND_13.37.attr | 7 - .../SATELLITE/GINI_NOAA18/SND_13.64.attr | 7 - .../SATELLITE/GINI_NOAA18/SND_14.06.attr | 7 - .../SATELLITE/GINI_NOAA18/SND_14.37.attr | 7 - .../SATELLITE/GINI_NOAA18/SND_14.71.attr | 7 - .../SATELLITE/GINI_NOAA18/SND_3.74.attr | 7 - .../SATELLITE/GINI_NOAA18/SND_3.98.attr | 7 - .../SATELLITE/GINI_NOAA18/SND_4.13.attr | 7 - .../SATELLITE/GINI_NOAA18/SND_4.45.attr | 7 - .../SATELLITE/GINI_NOAA18/SND_4.52.attr | 7 - .../SATELLITE/GINI_NOAA18/SND_4.57.attr | 7 - .../SATELLITE/GINI_NOAA18/SND_6.51.attr | 7 - .../SATELLITE/GINI_NOAA18/SND_7.02.attr | 7 - .../SATELLITE/GINI_NOAA18/SND_7.43.attr | 7 - .../SATELLITE/GINI_NOAA18/SND_9.71.attr | 7 - .../GINI_NOAA18/SND_LIFTED_INDEX.attr | 7 - .../GINI_NOAA18/SND_PRECIP_WATER.attr | 7 - .../GINI_NOAA18/SND_SFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_NOAA18/SND_VIS.attr | 7 - .../SATELLITE/GINI_NOAA18/SNOW_IND.attr | 7 - .../SATELLITE/GINI_NOAA18/SNOW_WATER.attr | 7 - .../SATELLITE/GINI_NOAA18/SURFACE_TYPE.attr | 7 - .../SATELLITE/GINI_NOAA18/VIS.attr | 8 - .../SATELLITE/GINI_NOAA18/WV.attr | 8 - .../SATELLITE/GINI_NOAA18/default.attr | 7 - .../SATELLITE/GINI_NOAA19/CLOUD_WATER.attr | 7 - .../SATELLITE/GINI_NOAA19/DERIVED_CAPE.attr | 7 - .../GINI_NOAA19/DERIVED_CONV_INH.attr | 7 - .../GINI_NOAA19/DERIVED_LAND_SEA_TEMP.attr | 7 - .../GINI_NOAA19/DERIVED_VOLCANO_IMG.attr | 7 - .../SATELLITE/GINI_NOAA19/DERIVED_WINDEX.attr | 7 - .../SATELLITE/GINI_NOAA19/DMPI.attr | 7 - .../SATELLITE/GINI_NOAA19/GINI_NOAA19.xml | 21 - .../SATELLITE/GINI_NOAA19/GRID_CLOUD_AMT.attr | 7 - .../GINI_NOAA19/GRID_CTOP_PRES_HGHT.attr | 7 - .../SATELLITE/GINI_NOAA19/ICE_CONC.attr | 7 - .../SATELLITE/GINI_NOAA19/ICE_EDGE.attr | 7 - .../SATELLITE/GINI_NOAA19/ICE_TYPE.attr | 7 - .../GINI_NOAA19/IMG_LIFTED_INDEX.attr | 7 - .../GINI_NOAA19/IMG_PRECIP_WATER.attr | 7 - .../GINI_NOAA19/IMG_SRFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_NOAA19/IR.attr | 8 - .../SATELLITE/GINI_NOAA19/IR13.attr | 8 - .../SATELLITE/GINI_NOAA19/LOW_CLOUD_IMG.attr | 7 - .../SATELLITE/GINI_NOAA19/MDPI.attr | 7 - .../GINI_NOAA19/NORMAL_TPW_PERCENT.attr | 7 - .../SATELLITE/GINI_NOAA19/POLAR_3.7u.attr | 7 - .../SATELLITE/GINI_NOAA19/POLAR_3.9u.attr | 7 - .../SATELLITE/GINI_NOAA19/POLAR_IR.attr | 7 - .../SATELLITE/GINI_NOAA19/POLAR_VIS.attr | 7 - .../SATELLITE/GINI_NOAA19/RAIN_RATE.attr | 7 - .../SATELLITE/GINI_NOAA19/SCATTEROMETER.attr | 7 - .../SATELLITE/GINI_NOAA19/SFC_WETNESS.attr | 7 - .../SATELLITE/GINI_NOAA19/SFC_WIND_SPD.attr | 7 - .../SATELLITE/GINI_NOAA19/SND_11.03.attr | 7 - .../SATELLITE/GINI_NOAA19/SND_12.02.attr | 7 - .../SATELLITE/GINI_NOAA19/SND_12.66.attr | 7 - .../SATELLITE/GINI_NOAA19/SND_13.37.attr | 7 - .../SATELLITE/GINI_NOAA19/SND_13.64.attr | 7 - .../SATELLITE/GINI_NOAA19/SND_14.06.attr | 7 - .../SATELLITE/GINI_NOAA19/SND_14.37.attr | 7 - .../SATELLITE/GINI_NOAA19/SND_14.71.attr | 7 - .../SATELLITE/GINI_NOAA19/SND_3.74.attr | 7 - .../SATELLITE/GINI_NOAA19/SND_3.98.attr | 7 - .../SATELLITE/GINI_NOAA19/SND_4.13.attr | 7 - .../SATELLITE/GINI_NOAA19/SND_4.45.attr | 7 - .../SATELLITE/GINI_NOAA19/SND_4.52.attr | 7 - .../SATELLITE/GINI_NOAA19/SND_4.57.attr | 7 - .../SATELLITE/GINI_NOAA19/SND_6.51.attr | 7 - .../SATELLITE/GINI_NOAA19/SND_7.02.attr | 7 - .../SATELLITE/GINI_NOAA19/SND_7.43.attr | 7 - .../SATELLITE/GINI_NOAA19/SND_9.71.attr | 7 - .../GINI_NOAA19/SND_LIFTED_INDEX.attr | 7 - .../GINI_NOAA19/SND_PRECIP_WATER.attr | 7 - .../GINI_NOAA19/SND_SFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_NOAA19/SND_VIS.attr | 7 - .../SATELLITE/GINI_NOAA19/SNOW_IND.attr | 7 - .../SATELLITE/GINI_NOAA19/SNOW_WATER.attr | 7 - .../SATELLITE/GINI_NOAA19/SURFACE_TYPE.attr | 7 - .../SATELLITE/GINI_NOAA19/VIS.attr | 8 - .../SATELLITE/GINI_NOAA19/WV.attr | 8 - .../SATELLITE/GINI_NOAA19/default.attr | 7 - .../GINI_POES-NPOESS/CLOUD_WATER.attr | 7 - .../GINI_POES-NPOESS/DERIVED_CAPE.attr | 7 - .../GINI_POES-NPOESS/DERIVED_CONV_INH.attr | 7 - .../DERIVED_LAND_SEA_TEMP.attr | 7 - .../GINI_POES-NPOESS/DERIVED_VOLCANO_IMG.attr | 7 - .../GINI_POES-NPOESS/DERIVED_WINDEX.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/DMPI.attr | 7 - .../GINI_POES-NPOESS/GRID_CLOUD_AMT.attr | 7 - .../GINI_POES-NPOESS/GRID_CTOP_PRES_HGHT.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/ICE_CONC.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/ICE_EDGE.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/ICE_TYPE.attr | 7 - .../GINI_POES-NPOESS/IMG_LIFTED_INDEX.attr | 7 - .../GINI_POES-NPOESS/IMG_PRECIP_WATER.attr | 7 - .../GINI_POES-NPOESS/IMG_SRFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/IR.attr | 8 - .../SATELLITE/GINI_POES-NPOESS/IR13.attr | 8 - .../GINI_POES-NPOESS/LOW_CLOUD_IMG.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/MDPI.attr | 7 - .../GINI_POES-NPOESS/NORMAL_TPW_PERCENT.attr | 7 - .../GINI_POES-NPOESS/POLAR_3.7u.attr | 7 - .../GINI_POES-NPOESS/POLAR_3.9u.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/POLAR_IR.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/POLAR_VIS.attr | 7 - .../GINI_POES-NPOESS/SCATTEROMETER.attr | 7 - .../GINI_POES-NPOESS/SFC_WETNESS.attr | 7 - .../GINI_POES-NPOESS/SFC_WIND_SPD.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/SND_11.03.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/SND_12.02.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/SND_12.66.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/SND_13.37.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/SND_13.64.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/SND_14.06.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/SND_14.37.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/SND_14.71.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/SND_3.74.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/SND_3.98.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/SND_4.13.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/SND_4.45.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/SND_4.52.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/SND_4.57.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/SND_6.51.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/SND_7.02.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/SND_7.43.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/SND_9.71.attr | 7 - .../GINI_POES-NPOESS/SND_LIFTED_INDEX.attr | 7 - .../GINI_POES-NPOESS/SND_PRECIP_WATER.attr | 7 - .../GINI_POES-NPOESS/SND_SFC_SKIN_TEMP.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/SND_VIS.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/SNOW_IND.attr | 7 - .../GINI_POES-NPOESS/SNOW_WATER.attr | 7 - .../GINI_POES-NPOESS/SURFACE_TYPE.attr | 7 - .../SATELLITE/GINI_POES-NPOESS/VIS.attr | 8 - .../SATELLITE/GINI_POES-NPOESS/WV.attr | 8 - .../SATELLITE/GINI_POES-NPOESS/default.attr | 7 - .../ncep/ResourceDefns/SATELLITE/GMS/GMS.xml | 22 - .../ncep/ResourceDefns/SATELLITE/GMS/IR2.attr | 7 - .../ncep/ResourceDefns/SATELLITE/GMS/IR3.attr | 7 - .../ncep/ResourceDefns/SATELLITE/GMS/VIS.attr | 7 - .../ResourceDefns/SATELLITE/GOES10/GOES10.xml | 22 - .../ResourceDefns/SATELLITE/GOES10/IR.attr | 7 - .../ResourceDefns/SATELLITE/GOES10/IR2.attr | 7 - .../ResourceDefns/SATELLITE/GOES10/IR3.attr | 7 - .../ResourceDefns/SATELLITE/GOES10/IR4.attr | 7 - .../ResourceDefns/SATELLITE/GOES10/VIS.attr | 7 - .../ResourceDefns/SATELLITE/GOES11/GOES11.xml | 22 - .../ResourceDefns/SATELLITE/GOES11/IR.attr | 7 - .../ResourceDefns/SATELLITE/GOES11/IR2.attr | 7 - .../ResourceDefns/SATELLITE/GOES11/IR3.attr | 7 - .../ResourceDefns/SATELLITE/GOES11/IR4.attr | 7 - .../ResourceDefns/SATELLITE/GOES11/VIS.attr | 7 - .../ResourceDefns/SATELLITE/GOES12/IR3.attr | 7 - .../ResourceDefns/SATELLITE/GOES12/IR4.attr | 7 - .../ResourceDefns/SATELLITE/GOES13/IR3.attr | 7 - .../ResourceDefns/SATELLITE/GOES13/IR4.attr | 7 - .../{FYC/FYC.xml => GOES14/GOES14.xml} | 4 +- .../SATELLITE/{FYC => GOES14}/IR.attr | 0 .../SATELLITE/{DPD => GOES14}/IR2.attr | 0 .../SATELLITE/{FYC => GOES14}/VIS.attr | 0 .../SATELLITE/{GMS => GOES14}/WV.attr | 0 .../ResourceDefns/SATELLITE/GOES15/IR3.attr | 7 - .../ResourceDefns/SATELLITE/GOES15/IR4.attr | 7 - .../ResourceDefns/SATELLITE/GOES6/GOES6.xml | 22 - .../ResourceDefns/SATELLITE/GOES6/IR.attr | 7 - .../ResourceDefns/SATELLITE/GOES6/VIS.attr | 7 - .../ResourceDefns/SATELLITE/GOES7/GOES7.xml | 22 - .../ResourceDefns/SATELLITE/GOES7/IR.attr | 7 - .../ResourceDefns/SATELLITE/GOES7/VIS.attr | 7 - .../ResourceDefns/SATELLITE/GOES7/VISPC.attr | 7 - .../ResourceDefns/SATELLITE/GOES7/WV.attr | 7 - .../ResourceDefns/SATELLITE/GOES8/GOES8.xml | 22 - .../ResourceDefns/SATELLITE/GOES8/IR.attr | 7 - .../ResourceDefns/SATELLITE/GOES8/IR2.attr | 7 - .../ResourceDefns/SATELLITE/GOES8/IR3.attr | 7 - .../ResourceDefns/SATELLITE/GOES8/IR4.attr | 7 - .../ResourceDefns/SATELLITE/GOES8/VIS.attr | 7 - .../ResourceDefns/SATELLITE/GOES8/WV.attr | 7 - .../ResourceDefns/SATELLITE/GOES9/GOES9.xml | 22 - .../ResourceDefns/SATELLITE/GOES9/IR.attr | 7 - .../ResourceDefns/SATELLITE/GOES9/IR2.attr | 7 - .../ResourceDefns/SATELLITE/GOES9/IR3.attr | 7 - .../ResourceDefns/SATELLITE/GOES9/IR4.attr | 7 - .../ResourceDefns/SATELLITE/GOES9/VIS.attr | 7 - .../ResourceDefns/SATELLITE/GOES9/WV.attr | 7 - .../{GOES11/WV.attr => Global/GPS.attr} | 4 +- .../SATELLITE/{GMS => Global}/IR.attr | 0 .../{GOES6/WV.attr => Global/PCT.attr} | 4 +- .../SATELLITE/{GOES10 => Global}/WV.attr | 0 .../SATELLITE/METEOSAT10/HRVIS.attr | 7 - .../SATELLITE/METEOSAT10/IR.attr | 7 - .../SATELLITE/METEOSAT10/IR_12.0.attr | 7 - .../SATELLITE/METEOSAT10/IR_8.7.attr | 7 - .../SATELLITE/METEOSAT10/NIR_1.6.attr | 7 - .../SATELLITE/METEOSAT10/VIS_0.8.attr | 7 - .../SATELLITE/METEOSAT10/WV_7.3.attr | 7 - .../ResourceDefns/SATELLITE/METEOSAT3/IR.attr | 7 - .../SATELLITE/METEOSAT3/METEOSAT3.xml | 22 - .../SATELLITE/METEOSAT3/VIS.attr | 7 - .../ResourceDefns/SATELLITE/METEOSAT3/WV.attr | 7 - .../ResourceDefns/SATELLITE/METEOSAT5/IR.attr | 7 - .../SATELLITE/METEOSAT5/IR3.attr | 7 - .../SATELLITE/METEOSAT5/METEOSAT5.xml | 22 - .../SATELLITE/METEOSAT5/VIS.attr | 7 - .../ResourceDefns/SATELLITE/METEOSAT5/WV.attr | 7 - .../ResourceDefns/SATELLITE/METEOSAT6/IR.attr | 7 - .../SATELLITE/METEOSAT6/METEOSAT6.xml | 22 - .../SATELLITE/METEOSAT6/VIS.attr | 7 - .../ResourceDefns/SATELLITE/METEOSAT6/WV.attr | 7 - .../ResourceDefns/SATELLITE/METEOSAT7/IR.attr | 7 - .../SATELLITE/METEOSAT7/IR3.attr | 7 - .../SATELLITE/METEOSAT7/METEOSAT7.xml | 22 - .../SATELLITE/METEOSAT7/VIS.attr | 7 - .../ResourceDefns/SATELLITE/METEOSAT7/WV.attr | 7 - .../SATELLITE/METEOSAT9/HRVIS.attr | 7 - .../ResourceDefns/SATELLITE/METEOSAT9/IR.attr | 7 - .../SATELLITE/METEOSAT9/IR_12.0.attr | 7 - .../SATELLITE/METEOSAT9/IR_8.7.attr | 7 - .../SATELLITE/METEOSAT9/NIR_1.6.attr | 7 - .../SATELLITE/METEOSAT9/VIS_0.8.attr | 7 - .../SATELLITE/METEOSAT9/WV_7.3.attr | 7 - .../common/cave/etc/ncep/basemaps/snap.lpi | 1904 ----------- .../cave/etc/ncep/basemaps/volcanoes.lpi | 1483 +++++++++ .../core/drawables/AbstractDescriptor.java | 9 + .../feature.xml | 7 + .../feature.xml | 51 +- .../ui/dialogs/ChooseDataPeriodDialog.java | 5 +- .../raytheon/viz/mpe/util/GetBasinData.java | 73 +- .../texteditor/command/ProductQueryJob.java | 150 +- .../texteditor/dialogs/TextEditorDialog.java | 46 +- .../viz/warngen/gui/WarngenAction.java | 8 +- .../viz/warngen/gui/WarngenDialog.java | 17 +- .../viz/warngen/gui/WarngenUIManager.java | 7 +- .../build.edex/opt/db/ddl/ncep/loadSnap.sql | 1904 ----------- .../res/spring.deprecated/grib-decode.xml | 4 + .../NcgribFileNameProcessor.java | 18 +- .../base/grib/ncgrib/ncgribModelNameMap.xml | 108 +- .../edex/plugin/radar/RadarDecompressor.java | 94 +- .../decoder/synoptic/SynopticSec2Decoder.java | 5 +- edexOsgi/com.raytheon.uf.tools.cli/impl/gpd | 34 + .../impl/src/gpd/GpdCliRequestHandler.py | 117 + .../impl/src/gpd/gpd.py | 695 ++++ .../feature.xml | 15 + .../ncep/common/dataplugin/aww/AwwRecord.java | 65 +- .../common/dataplugin/aww/UGCHeaderUtil.java | 74 + ...f.common.serialization.ISerializableObject | 5 +- .../build.properties | 3 +- .../res/scripts/geomagSourcePreferences.sql | 3 - .../res/scripts/geomagSources.sql | 3 - .../common/dataplugin/geomag/GeoMagAvg.java | 173 + .../common/dataplugin/geomag/GeoMagK1min.java | 365 +++ .../common/dataplugin/geomag/GeoMagK3hr.java | 203 ++ .../dataplugin/geomag/GeoMagPathProvider.java | 54 + .../dataplugin/geomag/GeoMagRecord.java | 604 +++- .../dataplugin/geomag/dao/GeoMagAvgDao.java | 94 + .../dataplugin/geomag/dao/GeoMagDao.java | 560 +++- .../dataplugin/geomag/dao/GeoMagK1minDao.java | 45 + .../dataplugin/geomag/dao/GeoMagK3hrDao.java | 75 + .../geomag/dao/GeoMagSourceDao.java | 85 - .../geomag/dao/GeoMagSourcePreferenceDao.java | 49 - .../dataplugin/geomag/fixed/GeoMagSource.java | 112 - .../geomag/fixed/GeoMagSourcePreference.java | 94 - .../dataplugin/geomag/table/GeoMagSource.java | 51 + .../geomag/table/GeoMagStation.java | 38 +- .../dataplugin/geomag/table/KFitTime.java | 74 + .../table/KStationCoeffTableReader.java | 61 + .../geomag/table/KStationCoefficient.java | 151 + .../geomag/table/KStationCoefficients.java | 98 + .../dataplugin/geomag/table/KsThree.java | 148 + .../geomag/util/GeoMagStationLookup.java | 45 +- .../util/KStationCoefficientLookup.java | 132 + .../.classpath | 0 .../.project | 8 +- .../.pydevproject | 7 + .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../META-INF/MANIFEST.MF | 22 + ...f.common.serialization.ISerializableObject | 8 + ...mon.serialization.ISerializableObjectForPy | 7 + .../TEMP/GenericPointDataLevel.py | 21 + .../TEMP/GenericPointDataParameter.py | 21 + .../TEMP/GenericPointDataProductContainer.py | 35 + .../TEMP/GenericPointDataProductInfo.py | 42 + .../TEMP/GenericPointDataStationProduct.py | 63 + .../TEMP/NY20130704190000.xml | 246 ++ .../TEMP/__init__.py | 17 + .../TEMP/productExample.xml | 309 ++ .../sfc_all_parms_single_station_00-12z.sfc | 76 + .../sfc_selected_parms_multi_stations_12z.sfc | 9 + .../TEMP/ship20130731191010.xml | 246 ++ .../TEMP/ship_multi_stations_12z.shp | 2903 +++++++++++++++++ .../TEMP/snd_multi_levels_station_BAD.snd | 50 + .../TEMP/snd_multi_levels_stations_00_12z.snd | 83 + .../TEMP/snd_wrap_around.snd | 465 +++ .../build.properties | 4 + .../component-deploy.xml | 12 + ...v.noaa.nws.ncep.common.dataplugin.gpd.ecl} | 0 .../gpd/GenericPointDataConstants.java | 69 + .../gpd/GenericPointDataRecord.java | 312 ++ .../gpd/dao/GenericPointDataDao.java | 1295 ++++++++ .../gpd/product/GenericPointDataLevel.java | 79 + .../product/GenericPointDataParameter.java | 68 + .../GenericPointDataProductContainer.java | 106 + .../product/GenericPointDataProductInfo.java | 167 + .../GenericPointDataStationProduct.java | 180 + .../gpd/query/GenericPointDataQuery.java | 262 ++ .../gpd/query/GenericPointDataReqMsg.java | 332 ++ .../mcidas/McidasSpatialFactory.java | 254 +- .../ncep/common/tools/IDecoderConstantsN.java | 7 +- .../edex/plugin/aww/decoder/AwwDecoder.java | 25 +- .../ncep/edex/plugin/aww/util/AwwParser.java | 6 + .../META-INF/MANIFEST.MF | 3 +- .../res/spring/geomag-common.xml | 14 +- .../res/spring/geomag-ingest.xml | 73 +- .../res/spring/geomag-request | 41 + .../edex/plugin/geomag/GeoMagDecoder.java | 908 +++--- .../edex/plugin/geomag/TrigKCalculation.java | 1221 +++++++ .../geomag/calculation/CalcEach1min.java | 479 +++ .../geomag/calculation/CalcEach3hr.java | 469 +++ .../plugin/geomag/calculation/CalcKp.java | 442 +++ .../plugin/geomag/calculation/CalcUtil.java | 715 ++++ .../base/ncep/geomag/geoMagStations.xml | 216 +- .../base/ncep/geomag/kStandardLookup.xml | 375 +++ .../base/ncep/geomag/kStationCoefficients.xml | 171 + .../base/purge/geomagPurgeRules.xml | 2 +- .../.classpath | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 3 +- .../META-INF/MANIFEST.MF | 20 + .../build.properties | 3 +- .../component-deploy.xml | 12 + .../gov.noaa.nws.ncep.edex.plugin.gpd.ecl} | 0 .../res/pointdata/gpdProduct.xml | 252 ++ .../res/pointdata/gpdProduct.xsd | 112 + .../res/pointdata/gpdProductChin.xml | 252 ++ .../res/pointdata/gpdProductInfo.xml | 57 + .../res/pointdata/gpdProductOld1.xml | 246 ++ .../res/pointdata/gpdProductOld1.xsd | 105 + .../res/pointdata/gpdProductShip.xml | 252 ++ .../res/pointdata/gpddb.xml | 17 + .../res/spring/gpd-common.xml | 37 + .../res/spring/gpd-ingest.xml | 60 + .../res/spring/gpd-request.xml | 17 + .../gpd/decoder/GenericPointDataDecoder.java | 1562 +++++++++ .../GenericPointDataRequestHandler.java | 506 +++ .../common_static/base/path/gpdPathKeys.xml | 11 + .../base/purge/gpdPurgeRules.xml | 15 + .../plugin/mcidas/decoder/McidasDecoder.java | 1612 ++++----- .../res/spring/stormtrack-ingest.xml | 2 +- .../stormtrack/decoder/StormTrackDecoder.java | 29 +- .../decoder/StormTrackSeparator.java | 55 +- .../META-INF/MANIFEST.MF | 1 - .../staticdataprovider/ContinuingWatch.java | 39 +- .../staticdataprovider/GreatLakeProvider.java | 152 +- .../palette/NctextuiPaletteWindow.java | 771 +++-- .../ui/nctextui/rsc/NctextuiMouseHandler.java | 395 +-- .../ui/nctextui/rsc/NctextuiResource.java | 447 +-- .../ui/nctextui/rsc/NctextuiResourceData.java | 46 +- .../display/map/NsharpMapMouseHandler.java | 274 +- .../nsharp/display/map/NsharpMapResource.java | 474 +-- .../display/map/NsharpMapResourceData.java | 39 +- .../display/rsc/NsharpResourceHandler.java | 4 +- .../ui/nsharp/view/NsharpPaletteWindow.java | 1202 +++---- .../META-INF/MANIFEST.MF | 1 + .../localization/ncep/pgen/TCAinfo.xml | 1 + .../ncep/pgen/outlooksettings.xml | 318 +- .../localization/ncep/pgen/outlooktimes.xml | 4 +- .../localization/ncep/pgen/outlooktype.xml | 16 +- .../localization/ncep/pgen/productTypes.xml | 635 +--- .../localization/ncep/pgen/settings_tbl.xml | 24 +- .../pgen/xslt/airmet/get_attention_line.xsl | 4 +- .../ncep/pgen/xslt/airmet/output_outlook.xsl | 13 +- .../ncep/pgen/xslt/airmet/sierra.xsl | 8 +- .../ncep/pgen/xslt/airmet/tango.xsl | 7 +- .../ncep/pgen/xslt/airmet/zulu.xsl | 9 +- .../gov/noaa/nws/ncep/ui/pgen/PgenUtil.java | 114 + .../nws/ncep/ui/pgen/attrdialog/AttrDlg.java | 8 +- .../ncep/ui/pgen/attrdialog/CloudAttrDlg.java | 41 +- .../nws/ncep/ui/pgen/attrdialog/CycleDlg.java | 6 +- .../ncep/ui/pgen/attrdialog/GfaAttrDlg.java | 16 + .../ui/pgen/attrdialog/GfaFormatAttrDlg.java | 15 +- .../ncep/ui/pgen/attrdialog/JetAttrDlg.java | 38 + .../ui/pgen/attrdialog/OutlookAttrDlg.java | 51 +- .../ui/pgen/attrdialog/OutlookFormatDlg.java | 191 +- .../pgen/attrdialog/OutlookFormatMsgDlg.java | 94 +- .../ui/pgen/attrdialog/PgenInterpDlg.java | 31 + .../ui/pgen/attrdialog/SigmetAttrDlg.java | 29 +- .../ui/pgen/attrdialog/SigmetCommAttrDlg.java | 10 +- .../ui/pgen/attrdialog/SymbolAttrDlg.java | 10 +- .../ncep/ui/pgen/attrdialog/TrackAttrDlg.java | 11 +- .../attrdialog/TrackExtrapPointInfoDlg.java | 3 +- .../ncep/ui/pgen/attrdialog/TurbAttrDlg.java | 45 +- .../ui/pgen/attrdialog/VectorAttrDlg.java | 5 +- .../ui/pgen/attrdialog/WatchCoordDlg.java | 5 + .../attrdialog/vaadialog/CcfpAttrDlg.java | 2 +- .../ncep/ui/pgen/contours/ContourLine.java | 28 +- .../nws/ncep/ui/pgen/contours/Contours.java | 40 +- .../pgen/controls/PgenFileManageDialog.java | 2 +- .../pgen/controls/PgenLayerMergeDialog.java | 54 + .../ui/pgen/controls/StoreActivityDialog.java | 4 +- .../ui/pgen/display/SymbolSetElement.java | 76 +- .../ncep/ui/pgen/elements/DECollection.java | 11 + .../noaa/nws/ncep/ui/pgen/elements/Jet.java | 1 + .../nws/ncep/ui/pgen/elements/Outlook.java | 38 +- .../noaa/nws/ncep/ui/pgen/elements/Track.java | 16 + .../ncep/ui/pgen/file/ProductConverter.java | 17 +- .../noaa/nws/ncep/ui/pgen/gfa/GfaFormat.java | 59 +- .../nws/ncep/ui/pgen/gfa/GfaGenerate.java | 187 +- .../noaa/nws/ncep/ui/pgen/gfa/GfaInfo.java | 15 +- .../noaa/nws/ncep/ui/pgen/gfa/GfaRules.java | 95 +- .../nws/ncep/ui/pgen/gfa/GfaWorstAttr.java | 9 +- .../graphtogrid/GraphToGridParamDialog.java | 5 + .../ui/pgen/palette/PgenPaletteWindow.java | 853 +++-- .../nws/ncep/ui/pgen/rsc/PgenResource.java | 6 + .../ncep/ui/pgen/rsc/PgenResourceData.java | 11 +- .../ui/pgen/tools/PgenAddLabelHandler.java | 2 +- .../ncep/ui/pgen/tools/PgenContoursTool.java | 4 +- .../ncep/ui/pgen/tools/PgenDeletePart.java | 72 +- .../ui/pgen/tools/PgenInterpolationTool.java | 13 + .../ncep/ui/pgen/tools/PgenInterpolator.java | 62 +- .../pgen/tools/PgenJetBarbAddingHandler.java | 16 +- .../pgen/tools/PgenJetHashAddingHandler.java | 10 +- .../tools/PgenLabeledLineDrawingTool.java | 4 + .../pgen/tools/PgenMultiPointDrawingTool.java | 5 + .../ui/pgen/tools/PgenOutlookDrawingTool.java | 6 +- .../ncep/ui/pgen/tools/PgenSelectHandler.java | 18 +- .../tools/PgenSinglePointDrawingTool.java | 5 +- .../META-INF/MANIFEST.MF | 6 + .../AbstractPointDataSource.java} | 94 +- .../DbTablePointDataSource.java | 116 + .../IStaticPointDataSource.java | 33 + .../staticPointDataSource/LabeledPoint.java | 60 + .../LpiPointDataSource.java | 115 + .../staticPointDataSource/PointDirDist.java | 84 + .../SpiPointDataSource.java | 71 + .../StaticPointDataSourceMngr.java | 67 + .../StationFilePointDataSource.java | 107 + .../StationsDbTablePointDataSource.java | 218 ++ .../noaa/nws/ncep/viz/common/ui/Markers.java} | 102 +- ...f.common.serialization.ISerializableObject | 3 +- .../ncep/resourceTemplates/DbOverlay.xml | 1 + .../{LpiOverlay.xml => PointOverlay.xml} | 14 +- .../ncep/resourceTemplates/SpiOverlay.xml | 20 - .../gov.noaa.nws.ncep.viz.overlays/plugin.xml | 144 +- .../dialogs/ChangeScaleAttributesDialog.java | 1 - ...java => PointOverlayAttributesDialog.java} | 195 +- .../viz/overlays/resources/LPIResource.java | 345 -- .../overlays/resources/LPIResourceData.java | 203 -- .../resources/PointOverlayResource.java | 416 +++ .../resources/PointOverlayResourceData.java | 282 ++ .../viz/overlays/resources/SPIResource.java | 285 -- .../overlays/resources/SPIResourceData.java | 174 - .../createRbd/ResourceSelectionControl.java | 37 +- .../ui/manageResources/EditAttrSetComp.java | 10 - .../manageResources/EditResourceTypeComp.java | 15 +- .../META-INF/MANIFEST.MF | 1 + ...tractNatlCntrsRequestableResourceData.java | 29 + .../resources/AbstractNatlCntrsResource.java | 20 +- .../attributes/ResourceExtPointMngr.java | 10 +- .../resources/manager/ResourceDefinition.java | 145 +- .../resources/manager/ResourceDefnsMngr.java | 107 +- .../resources/time_match/NCTimeMatcher.java | 82 +- .../ncep/resourceTemplates/Airmet.xml | 1 - .../ncep/resourceTemplates/ATCF.xml | 1 - .../.classpath | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 21 +- ...f.common.serialization.ISerializableObject | 7 + .../build.properties | 1 + .../gov.noaa.nws.ncep.viz.rsc.aww.ecl} | 0 .../icons/marker17.gif | Bin .../icons/marker18.gif | Bin .../icons/marker19.gif | Bin .../icons/marker2.gif | Bin .../icons/marker20.gif | Bin .../icons/marker21.gif | Bin .../ncep/resourceTemplates/FFA.xml | 1 - .../ncep/resourceTemplates/SVRL.xml | 1 - .../ncep/resourceTemplates/WATCH.xml | 1 - .../ncep/resourceTemplates/WCN.xml | 1 - .../ncep/resourceTemplates/WOU.xml | 1 - .../ncep/resourceTemplates/WSTM.xml | 1 - .../ncep/resourceTemplates/Warn.xml | 0 ncep/gov.noaa.nws.ncep.viz.rsc.aww/plugin.xml | 2225 +++++++++++++ .../noaa/nws/ncep/viz/rsc/aww}/Activator.java | 4 +- .../ncep/viz/rsc/aww/ffa}/FFAResource.java | 71 +- .../viz/rsc/aww/ffa}/FFAResourceData.java | 2 +- .../rsc/aww/query}/FfaZoneQueryResult.java | 3 +- .../rsc/aww/query}/SvrlCountyQueryResult.java | 6 +- .../viz/rsc/aww/query}/WarnCountyResult.java | 124 +- .../rsc/aww/query}/WcnCountyQueryResult.java | 37 +- .../viz/rsc/aww/query}/WstmQueryResult.java | 2 +- .../ncep/viz/rsc/aww/svrl}/SvrlResource.java | 88 +- .../viz/rsc/aww/svrl}/SvrlResourceData.java | 2 +- .../rsc/aww/utils}/AwwImmediateCauseUtil.java | 2 +- .../ncep/viz/rsc/aww/utils}/FFAConstant.java | 15 +- .../nws/ncep/viz/rsc/aww/utils/FFAUtil.java | 24 + .../ncep/viz/rsc/aww/utils}/StringUtil.java | 2 +- .../nws/ncep/viz/rsc/aww/utils}/UGCUtil.java | 3 +- .../ncep/viz/rsc/aww/utils/WtchConstant.java | 15 + .../nws/ncep/viz/rsc/aww/utils/WtchUtil.java | 28 + .../ncep/viz/rsc/aww/warn}/WarnResource.java | 289 +- .../viz/rsc/aww/warn}/WarnResourceData.java | 2 +- .../ncep/viz/rsc/aww/wcn}/WcnResource.java | 60 +- .../viz/rsc/aww/wcn}/WcnResourceData.java | 4 +- .../ncep/viz/rsc/aww/wou}/WouResource.java | 91 +- .../viz/rsc/aww/wou}/WouResourceData.java | 2 +- .../viz/rsc/aww/wstm}/EditWstmAttrDialog.java | 4 +- .../rsc/aww/wstm}/MarkerSelectionPanel.java | 6 +- .../ncep/viz/rsc/aww/wstm}/WstmResource.java | 55 +- .../viz/rsc/aww/wstm}/WstmResourceData.java | 2 +- .../ncep/viz/rsc/aww/wtch}/WtchResource.java | 164 +- .../viz/rsc/aww/wtch}/WtchResourceData.java | 2 +- .../resourceTemplates/ConvectiveSigmet.xml | 1 - .../.settings/org.eclipse.jdt.core.prefs | 7 - .../META-INF/MANIFEST.MF | 30 - ...f.common.serialization.ISerializableObject | 1 - .../log4j.properties | 36 - ncep/gov.noaa.nws.ncep.viz.rsc.ffa/plugin.xml | 190 -- .../nws/ncep/viz/rsc/ffa/util/FFAUtil.java | 24 - .../ncep/resourceTemplates/FFG.xml | 1 - .../ncep/resourceTemplates/HRCN.xml | 1 - .../ncep/resourceTemplates/IDFT.xml | 1 - .../ncep/resourceTemplates/IntlSigmet.xml | 1 - .../ncep/resourceTemplates/Lightning.xml | 1 - .../ncep/resourceTemplates/SCAT.xml | 1 - .../resourceTemplates/NonconvectiveSigmet.xml | 1 - .../ncep/resourceTemplates/NTRANS.xml | 1 - .../META-INF/MANIFEST.MF | 1 + .../ncep/resourceTemplates/PGEN.xml | 35 +- .../gov.noaa.nws.ncep.viz.rsc.pgen/plugin.xml | 69 +- .../viz/rsc/pgen/PgenFileManageDialog.java | 535 --- .../viz/rsc/pgen/rsc/PgenDisplayResource.java | 201 +- .../rsc/pgen/rsc/PgenDisplayResourceData.java | 52 +- .../ncep/resourceTemplates/SolarImage.xml | 1 - .../META-INF/MANIFEST.MF | 39 - ...f.common.serialization.ISerializableObject | 1 - .../build.properties | 7 - .../gov.noaa.nws.ncep.viz.rsc.svrl/plugin.xml | 413 --- .../noaa/nws/ncep/viz/rsc/svrl/Activator.java | 50 - .../META-INF/MANIFEST.MF | 39 - ...f.common.serialization.ISerializableObject | 1 - .../build.properties | 6 - .../gov.noaa.nws.ncep.viz.rsc.warn/plugin.xml | 161 - .../noaa/nws/ncep/viz/rsc/warn/Activator.java | 50 - .../.settings/org.eclipse.jdt.core.prefs | 7 - .../META-INF/MANIFEST.MF | 39 - ...f.common.serialization.ISerializableObject | 1 - .../build.properties | 6 - ncep/gov.noaa.nws.ncep.viz.rsc.wcn/plugin.xml | 518 --- .../ncep/resourceTemplates/WCP.xml | 1 - ncep/gov.noaa.nws.ncep.viz.rsc.wou/.classpath | 7 - ncep/gov.noaa.nws.ncep.viz.rsc.wou/.project | 28 - ...f.common.serialization.ISerializableObject | 1 - .../build.properties | 7 - .../gov.noaa.nws.ncep.viz.rsc.wou.ecl | 0 ncep/gov.noaa.nws.ncep.viz.rsc.wou/plugin.xml | 517 --- .../noaa/nws/ncep/viz/rsc/wou/Activator.java | 50 - .../gov.noaa.nws.ncep.viz.rsc.wstm/.classpath | 7 - ncep/gov.noaa.nws.ncep.viz.rsc.wstm/.project | 28 - .../.settings/org.eclipse.jdt.core.prefs | 7 - .../META-INF/MANIFEST.MF | 35 - ...f.common.serialization.ISerializableObject | 1 - .../gov.noaa.nws.ncep.viz.rsc.wstm.ecl | 0 .../gov.noaa.nws.ncep.viz.rsc.wstm/plugin.xml | 175 - .../noaa/nws/ncep/viz/rsc/wstm/Activator.java | 50 - .../ncep/viz/rsc/wstm/rsc/package-info.java | 3 - .../gov.noaa.nws.ncep.viz.rsc.wtch/.classpath | 7 - ncep/gov.noaa.nws.ncep.viz.rsc.wtch/.project | 28 - .../META-INF/MANIFEST.MF | 25 - ...f.common.serialization.ISerializableObject | 1 - .../gov.noaa.nws.ncep.viz.rsc.wtch.ecl | 0 .../gov.noaa.nws.ncep.viz.rsc.wtch/plugin.xml | 364 --- .../noaa/nws/ncep/viz/rsc/wtch/Activator.java | 50 - .../ncep/viz/rsc/wtch/util/WtchConstant.java | 14 - .../nws/ncep/viz/rsc/wtch/util/WtchUtil.java | 22 - .../.classpath | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 3 +- .../META-INF/MANIFEST.MF | 23 + ...f.common.serialization.ISerializableObject | 2 + .../build.properties | 3 +- .../gov.noaa.nws.ncep.viz.timeseries.ecl} | 0 .../plugin.xml | 115 + .../nws/ncep/viz/timeseries}/Activator.java | 4 +- .../ncep/viz/timeseries/GeoMagDescriptor.java | 66 + .../nws/ncep/viz/timeseries/GeoMagGraph.java | 426 +++ .../ncep/viz/timeseries/GeoMagPlotDialog.java | 340 ++ .../viz/timeseries/GeoMagPlotDialog2.java | 145 + .../timeseries/GeoMagTimeSeriesAdapter.java | 81 + .../timeseries/TimeSeriesBundleLoader.java | 42 + .../timeseries/actions/GeoMagPlotAction.java | 59 + .../timeseries/actions/TimeSeriesAction.java | 132 + .../viz/timeseries/rsc/GeoMagResource.java | 266 ++ .../timeseries/rsc/GeoMagResourceData.java | 276 ++ .../ncep/viz/ui/display/NCLegendResource.java | 125 +- .../ncep/LocatorDataSources/SNAP_POINTS.xml | 9 + .../locator/resource/LocatorDataSource.java | 51 +- .../resource/LocatorDataSourceMngr.java | 2 +- .../locator/resource/LocatorEditDialog.java | 12 +- .../viz/ui/locator/resource/PointData.java | 93 - .../nws/ncep/common/dataplugin/__init__.py | 1 + .../ncep/common/dataplugin/gpd/__init__.py | 6 + .../gpd/query/GenericPointDataReqMsg.py | 84 + .../common/dataplugin/gpd/query/__init__.py | 8 + rpms/awips2.qpid/0.18/SOURCES/awips.patch | 22 +- rpms/build/i386/build.sh | 16 +- 1626 files changed, 35389 insertions(+), 23564 deletions(-) create mode 100644 cave/build/static/common/cave/etc/ncep/Bundles/GeoMagPlot.xml create mode 100644 cave/build/static/common/cave/etc/ncep/PredefinedAreas/ICAO-B.xml create mode 100644 cave/build/static/common/cave/etc/ncep/PredefinedAreas/S_Hemisphere.xml rename cave/build/static/common/cave/etc/ncep/ResourceDefns/{SATELLITE/GINI_GMS/GINI_GMS.xml => OVERLAYS/Airports/Airports.xml} (51%) create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Airports/default.attr rename cave/build/static/common/cave/etc/ncep/ResourceDefns/{SATELLITE/GINI_JERS/GINI_JERS.xml => OVERLAYS/Buoys/Buoys.xml} (51%) rename cave/build/static/common/cave/etc/ncep/ResourceDefns/{SATELLITE/GINI_DMSP/GINI_DMSP.xml => OVERLAYS/BuoysFixed/BuoysFixed.xml} (51%) create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/BuoysFixed/default.attr rename cave/build/static/common/cave/etc/ncep/ResourceDefns/{SATELLITE/GINI_NOAA16/GINI_NOAA16.xml => OVERLAYS/CMAN/CMAN.xml} (51%) create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/CMAN/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Cities/Cities.xml create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/FfgZones/FfgZones.xml create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/FfgZones/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/IcaoStations/IcaoStations.xml create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/IcaoStations/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Locator/snapPoints.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/MetarStations/MetarStations.xml create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Nexrad/Nexrad.xml create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/RAOBs/RAOBs.xml create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Railroads/Railroads.xml create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/RaobNames/RaobNames.xml create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/RaobNames/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SpcWatchName/SpcWatchName.xml create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SpcWatchName/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SynopStationIds/SynopStationIds.xml create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SynopStationIds/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VolcanosAll/VolcanosAll.xml create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VolcanosAll/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VorNames/VorNames.xml create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VorNames/default.attr rename cave/build/static/common/cave/etc/ncep/ResourceDefns/{SATELLITE/GINI_GOES8/GINI_GOES8.xml => PGEN/Atlantic_500mb/Atlantic_500mb.xml} (52%) create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_500mb/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_Surface/Atlantic_Surface.xml create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_Surface/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_Wind_Wave/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CCFP-ByZ/CCFP-ByZ.xml create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CCFP-ByZ/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CCFP/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CONV_SIGMET/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Convective_Outlook/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Extended_Range/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-ByLabel/G_AIRMET-ByLabel.xml create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-ByLabel/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-BySubType/G_AIRMET-BySubType.xml create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-BySubType/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-East/G_AIRMET-East.xml create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-East/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-West/G_AIRMET-West.xml create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-West/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/HPC_Basic_WX/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/HPC_QPF/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Hazard_Outlook/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/International_Sigmet/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/NONCONV_SIGMET/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High-BySubType/SIGWX_High-BySubType.xml create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High-BySubType/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High-North/SIGWX_High-North.xml create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High-North/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_Low/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_Medium/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Sample/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Surface_Analysis/default.attr create mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/VOLCANO/VOLCANO.xml delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/FYC/IR2.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/FYC/SW.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/CLOUD_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DERIVED_CAPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DERIVED_CONV_INH.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DERIVED_LAND_SEA_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DERIVED_VOLCANO_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DERIVED_WINDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DMPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/GRID_CLOUD_AMT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/GRID_CTOP_PRES_HGHT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/ICE_CONC.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/ICE_EDGE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/ICE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/IMG_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/IMG_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/IMG_SRFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/LOW_CLOUD_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/MDPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/NORMAL_TPW_PERCENT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/POLAR_3.7u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/POLAR_3.9u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/POLAR_IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/POLAR_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/RAIN_RATE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SCATTEROMETER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SFC_WETNESS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SFC_WIND_SPD.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_12.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_12.66.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_13.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_13.64.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_14.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_14.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_3.74.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_4.13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_4.52.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_4.57.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_9.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_SFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SNOW_IND.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SNOW_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SURFACE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/CLOUD_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DERIVED_CAPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DERIVED_CONV_INH.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DERIVED_LAND_SEA_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DERIVED_VOLCANO_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DERIVED_WINDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DMPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/GRID_CLOUD_AMT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/GRID_CTOP_PRES_HGHT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/ICE_CONC.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/ICE_EDGE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/ICE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/IMG_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/IMG_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/IMG_SRFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/IR13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/LOW_CLOUD_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/MDPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/NORMAL_TPW_PERCENT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/POLAR_3.7u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/POLAR_3.9u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/POLAR_IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/POLAR_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/RAIN_RATE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SCATTEROMETER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SFC_WETNESS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SFC_WIND_SPD.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_11.03.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_12.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_12.66.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_13.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_13.64.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_14.06.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_14.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_14.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_3.74.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_3.98.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_4.13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_4.45.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_4.52.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_4.57.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_6.51.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_7.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_7.43.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_9.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_SFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SNOW_IND.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SNOW_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SURFACE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/default.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/CLOUD_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DERIVED_CAPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DERIVED_CONV_INH.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DERIVED_LAND_SEA_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DERIVED_VOLCANO_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DERIVED_WINDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DMPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/GINI_ERS-QuickSCAT-Scatterometer.xml delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/GRID_CLOUD_AMT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/GRID_CTOP_PRES_HGHT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/ICE_CONC.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/ICE_EDGE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/ICE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/IMG_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/IMG_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/IMG_SRFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/IR13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/LOW_CLOUD_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/MDPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/NORMAL_TPW_PERCENT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/POLAR_3.7u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/POLAR_3.9u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/POLAR_IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/POLAR_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/RAIN_RATE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SCATTEROMETER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SFC_WETNESS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SFC_WIND_SPD.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_11.03.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_12.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_12.66.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_13.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_13.64.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_14.06.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_14.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_14.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_3.74.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_3.98.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_4.13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_4.45.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_4.52.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_4.57.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_6.51.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_7.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_7.43.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_9.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_SFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SNOW_IND.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SNOW_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SURFACE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/WV.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/default.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/CLOUD_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DERIVED_CAPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DERIVED_CONV_INH.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DERIVED_LAND_SEA_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DERIVED_VOLCANO_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DERIVED_WINDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DMPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/GRID_CLOUD_AMT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/GRID_CTOP_PRES_HGHT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/ICE_CONC.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/ICE_EDGE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/ICE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/IMG_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/IMG_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/IMG_SRFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/IR13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/LOW_CLOUD_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/MDPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/NORMAL_TPW_PERCENT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/POLAR_3.7u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/POLAR_3.9u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/POLAR_IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/POLAR_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/RAIN_RATE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SCATTEROMETER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SFC_WETNESS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SFC_WIND_SPD.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_11.03.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_12.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_12.66.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_13.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_13.64.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_14.06.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_14.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_14.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_3.74.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_3.98.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_4.13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_4.45.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_4.52.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_4.57.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_6.51.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_7.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_7.43.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_9.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_SFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SNOW_IND.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SNOW_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SURFACE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/WV.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/default.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/CLOUD_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DERIVED_CAPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DERIVED_CONV_INH.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DERIVED_LAND_SEA_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DERIVED_VOLCANO_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DERIVED_WINDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DMPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/GRID_CLOUD_AMT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/GRID_CTOP_PRES_HGHT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/ICE_CONC.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/ICE_EDGE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/ICE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/IMG_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/IMG_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/IMG_SRFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/IR13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/MDPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/NORMAL_TPW_PERCENT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/POLAR_3.7u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/POLAR_3.9u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/POLAR_IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/POLAR_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/RAIN_RATE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SCATTEROMETER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SFC_WETNESS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SFC_WIND_SPD.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_11.03.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_12.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_12.66.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_13.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_13.64.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_14.06.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_14.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_14.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_3.74.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_3.98.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_4.13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_4.45.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_4.52.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_4.57.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_6.51.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_7.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_7.43.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_9.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_SFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SNOW_IND.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SNOW_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SURFACE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/WV.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/default.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/CLOUD_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DERIVED_CAPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DERIVED_CONV_INH.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DERIVED_LAND_SEA_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DERIVED_VOLCANO_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DERIVED_WINDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DMPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/GRID_CLOUD_AMT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/GRID_CTOP_PRES_HGHT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/ICE_CONC.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/ICE_EDGE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/ICE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/IMG_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/IMG_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/IMG_SRFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/IR13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/MDPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/NORMAL_TPW_PERCENT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/POLAR_3.7u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/POLAR_3.9u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/POLAR_IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/POLAR_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/RAIN_RATE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SCATTEROMETER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SFC_WETNESS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SFC_WIND_SPD.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_11.03.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_12.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_12.66.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_13.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_13.64.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_14.06.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_14.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_14.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_3.74.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_3.98.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_4.13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_4.45.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_4.52.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_4.57.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_6.51.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_7.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_7.43.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_9.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_SFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SNOW_IND.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SNOW_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SURFACE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/WV.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/CLOUD_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DERIVED_CAPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DERIVED_CONV_INH.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DERIVED_LAND_SEA_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DERIVED_VOLCANO_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DERIVED_WINDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DMPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/GRID_CLOUD_AMT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/GRID_CTOP_PRES_HGHT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/ICE_CONC.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/ICE_EDGE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/ICE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/IMG_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/IMG_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/IMG_SRFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/LOW_CLOUD_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/MDPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/NORMAL_TPW_PERCENT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/POLAR_3.7u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/POLAR_3.9u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/POLAR_IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/POLAR_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/RAIN_RATE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SCATTEROMETER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SFC_WETNESS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SFC_WIND_SPD.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_12.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_12.66.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_13.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_13.64.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_14.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_14.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_3.74.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_4.13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_4.52.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_4.57.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_9.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_SFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SNOW_IND.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SNOW_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SURFACE_TYPE.attr rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{GINI_GOES7/GINI_GOES7.xml => GINI_GOES14/GINI_GOES14.xml} (91%) rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{GINI_DMSP => GINI_GOES14}/IR.attr (100%) rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{GINI_Composite => GINI_GOES14}/IR13.attr (100%) rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{GINI_Composite => GINI_GOES14}/SND_11.03.attr (100%) rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{GINI_Composite => GINI_GOES14}/SND_14.06.attr (100%) rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{GINI_Composite => GINI_GOES14}/SND_3.98.attr (100%) rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{GINI_Composite => GINI_GOES14}/SND_4.45.attr (100%) rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{GINI_Composite => GINI_GOES14}/SND_6.51.attr (100%) rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{GINI_Composite => GINI_GOES14}/SND_7.02.attr (100%) rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{GINI_Composite => GINI_GOES14}/SND_7.43.attr (100%) rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{GINI_Composite => GINI_GOES14}/SND_VIS.attr (100%) rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{GINI_DMSP => GINI_GOES14}/VIS.attr (100%) rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{GINI_DMSP => GINI_GOES14}/WV.attr (100%) rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{GINI_GOES12 => GINI_GOES14}/default.attr (100%) delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/CLOUD_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DERIVED_CAPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DERIVED_CONV_INH.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DERIVED_LAND_SEA_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DERIVED_VOLCANO_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DERIVED_WINDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DMPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/GRID_CLOUD_AMT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/GRID_CTOP_PRES_HGHT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/ICE_CONC.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/ICE_EDGE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/ICE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/IMG_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/IMG_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/IMG_SRFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/LOW_CLOUD_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/MDPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/NORMAL_TPW_PERCENT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/POLAR_3.7u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/POLAR_3.9u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/POLAR_IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/POLAR_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/RAIN_RATE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SCATTEROMETER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SFC_WETNESS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SFC_WIND_SPD.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_12.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_12.66.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_13.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_13.64.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_14.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_14.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_3.74.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_4.13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_4.52.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_4.57.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_9.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_SFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SNOW_IND.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SNOW_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SURFACE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/CLOUD_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DERIVED_CAPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DERIVED_CONV_INH.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DERIVED_LAND_SEA_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DERIVED_VOLCANO_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DERIVED_WINDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DMPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/GRID_CLOUD_AMT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/GRID_CTOP_PRES_HGHT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/ICE_CONC.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/ICE_EDGE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/ICE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/IMG_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/IMG_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/IMG_SRFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/IR13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/LOW_CLOUD_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/MDPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/NORMAL_TPW_PERCENT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/POLAR_3.7u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/POLAR_3.9u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/POLAR_IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/POLAR_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/RAIN_RATE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SCATTEROMETER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SFC_WETNESS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SFC_WIND_SPD.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_11.03.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_12.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_12.66.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_13.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_13.64.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_14.06.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_14.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_14.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_3.74.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_3.98.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_4.13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_4.45.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_4.52.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_4.57.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_6.51.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_7.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_7.43.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_9.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_SFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SNOW_IND.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SNOW_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SURFACE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/WV.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/default.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/CLOUD_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DERIVED_CAPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DERIVED_CONV_INH.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DERIVED_LAND_SEA_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DERIVED_VOLCANO_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DERIVED_WINDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DMPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/GRID_CLOUD_AMT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/GRID_CTOP_PRES_HGHT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/ICE_CONC.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/ICE_EDGE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/ICE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/IMG_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/IMG_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/IMG_SRFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/IR13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/LOW_CLOUD_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/MDPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/NORMAL_TPW_PERCENT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/POLAR_3.7u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/POLAR_3.9u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/POLAR_IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/POLAR_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/RAIN_RATE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SCATTEROMETER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SFC_WETNESS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SFC_WIND_SPD.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_11.03.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_12.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_12.66.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_13.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_13.64.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_14.06.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_14.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_14.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_3.74.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_3.98.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_4.13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_4.45.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_4.52.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_4.57.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_6.51.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_7.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_7.43.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_9.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_SFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SNOW_IND.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SNOW_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SURFACE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/WV.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/default.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/CLOUD_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DERIVED_CAPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DERIVED_CONV_INH.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DERIVED_LAND_SEA_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DERIVED_VOLCANO_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DERIVED_WINDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DMPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/GINI_GOES9.xml delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/GRID_CLOUD_AMT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/GRID_CTOP_PRES_HGHT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/ICE_CONC.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/ICE_EDGE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/ICE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/IMG_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/IMG_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/IMG_SRFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/IR13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/LOW_CLOUD_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/MDPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/NORMAL_TPW_PERCENT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/POLAR_3.7u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/POLAR_3.9u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/POLAR_IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/POLAR_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/RAIN_RATE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SCATTEROMETER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SFC_WETNESS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SFC_WIND_SPD.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_11.03.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_12.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_12.66.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_13.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_13.64.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_14.06.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_14.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_14.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_3.74.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_3.98.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_4.13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_4.45.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_4.52.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_4.57.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_6.51.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_7.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_7.43.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_9.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_SFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SNOW_IND.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SNOW_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SURFACE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/WV.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/default.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/CLOUD_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DERIVED_CAPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DERIVED_CONV_INH.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DERIVED_LAND_SEA_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DERIVED_VOLCANO_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DERIVED_WINDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DMPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/GRID_CLOUD_AMT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/GRID_CTOP_PRES_HGHT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/ICE_CONC.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/ICE_EDGE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/ICE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/IMG_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/IMG_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/IMG_SRFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/IR13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/LOW_CLOUD_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/MDPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/NORMAL_TPW_PERCENT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/POLAR_3.7u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/POLAR_3.9u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/POLAR_IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/POLAR_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/RAIN_RATE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SCATTEROMETER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SFC_WETNESS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SFC_WIND_SPD.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_11.03.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_12.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_12.66.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_13.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_13.64.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_14.06.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_14.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_14.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_3.74.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_3.98.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_4.13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_4.45.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_4.52.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_4.57.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_6.51.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_7.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_7.43.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_9.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_SFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SNOW_IND.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SNOW_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SURFACE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/WV.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/default.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/CLOUD_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DERIVED_CAPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DERIVED_CONV_INH.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DERIVED_LAND_SEA_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DERIVED_VOLCANO_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DERIVED_WINDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DMPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/GINI_METEOSAT.xml delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/GRID_CLOUD_AMT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/GRID_CTOP_PRES_HGHT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/ICE_CONC.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/ICE_EDGE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/ICE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/IMG_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/IMG_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/IMG_SRFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/IR13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/LOW_CLOUD_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/MDPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/NORMAL_TPW_PERCENT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/POLAR_3.7u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/POLAR_3.9u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/POLAR_IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/POLAR_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/RAIN_RATE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SCATTEROMETER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SFC_WETNESS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SFC_WIND_SPD.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_11.03.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_12.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_12.66.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_13.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_13.64.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_14.06.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_14.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_14.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_3.74.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_3.98.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_4.13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_4.45.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_4.52.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_4.57.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_6.51.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_7.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_7.43.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_9.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_SFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SNOW_IND.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SNOW_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SURFACE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/WV.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/default.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/CLOUD_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DERIVED_CAPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DERIVED_CONV_INH.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DERIVED_LAND_SEA_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DERIVED_VOLCANO_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DERIVED_WINDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DMPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/GRID_CLOUD_AMT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/GRID_CTOP_PRES_HGHT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/ICE_CONC.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/ICE_EDGE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/ICE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/IMG_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/IMG_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/IMG_SRFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/IR13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/LOW_CLOUD_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/MDPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/POLAR_3.7u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/POLAR_3.9u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/POLAR_IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/POLAR_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/RAIN_RATE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SCATTEROMETER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SFC_WETNESS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SFC_WIND_SPD.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_11.03.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_12.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_12.66.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_13.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_13.64.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_14.06.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_14.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_14.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_3.74.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_3.98.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_4.13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_4.45.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_4.52.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_4.57.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_6.51.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_7.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_7.43.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_9.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_SFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SNOW_IND.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SNOW_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SURFACE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/WV.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/default.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/CLOUD_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DERIVED_CAPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DERIVED_CONV_INH.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DERIVED_LAND_SEA_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DERIVED_VOLCANO_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DERIVED_WINDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DMPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/GRID_CLOUD_AMT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/GRID_CTOP_PRES_HGHT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/ICE_CONC.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/ICE_EDGE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/ICE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/IMG_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/IMG_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/IMG_SRFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/IR13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/LOW_CLOUD_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/MDPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/NORMAL_TPW_PERCENT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/POLAR_3.7u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/POLAR_3.9u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/POLAR_IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/POLAR_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/RAIN_RATE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SCATTEROMETER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SFC_WETNESS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SFC_WIND_SPD.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_11.03.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_12.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_12.66.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_13.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_13.64.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_14.06.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_14.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_14.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_3.74.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_3.98.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_4.13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_4.45.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_4.52.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_4.57.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_6.51.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_7.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_7.43.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_9.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_SFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SNOW_IND.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SNOW_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SURFACE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/WV.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/default.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/CLOUD_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DERIVED_CAPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DERIVED_CONV_INH.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DERIVED_LAND_SEA_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DERIVED_VOLCANO_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DERIVED_WINDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DMPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/GINI_NOAA17.xml delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/GRID_CLOUD_AMT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/GRID_CTOP_PRES_HGHT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/ICE_CONC.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/ICE_EDGE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/ICE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/IMG_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/IMG_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/IMG_SRFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/IR13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/LOW_CLOUD_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/MDPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/NORMAL_TPW_PERCENT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/POLAR_3.7u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/POLAR_3.9u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/POLAR_IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/POLAR_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/RAIN_RATE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SCATTEROMETER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SFC_WETNESS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SFC_WIND_SPD.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_11.03.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_12.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_12.66.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_13.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_13.64.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_14.06.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_14.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_14.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_3.74.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_3.98.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_4.13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_4.45.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_4.52.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_4.57.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_6.51.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_7.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_7.43.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_9.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_SFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SNOW_IND.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SNOW_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SURFACE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/WV.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/default.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/CLOUD_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DERIVED_CAPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DERIVED_CONV_INH.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DERIVED_LAND_SEA_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DERIVED_VOLCANO_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DERIVED_WINDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DMPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/GINI_NOAA18.xml delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/GRID_CLOUD_AMT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/GRID_CTOP_PRES_HGHT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/ICE_CONC.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/ICE_EDGE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/ICE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/IMG_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/IMG_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/IMG_SRFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/IR13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/LOW_CLOUD_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/MDPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/NORMAL_TPW_PERCENT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/POLAR_3.7u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/POLAR_3.9u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/POLAR_IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/POLAR_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/RAIN_RATE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SCATTEROMETER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SFC_WETNESS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SFC_WIND_SPD.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_11.03.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_12.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_12.66.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_13.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_13.64.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_14.06.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_14.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_14.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_3.74.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_3.98.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_4.13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_4.45.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_4.52.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_4.57.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_6.51.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_7.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_7.43.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_9.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_SFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SNOW_IND.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SNOW_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SURFACE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/WV.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/default.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/CLOUD_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DERIVED_CAPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DERIVED_CONV_INH.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DERIVED_LAND_SEA_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DERIVED_VOLCANO_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DERIVED_WINDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DMPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/GINI_NOAA19.xml delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/GRID_CLOUD_AMT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/GRID_CTOP_PRES_HGHT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/ICE_CONC.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/ICE_EDGE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/ICE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/IMG_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/IMG_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/IMG_SRFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/IR13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/LOW_CLOUD_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/MDPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/NORMAL_TPW_PERCENT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/POLAR_3.7u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/POLAR_3.9u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/POLAR_IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/POLAR_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/RAIN_RATE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SCATTEROMETER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SFC_WETNESS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SFC_WIND_SPD.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_11.03.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_12.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_12.66.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_13.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_13.64.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_14.06.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_14.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_14.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_3.74.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_3.98.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_4.13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_4.45.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_4.52.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_4.57.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_6.51.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_7.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_7.43.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_9.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_SFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SNOW_IND.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SNOW_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SURFACE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/WV.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/default.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/CLOUD_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DERIVED_CAPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DERIVED_CONV_INH.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DERIVED_LAND_SEA_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DERIVED_VOLCANO_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DERIVED_WINDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DMPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/GRID_CLOUD_AMT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/GRID_CTOP_PRES_HGHT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/ICE_CONC.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/ICE_EDGE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/ICE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/IMG_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/IMG_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/IMG_SRFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/IR13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/LOW_CLOUD_IMG.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/MDPI.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/NORMAL_TPW_PERCENT.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/POLAR_3.7u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/POLAR_3.9u.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/POLAR_IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/POLAR_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SCATTEROMETER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SFC_WETNESS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SFC_WIND_SPD.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_11.03.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_12.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_12.66.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_13.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_13.64.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_14.06.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_14.37.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_14.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_3.74.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_3.98.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_4.13.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_4.45.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_4.52.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_4.57.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_6.51.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_7.02.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_7.43.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_9.71.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_LIFTED_INDEX.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_PRECIP_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_SFC_SKIN_TEMP.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SNOW_IND.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SNOW_WATER.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SURFACE_TYPE.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/WV.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/default.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GMS/GMS.xml delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GMS/IR2.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GMS/IR3.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GMS/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/GOES10.xml delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/IR2.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/IR3.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/IR4.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/GOES11.xml delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/IR2.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/IR3.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/IR4.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES12/IR3.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES12/IR4.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES13/IR3.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES13/IR4.attr rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{FYC/FYC.xml => GOES14/GOES14.xml} (92%) rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{FYC => GOES14}/IR.attr (100%) rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{DPD => GOES14}/IR2.attr (100%) rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{FYC => GOES14}/VIS.attr (100%) rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{GMS => GOES14}/WV.attr (100%) delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES15/IR3.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES15/IR4.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES6/GOES6.xml delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES6/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES6/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES7/GOES7.xml delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES7/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES7/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES7/VISPC.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES7/WV.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/GOES8.xml delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/IR2.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/IR3.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/IR4.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/WV.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/GOES9.xml delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/IR2.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/IR3.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/IR4.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/WV.attr rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{GOES11/WV.attr => Global/GPS.attr} (76%) rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{GMS => Global}/IR.attr (100%) rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{GOES6/WV.attr => Global/PCT.attr} (76%) rename cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/{GOES10 => Global}/WV.attr (100%) delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/HRVIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/IR_12.0.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/IR_8.7.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/NIR_1.6.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/VIS_0.8.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/WV_7.3.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT3/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT3/METEOSAT3.xml delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT3/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT3/WV.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT5/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT5/IR3.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT5/METEOSAT5.xml delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT5/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT5/WV.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT6/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT6/METEOSAT6.xml delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT6/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT6/WV.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT7/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT7/IR3.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT7/METEOSAT7.xml delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT7/VIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT7/WV.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/HRVIS.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/IR.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/IR_12.0.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/IR_8.7.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/NIR_1.6.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/VIS_0.8.attr delete mode 100644 cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/WV_7.3.attr create mode 100644 cave/build/static/common/cave/etc/ncep/basemaps/volcanoes.lpi create mode 100644 edexOsgi/com.raytheon.uf.tools.cli/impl/gpd create mode 100644 edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/GpdCliRequestHandler.py create mode 100644 edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/gpd.py create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.aww/src/gov/noaa/nws/ncep/common/dataplugin/aww/UGCHeaderUtil.java delete mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/res/scripts/geomagSourcePreferences.sql delete mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/res/scripts/geomagSources.sql create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagAvg.java create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagK1min.java create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagK3hr.java create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagPathProvider.java create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagAvgDao.java create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagK1minDao.java create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagK3hrDao.java delete mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagSourceDao.java delete mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagSourcePreferenceDao.java delete mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/fixed/GeoMagSource.java delete mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/fixed/GeoMagSourcePreference.java create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/GeoMagSource.java create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/KFitTime.java create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/KStationCoeffTableReader.java create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/KStationCoefficient.java create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/KStationCoefficients.java create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/KsThree.java create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/util/KStationCoefficientLookup.java rename ncep/{gov.noaa.nws.ncep.viz.rsc.ffa => gov.noaa.nws.ncep.common.dataplugin.gpd}/.classpath (100%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wcn => gov.noaa.nws.ncep.common.dataplugin.gpd}/.project (74%) create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/.pydevproject rename ncep/{gov.noaa.nws.ncep.viz.rsc.wtch => gov.noaa.nws.ncep.common.dataplugin.gpd}/.settings/org.eclipse.jdt.core.prefs (92%) create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/META-INF/MANIFEST.MF create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObjectForPy create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/GenericPointDataLevel.py create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/GenericPointDataParameter.py create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/GenericPointDataProductContainer.py create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/GenericPointDataProductInfo.py create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/GenericPointDataStationProduct.py create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/NY20130704190000.xml create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/__init__.py create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/productExample.xml create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/sfc_all_parms_single_station_00-12z.sfc create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/sfc_selected_parms_multi_stations_12z.sfc create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/ship20130731191010.xml create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/ship_multi_stations_12z.shp create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/snd_multi_levels_station_BAD.snd create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/snd_multi_levels_stations_00_12z.snd create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/snd_wrap_around.snd create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/build.properties create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/component-deploy.xml rename ncep/{gov.noaa.nws.ncep.viz.rsc.ffa/gov.noaa.nws.ncep.viz.rsc.ffa.ecl => gov.noaa.nws.ncep.common.dataplugin.gpd/gov.noaa.nws.ncep.common.dataplugin.gpd.ecl} (100%) create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/GenericPointDataConstants.java create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/GenericPointDataRecord.java create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/dao/GenericPointDataDao.java create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/product/GenericPointDataLevel.java create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/product/GenericPointDataParameter.java create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/product/GenericPointDataProductContainer.java create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/product/GenericPointDataProductInfo.java create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/product/GenericPointDataStationProduct.java create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/query/GenericPointDataQuery.java create mode 100644 ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/query/GenericPointDataReqMsg.java create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-request create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/TrigKCalculation.java create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/calculation/CalcEach1min.java create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/calculation/CalcEach3hr.java create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/calculation/CalcKp.java create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/calculation/CalcUtil.java create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.geomag/utility/common_static/base/ncep/geomag/kStandardLookup.xml create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.geomag/utility/common_static/base/ncep/geomag/kStationCoefficients.xml rename ncep/{gov.noaa.nws.ncep.viz.rsc.svrl => gov.noaa.nws.ncep.edex.plugin.gpd}/.classpath (100%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.warn => gov.noaa.nws.ncep.edex.plugin.gpd}/.project (92%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.svrl => gov.noaa.nws.ncep.edex.plugin.gpd}/.settings/org.eclipse.jdt.core.prefs (75%) create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.gpd/META-INF/MANIFEST.MF rename ncep/{gov.noaa.nws.ncep.viz.rsc.ffa => gov.noaa.nws.ncep.edex.plugin.gpd}/build.properties (57%) create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.gpd/component-deploy.xml rename ncep/{gov.noaa.nws.ncep.viz.rsc.svrl/gov.noaa.nws.ncep.viz.rsc.svrl.ecl => gov.noaa.nws.ncep.edex.plugin.gpd/gov.noaa.nws.ncep.edex.plugin.gpd.ecl} (100%) create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProduct.xml create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProduct.xsd create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProductChin.xml create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProductInfo.xml create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProductOld1.xml create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProductOld1.xsd create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProductShip.xml create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpddb.xml create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-common.xml create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-request.xml create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.gpd/src/gov/noaa/nws/ncep/edex/plugin/gpd/decoder/GenericPointDataDecoder.java create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.gpd/src/gov/noaa/nws/ncep/edex/plugin/gpd/handler/GenericPointDataRequestHandler.java create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.gpd/utility/common_static/base/path/gpdPathKeys.xml create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.gpd/utility/common_static/base/purge/gpdPurgeRules.xml rename ncep/{gov.noaa.nws.ncep.viz.ui.locator/src/gov/noaa/nws/ncep/viz/ui/locator/resource/PointDataSource.java => gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/staticPointDataSource/AbstractPointDataSource.java} (50%) create mode 100644 ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/staticPointDataSource/DbTablePointDataSource.java create mode 100644 ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/staticPointDataSource/IStaticPointDataSource.java create mode 100644 ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/staticPointDataSource/LabeledPoint.java create mode 100644 ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/staticPointDataSource/LpiPointDataSource.java create mode 100644 ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/staticPointDataSource/PointDirDist.java create mode 100644 ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/staticPointDataSource/SpiPointDataSource.java create mode 100644 ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/staticPointDataSource/StaticPointDataSourceMngr.java create mode 100644 ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/staticPointDataSource/StationFilePointDataSource.java create mode 100644 ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/staticPointDataSource/StationsDbTablePointDataSource.java rename ncep/{gov.noaa.nws.ncep.viz.overlays/src/gov/noaa/nws/ncep/viz/overlays/IPointOverlayResourceData.java => gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/ui/Markers.java} (61%) rename ncep/gov.noaa.nws.ncep.viz.overlays/localization/ncep/resourceTemplates/{LpiOverlay.xml => PointOverlay.xml} (59%) delete mode 100644 ncep/gov.noaa.nws.ncep.viz.overlays/localization/ncep/resourceTemplates/SpiOverlay.xml rename ncep/gov.noaa.nws.ncep.viz.overlays/src/gov/noaa/nws/ncep/viz/overlays/dialogs/{ChangeMarkerAttributesDialog.java => PointOverlayAttributesDialog.java} (72%) delete mode 100644 ncep/gov.noaa.nws.ncep.viz.overlays/src/gov/noaa/nws/ncep/viz/overlays/resources/LPIResource.java delete mode 100644 ncep/gov.noaa.nws.ncep.viz.overlays/src/gov/noaa/nws/ncep/viz/overlays/resources/LPIResourceData.java create mode 100644 ncep/gov.noaa.nws.ncep.viz.overlays/src/gov/noaa/nws/ncep/viz/overlays/resources/PointOverlayResource.java create mode 100644 ncep/gov.noaa.nws.ncep.viz.overlays/src/gov/noaa/nws/ncep/viz/overlays/resources/PointOverlayResourceData.java delete mode 100644 ncep/gov.noaa.nws.ncep.viz.overlays/src/gov/noaa/nws/ncep/viz/overlays/resources/SPIResource.java delete mode 100644 ncep/gov.noaa.nws.ncep.viz.overlays/src/gov/noaa/nws/ncep/viz/overlays/resources/SPIResourceData.java rename ncep/{gov.noaa.nws.ncep.viz.rsc.warn => gov.noaa.nws.ncep.viz.rsc.aww}/.classpath (100%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.ffa => gov.noaa.nws.ncep.viz.rsc.aww}/.project (93%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wou => gov.noaa.nws.ncep.viz.rsc.aww}/.settings/org.eclipse.jdt.core.prefs (100%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wou => gov.noaa.nws.ncep.viz.rsc.aww}/META-INF/MANIFEST.MF (71%) create mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.aww/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject rename ncep/{gov.noaa.nws.ncep.viz.rsc.wstm => gov.noaa.nws.ncep.viz.rsc.aww}/build.properties (99%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.warn/gov.noaa.nws.ncep.viz.rsc.warn.ecl => gov.noaa.nws.ncep.viz.rsc.aww/gov.noaa.nws.ncep.viz.rsc.aww.ecl} (100%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wstm => gov.noaa.nws.ncep.viz.rsc.aww}/icons/marker17.gif (100%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wstm => gov.noaa.nws.ncep.viz.rsc.aww}/icons/marker18.gif (100%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wstm => gov.noaa.nws.ncep.viz.rsc.aww}/icons/marker19.gif (100%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wstm => gov.noaa.nws.ncep.viz.rsc.aww}/icons/marker2.gif (100%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wstm => gov.noaa.nws.ncep.viz.rsc.aww}/icons/marker20.gif (100%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wstm => gov.noaa.nws.ncep.viz.rsc.aww}/icons/marker21.gif (100%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.ffa => gov.noaa.nws.ncep.viz.rsc.aww}/localization/ncep/resourceTemplates/FFA.xml (98%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.svrl => gov.noaa.nws.ncep.viz.rsc.aww}/localization/ncep/resourceTemplates/SVRL.xml (99%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wtch => gov.noaa.nws.ncep.viz.rsc.aww}/localization/ncep/resourceTemplates/WATCH.xml (98%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wcn => gov.noaa.nws.ncep.viz.rsc.aww}/localization/ncep/resourceTemplates/WCN.xml (99%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wou => gov.noaa.nws.ncep.viz.rsc.aww}/localization/ncep/resourceTemplates/WOU.xml (99%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wstm => gov.noaa.nws.ncep.viz.rsc.aww}/localization/ncep/resourceTemplates/WSTM.xml (98%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.warn => gov.noaa.nws.ncep.viz.rsc.aww}/localization/ncep/resourceTemplates/Warn.xml (100%) create mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.aww/plugin.xml rename ncep/{gov.noaa.nws.ncep.viz.rsc.wcn/src/gov/noaa/nws/ncep/viz/rsc/wcn => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww}/Activator.java (95%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.ffa/src/gov/noaa/nws/ncep/viz/rsc/ffa/rsc => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/ffa}/FFAResource.java (97%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.ffa/src/gov/noaa/nws/ncep/viz/rsc/ffa/rsc => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/ffa}/FFAResourceData.java (99%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.ffa/src/gov/noaa/nws/ncep/viz/rsc/ffa/rsc => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/query}/FfaZoneQueryResult.java (97%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.svrl/src/gov/noaa/nws/ncep/viz/rsc/svrl/rsc => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/query}/SvrlCountyQueryResult.java (96%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.warn/src/gov/noaa/nws/ncep/viz/rsc/warn/rsc => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/query}/WarnCountyResult.java (54%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wcn/src/gov/noaa/nws/ncep/viz/rsc/wcn/rsc => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/query}/WcnCountyQueryResult.java (81%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wstm/src/gov/noaa/nws/ncep/viz/rsc/wstm/rsc => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/query}/WstmQueryResult.java (99%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.svrl/src/gov/noaa/nws/ncep/viz/rsc/svrl/rsc => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/svrl}/SvrlResource.java (93%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.svrl/src/gov/noaa/nws/ncep/viz/rsc/svrl/rsc => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/svrl}/SvrlResourceData.java (99%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.ffa/src/gov/noaa/nws/ncep/viz/rsc/ffa/util => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/utils}/AwwImmediateCauseUtil.java (97%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.ffa/src/gov/noaa/nws/ncep/viz/rsc/ffa/util => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/utils}/FFAConstant.java (76%) create mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/utils/FFAUtil.java rename ncep/{gov.noaa.nws.ncep.viz.rsc.ffa/src/gov/noaa/nws/ncep/viz/rsc/ffa/util => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/utils}/StringUtil.java (96%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.ffa/src/gov/noaa/nws/ncep/viz/rsc/ffa/util => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/utils}/UGCUtil.java (97%) create mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/utils/WtchConstant.java create mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/utils/WtchUtil.java rename ncep/{gov.noaa.nws.ncep.viz.rsc.warn/src/gov/noaa/nws/ncep/viz/rsc/warn/rsc => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/warn}/WarnResource.java (78%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.warn/src/gov/noaa/nws/ncep/viz/rsc/warn/rsc => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/warn}/WarnResourceData.java (99%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wcn/src/gov/noaa/nws/ncep/viz/rsc/wcn/rsc => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/wcn}/WcnResource.java (96%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wcn/src/gov/noaa/nws/ncep/viz/rsc/wcn/rsc => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/wcn}/WcnResourceData.java (99%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wou/src/gov/noaa/nws/ncep/viz/rsc/wou/rsc => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/wou}/WouResource.java (94%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wou/src/gov/noaa/nws/ncep/viz/rsc/wou/rsc => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/wou}/WouResourceData.java (99%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wstm/src/gov/noaa/nws/ncep/viz/rsc/wstm/rsc => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/wstm}/EditWstmAttrDialog.java (99%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wstm/src/gov/noaa/nws/ncep/viz/rsc/wstm/rsc => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/wstm}/MarkerSelectionPanel.java (96%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wstm/src/gov/noaa/nws/ncep/viz/rsc/wstm/rsc => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/wstm}/WstmResource.java (98%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wstm/src/gov/noaa/nws/ncep/viz/rsc/wstm/rsc => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/wstm}/WstmResourceData.java (99%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wtch/src/gov/noaa/nws/ncep/viz/rsc/wtch/rsc => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/wtch}/WtchResource.java (90%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wtch/src/gov/noaa/nws/ncep/viz/rsc/wtch/rsc => gov.noaa.nws.ncep.viz.rsc.aww/src/gov/noaa/nws/ncep/viz/rsc/aww/wtch}/WtchResourceData.java (99%) delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.ffa/.settings/org.eclipse.jdt.core.prefs delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.ffa/META-INF/MANIFEST.MF delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.ffa/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.ffa/log4j.properties delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.ffa/plugin.xml delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.ffa/src/gov/noaa/nws/ncep/viz/rsc/ffa/util/FFAUtil.java delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.pgen/src/gov/noaa/nws/ncep/viz/rsc/pgen/PgenFileManageDialog.java delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.svrl/META-INF/MANIFEST.MF delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.svrl/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.svrl/build.properties delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.svrl/plugin.xml delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.svrl/src/gov/noaa/nws/ncep/viz/rsc/svrl/Activator.java delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.warn/META-INF/MANIFEST.MF delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.warn/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.warn/build.properties delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.warn/plugin.xml delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.warn/src/gov/noaa/nws/ncep/viz/rsc/warn/Activator.java delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wcn/.settings/org.eclipse.jdt.core.prefs delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wcn/META-INF/MANIFEST.MF delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wcn/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wcn/build.properties delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wcn/plugin.xml delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wou/.classpath delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wou/.project delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wou/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wou/build.properties delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wou/gov.noaa.nws.ncep.viz.rsc.wou.ecl delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wou/plugin.xml delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wou/src/gov/noaa/nws/ncep/viz/rsc/wou/Activator.java delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wstm/.classpath delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wstm/.project delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wstm/.settings/org.eclipse.jdt.core.prefs delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wstm/META-INF/MANIFEST.MF delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wstm/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wstm/gov.noaa.nws.ncep.viz.rsc.wstm.ecl delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wstm/plugin.xml delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wstm/src/gov/noaa/nws/ncep/viz/rsc/wstm/Activator.java delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wstm/src/gov/noaa/nws/ncep/viz/rsc/wstm/rsc/package-info.java delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wtch/.classpath delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wtch/.project delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wtch/META-INF/MANIFEST.MF delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wtch/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wtch/gov.noaa.nws.ncep.viz.rsc.wtch.ecl delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wtch/plugin.xml delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wtch/src/gov/noaa/nws/ncep/viz/rsc/wtch/Activator.java delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wtch/src/gov/noaa/nws/ncep/viz/rsc/wtch/util/WtchConstant.java delete mode 100644 ncep/gov.noaa.nws.ncep.viz.rsc.wtch/src/gov/noaa/nws/ncep/viz/rsc/wtch/util/WtchUtil.java rename ncep/{gov.noaa.nws.ncep.viz.rsc.wcn => gov.noaa.nws.ncep.viz.timeseries}/.classpath (100%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.svrl => gov.noaa.nws.ncep.viz.timeseries}/.project (92%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.warn => gov.noaa.nws.ncep.viz.timeseries}/.settings/org.eclipse.jdt.core.prefs (75%) create mode 100644 ncep/gov.noaa.nws.ncep.viz.timeseries/META-INF/MANIFEST.MF create mode 100644 ncep/gov.noaa.nws.ncep.viz.timeseries/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject rename ncep/{gov.noaa.nws.ncep.viz.rsc.wtch => gov.noaa.nws.ncep.viz.timeseries}/build.properties (57%) rename ncep/{gov.noaa.nws.ncep.viz.rsc.wcn/gov.noaa.nws.ncep.viz.rsc.wcn.ecl => gov.noaa.nws.ncep.viz.timeseries/gov.noaa.nws.ncep.viz.timeseries.ecl} (100%) create mode 100644 ncep/gov.noaa.nws.ncep.viz.timeseries/plugin.xml rename ncep/{gov.noaa.nws.ncep.viz.rsc.ffa/src/gov/noaa/nws/ncep/viz/rsc/ffa => gov.noaa.nws.ncep.viz.timeseries/src/gov/noaa/nws/ncep/viz/timeseries}/Activator.java (87%) create mode 100644 ncep/gov.noaa.nws.ncep.viz.timeseries/src/gov/noaa/nws/ncep/viz/timeseries/GeoMagDescriptor.java create mode 100644 ncep/gov.noaa.nws.ncep.viz.timeseries/src/gov/noaa/nws/ncep/viz/timeseries/GeoMagGraph.java create mode 100644 ncep/gov.noaa.nws.ncep.viz.timeseries/src/gov/noaa/nws/ncep/viz/timeseries/GeoMagPlotDialog.java create mode 100644 ncep/gov.noaa.nws.ncep.viz.timeseries/src/gov/noaa/nws/ncep/viz/timeseries/GeoMagPlotDialog2.java create mode 100644 ncep/gov.noaa.nws.ncep.viz.timeseries/src/gov/noaa/nws/ncep/viz/timeseries/GeoMagTimeSeriesAdapter.java create mode 100644 ncep/gov.noaa.nws.ncep.viz.timeseries/src/gov/noaa/nws/ncep/viz/timeseries/TimeSeriesBundleLoader.java create mode 100644 ncep/gov.noaa.nws.ncep.viz.timeseries/src/gov/noaa/nws/ncep/viz/timeseries/actions/GeoMagPlotAction.java create mode 100644 ncep/gov.noaa.nws.ncep.viz.timeseries/src/gov/noaa/nws/ncep/viz/timeseries/actions/TimeSeriesAction.java create mode 100644 ncep/gov.noaa.nws.ncep.viz.timeseries/src/gov/noaa/nws/ncep/viz/timeseries/rsc/GeoMagResource.java create mode 100644 ncep/gov.noaa.nws.ncep.viz.timeseries/src/gov/noaa/nws/ncep/viz/timeseries/rsc/GeoMagResourceData.java create mode 100644 ncep/gov.noaa.nws.ncep.viz.ui.locator/localization/ncep/LocatorDataSources/SNAP_POINTS.xml delete mode 100644 ncep/gov.noaa.nws.ncep.viz.ui.locator/src/gov/noaa/nws/ncep/viz/ui/locator/resource/PointData.java create mode 100644 pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gpd/__init__.py create mode 100644 pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gpd/query/GenericPointDataReqMsg.py create mode 100644 pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gpd/query/__init__.py diff --git a/cave/build/static/common/cave/etc/ncep/Bundles/GeoMagPlot.xml b/cave/build/static/common/cave/etc/ncep/Bundles/GeoMagPlot.xml new file mode 100644 index 0000000000..22736a3761 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/Bundles/GeoMagPlot.xml @@ -0,0 +1,118 @@ + + + + + + + + PLAN_VIEW + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + nT + Magnetic Flux Density + + + time + Universal Time + + + -105.24 + 40.03 + NaN + + + + + + PLAN_VIEW + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + nT + Magnetic Flux Density + + + time + Universal Time + + + -105.24 + 40.03 + NaN + + + + 2147483647 + 4320 + + + + + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/PredefinedAreas/ICAO-B.xml b/cave/build/static/common/cave/etc/ncep/PredefinedAreas/ICAO-B.xml new file mode 100644 index 0000000000..fbca25b21f --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/PredefinedAreas/ICAO-B.xml @@ -0,0 +1,36 @@ + + + NMAP_DISPLAY + PREDEFINED_AREA + 0.4779336750507355 + N/A + + FITTED_CS["rotated", + PARAM_MT["Affine", + PARAMETER["num_row", 3], + PARAMETER["num_col", 3], + PARAMETER["elt_0_0", -0.7071067811865476], + PARAMETER["elt_0_1", 0.7071067811865475], + PARAMETER["elt_1_0", -0.7071067811865475], + PARAMETER["elt_1_1", -0.7071067811865476]], + PROJCS["Mercator_1SP", + GEOGCS["WGS84", + DATUM["WGS84", + SPHEROID["WGS84", 6378137.0, 298.257223563]], + PRIMEM["Greenwich", 0.0], + UNIT["degree", 0.017453292519943295], + AXIS["Geodetic longitude", EAST], + AXIS["Geodetic latitude", NORTH]], + PROJECTION["Mercator_1SP"], + PARAMETER["semi_major", 6371200.0], + PARAMETER["semi_minor", 6371200.0], + PARAMETER["latitude_of_origin", 0.0], + PARAMETER["central_meridian", 0.0], + PARAMETER["scale_factor", 1.0], + PARAMETER["false_easting", 0.0], + PARAMETER["false_northing", 0.0], + UNIT["m", 1.0], + AXIS["Easting", EAST], + AXIS["Northing", NORTH]]] + + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/PredefinedAreas/S_Hemisphere.xml b/cave/build/static/common/cave/etc/ncep/PredefinedAreas/S_Hemisphere.xml new file mode 100644 index 0000000000..aa67911fde --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/PredefinedAreas/S_Hemisphere.xml @@ -0,0 +1,29 @@ + + + + NMAP_DISPLAY + PREDEFINED_AREA + 1.0 + N/A + + PROJCS["Polar_Stereographic", + GEOGCS["WGS84(DD)", + DATUM["WGS84", + SPHEROID["WGS84", 6378137.0, 298.257223563]], + PRIMEM["Greenwich", 0.0], + UNIT["degree", 0.017453292519943295], + AXIS["Geodetic longitude", EAST], + AXIS["Geodetic latitude", NORTH]], + PROJECTION["Polar_Stereographic"], + PARAMETER["semi_major", 6371229.0], + PARAMETER["semi_minor", 6371229.0], + PARAMETER["central_meridian", -142.0], + PARAMETER["latitude_of_origin", -90.0], + PARAMETER["scale_factor", 1.0], + PARAMETER["false_easting", 0.0], + PARAMETER["false_northing", 0.0], + UNIT["m", 1.0], + AXIS["Easting", EAST], + AXIS["Northing", NORTH]] + + diff --git a/cave/build/static/common/cave/etc/ncep/PredefinedAreas/gempak/geog.xml b/cave/build/static/common/cave/etc/ncep/PredefinedAreas/gempak/geog.xml index 0902b2f6aa..3f7fb35c6c 100644 --- a/cave/build/static/common/cave/etc/ncep/PredefinedAreas/gempak/geog.xml +++ b/cave/build/static/common/cave/etc/ncep/PredefinedAreas/gempak/geog.xml @@ -9,7 +9,17 @@ In the Eclipse IDE, after removing the '&' character, right-click and select Validate to get rid of any error messages attributed to the '&' character. --> - + + SHM + SOUTHERN_HEMISPHERE + -89.50 + -142 + 30.00 + 88.00 + 30.00 + -92.00 + STR/-90;-142 + 105 diff --git a/cave/build/static/common/cave/etc/ncep/PredefinedAreas/menus/AreaMenus.xml b/cave/build/static/common/cave/etc/ncep/PredefinedAreas/menus/AreaMenus.xml index 1466efc7a7..9b72ff25f1 100644 --- a/cave/build/static/common/cave/etc/ncep/PredefinedAreas/menus/AreaMenus.xml +++ b/cave/build/static/common/cave/etc/ncep/PredefinedAreas/menus/AreaMenus.xml @@ -46,6 +46,10 @@ Caribbean + + PREDEFINED_AREA + ICAO-B + PREDEFINED_AREA Atlantic-Western @@ -92,10 +96,15 @@ PREDEFINED_AREA Africa - + PREDEFINED_AREA South_America + + + PREDEFINED_AREA + S_Hemisphere + PREDEFINED_AREA World diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/88Ds/88Ds.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/88Ds/88Ds.xml index f6f871d08d..9454e6aed5 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/88Ds/88Ds.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/88Ds/88Ds.xml @@ -3,10 +3,12 @@ 88Ds OVERLAY -LpiFilename=88D.lpi +sourceType=LPI_FILE +sourceName=88D.lpi +sourceParams=not_used mapName=WSR-88D Station Locs - LpiOverlay + PointOverlay CLOSEST_BEFORE_OR_AFTER diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/88Ds/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/88Ds/default.attr index c92227db02..171a85bee3 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/88Ds/default.attr +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/88Ds/default.attr @@ -4,4 +4,6 @@ markerType=ASTERISK markerSize=1 markerWidth=1 markerTextSize=MEDIUM -markerTextAppearanceZoomLevel=1 +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=10000 +maxLabelDisplayWidth=3000 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/GINI_GMS.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Airports/Airports.xml similarity index 51% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/GINI_GMS.xml rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Airports/Airports.xml index 779411eee1..df5716a18e 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/GINI_GMS.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Airports/Airports.xml @@ -1,21 +1,20 @@ - GINI_GMS - SATELLITE + Airports + OVERLAY -! This must match the "creatingEntity" in the -! satellite DB table valid values are -pluginName=satellite -satelliteName=GMS -legendColor=RGB {200, 200, 200} +sourceType=SPI_FILE +sourceName=airports.spi +sourceParams=not_used +mapName=Airports - GiniSatellite - sectorID + PointOverlay + CLOSEST_BEFORE_OR_AFTER - 60 + 0 USE_DATA_TIMES 10 - 48 + 24 BasicWX_US diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Airports/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Airports/default.attr new file mode 100644 index 0000000000..76cfa96679 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Airports/default.attr @@ -0,0 +1,9 @@ +color= RGB {255,255,255} +markerState=MARKER_PLUS_TEXT +markerType=PLUS_SIGN +markerSize=1 +markerWidth=1 +markerTextSize=MEDIUM +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=10000 +maxLabelDisplayWidth=3000 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/GINI_JERS.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Buoys/Buoys.xml similarity index 51% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/GINI_JERS.xml rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Buoys/Buoys.xml index 69a7975d87..ee36ac2528 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/GINI_JERS.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Buoys/Buoys.xml @@ -1,21 +1,20 @@ - GINI_JERS - SATELLITE + Buoys + OVERLAY -! This must match the "creatingEntity" in the -! satellite DB table valid values are -pluginName=satellite -satelliteName=JERS -legendColor=RGB {200, 200, 200} +sourceType=SPI_FILE +sourceName=BUOY.spi +sourceParams=not_used +mapName=Fixed Buoys - GiniSatellite - sectorID + PointOverlay + CLOSEST_BEFORE_OR_AFTER - 60 + 0 USE_DATA_TIMES 10 - 48 + 24 BasicWX_US diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Buoys/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Buoys/default.attr index 6ff392158b..65249a3592 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Buoys/default.attr +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Buoys/default.attr @@ -4,4 +4,6 @@ markerType=PLUS_SIGN markerSize=1 markerWidth=1 markerTextSize=MEDIUM -markerTextAppearanceZoomLevel=1 +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=40100 +maxLabelDisplayWidth=40100 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/GINI_DMSP.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/BuoysFixed/BuoysFixed.xml similarity index 51% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/GINI_DMSP.xml rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/BuoysFixed/BuoysFixed.xml index fc3b52e77d..073729a049 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/GINI_DMSP.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/BuoysFixed/BuoysFixed.xml @@ -1,21 +1,21 @@ - GINI_DMSP - SATELLITE + BuoysFixed + OVERLAY -! This must match the "creatingEntity" in the -! satellite DB table valid values are -pluginName=satellite -satelliteName=DMSP -legendColor=RGB {200, 200, 200} +sourceType=STATIONS_DB_TABLE +! catalogType=32 in common_obs_spatial db +sourceName=BUOY_FXD +sourceParams=stationid +mapName=Fixed Buoys ids - GiniSatellite - sectorID + PointOverlay + CLOSEST_BEFORE_OR_AFTER - 60 + 0 USE_DATA_TIMES 10 - 48 + 24 BasicWX_US diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/BuoysFixed/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/BuoysFixed/default.attr new file mode 100644 index 0000000000..70e9105dea --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/BuoysFixed/default.attr @@ -0,0 +1,9 @@ +color= RGB {255,255,255} +markerState=MARKER_PLUS_TEXT +markerType=PLUS_SIGN +markerSize=0.7 +markerWidth=1 +markerTextSize=MEDIUM +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=20100 +maxLabelDisplayWidth=1500 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/GINI_NOAA16.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/CMAN/CMAN.xml similarity index 51% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/GINI_NOAA16.xml rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/CMAN/CMAN.xml index e7f6560178..3fd16b2b6f 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/GINI_NOAA16.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/CMAN/CMAN.xml @@ -1,21 +1,22 @@ - GINI_NOAA16 - SATELLITE + CMAN + OVERLAY -! This must match the "creatingEntity" in the -! satellite DB table valid values are -pluginName=satellite -satelliteName=NOAA16 -legendColor=RGB {200, 200, 200} +sourceType=STATIONS_DB_TABLE +! catalogType=33 in common_obs_spatial db +sourceName=CMAN +! sourceParams=name +sourceParams=stationid +mapName=Coastal Marine Locations - GiniSatellite - sectorID + PointOverlay + CLOSEST_BEFORE_OR_AFTER - 60 + 0 USE_DATA_TIMES 10 - 48 + 24 BasicWX_US diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/CMAN/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/CMAN/default.attr new file mode 100644 index 0000000000..70e9105dea --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/CMAN/default.attr @@ -0,0 +1,9 @@ +color= RGB {255,255,255} +markerState=MARKER_PLUS_TEXT +markerType=PLUS_SIGN +markerSize=0.7 +markerWidth=1 +markerTextSize=MEDIUM +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=20100 +maxLabelDisplayWidth=1500 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/CWAs/CWAs.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/CWAs/CWAs.xml index e7ecfd5b25..17167222f2 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/CWAs/CWAs.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/CWAs/CWAs.xml @@ -6,6 +6,8 @@ dbName=maps tableName=mapdata.cwa labelField=wfo +! set this to true to display the wfo names +displayLabelField=false mapName=County Warning Areas DbOverlay diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Cities/Cities.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Cities/Cities.xml new file mode 100644 index 0000000000..1517bee5de --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Cities/Cities.xml @@ -0,0 +1,25 @@ + + + Cities + OVERLAY + +sourceType=NCEP_DB_TABLE +! the name of the ncep stns table +sourceName=stns.cities +! the name of the db field to use +sourceParams=name +mapName=Cities +! This would read the lpi file instead +!sourceType=LPI_FILE +!sourceName=cities.lpi + + PointOverlay + + + CLOSEST_BEFORE_OR_AFTER + 0 + USE_DATA_TIMES + 10 + 24 + BasicWX_US + diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Cities/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Cities/default.attr index 6ff392158b..09d2fb07b6 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Cities/default.attr +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Cities/default.attr @@ -4,4 +4,5 @@ markerType=PLUS_SIGN markerSize=1 markerWidth=1 markerTextSize=MEDIUM -markerTextAppearanceZoomLevel=1 +maxSymbolDisplayWidth=500 +maxLabelDisplayWidth=250 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/DwmStns/DwmStns.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/DwmStns/DwmStns.xml index 6852c68730..2c97420cc4 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/DwmStns/DwmStns.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/DwmStns/DwmStns.xml @@ -3,10 +3,11 @@ DwmStns OVERLAY -LpiFilename=dlwx.lpi +sourceType=LPI_FILE +sourceName=dlwx.lpi mapName=DWM Stations - LpiOverlay + PointOverlay CLOSEST_BEFORE_OR_AFTER diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/DwmStns/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/DwmStns/default.attr index f56410246e..70a2cb59aa 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/DwmStns/default.attr +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/DwmStns/default.attr @@ -4,4 +4,6 @@ markerType=DOT markerSize=2 markerWidth=1 markerTextSize=SMALL -markerTextAppearanceZoomLevel=3 +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=10000 +maxLabelDisplayWidth=4000 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/FfgZones/FfgZones.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/FfgZones/FfgZones.xml new file mode 100644 index 0000000000..2fdf4c548f --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/FfgZones/FfgZones.xml @@ -0,0 +1,21 @@ + + + FfgZones + OVERLAY + +sourceType=NCEP_STATIONS_TBL_FILES +sourceName=ffgZones.xml +! the name of the xml element in the xml file +sourceParams=stid +mapName=FFG Zones + + PointOverlay + + + CLOSEST_BEFORE_OR_AFTER + 0 + USE_DATA_TIMES + 10 + 24 + BasicWX_US + diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/FfgZones/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/FfgZones/default.attr new file mode 100644 index 0000000000..53ddd76727 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/FfgZones/default.attr @@ -0,0 +1,9 @@ +color= RGB {0,255,0} +markerState=MARKER_PLUS_TEXT +markerType=PLUS_SIGN +markerSize=1 +markerWidth=1 +markerTextSize=MEDIUM +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=8000 +maxLabelDisplayWidth=300 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/IcaoStations/IcaoStations.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/IcaoStations/IcaoStations.xml new file mode 100644 index 0000000000..3d55f072fd --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/IcaoStations/IcaoStations.xml @@ -0,0 +1,21 @@ + + + IcaoStations + OVERLAY + +sourceType=STATIONS_DB_TABLE +! catalogType=1 in common_obs_spatial db +sourceName=ICAO +sourceParams=icao +mapName=ICAO Stations + + PointOverlay + + + CLOSEST_BEFORE_OR_AFTER + 0 + USE_DATA_TIMES + 10 + 24 + BasicWX_US + diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/IcaoStations/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/IcaoStations/default.attr new file mode 100644 index 0000000000..70e9105dea --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/IcaoStations/default.attr @@ -0,0 +1,9 @@ +color= RGB {255,255,255} +markerState=MARKER_PLUS_TEXT +markerType=PLUS_SIGN +markerSize=0.7 +markerWidth=1 +markerTextSize=MEDIUM +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=20100 +maxLabelDisplayWidth=1500 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Locator/Locator.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Locator/Locator.xml index 9d4135aadd..08ac1816e8 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Locator/Locator.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Locator/Locator.xml @@ -3,7 +3,7 @@ Locator OVERLAY -# default fontSize, fontName and color which may be overridden in an attrSet. +! default fontSize, fontName and color which may be overridden in an attrSet. fontSize=14 fontName=Monospace color=RGB {255, 255, 255} diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Locator/snapPoints.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Locator/snapPoints.attr new file mode 100644 index 0000000000..e0350fda18 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Locator/snapPoints.attr @@ -0,0 +1,25 @@ +! Position 1 +pos1LocatorSource=SNAP_POINTS +pos1RoundToNearest=1 +pos1DisplayUnit=omit +pos1DirectionUnit=omit +! Position 2 +pos2LocatorSource=None +pos2RoundToNearest=omit +pos2DisplayUnit=omit +pos2DirectionUnit=omit +! Position 3 +pos3LocatorSource=None +pos3RoundToNearest=omit +pos3DisplayUnit=omit +pos3DirectionUnit=omit +! Position 4 +pos4LocatorSource=None +pos4RoundToNearest=omit +pos4DisplayUnit=omit +pos4DirectionUnit=omit +! Position 5 +pos5LocatorSource=None +pos5RoundToNearest=omit +pos5DisplayUnit=omit +pos5DirectionUnit=omit \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/MetarStations/MetarStations.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/MetarStations/MetarStations.xml new file mode 100644 index 0000000000..c84f71d3cf --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/MetarStations/MetarStations.xml @@ -0,0 +1,19 @@ + + + MetarStations + OVERLAY + +sourceType=SPI_FILE +sourceName=MTR.spi +mapName=Metar Stations + + PointOverlay + + + CLOSEST_BEFORE_OR_AFTER + 0 + USE_DATA_TIMES + 10 + 24 + BasicWX_US + diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/MetarStations/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/MetarStations/default.attr index b498fa9ee0..9a25132973 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/MetarStations/default.attr +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/MetarStations/default.attr @@ -4,4 +4,6 @@ markerType=PLUS_SIGN markerSize=1 markerWidth=1 markerTextSize=MEDIUM -markerTextAppearanceZoomLevel=1 +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=40000 +maxLabelDisplayWidth=3000 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Nexrad/Nexrad.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Nexrad/Nexrad.xml new file mode 100644 index 0000000000..9e1928d0e8 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Nexrad/Nexrad.xml @@ -0,0 +1,25 @@ + + + Nexrad + OVERLAY + +sourceType=NCEP_DB_TABLE +! the name of the ncep stns table +sourceName=stns.nexrad +! the name of the db field to use +sourceParams=name +mapName=Nexrad +! This would read the lpi file instead +!sourceType=LPI_FILE +!sourceName=nexrad.lpi + + PointOverlay + + + CLOSEST_BEFORE_OR_AFTER + 0 + USE_DATA_TIMES + 10 + 24 + BasicWX_US + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Nexrad/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Nexrad/default.attr index c92227db02..5ecb135293 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Nexrad/default.attr +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Nexrad/default.attr @@ -4,4 +4,6 @@ markerType=ASTERISK markerSize=1 markerWidth=1 markerTextSize=MEDIUM -markerTextAppearanceZoomLevel=1 +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=5000 +maxLabelDisplayWidth=1200 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/RAOBs/RAOBs.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/RAOBs/RAOBs.xml new file mode 100644 index 0000000000..1c720fdfb2 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/RAOBs/RAOBs.xml @@ -0,0 +1,22 @@ + + + RAOBs + OVERLAY + +sourceType=STATIONS_DB_TABLE +! catalogType=22 in common_obs_spatial db +! could use UAIR also +sourceName=RAOB +sourceParams=icao +mapName=RAOB Icao Ids + + PointOverlay + + + CLOSEST_BEFORE_OR_AFTER + 0 + USE_DATA_TIMES + 10 + 24 + BasicWX_US + diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/RAOBs/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/RAOBs/default.attr index 6ff392158b..3daf767388 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/RAOBs/default.attr +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/RAOBs/default.attr @@ -4,4 +4,6 @@ markerType=PLUS_SIGN markerSize=1 markerWidth=1 markerTextSize=MEDIUM -markerTextAppearanceZoomLevel=1 +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=20100 +maxLabelDisplayWidth=1500 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Railroads/Railroads.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Railroads/Railroads.xml new file mode 100644 index 0000000000..aea49e6a79 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Railroads/Railroads.xml @@ -0,0 +1,20 @@ + + + Railroads + OVERLAY + +dbName=maps +tableName=mapdata.railroad +labelField=name +mapName=Railroads + + DbOverlay + + + CLOSEST_BEFORE_OR_AFTER + 0 + USE_DATA_TIMES + 10 + 24 + BasicWX_US + diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/RaobNames/RaobNames.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/RaobNames/RaobNames.xml new file mode 100644 index 0000000000..b325cbe352 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/RaobNames/RaobNames.xml @@ -0,0 +1,22 @@ + + + RaobNames + OVERLAY + +sourceType=STATIONS_DB_TABLE +! catalogType=22 in common_obs_spatial db +! could use UAIR or "22" also +sourceName=RAOB +sourceParams=name +mapName=RAOBs by Name + + PointOverlay + + + CLOSEST_BEFORE_OR_AFTER + 0 + USE_DATA_TIMES + 10 + 24 + BasicWX_US + diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/RaobNames/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/RaobNames/default.attr new file mode 100644 index 0000000000..3daf767388 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/RaobNames/default.attr @@ -0,0 +1,9 @@ +color= RGB {255,255,255} +markerState=MARKER_PLUS_TEXT +markerType=PLUS_SIGN +markerSize=1 +markerWidth=1 +markerTextSize=MEDIUM +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=20100 +maxLabelDisplayWidth=1500 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SfcStns/SfcStns.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SfcStns/SfcStns.xml index a0a687ec1e..2ad30f5d06 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SfcStns/SfcStns.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SfcStns/SfcStns.xml @@ -3,10 +3,11 @@ SfcStns OVERLAY -LpiFilename=sfstns.lpi +sourceType=LPI_FILE +sourceName=sfstns.lpi mapName=Surface Stations - LpiOverlay + PointOverlay CLOSEST_BEFORE_OR_AFTER diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SfcStns/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SfcStns/default.attr index 7453822eb1..4efdd3482a 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SfcStns/default.attr +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SfcStns/default.attr @@ -4,4 +4,6 @@ markerType=PLUS_SIGN markerSize=0.7 markerWidth=1 markerTextSize=MEDIUM -markerTextAppearanceZoomLevel=1 \ No newline at end of file +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=20100 +maxLabelDisplayWidth=1500 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SpcWatchName/SpcWatchName.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SpcWatchName/SpcWatchName.xml new file mode 100644 index 0000000000..8538843349 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SpcWatchName/SpcWatchName.xml @@ -0,0 +1,21 @@ + + + SpcWatchName + OVERLAY + +sourceType=NCEP_STATIONS_TBL_FILES +sourceName=spcwatch.xml +! the name of the xml element in the xml file +sourceParams=stnname +mapName=SPC Watch Anchor Points Names + + PointOverlay + + + CLOSEST_BEFORE_OR_AFTER + 0 + USE_DATA_TIMES + 10 + 24 + BasicWX_US + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SpcWatchName/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SpcWatchName/default.attr new file mode 100644 index 0000000000..361790b531 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SpcWatchName/default.attr @@ -0,0 +1,9 @@ +color= RGB {0,255,0} +markerState=MARKER_PLUS_TEXT +markerType=BOX_WITH_DIAGONALS +markerSize=1 +markerWidth=1 +markerTextSize=MEDIUM +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=10000 +maxLabelDisplayWidth=700 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SynopStationIds/SynopStationIds.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SynopStationIds/SynopStationIds.xml new file mode 100644 index 0000000000..72bbe5608a --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SynopStationIds/SynopStationIds.xml @@ -0,0 +1,20 @@ + + + SynopStationIds + OVERLAY + +sourceType=STATIONS_DB_TABLE +sourceName=Synop +sourceParams=stationid +mapName=Synoptic Stations + + PointOverlay + + + CLOSEST_BEFORE_OR_AFTER + 0 + USE_DATA_TIMES + 10 + 24 + BasicWX_US + diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SynopStationIds/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SynopStationIds/default.attr new file mode 100644 index 0000000000..4efdd3482a --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/SynopStationIds/default.attr @@ -0,0 +1,9 @@ +color= RGB {255,0,0} +markerState=MARKER_PLUS_TEXT +markerType=PLUS_SIGN +markerSize=0.7 +markerWidth=1 +markerTextSize=MEDIUM +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=20100 +maxLabelDisplayWidth=1500 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VORs/VORs.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VORs/VORs.xml index 236b317870..af6979ace1 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VORs/VORs.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VORs/VORs.xml @@ -3,10 +3,11 @@ VORs OVERLAY -LpiFilename=vors.lpi +sourceType=LPI_FILE +sourceName=vors.lpi mapName=VORs - LpiOverlay + PointOverlay CLOSEST_BEFORE_OR_AFTER diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VORs/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VORs/default.attr index 5eb8f16c54..ba895ac286 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VORs/default.attr +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VORs/default.attr @@ -1,7 +1,9 @@ color= RGB {0,0,255} -markerState=MARKER_ONLY +markerState=MARKER_PLUS_TEXT markerType=TRIANGLE markerSize=1 markerWidth=1 markerTextSize=MEDIUM -markerTextAppearanceZoomLevel=3 +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=10000 +maxLabelDisplayWidth=300 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VolcanoNames/VolcanoNames.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VolcanoNames/VolcanoNames.xml index a0fdd5d85d..c8c3377c4a 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VolcanoNames/VolcanoNames.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VolcanoNames/VolcanoNames.xml @@ -3,10 +3,11 @@ VolcanoNames OVERLAY -LpiFilename=volcano_names.lpi +sourceType=LPI_FILE +sourceName=volcano_names.lpi mapName=Volcano Names - LpiOverlay + PointOverlay CLOSEST_BEFORE_OR_AFTER diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VolcanoNames/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VolcanoNames/default.attr index 8cc5aaa9bf..68708d5045 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VolcanoNames/default.attr +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VolcanoNames/default.attr @@ -4,4 +4,6 @@ markerType=TRIANGLE markerSize=1.0 markerWidth=1 markerTextSize=MEDIUM -markerTextAppearanceZoomLevel=8 +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=40100 +maxLabelDisplayWidth=5000 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Volcanos/Volcanos.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Volcanos/Volcanos.xml index 0d6252cc71..59037549f7 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Volcanos/Volcanos.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Volcanos/Volcanos.xml @@ -3,10 +3,11 @@ Volcanos OVERLAY -LpiFilename=volcano.lpi +sourceType=LPI_FILE +sourceName=volcano.lpi mapName=Volcanos - LpiOverlay + PointOverlay CLOSEST_BEFORE_OR_AFTER diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Volcanos/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Volcanos/default.attr index 28c9400f49..35e21ccdd9 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Volcanos/default.attr +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/Volcanos/default.attr @@ -4,4 +4,6 @@ markerType=FILLED_TRIANGLE markerSize=1.2 markerWidth=1 markerTextSize=SMALL -markerTextAppearanceZoomLevel=5 +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=40100 +maxLabelDisplayWidth=500 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VolcanosAll/VolcanosAll.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VolcanosAll/VolcanosAll.xml new file mode 100644 index 0000000000..9e323f90e6 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VolcanosAll/VolcanosAll.xml @@ -0,0 +1,19 @@ + + + VolcanosAll + OVERLAY + +sourceType=LPI_FILE +sourceName=volcanoes.lpi +mapName=All Volcanos + + PointOverlay + + + CLOSEST_BEFORE_OR_AFTER + 0 + USE_DATA_TIMES + 10 + 24 + BasicWX_US + diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VolcanosAll/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VolcanosAll/default.attr new file mode 100644 index 0000000000..35e21ccdd9 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VolcanosAll/default.attr @@ -0,0 +1,9 @@ +color= RGB {0,255,0} +markerState=MARKER_ONLY +markerType=FILLED_TRIANGLE +markerSize=1.2 +markerWidth=1 +markerTextSize=SMALL +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=40100 +maxLabelDisplayWidth=500 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VorNames/VorNames.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VorNames/VorNames.xml new file mode 100644 index 0000000000..9b3ba82935 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VorNames/VorNames.xml @@ -0,0 +1,21 @@ + + + VorNames + OVERLAY + +sourceType=NCEP_STATIONS_TBL_FILES +sourceName=vors.xml +! the name of the xml element in the xml file +sourceParams=stnname +mapName=VOR Names + + PointOverlay + + + CLOSEST_BEFORE_OR_AFTER + 0 + USE_DATA_TIMES + 10 + 24 + BasicWX_US + diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VorNames/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VorNames/default.attr new file mode 100644 index 0000000000..5c3653aa8d --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/VorNames/default.attr @@ -0,0 +1,9 @@ +color= RGB {0,0,255} +markerState=MARKER_PLUS_TEXT +markerType=TRIANGLE +markerSize=1 +markerWidth=1 +markerTextSize=MEDIUM +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=4000 +maxLabelDisplayWidth=600 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/WFOs/WFOs.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/WFOs/WFOs.xml index dbc9c0a8b3..d89f2f84ea 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/WFOs/WFOs.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/WFOs/WFOs.xml @@ -3,10 +3,11 @@ WFOs OVERLAY -LpiFilename=wfo.lpi +sourceType=LPI_FILE +sourceName=wfo.lpi mapName=WFO - LpiOverlay + PointOverlay CLOSEST_BEFORE_OR_AFTER diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/WFOs/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/WFOs/default.attr index f71b27f3e1..3e52441cf6 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/WFOs/default.attr +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/WFOs/default.attr @@ -4,4 +4,6 @@ markerType=STAR markerSize=1 markerWidth=1 markerTextSize=MEDIUM -markerTextAppearanceZoomLevel=4 \ No newline at end of file +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=10000 +maxLabelDisplayWidth=4000 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/countyCluster/countyCluster.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/countyCluster/countyCluster.xml index 8e8450e4a9..6387e80eb5 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/countyCluster/countyCluster.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/countyCluster/countyCluster.xml @@ -3,10 +3,11 @@ countyCluster OVERLAY -LpiFilename=cnty_clst.lpi +sourceType=LPI_FILE +sourceName=cnty_clst.lpi mapName=County Clusters - LpiOverlay + PointOverlay CLOSEST_BEFORE_OR_AFTER diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/countyCluster/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/countyCluster/default.attr index 282e76730a..482ed567f7 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/countyCluster/default.attr +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/countyCluster/default.attr @@ -1,7 +1,9 @@ color= RGB {255,255,0} -markerState=MARKER_ONLY +markerState=MARKER_PLUS_TEXT markerType=OCTAGON markerSize=1 markerWidth=1 markerTextSize=MEDIUM -markerTextAppearanceZoomLevel=1 +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=10000 +maxLabelDisplayWidth=300 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/countyNames/countyNames.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/countyNames/countyNames.xml index 076acd95ff..fd924ee6fe 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/countyNames/countyNames.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/countyNames/countyNames.xml @@ -3,10 +3,11 @@ countyNames OVERLAY -LpiFilename=us_county.lpi +sourceType=LPI_FILE +sourceName=us_county.lpi mapName=County Names - LpiOverlay + PointOverlay CLOSEST_BEFORE_OR_AFTER diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/countyNames/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/countyNames/default.attr index 1cc847be18..0dfbd31628 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/countyNames/default.attr +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/countyNames/default.attr @@ -4,4 +4,6 @@ markerType=PLUS_SIGN markerSize=1 markerWidth=1 markerTextSize=MEDIUM -markerTextAppearanceZoomLevel=3 +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=10000 +maxLabelDisplayWidth=2000 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/cpcStations/cpcStations.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/cpcStations/cpcStations.xml index 0bb1a538d9..1c1ed81ae0 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/cpcStations/cpcStations.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/cpcStations/cpcStations.xml @@ -3,10 +3,11 @@ cpcStations OVERLAY -LpiFilename=cpcstns.lpi +sourceType=LPI_FILE +sourceName=cpcstns.lpi mapName=CPC Stations - LpiOverlay + PointOverlay CLOSEST_BEFORE_OR_AFTER diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/cpcStations/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/cpcStations/default.attr index 595a01a31a..f1609ac50f 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/cpcStations/default.attr +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/cpcStations/default.attr @@ -4,4 +4,6 @@ markerType=PLUS_SIGN markerSize=1 markerWidth=1 markerTextSize=MEDIUM -markerTextAppearanceZoomLevel=1 +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=10000 +maxLabelDisplayWidth=4000 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/snapPoints/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/snapPoints/default.attr index 595a01a31a..3566ab7da5 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/snapPoints/default.attr +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/snapPoints/default.attr @@ -4,4 +4,6 @@ markerType=PLUS_SIGN markerSize=1 markerWidth=1 markerTextSize=MEDIUM -markerTextAppearanceZoomLevel=1 +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=1200 +maxLabelDisplayWidth=600 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/snapPoints/snapPoints.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/snapPoints/snapPoints.xml index 7902b390e3..d9df78bf14 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/snapPoints/snapPoints.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/snapPoints/snapPoints.xml @@ -3,10 +3,17 @@ snapPoints OVERLAY -LpiFilename=snap.lpi +sourceType=NCEP_DB_TABLE +! the name of the ncep stns table +sourceName=stns.snap +! the name of the db field to use +sourceParams=station_name +! This would read the lpi file instead +!sourceType=LPI_FILE +!sourceName=snap.lpi mapName=Snap Points - LpiOverlay + PointOverlay CLOSEST_BEFORE_OR_AFTER diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/spcwatch/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/spcwatch/default.attr index 8374092d51..c1501e4151 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/spcwatch/default.attr +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/spcwatch/default.attr @@ -1,7 +1,9 @@ color= RGB {0,255,0} -markerState=MARKER_ONLY +markerState=MARKER_PLUS_TEXT markerType=BOX_WITH_DIAGONALS markerSize=1 markerWidth=1 markerTextSize=MEDIUM -markerTextAppearanceZoomLevel=1 +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth=10000 +maxLabelDisplayWidth=300 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/spcwatch/spcwatch.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/spcwatch/spcwatch.xml index f7eed49a4b..1024adc700 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/spcwatch/spcwatch.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/spcwatch/spcwatch.xml @@ -3,10 +3,11 @@ spcwatch OVERLAY -LpiFilename=spcwatch.lpi +sourceType=LPI_FILE +sourceName=spcwatch.lpi mapName=SPC Watch Anchor Points - LpiOverlay + PointOverlay CLOSEST_BEFORE_OR_AFTER diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/wrqpf/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/wrqpf/default.attr index 1cc847be18..1222ce7a6b 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/wrqpf/default.attr +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/wrqpf/default.attr @@ -1,7 +1,9 @@ color= RGB {205,0,0} -markerState=TEXT_ONLY +markerState=MARKER_PLUS_TEXT markerType=PLUS_SIGN markerSize=1 markerWidth=1 markerTextSize=MEDIUM -markerTextAppearanceZoomLevel=3 +! the distance in km of the screen width when the symbols/labels will be displayed. +maxSymbolDisplayWidth= 300 +maxLabelDisplayWidth=2000 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/wrqpf/wrqpf.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/wrqpf/wrqpf.xml index 1a73f9f7ba..0667bf7037 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/wrqpf/wrqpf.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/wrqpf/wrqpf.xml @@ -3,10 +3,11 @@ wrqpf OVERLAY -LpiFilename=wrqpf.lpi +sourceType=LPI_FILE +sourceName=wrqpf.lpi mapName=WR_QPF - LpiOverlay + PointOverlay CLOSEST_BEFORE_OR_AFTER diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/GINI_GOES8.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_500mb/Atlantic_500mb.xml similarity index 52% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/GINI_GOES8.xml rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_500mb/Atlantic_500mb.xml index 2ee93e0360..fecc288778 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/GINI_GOES8.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_500mb/Atlantic_500mb.xml @@ -1,21 +1,25 @@ - GINI_GOES8 - SATELLITE + Atlantic_500mb + PGEN -! This must match the "creatingEntity" in the -! satellite DB table valid values are -pluginName=satellite -satelliteName=GOES-8(I) -legendColor=RGB {200, 200, 200} +pluginName=pgen +activityLabel=Atlantic_500mb +activityName=Atlantic_500mb +activityType=Atlantic_500mb +!activitySubtype=% +operatingMode=OPERATIONAL +site=%1 +desk=% +forecaster=% - GiniSatellite - sectorID + PGEN + dataTime CLOSEST_BEFORE_OR_AFTER 60 USE_DATA_TIMES 10 - 48 + 24 BasicWX_US - + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_500mb/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_500mb/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_500mb/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_Surface/Atlantic_Surface.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_Surface/Atlantic_Surface.xml new file mode 100644 index 0000000000..2b958e99f8 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_Surface/Atlantic_Surface.xml @@ -0,0 +1,25 @@ + + + Atlantic_Surface + PGEN + +pluginName=pgen +activityLabel=Atlantic_Surface +activityName=Atlantic_Surface +activityType=Atlantic_Surface +activitySubtype=% +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% + + PGEN + dataTime + + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 + 24 + BasicWX_US + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_Surface/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_Surface/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_Surface/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_Wind_Wave/Atlantic_Wind_Wave.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_Wind_Wave/Atlantic_Wind_Wave.xml index 097d33df0c..71ec64ddce 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_Wind_Wave/Atlantic_Wind_Wave.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_Wind_Wave/Atlantic_Wind_Wave.xml @@ -3,17 +3,23 @@ Atlantic_Wind_Wave PGEN -! the sub-directory under the current PGEN working directory -! TODO : may want to change pgenDirectory to productType/activity and get the directory of the productType -pgenDirectory=/home/awp2pgen/activities/Atlantic_Wind_Wave/xml +pluginName=pgen +activityLabel=Atlantic_Wind_Wave +activityName=Atlantic Wind Wave +activityType=Atlantic Wind Wave +activitySubtype=% +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% PGEN - productName + dataTime - CLOSEST_BEFORE_OR_AFTER - 60 - USE_FRAME_INTERVAL - 10 + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 24 BasicWX_US \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_Wind_Wave/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_Wind_Wave/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Atlantic_Wind_Wave/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CCFP-ByZ/CCFP-ByZ.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CCFP-ByZ/CCFP-ByZ.xml new file mode 100644 index 0000000000..185139856d --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CCFP-ByZ/CCFP-ByZ.xml @@ -0,0 +1,25 @@ + + + CCFP-ByZ + PGEN + +pluginName=pgen +activityLabel=% +activityName=CCFP +activityType=CCFP +!activitySubtype=% +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% + + PGEN + activitySubtype + + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 + 24 + BasicWX_US + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CCFP-ByZ/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CCFP-ByZ/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CCFP-ByZ/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CCFP/CCFP.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CCFP/CCFP.xml index 9b893491e1..524422aef4 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CCFP/CCFP.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CCFP/CCFP.xml @@ -3,17 +3,23 @@ CCFP PGEN -! the sub-directory under the current PGEN working directory -! TODO : may want to change pgenDirectory to productType/activity and get the directory of the productType -pgenDirectory=/home/awp2pgen/activities/CCFP/xml +pluginName=pgen +activityLabel=CCFP +activityName=CCFP +activityType=CCFP +activitySubtype=% +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% PGEN - productName + dataTime - CLOSEST_BEFORE_OR_AFTER - 60 - USE_FRAME_INTERVAL - 10 + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 24 BasicWX_US diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CCFP/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CCFP/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CCFP/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CONV_SIGMET/CONV_SIGMET.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CONV_SIGMET/CONV_SIGMET.xml index edbbdba4b2..ee4eeaaa86 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CONV_SIGMET/CONV_SIGMET.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CONV_SIGMET/CONV_SIGMET.xml @@ -3,17 +3,23 @@ CONV_SIGMET PGEN -! the sub-directory under the current PGEN working directory -! TODO : may want to change pgenDirectory to productType/activity and get the directory of the productType -pgenDirectory=/home/awp2pgen/activities/CONV_SIGMET/xml +pluginName=pgen +activityLabel=CONV_SIGMET +activityName=CONV SIGMET +activityType=CONV SIGMET +activitySubtype=% +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% PGEN - productName + dataTime - CLOSEST_BEFORE_OR_AFTER - 60 - USE_FRAME_INTERVAL - 10 + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 24 BasicWX_US diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CONV_SIGMET/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CONV_SIGMET/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/CONV_SIGMET/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Convective_Outlook/Convective_Outlook.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Convective_Outlook/Convective_Outlook.xml index 0eb731b6b5..2e1be50517 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Convective_Outlook/Convective_Outlook.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Convective_Outlook/Convective_Outlook.xml @@ -3,17 +3,23 @@ Convective_Outlook PGEN -! the sub-directory under the current PGEN working directory -! TODO : may want to change pgenDirectory to productType/activity and get the directory of the productType -pgenDirectory=/home/awp2pgen/activities/Convective_Outlook/xml +pluginName=pgen +activityLabel=Convective_Outlook +activityName=Convective Outlook +activityType=Convective Outlook +activitySubtype=% +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% PGEN - productName + dataTime - CLOSEST_BEFORE_OR_AFTER - 60 - USE_FRAME_INTERVAL - 10 + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 24 BasicWX_US diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Convective_Outlook/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Convective_Outlook/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Convective_Outlook/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Extended_Range/Extended_Range.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Extended_Range/Extended_Range.xml index ba3c0b670b..1e4e57c758 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Extended_Range/Extended_Range.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Extended_Range/Extended_Range.xml @@ -3,17 +3,23 @@ Extended_Range PGEN -! the sub-directory under the current PGEN working directory -! TODO : may want to change pgenDirectory to productType/activity and get the directory of the productType -pgenDirectory=/home/awp2pgen/activities/Extended_Range/xml +pluginName=pgen +activityLabel=Extended_Range +activityName=Extended Range +activityType=Extended Range +activitySubtype=% +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% PGEN - productName + dataTime - CLOSEST_BEFORE_OR_AFTER - 60 - USE_FRAME_INTERVAL - 10 + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 24 BasicWX_US diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Extended_Range/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Extended_Range/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Extended_Range/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-ByLabel/G_AIRMET-ByLabel.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-ByLabel/G_AIRMET-ByLabel.xml new file mode 100644 index 0000000000..a540213d21 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-ByLabel/G_AIRMET-ByLabel.xml @@ -0,0 +1,25 @@ + + + G_AIRMET-ByLabel + PGEN + +pluginName=pgen +!activityLabel=% +activityName=G_AIRMET +activityType=G_AIRMET +activitySubtype=% +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% + + PGEN + activityLabel + + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 + 24 + BasicWX_US + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-ByLabel/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-ByLabel/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-ByLabel/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-BySubType/G_AIRMET-BySubType.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-BySubType/G_AIRMET-BySubType.xml new file mode 100644 index 0000000000..1e7e50bdfc --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-BySubType/G_AIRMET-BySubType.xml @@ -0,0 +1,25 @@ + + + G_AIRMET-BySubType + PGEN + +pluginName=pgen +activityLabel=% +activityName=G_AIRMET +activityType=G_AIRMET +!activitySubtype=None +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% + + PGEN + activitySubtype + + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 + 24 + BasicWX_US + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-BySubType/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-BySubType/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-BySubType/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-East/G_AIRMET-East.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-East/G_AIRMET-East.xml new file mode 100644 index 0000000000..2c297b83a7 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-East/G_AIRMET-East.xml @@ -0,0 +1,25 @@ + + + G_AIRMET-East + PGEN + +pluginName=pgen +activityLabel=% +activityName=G_AIRMET +activityType=G_AIRMET +activitySubtype=East +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% + + PGEN + dataTime + + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 + 24 + BasicWX_US + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-East/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-East/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-East/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-West/G_AIRMET-West.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-West/G_AIRMET-West.xml new file mode 100644 index 0000000000..30fec488c0 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-West/G_AIRMET-West.xml @@ -0,0 +1,25 @@ + + + G_AIRMET-West + PGEN + +pluginName=pgen +activityLabel=% +activityName=G_AIRMET +activityType=G_AIRMET +activitySubtype=West +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% + + PGEN + dataTime + + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 + 24 + BasicWX_US + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-West/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-West/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET-West/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET/G_AIRMET.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET/G_AIRMET.xml index d44558485b..15f7212883 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET/G_AIRMET.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET/G_AIRMET.xml @@ -3,17 +3,23 @@ G_AIRMET PGEN -! the sub-directory under the current PGEN working directory -! TODO : may want to change pgenDirectory to productType/activity and get the directory of the productType -pgenDirectory=/home/awp2pgen/activities/G_AIRMET/xml +pluginName=pgen +activityLabel=Enter name of product here +activityName=G_AIRMET +activityType=G_AIRMET +activitySubtype=% +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% PGEN - productName + dataTime - CLOSEST_BEFORE_OR_AFTER - 60 - USE_FRAME_INTERVAL - 10 + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 24 BasicWX_US diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/G_AIRMET/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/HPC_Basic_WX/HPC_Basic_WX.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/HPC_Basic_WX/HPC_Basic_WX.xml index 7b9f8a7f4b..c035c1c066 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/HPC_Basic_WX/HPC_Basic_WX.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/HPC_Basic_WX/HPC_Basic_WX.xml @@ -3,17 +3,23 @@ HPC_Basic_WX PGEN -! the sub-directory under the current PGEN working directory -! TODO : may want to change pgenDirectory to productType/activity and get the directory of the productType -pgenDirectory=/home/awp2pgen/activities/HPC_Basic_WX/xml +pluginName=pgen +activityLabel=HPC_Basic_WX +activityName=HPC Basic WX +activityType=HPC Basic WX +activitySubtype=% +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% PGEN - productName + dataTime - CLOSEST_BEFORE_OR_AFTER - 60 - USE_FRAME_INTERVAL - 10 + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 24 BasicWX_US \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/HPC_Basic_WX/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/HPC_Basic_WX/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/HPC_Basic_WX/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/HPC_QPF/HPC_QPF.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/HPC_QPF/HPC_QPF.xml index 79c32914aa..0b65b1e9ff 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/HPC_QPF/HPC_QPF.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/HPC_QPF/HPC_QPF.xml @@ -3,17 +3,23 @@ HPC_QPF PGEN -! the sub-directory under the current PGEN working directory -! TODO : may want to change pgenDirectory to productType/activity and get the directory of the productType -pgenDirectory=/home/awp2pgen/activities/HPC_QPF/xml +pluginName=pgen +activityLabel=HPC_QPF +activityName=HPC QPF +activityType=HPC QPF +activitySubtype=% +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% PGEN - productName + dataTime - CLOSEST_BEFORE_OR_AFTER - 60 - USE_FRAME_INTERVAL - 10 + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 24 BasicWX_US \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/HPC_QPF/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/HPC_QPF/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/HPC_QPF/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Hazard_Outlook/Hazard_Outlook.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Hazard_Outlook/Hazard_Outlook.xml index 6806b95930..371e53f8e9 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Hazard_Outlook/Hazard_Outlook.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Hazard_Outlook/Hazard_Outlook.xml @@ -3,17 +3,23 @@ Hazard_Outlook PGEN -! the sub-directory under the current PGEN working directory -! TODO : may want to change pgenDirectory to productType/activity and get the directory of the productType -pgenDirectory=/home/awp2pgen/activities/Hazard_Outlook/xml +pluginName=pgen +activityLabel=Hazard_Outlook +activityName=Hazard Outlook +activityType=Hazard Outlook +activitySubtype=% +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% PGEN - productName + dataTime - CLOSEST_BEFORE_OR_AFTER - 60 - USE_FRAME_INTERVAL - 10 + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 24 BasicWX_US diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Hazard_Outlook/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Hazard_Outlook/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Hazard_Outlook/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/International_Sigmet/International_Sigmet.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/International_Sigmet/International_Sigmet.xml index 2b46b8fcce..c828fbccf0 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/International_Sigmet/International_Sigmet.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/International_Sigmet/International_Sigmet.xml @@ -3,17 +3,23 @@ International_Sigmet PGEN -! the sub-directory under the current PGEN working directory -! TODO : may want to change pgenDirectory to productType/activity and get the directory of the productType -pgenDirectory=/home/awp2pgen/activities/International_Sigmet/xml +pluginName=pgen +activityLabel=International_Sigmet +activityName=International_Sigmet +activityType=International_Sigmet +activitySubtype=% +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% PGEN - productName + dataTime - CLOSEST_BEFORE_OR_AFTER - 60 - USE_FRAME_INTERVAL - 10 + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 24 BasicWX_US diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/International_Sigmet/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/International_Sigmet/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/International_Sigmet/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/NONCONV_SIGMET/NONCONV_SIGMET.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/NONCONV_SIGMET/NONCONV_SIGMET.xml index 6ae32b5136..ea59b97c8b 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/NONCONV_SIGMET/NONCONV_SIGMET.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/NONCONV_SIGMET/NONCONV_SIGMET.xml @@ -3,17 +3,23 @@ NONCONV_SIGMET PGEN -! the sub-directory under the current PGEN working directory -! TODO : may want to change pgenDirectory to productType/activity and get the directory of the productType -pgenDirectory=/home/awp2pgen/activities/NONCONV_SIGMET/xml +pluginName=pgen +activityLabel=NONCONV_SIGMET +activityName=NONCONV_SIGMET +activityType=NONCONV_SIGMET +activitySubtype=% +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% PGEN - productName + dataTime - CLOSEST_BEFORE_OR_AFTER - 60 - USE_FRAME_INTERVAL - 10 + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 24 BasicWX_US \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/NONCONV_SIGMET/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/NONCONV_SIGMET/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/NONCONV_SIGMET/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High-BySubType/SIGWX_High-BySubType.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High-BySubType/SIGWX_High-BySubType.xml new file mode 100644 index 0000000000..4f3c5b905d --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High-BySubType/SIGWX_High-BySubType.xml @@ -0,0 +1,25 @@ + + + SIGWX_High-BySubType + PGEN + +pluginName=pgen +activityLabel=SIGWX High +activityName=SIGWX High +activityType=SIGWX High +!activitySubtype=None +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% + + PGEN + activitySubtype + + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 + 24 + BasicWX_US + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High-BySubType/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High-BySubType/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High-BySubType/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High-North/SIGWX_High-North.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High-North/SIGWX_High-North.xml new file mode 100644 index 0000000000..acdd523364 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High-North/SIGWX_High-North.xml @@ -0,0 +1,25 @@ + + + SIGWX_High-North + PGEN + +pluginName=pgen +activityLabel=SIGWX High +activityName=SIGWX High +activityType=SIGWX High +activitySubtype=North +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% + + PGEN + dataTime + + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 + 24 + BasicWX_US + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High-North/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High-North/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High-North/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High/SIGWX_High.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High/SIGWX_High.xml index e7edcc5b82..06f093e0c8 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High/SIGWX_High.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High/SIGWX_High.xml @@ -3,17 +3,25 @@ SIGWX_High PGEN -! the sub-directory under the current PGEN working directory -! TODO : may want to change pgenDirectory to productType/activity and get the directory of the productType -pgenDirectory=/home/awp2pgen/activities/SIGWX_High/xml +pluginName=pgen +activityLabel=SIGWX High +activityName=SIGWX High +activityType=SIGWX High +! with other valid subtypes, this cannot be % since it will query other +! subtypes +activitySubtype=None +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% PGEN - productName + dataTime - CLOSEST_BEFORE_OR_AFTER - 60 - USE_FRAME_INTERVAL - 10 + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 24 BasicWX_US diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_High/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_Low/SIGWX_Low b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_Low/SIGWX_Low index 317cf0b105..97614edf17 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_Low/SIGWX_Low +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_Low/SIGWX_Low @@ -1,21 +1,25 @@ - true SIGWX_Low PGEN - -! the sub-directory under the current PGEN working directory -! TODO : may want to change pgenDirectory to productType/activity and get the directory of the productType -pgenDirectory=/home/awp2pgen/activities/SIGWX_Low/xml +pluginName=pgen +activityLabel=SIGWX Low Product info +activityName=SIGWX Low +activityType=SIGWX Low +activitySubtype=% +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% PGEN - productName + dataTime - CLOSEST_BEFORE_OR_AFTER - 60 - USE_FRAME_INTERVAL - 10 + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 24 BasicWX_US diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_Low/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_Low/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_Low/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_Medium/SIGWX_Medium.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_Medium/SIGWX_Medium.xml index de43db20e0..ae5296bb3c 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_Medium/SIGWX_Medium.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_Medium/SIGWX_Medium.xml @@ -3,17 +3,23 @@ SIGWX_Medium PGEN -! the sub-directory under the current PGEN working directory -! TODO : may want to change pgenDirectory to productType/activity and get the directory of the productType -pgenDirectory=/home/awp2pgen/activities/SIGWX_Medium/xml +pluginName=pgen +activityLabel=SIGWX_Medium Product Info +activityName=SIGWX Medium +activityType=SIGWX Medium +activitySubtype=% +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% PGEN - productName + dataTime - CLOSEST_BEFORE_OR_AFTER - 60 - USE_FRAME_INTERVAL - 10 + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 24 BasicWX_US diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_Medium/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_Medium/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/SIGWX_Medium/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Sample/Sample.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Sample/Sample.xml index 6cc0b9da91..add90dd3ba 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Sample/Sample.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Sample/Sample.xml @@ -3,17 +3,23 @@ Sample PGEN -! the sub-directory under the current PGEN working directory -! TODO : may want to change pgenDirectory to productType/activity and get the directory of the productType -pgenDirectory=/home/awp2pgen/activities/Sample/xml +pluginName=pgen +activityLabel=Sample +activityName=Sample +activityType=Sample +activitySubtype=% +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% PGEN - productName + dataTime - CLOSEST_BEFORE_OR_AFTER - 60 - USE_FRAME_INTERVAL - 10 + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 24 BasicWX_US diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Sample/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Sample/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Sample/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Surface_Analysis/Surface_Analysis.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Surface_Analysis/Surface_Analysis.xml index 7057595636..6c17d46b40 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Surface_Analysis/Surface_Analysis.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Surface_Analysis/Surface_Analysis.xml @@ -3,17 +3,23 @@ Surface_Analysis PGEN -! the sub-directory under the current PGEN working directory -! TODO : may want to change pgenDirectory to productType/activity and get the directory of the productType -pgenDirectory=/home/awp2pgen/activities/Surface_Analysis/xml +pluginName=pgen +activityLabel=Surface_Analysis Product Info +activityName=Surface_Analysis +activityType=Surface_Analysis +activitySubtype=% +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% PGEN - productName + dataTime - CLOSEST_BEFORE_OR_AFTER - 60 - USE_FRAME_INTERVAL - 10 + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 24 BasicWX_US diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Surface_Analysis/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Surface_Analysis/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Surface_Analysis/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/VOLCANO/VOLCANO.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/VOLCANO/VOLCANO.xml new file mode 100644 index 0000000000..3f2bbb63ed --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/VOLCANO/VOLCANO.xml @@ -0,0 +1,25 @@ + + + VOLCANO + PGEN + +pluginName=pgen +activityLabel=VOLCANO Product Info +activityName=Volcano +activityType=Volcano +activitySubtype=% +operatingMode=OPERATIONAL +site=% +desk=% +forecaster=% + + PGEN + dataTime + + MATCH_ALL_DATA + 2147483647 + USE_DATA_TIMES + 1 + 24 + BasicWX_US + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/ResourceFilters.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/ResourceFilters.xml index c93405c6c0..d411923aca 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/ResourceFilters.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/ResourceFilters.xml @@ -95,53 +95,84 @@ Observed + - +CCFP + + +CCFP - +Sigmet - - + +G_AIRMET + + +G_AIRMET + + +G_AIRMET + + +G_AIRMET + + +G_AIRMET - +Extended_Range - +Surface,Analysis - +Sample - +NonConvective,Sigmet - - + +SIGWX - - + +SIGWX - - - - - - - - - - - - - - + +SIGWX - +SIGWX + + +SIGWX + + +Hazard,Outlook + + +HPC + + +HPC + + +Convective,Outlook + + +Atlantic,Wind,Wave + + +Atlantic,500mb + + +Atlantic,Surface + + +VOLCANO - +Convective,Sigmet AWW @@ -362,6 +393,9 @@ AdministrativeBoundaries + +AdministrativeBoundaries + @@ -380,6 +414,9 @@ + + + AdministrativeBoundaries @@ -419,6 +456,36 @@ Stations + +Stations + + +Stations + + +Stations + + +Stations + + +Stations + + +Stations + + +Stations + + +Stations + + +Stations + + +Stations + AdministrativeBoundaries @@ -428,6 +495,15 @@ ManMadeFeatures + +ManMadeFeatures + + +ManMadeFeatures + + +ManMadeFeatures + @@ -560,9 +636,6 @@ - -Stations - @@ -572,6 +645,9 @@ NaturalFeatures + +NaturalFeatures + Stations @@ -581,12 +657,18 @@ + + + NaturalFeatures + +AdministrativeBoundaries + AdministrativeBoundaries @@ -1187,99 +1269,48 @@ Forecast,Ensemble,Global - -McIdas,GOES - - -GINI - - -NOAA,GINI - - -METEOSAT,GINI - GINI - -NOAA,GINI - - -McIdas - - + GOES,GINI GOES,GINI + +GOES,GINI + GINI GOES,GINI - -GOES,GINI - Standard,McIdas - -Standard,McIdas,GOES - McIdas,GOES - -McIdas,METEOSAT + +Standard,McIdas,GOES - -McIdas,METEOSAT - - -McIdas,METEOSAT - - -Standard,McIdas,GMS - - -GINI - - -GOES,GINI - - -McIdas,METEOSAT - - -GOES,GINI - - -Standard,McIdas,METEOSAT + +Standard,McIdas,GOES Standard,McIdas,GOES - -NOAA,GINI - - -GINI - - -GMS,GINI - - -NOAA,GINI - - -McIdas,GOES - Standard,McIdas + +McIdas,METEOSAT + + +Standard,McIdas,METEOSAT + McIdas,METEOSAT @@ -1295,27 +1326,12 @@ Standard,McIdas - -McIdas,GOES - Standard,McIdas - -McIdas,GOES - McIdas - -McIdas,GOES - - -McIdas,GOES - - -McIdas,METEOSAT - GINI diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/FYC/IR2.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/FYC/IR2.attr deleted file mode 100644 index eb0f7432f7..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/FYC/IR2.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR2 -displayUnitStr=C -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/FYC/SW.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/FYC/SW.attr deleted file mode 100644 index eb2b9c2848..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/FYC/SW.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=SW -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/CLOUD_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/CLOUD_WATER.attr deleted file mode 100644 index 4e62b6105c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/CLOUD_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Cloud water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DERIVED_CAPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DERIVED_CAPE.attr deleted file mode 100644 index 98ba73b6fb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DERIVED_CAPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Available Potential Energy (CAPE) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DERIVED_CONV_INH.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DERIVED_CONV_INH.attr deleted file mode 100644 index 57a4f38069..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DERIVED_CONV_INH.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Inhibition -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DERIVED_LAND_SEA_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DERIVED_LAND_SEA_TEMP.attr deleted file mode 100644 index 7a23e38f72..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DERIVED_LAND_SEA_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived land-sea temp -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DERIVED_VOLCANO_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DERIVED_VOLCANO_IMG.attr deleted file mode 100644 index 2229ec1825..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DERIVED_VOLCANO_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Volcano Imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DERIVED_WINDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DERIVED_WINDEX.attr deleted file mode 100644 index 089564cdb4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DERIVED_WINDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Wind Index(WINDEX) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DMPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DMPI.attr deleted file mode 100644 index a899181e1c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/DMPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Dry Microburst Potential Index (DMPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/GRID_CLOUD_AMT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/GRID_CLOUD_AMT.attr deleted file mode 100644 index 8fd34efc0b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/GRID_CLOUD_AMT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Amount -displayUnitStr=SounderCloudAmountPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/GRID_CTOP_PRES_HGHT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/GRID_CTOP_PRES_HGHT.attr deleted file mode 100644 index 1c64cd80c4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/GRID_CTOP_PRES_HGHT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Top Pressure or Height -displayUnitStr=SounderCloudTopHeightPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/ICE_CONC.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/ICE_CONC.attr deleted file mode 100644 index 9efb75ca77..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/ICE_CONC.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice concentrations -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/ICE_EDGE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/ICE_EDGE.attr deleted file mode 100644 index 9379c1e0de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/ICE_EDGE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice edge -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/ICE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/ICE_TYPE.attr deleted file mode 100644 index e8befd0987..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/ICE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/IMG_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/IMG_LIFTED_INDEX.attr deleted file mode 100644 index 4ef5aa938c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/IMG_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/IMG_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/IMG_PRECIP_WATER.attr deleted file mode 100644 index 646aeffd51..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/IMG_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Precipitable Water (PW) -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/IMG_SRFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/IMG_SRFC_SKIN_TEMP.attr deleted file mode 100644 index bdd4ad59a5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/IMG_SRFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/LOW_CLOUD_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/LOW_CLOUD_IMG.attr deleted file mode 100644 index d7926c72dd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/LOW_CLOUD_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Low cloud base imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/MDPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/MDPI.attr deleted file mode 100644 index cef6535f0e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/MDPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Microburst Day Potential Index (MDPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/NORMAL_TPW_PERCENT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/NORMAL_TPW_PERCENT.attr deleted file mode 100644 index 6bd99b6f42..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/NORMAL_TPW_PERCENT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Percent of Normal TPW -displayUnitStr=PercentOfNormalTPWPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/POLAR_3.7u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/POLAR_3.7u.attr deleted file mode 100644 index 4d633f1530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/POLAR_3.7u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.7u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/POLAR_3.9u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/POLAR_3.9u.attr deleted file mode 100644 index 06854db01e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/POLAR_3.9u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.9u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/POLAR_IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/POLAR_IR.attr deleted file mode 100644 index 6a20f7d566..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/POLAR_IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/POLAR_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/POLAR_VIS.attr deleted file mode 100644 index d6578a334f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/POLAR_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar Vis -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/RAIN_RATE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/RAIN_RATE.attr deleted file mode 100644 index 7305eb7685..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/RAIN_RATE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Rain fall rate -displayUnitStr=RainfallRatePixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SCATTEROMETER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SCATTEROMETER.attr deleted file mode 100644 index a05f578deb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SCATTEROMETER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Scatterometer Data -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SFC_WETNESS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SFC_WETNESS.attr deleted file mode 100644 index 9753cf44db..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SFC_WETNESS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wetness -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SFC_WIND_SPD.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SFC_WIND_SPD.attr deleted file mode 100644 index 04808eb1b9..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SFC_WIND_SPD.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wind speeds over oceans and Great Lakes -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_12.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_12.02.attr deleted file mode 100644 index 244de73617..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_12.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_12.66.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_12.66.attr deleted file mode 100644 index 462e666f93..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_12.66.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.66 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_13.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_13.37.attr deleted file mode 100644 index 9cb1aa9c5e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_13.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_13.64.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_13.64.attr deleted file mode 100644 index 9f58a6bac2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_13.64.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.64 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_14.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_14.37.attr deleted file mode 100644 index da7800808b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_14.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_14.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_14.71.attr deleted file mode 100644 index b4f2c87ea2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_14.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_3.74.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_3.74.attr deleted file mode 100644 index 4b0e26bda5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_3.74.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.74 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_4.13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_4.13.attr deleted file mode 100644 index 8e3484d48e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_4.13.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.13 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_4.52.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_4.52.attr deleted file mode 100644 index 54e31f291f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_4.52.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.52 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_4.57.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_4.57.attr deleted file mode 100644 index f8c6a6c828..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_4.57.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.57 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_9.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_9.71.attr deleted file mode 100644 index 29d901bdfd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_9.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 9.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_LIFTED_INDEX.attr deleted file mode 100644 index e2cf799bbf..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_PRECIP_WATER.attr deleted file mode 100644 index 2c88a0f5d8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Precipitable Water (PW) -displayUnitStr=SounderPrecipWaterPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_SFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_SFC_SKIN_TEMP.attr deleted file mode 100644 index 311972a597..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_SFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SNOW_IND.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SNOW_IND.attr deleted file mode 100644 index de51b42452..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SNOW_IND.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow indicator -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SNOW_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SNOW_WATER.attr deleted file mode 100644 index 4eec894549..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SNOW_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow-water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SURFACE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SURFACE_TYPE.attr deleted file mode 100644 index 0cc7cca419..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SURFACE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/CLOUD_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/CLOUD_WATER.attr deleted file mode 100644 index 4e62b6105c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/CLOUD_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Cloud water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DERIVED_CAPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DERIVED_CAPE.attr deleted file mode 100644 index 98ba73b6fb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DERIVED_CAPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Available Potential Energy (CAPE) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DERIVED_CONV_INH.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DERIVED_CONV_INH.attr deleted file mode 100644 index 57a4f38069..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DERIVED_CONV_INH.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Inhibition -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DERIVED_LAND_SEA_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DERIVED_LAND_SEA_TEMP.attr deleted file mode 100644 index 7a23e38f72..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DERIVED_LAND_SEA_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived land-sea temp -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DERIVED_VOLCANO_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DERIVED_VOLCANO_IMG.attr deleted file mode 100644 index 2229ec1825..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DERIVED_VOLCANO_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Volcano Imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DERIVED_WINDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DERIVED_WINDEX.attr deleted file mode 100644 index 089564cdb4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DERIVED_WINDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Wind Index(WINDEX) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DMPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DMPI.attr deleted file mode 100644 index a899181e1c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/DMPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Dry Microburst Potential Index (DMPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/GRID_CLOUD_AMT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/GRID_CLOUD_AMT.attr deleted file mode 100644 index 8fd34efc0b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/GRID_CLOUD_AMT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Amount -displayUnitStr=SounderCloudAmountPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/GRID_CTOP_PRES_HGHT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/GRID_CTOP_PRES_HGHT.attr deleted file mode 100644 index 1c64cd80c4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/GRID_CTOP_PRES_HGHT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Top Pressure or Height -displayUnitStr=SounderCloudTopHeightPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/ICE_CONC.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/ICE_CONC.attr deleted file mode 100644 index 9efb75ca77..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/ICE_CONC.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice concentrations -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/ICE_EDGE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/ICE_EDGE.attr deleted file mode 100644 index 9379c1e0de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/ICE_EDGE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice edge -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/ICE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/ICE_TYPE.attr deleted file mode 100644 index e8befd0987..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/ICE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/IMG_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/IMG_LIFTED_INDEX.attr deleted file mode 100644 index 4ef5aa938c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/IMG_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/IMG_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/IMG_PRECIP_WATER.attr deleted file mode 100644 index 646aeffd51..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/IMG_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Precipitable Water (PW) -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/IMG_SRFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/IMG_SRFC_SKIN_TEMP.attr deleted file mode 100644 index bdd4ad59a5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/IMG_SRFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/IR13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/IR13.attr deleted file mode 100644 index 43b1bf4b32..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/IR13.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 13 micron (IR) -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/LOW_CLOUD_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/LOW_CLOUD_IMG.attr deleted file mode 100644 index d7926c72dd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/LOW_CLOUD_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Low cloud base imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/MDPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/MDPI.attr deleted file mode 100644 index cef6535f0e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/MDPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Microburst Day Potential Index (MDPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/NORMAL_TPW_PERCENT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/NORMAL_TPW_PERCENT.attr deleted file mode 100644 index 6bd99b6f42..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/NORMAL_TPW_PERCENT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Percent of Normal TPW -displayUnitStr=PercentOfNormalTPWPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/POLAR_3.7u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/POLAR_3.7u.attr deleted file mode 100644 index 4d633f1530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/POLAR_3.7u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.7u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/POLAR_3.9u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/POLAR_3.9u.attr deleted file mode 100644 index 06854db01e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/POLAR_3.9u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.9u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/POLAR_IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/POLAR_IR.attr deleted file mode 100644 index 6a20f7d566..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/POLAR_IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/POLAR_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/POLAR_VIS.attr deleted file mode 100644 index d6578a334f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/POLAR_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar Vis -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/RAIN_RATE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/RAIN_RATE.attr deleted file mode 100644 index 7305eb7685..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/RAIN_RATE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Rain fall rate -displayUnitStr=RainfallRatePixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SCATTEROMETER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SCATTEROMETER.attr deleted file mode 100644 index a05f578deb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SCATTEROMETER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Scatterometer Data -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SFC_WETNESS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SFC_WETNESS.attr deleted file mode 100644 index 9753cf44db..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SFC_WETNESS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wetness -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SFC_WIND_SPD.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SFC_WIND_SPD.attr deleted file mode 100644 index 04808eb1b9..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SFC_WIND_SPD.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wind speeds over oceans and Great Lakes -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_11.03.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_11.03.attr deleted file mode 100644 index 547dd6e061..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_11.03.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 11.03 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_12.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_12.02.attr deleted file mode 100644 index 244de73617..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_12.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_12.66.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_12.66.attr deleted file mode 100644 index 462e666f93..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_12.66.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.66 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_13.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_13.37.attr deleted file mode 100644 index 9cb1aa9c5e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_13.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_13.64.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_13.64.attr deleted file mode 100644 index 9f58a6bac2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_13.64.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.64 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_14.06.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_14.06.attr deleted file mode 100644 index de2a6e2798..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_14.06.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.06 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_14.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_14.37.attr deleted file mode 100644 index da7800808b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_14.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_14.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_14.71.attr deleted file mode 100644 index b4f2c87ea2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_14.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_3.74.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_3.74.attr deleted file mode 100644 index 4b0e26bda5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_3.74.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.74 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_3.98.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_3.98.attr deleted file mode 100644 index db0e925130..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_3.98.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.98 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_4.13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_4.13.attr deleted file mode 100644 index 8e3484d48e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_4.13.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.13 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_4.45.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_4.45.attr deleted file mode 100644 index 4f0b9bce68..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_4.45.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.45 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_4.52.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_4.52.attr deleted file mode 100644 index 54e31f291f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_4.52.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.52 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_4.57.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_4.57.attr deleted file mode 100644 index f8c6a6c828..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_4.57.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.57 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_6.51.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_6.51.attr deleted file mode 100644 index de741eae3a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_6.51.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 6.51 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_7.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_7.02.attr deleted file mode 100644 index ed7f062cf5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_7.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_7.43.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_7.43.attr deleted file mode 100644 index 748ac900d6..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_7.43.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.43 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_9.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_9.71.attr deleted file mode 100644 index 29d901bdfd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_9.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 9.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_LIFTED_INDEX.attr deleted file mode 100644 index e2cf799bbf..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_PRECIP_WATER.attr deleted file mode 100644 index 2c88a0f5d8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Precipitable Water (PW) -displayUnitStr=SounderPrecipWaterPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_SFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_SFC_SKIN_TEMP.attr deleted file mode 100644 index 311972a597..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_SFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_VIS.attr deleted file mode 100644 index d99cea7530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SND_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Visible imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SNOW_IND.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SNOW_IND.attr deleted file mode 100644 index de51b42452..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SNOW_IND.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow indicator -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SNOW_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SNOW_WATER.attr deleted file mode 100644 index 4eec894549..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SNOW_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow-water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SURFACE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SURFACE_TYPE.attr deleted file mode 100644 index 0cc7cca419..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/SURFACE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/default.attr deleted file mode 100644 index 267d61ad67..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/default.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/CLOUD_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/CLOUD_WATER.attr deleted file mode 100644 index 4e62b6105c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/CLOUD_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Cloud water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DERIVED_CAPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DERIVED_CAPE.attr deleted file mode 100644 index 98ba73b6fb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DERIVED_CAPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Available Potential Energy (CAPE) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DERIVED_CONV_INH.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DERIVED_CONV_INH.attr deleted file mode 100644 index 57a4f38069..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DERIVED_CONV_INH.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Inhibition -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DERIVED_LAND_SEA_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DERIVED_LAND_SEA_TEMP.attr deleted file mode 100644 index 7a23e38f72..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DERIVED_LAND_SEA_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived land-sea temp -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DERIVED_VOLCANO_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DERIVED_VOLCANO_IMG.attr deleted file mode 100644 index 2229ec1825..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DERIVED_VOLCANO_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Volcano Imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DERIVED_WINDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DERIVED_WINDEX.attr deleted file mode 100644 index 089564cdb4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DERIVED_WINDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Wind Index(WINDEX) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DMPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DMPI.attr deleted file mode 100644 index a899181e1c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/DMPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Dry Microburst Potential Index (DMPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/GINI_ERS-QuickSCAT-Scatterometer.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/GINI_ERS-QuickSCAT-Scatterometer.xml deleted file mode 100644 index d971cff08c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/GINI_ERS-QuickSCAT-Scatterometer.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - GINI_ERS-QuickSCAT-Scatterometer - SATELLITE - -! This must match the "creatingEntity" in the -! satellite DB table valid values are -pluginName=satellite -satelliteName=ERS-QuickSCAT-Scatterometer -legendColor=RGB {200, 200, 200} - - GiniSatellite - sectorID - - CLOSEST_BEFORE_OR_AFTER - 60 - USE_DATA_TIMES - 10 - 48 - BasicWX_US - diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/GRID_CLOUD_AMT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/GRID_CLOUD_AMT.attr deleted file mode 100644 index 8fd34efc0b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/GRID_CLOUD_AMT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Amount -displayUnitStr=SounderCloudAmountPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/GRID_CTOP_PRES_HGHT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/GRID_CTOP_PRES_HGHT.attr deleted file mode 100644 index 1c64cd80c4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/GRID_CTOP_PRES_HGHT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Top Pressure or Height -displayUnitStr=SounderCloudTopHeightPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/ICE_CONC.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/ICE_CONC.attr deleted file mode 100644 index 9efb75ca77..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/ICE_CONC.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice concentrations -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/ICE_EDGE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/ICE_EDGE.attr deleted file mode 100644 index 9379c1e0de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/ICE_EDGE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice edge -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/ICE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/ICE_TYPE.attr deleted file mode 100644 index e8befd0987..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/ICE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/IMG_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/IMG_LIFTED_INDEX.attr deleted file mode 100644 index 4ef5aa938c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/IMG_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/IMG_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/IMG_PRECIP_WATER.attr deleted file mode 100644 index 646aeffd51..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/IMG_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Precipitable Water (PW) -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/IMG_SRFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/IMG_SRFC_SKIN_TEMP.attr deleted file mode 100644 index bdd4ad59a5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/IMG_SRFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/IR.attr deleted file mode 100644 index ab8d27b7e8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/IR.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/IR13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/IR13.attr deleted file mode 100644 index 43b1bf4b32..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/IR13.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 13 micron (IR) -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/LOW_CLOUD_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/LOW_CLOUD_IMG.attr deleted file mode 100644 index d7926c72dd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/LOW_CLOUD_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Low cloud base imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/MDPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/MDPI.attr deleted file mode 100644 index cef6535f0e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/MDPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Microburst Day Potential Index (MDPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/NORMAL_TPW_PERCENT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/NORMAL_TPW_PERCENT.attr deleted file mode 100644 index 6bd99b6f42..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/NORMAL_TPW_PERCENT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Percent of Normal TPW -displayUnitStr=PercentOfNormalTPWPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/POLAR_3.7u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/POLAR_3.7u.attr deleted file mode 100644 index 4d633f1530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/POLAR_3.7u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.7u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/POLAR_3.9u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/POLAR_3.9u.attr deleted file mode 100644 index 06854db01e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/POLAR_3.9u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.9u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/POLAR_IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/POLAR_IR.attr deleted file mode 100644 index 6a20f7d566..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/POLAR_IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/POLAR_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/POLAR_VIS.attr deleted file mode 100644 index d6578a334f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/POLAR_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar Vis -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/RAIN_RATE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/RAIN_RATE.attr deleted file mode 100644 index 7305eb7685..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/RAIN_RATE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Rain fall rate -displayUnitStr=RainfallRatePixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SCATTEROMETER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SCATTEROMETER.attr deleted file mode 100644 index a05f578deb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SCATTEROMETER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Scatterometer Data -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SFC_WETNESS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SFC_WETNESS.attr deleted file mode 100644 index 9753cf44db..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SFC_WETNESS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wetness -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SFC_WIND_SPD.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SFC_WIND_SPD.attr deleted file mode 100644 index 04808eb1b9..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SFC_WIND_SPD.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wind speeds over oceans and Great Lakes -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_11.03.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_11.03.attr deleted file mode 100644 index 547dd6e061..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_11.03.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 11.03 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_12.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_12.02.attr deleted file mode 100644 index 244de73617..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_12.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_12.66.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_12.66.attr deleted file mode 100644 index 462e666f93..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_12.66.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.66 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_13.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_13.37.attr deleted file mode 100644 index 9cb1aa9c5e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_13.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_13.64.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_13.64.attr deleted file mode 100644 index 9f58a6bac2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_13.64.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.64 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_14.06.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_14.06.attr deleted file mode 100644 index de2a6e2798..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_14.06.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.06 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_14.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_14.37.attr deleted file mode 100644 index da7800808b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_14.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_14.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_14.71.attr deleted file mode 100644 index b4f2c87ea2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_14.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_3.74.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_3.74.attr deleted file mode 100644 index 4b0e26bda5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_3.74.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.74 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_3.98.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_3.98.attr deleted file mode 100644 index db0e925130..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_3.98.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.98 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_4.13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_4.13.attr deleted file mode 100644 index 8e3484d48e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_4.13.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.13 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_4.45.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_4.45.attr deleted file mode 100644 index 4f0b9bce68..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_4.45.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.45 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_4.52.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_4.52.attr deleted file mode 100644 index 54e31f291f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_4.52.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.52 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_4.57.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_4.57.attr deleted file mode 100644 index f8c6a6c828..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_4.57.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.57 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_6.51.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_6.51.attr deleted file mode 100644 index de741eae3a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_6.51.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 6.51 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_7.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_7.02.attr deleted file mode 100644 index ed7f062cf5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_7.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_7.43.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_7.43.attr deleted file mode 100644 index 748ac900d6..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_7.43.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.43 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_9.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_9.71.attr deleted file mode 100644 index 29d901bdfd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_9.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 9.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_LIFTED_INDEX.attr deleted file mode 100644 index e2cf799bbf..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_PRECIP_WATER.attr deleted file mode 100644 index 2c88a0f5d8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Precipitable Water (PW) -displayUnitStr=SounderPrecipWaterPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_SFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_SFC_SKIN_TEMP.attr deleted file mode 100644 index 311972a597..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_SFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_VIS.attr deleted file mode 100644 index d99cea7530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SND_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Visible imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SNOW_IND.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SNOW_IND.attr deleted file mode 100644 index de51b42452..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SNOW_IND.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow indicator -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SNOW_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SNOW_WATER.attr deleted file mode 100644 index 4eec894549..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SNOW_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow-water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SURFACE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SURFACE_TYPE.attr deleted file mode 100644 index 0cc7cca419..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/SURFACE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/VIS.attr deleted file mode 100644 index 56a43a4d7e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/VIS.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager Visible -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/WV.attr deleted file mode 100644 index e34cef65ef..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/WV.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=watvap -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 6.7-6.5 micron IR (WV) -displayUnitStr=DerivedWVPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/default.attr deleted file mode 100644 index 267d61ad67..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_ERS-QuickSCAT-Scatterometer/default.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/CLOUD_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/CLOUD_WATER.attr deleted file mode 100644 index 4e62b6105c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/CLOUD_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Cloud water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DERIVED_CAPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DERIVED_CAPE.attr deleted file mode 100644 index 98ba73b6fb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DERIVED_CAPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Available Potential Energy (CAPE) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DERIVED_CONV_INH.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DERIVED_CONV_INH.attr deleted file mode 100644 index 57a4f38069..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DERIVED_CONV_INH.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Inhibition -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DERIVED_LAND_SEA_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DERIVED_LAND_SEA_TEMP.attr deleted file mode 100644 index 7a23e38f72..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DERIVED_LAND_SEA_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived land-sea temp -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DERIVED_VOLCANO_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DERIVED_VOLCANO_IMG.attr deleted file mode 100644 index 2229ec1825..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DERIVED_VOLCANO_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Volcano Imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DERIVED_WINDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DERIVED_WINDEX.attr deleted file mode 100644 index 089564cdb4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DERIVED_WINDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Wind Index(WINDEX) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DMPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DMPI.attr deleted file mode 100644 index a899181e1c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/DMPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Dry Microburst Potential Index (DMPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/GRID_CLOUD_AMT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/GRID_CLOUD_AMT.attr deleted file mode 100644 index 8fd34efc0b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/GRID_CLOUD_AMT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Amount -displayUnitStr=SounderCloudAmountPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/GRID_CTOP_PRES_HGHT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/GRID_CTOP_PRES_HGHT.attr deleted file mode 100644 index 1c64cd80c4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/GRID_CTOP_PRES_HGHT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Top Pressure or Height -displayUnitStr=SounderCloudTopHeightPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/ICE_CONC.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/ICE_CONC.attr deleted file mode 100644 index 9efb75ca77..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/ICE_CONC.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice concentrations -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/ICE_EDGE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/ICE_EDGE.attr deleted file mode 100644 index 9379c1e0de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/ICE_EDGE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice edge -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/ICE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/ICE_TYPE.attr deleted file mode 100644 index e8befd0987..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/ICE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/IMG_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/IMG_LIFTED_INDEX.attr deleted file mode 100644 index 4ef5aa938c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/IMG_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/IMG_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/IMG_PRECIP_WATER.attr deleted file mode 100644 index 646aeffd51..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/IMG_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Precipitable Water (PW) -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/IMG_SRFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/IMG_SRFC_SKIN_TEMP.attr deleted file mode 100644 index bdd4ad59a5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/IMG_SRFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/IR.attr deleted file mode 100644 index ab8d27b7e8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/IR.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/IR13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/IR13.attr deleted file mode 100644 index 43b1bf4b32..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/IR13.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 13 micron (IR) -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/LOW_CLOUD_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/LOW_CLOUD_IMG.attr deleted file mode 100644 index d7926c72dd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/LOW_CLOUD_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Low cloud base imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/MDPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/MDPI.attr deleted file mode 100644 index cef6535f0e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/MDPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Microburst Day Potential Index (MDPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/NORMAL_TPW_PERCENT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/NORMAL_TPW_PERCENT.attr deleted file mode 100644 index 6bd99b6f42..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/NORMAL_TPW_PERCENT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Percent of Normal TPW -displayUnitStr=PercentOfNormalTPWPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/POLAR_3.7u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/POLAR_3.7u.attr deleted file mode 100644 index 4d633f1530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/POLAR_3.7u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.7u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/POLAR_3.9u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/POLAR_3.9u.attr deleted file mode 100644 index 06854db01e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/POLAR_3.9u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.9u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/POLAR_IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/POLAR_IR.attr deleted file mode 100644 index 6a20f7d566..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/POLAR_IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/POLAR_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/POLAR_VIS.attr deleted file mode 100644 index d6578a334f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/POLAR_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar Vis -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/RAIN_RATE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/RAIN_RATE.attr deleted file mode 100644 index 7305eb7685..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/RAIN_RATE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Rain fall rate -displayUnitStr=RainfallRatePixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SCATTEROMETER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SCATTEROMETER.attr deleted file mode 100644 index a05f578deb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SCATTEROMETER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Scatterometer Data -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SFC_WETNESS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SFC_WETNESS.attr deleted file mode 100644 index 9753cf44db..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SFC_WETNESS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wetness -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SFC_WIND_SPD.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SFC_WIND_SPD.attr deleted file mode 100644 index 04808eb1b9..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SFC_WIND_SPD.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wind speeds over oceans and Great Lakes -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_11.03.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_11.03.attr deleted file mode 100644 index 547dd6e061..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_11.03.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 11.03 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_12.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_12.02.attr deleted file mode 100644 index 244de73617..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_12.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_12.66.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_12.66.attr deleted file mode 100644 index 462e666f93..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_12.66.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.66 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_13.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_13.37.attr deleted file mode 100644 index 9cb1aa9c5e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_13.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_13.64.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_13.64.attr deleted file mode 100644 index 9f58a6bac2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_13.64.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.64 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_14.06.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_14.06.attr deleted file mode 100644 index de2a6e2798..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_14.06.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.06 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_14.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_14.37.attr deleted file mode 100644 index da7800808b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_14.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_14.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_14.71.attr deleted file mode 100644 index b4f2c87ea2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_14.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_3.74.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_3.74.attr deleted file mode 100644 index 4b0e26bda5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_3.74.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.74 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_3.98.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_3.98.attr deleted file mode 100644 index db0e925130..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_3.98.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.98 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_4.13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_4.13.attr deleted file mode 100644 index 8e3484d48e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_4.13.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.13 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_4.45.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_4.45.attr deleted file mode 100644 index 4f0b9bce68..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_4.45.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.45 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_4.52.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_4.52.attr deleted file mode 100644 index 54e31f291f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_4.52.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.52 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_4.57.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_4.57.attr deleted file mode 100644 index f8c6a6c828..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_4.57.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.57 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_6.51.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_6.51.attr deleted file mode 100644 index de741eae3a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_6.51.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 6.51 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_7.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_7.02.attr deleted file mode 100644 index ed7f062cf5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_7.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_7.43.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_7.43.attr deleted file mode 100644 index 748ac900d6..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_7.43.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.43 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_9.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_9.71.attr deleted file mode 100644 index 29d901bdfd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_9.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 9.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_LIFTED_INDEX.attr deleted file mode 100644 index e2cf799bbf..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_PRECIP_WATER.attr deleted file mode 100644 index 2c88a0f5d8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Precipitable Water (PW) -displayUnitStr=SounderPrecipWaterPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_SFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_SFC_SKIN_TEMP.attr deleted file mode 100644 index 311972a597..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_SFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_VIS.attr deleted file mode 100644 index d99cea7530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SND_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Visible imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SNOW_IND.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SNOW_IND.attr deleted file mode 100644 index de51b42452..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SNOW_IND.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow indicator -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SNOW_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SNOW_WATER.attr deleted file mode 100644 index 4eec894549..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SNOW_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow-water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SURFACE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SURFACE_TYPE.attr deleted file mode 100644 index 0cc7cca419..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/SURFACE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/VIS.attr deleted file mode 100644 index 56a43a4d7e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/VIS.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager Visible -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/WV.attr deleted file mode 100644 index e34cef65ef..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/WV.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=watvap -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 6.7-6.5 micron IR (WV) -displayUnitStr=DerivedWVPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/default.attr deleted file mode 100644 index 267d61ad67..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GMS/default.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/CLOUD_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/CLOUD_WATER.attr deleted file mode 100644 index 4e62b6105c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/CLOUD_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Cloud water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DERIVED_CAPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DERIVED_CAPE.attr deleted file mode 100644 index 98ba73b6fb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DERIVED_CAPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Available Potential Energy (CAPE) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DERIVED_CONV_INH.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DERIVED_CONV_INH.attr deleted file mode 100644 index 57a4f38069..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DERIVED_CONV_INH.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Inhibition -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DERIVED_LAND_SEA_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DERIVED_LAND_SEA_TEMP.attr deleted file mode 100644 index 7a23e38f72..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DERIVED_LAND_SEA_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived land-sea temp -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DERIVED_VOLCANO_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DERIVED_VOLCANO_IMG.attr deleted file mode 100644 index 2229ec1825..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DERIVED_VOLCANO_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Volcano Imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DERIVED_WINDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DERIVED_WINDEX.attr deleted file mode 100644 index 089564cdb4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DERIVED_WINDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Wind Index(WINDEX) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DMPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DMPI.attr deleted file mode 100644 index a899181e1c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/DMPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Dry Microburst Potential Index (DMPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/GRID_CLOUD_AMT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/GRID_CLOUD_AMT.attr deleted file mode 100644 index 8fd34efc0b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/GRID_CLOUD_AMT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Amount -displayUnitStr=SounderCloudAmountPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/GRID_CTOP_PRES_HGHT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/GRID_CTOP_PRES_HGHT.attr deleted file mode 100644 index 1c64cd80c4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/GRID_CTOP_PRES_HGHT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Top Pressure or Height -displayUnitStr=SounderCloudTopHeightPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/ICE_CONC.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/ICE_CONC.attr deleted file mode 100644 index 9efb75ca77..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/ICE_CONC.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice concentrations -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/ICE_EDGE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/ICE_EDGE.attr deleted file mode 100644 index 9379c1e0de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/ICE_EDGE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice edge -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/ICE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/ICE_TYPE.attr deleted file mode 100644 index e8befd0987..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/ICE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/IMG_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/IMG_LIFTED_INDEX.attr deleted file mode 100644 index 4ef5aa938c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/IMG_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/IMG_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/IMG_PRECIP_WATER.attr deleted file mode 100644 index 646aeffd51..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/IMG_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Precipitable Water (PW) -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/IMG_SRFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/IMG_SRFC_SKIN_TEMP.attr deleted file mode 100644 index bdd4ad59a5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/IMG_SRFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/IR.attr deleted file mode 100644 index ab8d27b7e8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/IR.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/IR13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/IR13.attr deleted file mode 100644 index 43b1bf4b32..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/IR13.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 13 micron (IR) -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/MDPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/MDPI.attr deleted file mode 100644 index cef6535f0e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/MDPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Microburst Day Potential Index (MDPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/NORMAL_TPW_PERCENT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/NORMAL_TPW_PERCENT.attr deleted file mode 100644 index 6bd99b6f42..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/NORMAL_TPW_PERCENT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Percent of Normal TPW -displayUnitStr=PercentOfNormalTPWPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/POLAR_3.7u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/POLAR_3.7u.attr deleted file mode 100644 index 4d633f1530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/POLAR_3.7u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.7u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/POLAR_3.9u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/POLAR_3.9u.attr deleted file mode 100644 index 06854db01e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/POLAR_3.9u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.9u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/POLAR_IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/POLAR_IR.attr deleted file mode 100644 index 6a20f7d566..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/POLAR_IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/POLAR_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/POLAR_VIS.attr deleted file mode 100644 index d6578a334f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/POLAR_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar Vis -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/RAIN_RATE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/RAIN_RATE.attr deleted file mode 100644 index 7305eb7685..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/RAIN_RATE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Rain fall rate -displayUnitStr=RainfallRatePixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SCATTEROMETER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SCATTEROMETER.attr deleted file mode 100644 index a05f578deb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SCATTEROMETER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Scatterometer Data -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SFC_WETNESS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SFC_WETNESS.attr deleted file mode 100644 index 9753cf44db..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SFC_WETNESS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wetness -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SFC_WIND_SPD.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SFC_WIND_SPD.attr deleted file mode 100644 index 04808eb1b9..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SFC_WIND_SPD.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wind speeds over oceans and Great Lakes -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_11.03.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_11.03.attr deleted file mode 100644 index 547dd6e061..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_11.03.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 11.03 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_12.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_12.02.attr deleted file mode 100644 index 244de73617..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_12.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_12.66.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_12.66.attr deleted file mode 100644 index 462e666f93..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_12.66.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.66 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_13.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_13.37.attr deleted file mode 100644 index 9cb1aa9c5e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_13.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_13.64.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_13.64.attr deleted file mode 100644 index 9f58a6bac2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_13.64.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.64 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_14.06.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_14.06.attr deleted file mode 100644 index de2a6e2798..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_14.06.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.06 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_14.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_14.37.attr deleted file mode 100644 index da7800808b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_14.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_14.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_14.71.attr deleted file mode 100644 index b4f2c87ea2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_14.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_3.74.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_3.74.attr deleted file mode 100644 index 4b0e26bda5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_3.74.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.74 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_3.98.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_3.98.attr deleted file mode 100644 index db0e925130..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_3.98.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.98 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_4.13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_4.13.attr deleted file mode 100644 index 8e3484d48e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_4.13.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.13 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_4.45.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_4.45.attr deleted file mode 100644 index 4f0b9bce68..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_4.45.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.45 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_4.52.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_4.52.attr deleted file mode 100644 index 54e31f291f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_4.52.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.52 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_4.57.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_4.57.attr deleted file mode 100644 index f8c6a6c828..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_4.57.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.57 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_6.51.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_6.51.attr deleted file mode 100644 index de741eae3a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_6.51.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 6.51 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_7.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_7.02.attr deleted file mode 100644 index ed7f062cf5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_7.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_7.43.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_7.43.attr deleted file mode 100644 index 748ac900d6..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_7.43.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.43 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_9.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_9.71.attr deleted file mode 100644 index 29d901bdfd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_9.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 9.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_LIFTED_INDEX.attr deleted file mode 100644 index e2cf799bbf..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_PRECIP_WATER.attr deleted file mode 100644 index 2c88a0f5d8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Precipitable Water (PW) -displayUnitStr=SounderPrecipWaterPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_SFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_SFC_SKIN_TEMP.attr deleted file mode 100644 index 311972a597..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_SFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_VIS.attr deleted file mode 100644 index d99cea7530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SND_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Visible imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SNOW_IND.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SNOW_IND.attr deleted file mode 100644 index de51b42452..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SNOW_IND.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow indicator -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SNOW_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SNOW_WATER.attr deleted file mode 100644 index 4eec894549..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SNOW_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow-water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SURFACE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SURFACE_TYPE.attr deleted file mode 100644 index 0cc7cca419..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/SURFACE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/VIS.attr deleted file mode 100644 index 56a43a4d7e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/VIS.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager Visible -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/WV.attr deleted file mode 100644 index e34cef65ef..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/WV.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=watvap -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 6.7-6.5 micron IR (WV) -displayUnitStr=DerivedWVPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/default.attr deleted file mode 100644 index 267d61ad67..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/default.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/CLOUD_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/CLOUD_WATER.attr deleted file mode 100644 index 4e62b6105c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/CLOUD_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Cloud water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DERIVED_CAPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DERIVED_CAPE.attr deleted file mode 100644 index 98ba73b6fb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DERIVED_CAPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Available Potential Energy (CAPE) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DERIVED_CONV_INH.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DERIVED_CONV_INH.attr deleted file mode 100644 index 57a4f38069..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DERIVED_CONV_INH.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Inhibition -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DERIVED_LAND_SEA_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DERIVED_LAND_SEA_TEMP.attr deleted file mode 100644 index 7a23e38f72..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DERIVED_LAND_SEA_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived land-sea temp -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DERIVED_VOLCANO_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DERIVED_VOLCANO_IMG.attr deleted file mode 100644 index 2229ec1825..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DERIVED_VOLCANO_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Volcano Imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DERIVED_WINDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DERIVED_WINDEX.attr deleted file mode 100644 index 089564cdb4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DERIVED_WINDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Wind Index(WINDEX) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DMPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DMPI.attr deleted file mode 100644 index a899181e1c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/DMPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Dry Microburst Potential Index (DMPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/GRID_CLOUD_AMT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/GRID_CLOUD_AMT.attr deleted file mode 100644 index 8fd34efc0b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/GRID_CLOUD_AMT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Amount -displayUnitStr=SounderCloudAmountPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/GRID_CTOP_PRES_HGHT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/GRID_CTOP_PRES_HGHT.attr deleted file mode 100644 index 1c64cd80c4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/GRID_CTOP_PRES_HGHT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Top Pressure or Height -displayUnitStr=SounderCloudTopHeightPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/ICE_CONC.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/ICE_CONC.attr deleted file mode 100644 index 9efb75ca77..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/ICE_CONC.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice concentrations -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/ICE_EDGE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/ICE_EDGE.attr deleted file mode 100644 index 9379c1e0de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/ICE_EDGE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice edge -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/ICE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/ICE_TYPE.attr deleted file mode 100644 index e8befd0987..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/ICE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/IMG_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/IMG_LIFTED_INDEX.attr deleted file mode 100644 index 4ef5aa938c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/IMG_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/IMG_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/IMG_PRECIP_WATER.attr deleted file mode 100644 index 646aeffd51..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/IMG_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Precipitable Water (PW) -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/IMG_SRFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/IMG_SRFC_SKIN_TEMP.attr deleted file mode 100644 index bdd4ad59a5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/IMG_SRFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/IR.attr deleted file mode 100644 index ab8d27b7e8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/IR.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/IR13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/IR13.attr deleted file mode 100644 index 43b1bf4b32..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/IR13.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 13 micron (IR) -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/MDPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/MDPI.attr deleted file mode 100644 index cef6535f0e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/MDPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Microburst Day Potential Index (MDPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/NORMAL_TPW_PERCENT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/NORMAL_TPW_PERCENT.attr deleted file mode 100644 index 6bd99b6f42..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/NORMAL_TPW_PERCENT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Percent of Normal TPW -displayUnitStr=PercentOfNormalTPWPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/POLAR_3.7u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/POLAR_3.7u.attr deleted file mode 100644 index 4d633f1530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/POLAR_3.7u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.7u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/POLAR_3.9u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/POLAR_3.9u.attr deleted file mode 100644 index 06854db01e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/POLAR_3.9u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.9u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/POLAR_IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/POLAR_IR.attr deleted file mode 100644 index 6a20f7d566..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/POLAR_IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/POLAR_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/POLAR_VIS.attr deleted file mode 100644 index d6578a334f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/POLAR_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar Vis -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/RAIN_RATE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/RAIN_RATE.attr deleted file mode 100644 index 7305eb7685..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/RAIN_RATE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Rain fall rate -displayUnitStr=RainfallRatePixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SCATTEROMETER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SCATTEROMETER.attr deleted file mode 100644 index a05f578deb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SCATTEROMETER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Scatterometer Data -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SFC_WETNESS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SFC_WETNESS.attr deleted file mode 100644 index 9753cf44db..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SFC_WETNESS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wetness -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SFC_WIND_SPD.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SFC_WIND_SPD.attr deleted file mode 100644 index 04808eb1b9..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SFC_WIND_SPD.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wind speeds over oceans and Great Lakes -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_11.03.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_11.03.attr deleted file mode 100644 index 547dd6e061..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_11.03.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 11.03 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_12.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_12.02.attr deleted file mode 100644 index 244de73617..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_12.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_12.66.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_12.66.attr deleted file mode 100644 index 462e666f93..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_12.66.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.66 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_13.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_13.37.attr deleted file mode 100644 index 9cb1aa9c5e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_13.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_13.64.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_13.64.attr deleted file mode 100644 index 9f58a6bac2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_13.64.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.64 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_14.06.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_14.06.attr deleted file mode 100644 index de2a6e2798..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_14.06.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.06 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_14.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_14.37.attr deleted file mode 100644 index da7800808b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_14.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_14.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_14.71.attr deleted file mode 100644 index b4f2c87ea2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_14.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_3.74.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_3.74.attr deleted file mode 100644 index 4b0e26bda5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_3.74.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.74 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_3.98.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_3.98.attr deleted file mode 100644 index db0e925130..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_3.98.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.98 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_4.13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_4.13.attr deleted file mode 100644 index 8e3484d48e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_4.13.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.13 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_4.45.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_4.45.attr deleted file mode 100644 index 4f0b9bce68..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_4.45.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.45 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_4.52.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_4.52.attr deleted file mode 100644 index 54e31f291f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_4.52.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.52 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_4.57.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_4.57.attr deleted file mode 100644 index f8c6a6c828..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_4.57.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.57 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_6.51.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_6.51.attr deleted file mode 100644 index de741eae3a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_6.51.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 6.51 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_7.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_7.02.attr deleted file mode 100644 index ed7f062cf5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_7.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_7.43.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_7.43.attr deleted file mode 100644 index 748ac900d6..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_7.43.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.43 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_9.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_9.71.attr deleted file mode 100644 index 29d901bdfd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_9.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 9.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_LIFTED_INDEX.attr deleted file mode 100644 index e2cf799bbf..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_PRECIP_WATER.attr deleted file mode 100644 index 2c88a0f5d8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Precipitable Water (PW) -displayUnitStr=SounderPrecipWaterPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_SFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_SFC_SKIN_TEMP.attr deleted file mode 100644 index 311972a597..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_SFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_VIS.attr deleted file mode 100644 index d99cea7530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SND_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Visible imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SNOW_IND.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SNOW_IND.attr deleted file mode 100644 index de51b42452..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SNOW_IND.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow indicator -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SNOW_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SNOW_WATER.attr deleted file mode 100644 index 4eec894549..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SNOW_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow-water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SURFACE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SURFACE_TYPE.attr deleted file mode 100644 index 0cc7cca419..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/SURFACE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/VIS.attr deleted file mode 100644 index 56a43a4d7e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/VIS.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager Visible -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/WV.attr deleted file mode 100644 index e34cef65ef..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/WV.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=watvap -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 6.7-6.5 micron IR (WV) -displayUnitStr=DerivedWVPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/CLOUD_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/CLOUD_WATER.attr deleted file mode 100644 index 4e62b6105c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/CLOUD_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Cloud water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DERIVED_CAPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DERIVED_CAPE.attr deleted file mode 100644 index 98ba73b6fb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DERIVED_CAPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Available Potential Energy (CAPE) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DERIVED_CONV_INH.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DERIVED_CONV_INH.attr deleted file mode 100644 index 57a4f38069..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DERIVED_CONV_INH.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Inhibition -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DERIVED_LAND_SEA_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DERIVED_LAND_SEA_TEMP.attr deleted file mode 100644 index 7a23e38f72..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DERIVED_LAND_SEA_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived land-sea temp -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DERIVED_VOLCANO_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DERIVED_VOLCANO_IMG.attr deleted file mode 100644 index 2229ec1825..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DERIVED_VOLCANO_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Volcano Imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DERIVED_WINDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DERIVED_WINDEX.attr deleted file mode 100644 index 089564cdb4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DERIVED_WINDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Wind Index(WINDEX) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DMPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DMPI.attr deleted file mode 100644 index a899181e1c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/DMPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Dry Microburst Potential Index (DMPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/GRID_CLOUD_AMT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/GRID_CLOUD_AMT.attr deleted file mode 100644 index 8fd34efc0b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/GRID_CLOUD_AMT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Amount -displayUnitStr=SounderCloudAmountPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/GRID_CTOP_PRES_HGHT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/GRID_CTOP_PRES_HGHT.attr deleted file mode 100644 index 1c64cd80c4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/GRID_CTOP_PRES_HGHT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Top Pressure or Height -displayUnitStr=SounderCloudTopHeightPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/ICE_CONC.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/ICE_CONC.attr deleted file mode 100644 index 9efb75ca77..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/ICE_CONC.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice concentrations -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/ICE_EDGE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/ICE_EDGE.attr deleted file mode 100644 index 9379c1e0de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/ICE_EDGE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice edge -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/ICE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/ICE_TYPE.attr deleted file mode 100644 index e8befd0987..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/ICE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/IMG_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/IMG_LIFTED_INDEX.attr deleted file mode 100644 index 4ef5aa938c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/IMG_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/IMG_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/IMG_PRECIP_WATER.attr deleted file mode 100644 index 646aeffd51..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/IMG_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Precipitable Water (PW) -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/IMG_SRFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/IMG_SRFC_SKIN_TEMP.attr deleted file mode 100644 index bdd4ad59a5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/IMG_SRFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/LOW_CLOUD_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/LOW_CLOUD_IMG.attr deleted file mode 100644 index d7926c72dd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/LOW_CLOUD_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Low cloud base imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/MDPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/MDPI.attr deleted file mode 100644 index cef6535f0e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/MDPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Microburst Day Potential Index (MDPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/NORMAL_TPW_PERCENT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/NORMAL_TPW_PERCENT.attr deleted file mode 100644 index 6bd99b6f42..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/NORMAL_TPW_PERCENT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Percent of Normal TPW -displayUnitStr=PercentOfNormalTPWPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/POLAR_3.7u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/POLAR_3.7u.attr deleted file mode 100644 index 4d633f1530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/POLAR_3.7u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.7u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/POLAR_3.9u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/POLAR_3.9u.attr deleted file mode 100644 index 06854db01e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/POLAR_3.9u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.9u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/POLAR_IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/POLAR_IR.attr deleted file mode 100644 index 6a20f7d566..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/POLAR_IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/POLAR_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/POLAR_VIS.attr deleted file mode 100644 index d6578a334f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/POLAR_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar Vis -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/RAIN_RATE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/RAIN_RATE.attr deleted file mode 100644 index 7305eb7685..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/RAIN_RATE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Rain fall rate -displayUnitStr=RainfallRatePixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SCATTEROMETER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SCATTEROMETER.attr deleted file mode 100644 index a05f578deb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SCATTEROMETER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Scatterometer Data -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SFC_WETNESS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SFC_WETNESS.attr deleted file mode 100644 index 9753cf44db..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SFC_WETNESS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wetness -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SFC_WIND_SPD.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SFC_WIND_SPD.attr deleted file mode 100644 index 04808eb1b9..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SFC_WIND_SPD.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wind speeds over oceans and Great Lakes -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_12.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_12.02.attr deleted file mode 100644 index 244de73617..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_12.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_12.66.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_12.66.attr deleted file mode 100644 index 462e666f93..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_12.66.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.66 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_13.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_13.37.attr deleted file mode 100644 index 9cb1aa9c5e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_13.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_13.64.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_13.64.attr deleted file mode 100644 index 9f58a6bac2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_13.64.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.64 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_14.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_14.37.attr deleted file mode 100644 index da7800808b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_14.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_14.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_14.71.attr deleted file mode 100644 index b4f2c87ea2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_14.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_3.74.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_3.74.attr deleted file mode 100644 index 4b0e26bda5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_3.74.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.74 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_4.13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_4.13.attr deleted file mode 100644 index 8e3484d48e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_4.13.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.13 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_4.52.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_4.52.attr deleted file mode 100644 index 54e31f291f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_4.52.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.52 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_4.57.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_4.57.attr deleted file mode 100644 index f8c6a6c828..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_4.57.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.57 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_9.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_9.71.attr deleted file mode 100644 index 29d901bdfd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_9.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 9.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_LIFTED_INDEX.attr deleted file mode 100644 index e2cf799bbf..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_PRECIP_WATER.attr deleted file mode 100644 index 2c88a0f5d8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Precipitable Water (PW) -displayUnitStr=SounderPrecipWaterPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_SFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_SFC_SKIN_TEMP.attr deleted file mode 100644 index 311972a597..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_SFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SNOW_IND.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SNOW_IND.attr deleted file mode 100644 index de51b42452..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SNOW_IND.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow indicator -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SNOW_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SNOW_WATER.attr deleted file mode 100644 index 4eec894549..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SNOW_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow-water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SURFACE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SURFACE_TYPE.attr deleted file mode 100644 index 0cc7cca419..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SURFACE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/GINI_GOES7.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/GINI_GOES14.xml similarity index 91% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/GINI_GOES7.xml rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/GINI_GOES14.xml index e9c87929fc..44a6967f4d 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/GINI_GOES7.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/GINI_GOES14.xml @@ -1,12 +1,12 @@ - GINI_GOES7 + GINI_GOES14 SATELLITE ! This must match the "creatingEntity" in the ! satellite DB table valid values are pluginName=satellite -satelliteName=GOES-7(H) +satelliteName=GOES-14(O) legendColor=RGB {200, 200, 200} GiniSatellite diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/IR.attr similarity index 100% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/IR.attr rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/IR.attr diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/IR13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/IR13.attr similarity index 100% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/IR13.attr rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/IR13.attr diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_11.03.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/SND_11.03.attr similarity index 100% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_11.03.attr rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/SND_11.03.attr diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_14.06.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/SND_14.06.attr similarity index 100% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_14.06.attr rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/SND_14.06.attr diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_3.98.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/SND_3.98.attr similarity index 100% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_3.98.attr rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/SND_3.98.attr diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_4.45.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/SND_4.45.attr similarity index 100% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_4.45.attr rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/SND_4.45.attr diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_6.51.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/SND_6.51.attr similarity index 100% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_6.51.attr rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/SND_6.51.attr diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_7.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/SND_7.02.attr similarity index 100% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_7.02.attr rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/SND_7.02.attr diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_7.43.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/SND_7.43.attr similarity index 100% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_7.43.attr rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/SND_7.43.attr diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/SND_VIS.attr similarity index 100% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/SND_VIS.attr rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/SND_VIS.attr diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/VIS.attr similarity index 100% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/VIS.attr rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/VIS.attr diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/WV.attr similarity index 100% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_DMSP/WV.attr rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/WV.attr diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/default.attr similarity index 100% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/default.attr rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/default.attr diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/CLOUD_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/CLOUD_WATER.attr deleted file mode 100644 index 4e62b6105c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/CLOUD_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Cloud water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DERIVED_CAPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DERIVED_CAPE.attr deleted file mode 100644 index 98ba73b6fb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DERIVED_CAPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Available Potential Energy (CAPE) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DERIVED_CONV_INH.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DERIVED_CONV_INH.attr deleted file mode 100644 index 57a4f38069..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DERIVED_CONV_INH.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Inhibition -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DERIVED_LAND_SEA_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DERIVED_LAND_SEA_TEMP.attr deleted file mode 100644 index 7a23e38f72..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DERIVED_LAND_SEA_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived land-sea temp -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DERIVED_VOLCANO_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DERIVED_VOLCANO_IMG.attr deleted file mode 100644 index 2229ec1825..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DERIVED_VOLCANO_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Volcano Imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DERIVED_WINDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DERIVED_WINDEX.attr deleted file mode 100644 index 089564cdb4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DERIVED_WINDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Wind Index(WINDEX) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DMPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DMPI.attr deleted file mode 100644 index a899181e1c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/DMPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Dry Microburst Potential Index (DMPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/GRID_CLOUD_AMT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/GRID_CLOUD_AMT.attr deleted file mode 100644 index 8fd34efc0b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/GRID_CLOUD_AMT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Amount -displayUnitStr=SounderCloudAmountPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/GRID_CTOP_PRES_HGHT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/GRID_CTOP_PRES_HGHT.attr deleted file mode 100644 index 1c64cd80c4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/GRID_CTOP_PRES_HGHT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Top Pressure or Height -displayUnitStr=SounderCloudTopHeightPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/ICE_CONC.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/ICE_CONC.attr deleted file mode 100644 index 9efb75ca77..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/ICE_CONC.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice concentrations -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/ICE_EDGE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/ICE_EDGE.attr deleted file mode 100644 index 9379c1e0de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/ICE_EDGE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice edge -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/ICE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/ICE_TYPE.attr deleted file mode 100644 index e8befd0987..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/ICE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/IMG_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/IMG_LIFTED_INDEX.attr deleted file mode 100644 index 4ef5aa938c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/IMG_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/IMG_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/IMG_PRECIP_WATER.attr deleted file mode 100644 index 646aeffd51..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/IMG_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Precipitable Water (PW) -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/IMG_SRFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/IMG_SRFC_SKIN_TEMP.attr deleted file mode 100644 index bdd4ad59a5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/IMG_SRFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/LOW_CLOUD_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/LOW_CLOUD_IMG.attr deleted file mode 100644 index d7926c72dd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/LOW_CLOUD_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Low cloud base imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/MDPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/MDPI.attr deleted file mode 100644 index cef6535f0e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/MDPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Microburst Day Potential Index (MDPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/NORMAL_TPW_PERCENT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/NORMAL_TPW_PERCENT.attr deleted file mode 100644 index 6bd99b6f42..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/NORMAL_TPW_PERCENT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Percent of Normal TPW -displayUnitStr=PercentOfNormalTPWPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/POLAR_3.7u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/POLAR_3.7u.attr deleted file mode 100644 index 4d633f1530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/POLAR_3.7u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.7u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/POLAR_3.9u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/POLAR_3.9u.attr deleted file mode 100644 index 06854db01e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/POLAR_3.9u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.9u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/POLAR_IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/POLAR_IR.attr deleted file mode 100644 index 6a20f7d566..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/POLAR_IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/POLAR_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/POLAR_VIS.attr deleted file mode 100644 index d6578a334f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/POLAR_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar Vis -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/RAIN_RATE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/RAIN_RATE.attr deleted file mode 100644 index 7305eb7685..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/RAIN_RATE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Rain fall rate -displayUnitStr=RainfallRatePixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SCATTEROMETER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SCATTEROMETER.attr deleted file mode 100644 index a05f578deb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SCATTEROMETER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Scatterometer Data -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SFC_WETNESS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SFC_WETNESS.attr deleted file mode 100644 index 9753cf44db..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SFC_WETNESS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wetness -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SFC_WIND_SPD.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SFC_WIND_SPD.attr deleted file mode 100644 index 04808eb1b9..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SFC_WIND_SPD.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wind speeds over oceans and Great Lakes -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_12.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_12.02.attr deleted file mode 100644 index 244de73617..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_12.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_12.66.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_12.66.attr deleted file mode 100644 index 462e666f93..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_12.66.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.66 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_13.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_13.37.attr deleted file mode 100644 index 9cb1aa9c5e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_13.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_13.64.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_13.64.attr deleted file mode 100644 index 9f58a6bac2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_13.64.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.64 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_14.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_14.37.attr deleted file mode 100644 index da7800808b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_14.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_14.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_14.71.attr deleted file mode 100644 index b4f2c87ea2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_14.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_3.74.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_3.74.attr deleted file mode 100644 index 4b0e26bda5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_3.74.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.74 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_4.13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_4.13.attr deleted file mode 100644 index 8e3484d48e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_4.13.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.13 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_4.52.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_4.52.attr deleted file mode 100644 index 54e31f291f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_4.52.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.52 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_4.57.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_4.57.attr deleted file mode 100644 index f8c6a6c828..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_4.57.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.57 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_9.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_9.71.attr deleted file mode 100644 index 29d901bdfd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_9.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 9.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_LIFTED_INDEX.attr deleted file mode 100644 index e2cf799bbf..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_PRECIP_WATER.attr deleted file mode 100644 index 2c88a0f5d8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Precipitable Water (PW) -displayUnitStr=SounderPrecipWaterPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_SFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_SFC_SKIN_TEMP.attr deleted file mode 100644 index 311972a597..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_SFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SNOW_IND.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SNOW_IND.attr deleted file mode 100644 index de51b42452..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SNOW_IND.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow indicator -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SNOW_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SNOW_WATER.attr deleted file mode 100644 index 4eec894549..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SNOW_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow-water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SURFACE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SURFACE_TYPE.attr deleted file mode 100644 index 0cc7cca419..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SURFACE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/CLOUD_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/CLOUD_WATER.attr deleted file mode 100644 index 4e62b6105c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/CLOUD_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Cloud water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DERIVED_CAPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DERIVED_CAPE.attr deleted file mode 100644 index 98ba73b6fb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DERIVED_CAPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Available Potential Energy (CAPE) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DERIVED_CONV_INH.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DERIVED_CONV_INH.attr deleted file mode 100644 index 57a4f38069..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DERIVED_CONV_INH.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Inhibition -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DERIVED_LAND_SEA_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DERIVED_LAND_SEA_TEMP.attr deleted file mode 100644 index 7a23e38f72..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DERIVED_LAND_SEA_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived land-sea temp -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DERIVED_VOLCANO_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DERIVED_VOLCANO_IMG.attr deleted file mode 100644 index 2229ec1825..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DERIVED_VOLCANO_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Volcano Imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DERIVED_WINDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DERIVED_WINDEX.attr deleted file mode 100644 index 089564cdb4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DERIVED_WINDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Wind Index(WINDEX) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DMPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DMPI.attr deleted file mode 100644 index a899181e1c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/DMPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Dry Microburst Potential Index (DMPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/GRID_CLOUD_AMT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/GRID_CLOUD_AMT.attr deleted file mode 100644 index 8fd34efc0b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/GRID_CLOUD_AMT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Amount -displayUnitStr=SounderCloudAmountPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/GRID_CTOP_PRES_HGHT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/GRID_CTOP_PRES_HGHT.attr deleted file mode 100644 index 1c64cd80c4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/GRID_CTOP_PRES_HGHT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Top Pressure or Height -displayUnitStr=SounderCloudTopHeightPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/ICE_CONC.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/ICE_CONC.attr deleted file mode 100644 index 9efb75ca77..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/ICE_CONC.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice concentrations -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/ICE_EDGE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/ICE_EDGE.attr deleted file mode 100644 index 9379c1e0de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/ICE_EDGE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice edge -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/ICE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/ICE_TYPE.attr deleted file mode 100644 index e8befd0987..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/ICE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/IMG_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/IMG_LIFTED_INDEX.attr deleted file mode 100644 index 4ef5aa938c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/IMG_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/IMG_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/IMG_PRECIP_WATER.attr deleted file mode 100644 index 646aeffd51..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/IMG_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Precipitable Water (PW) -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/IMG_SRFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/IMG_SRFC_SKIN_TEMP.attr deleted file mode 100644 index bdd4ad59a5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/IMG_SRFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/IR.attr deleted file mode 100644 index ab8d27b7e8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/IR.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/IR13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/IR13.attr deleted file mode 100644 index 43b1bf4b32..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/IR13.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 13 micron (IR) -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/LOW_CLOUD_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/LOW_CLOUD_IMG.attr deleted file mode 100644 index d7926c72dd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/LOW_CLOUD_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Low cloud base imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/MDPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/MDPI.attr deleted file mode 100644 index cef6535f0e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/MDPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Microburst Day Potential Index (MDPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/NORMAL_TPW_PERCENT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/NORMAL_TPW_PERCENT.attr deleted file mode 100644 index 6bd99b6f42..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/NORMAL_TPW_PERCENT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Percent of Normal TPW -displayUnitStr=PercentOfNormalTPWPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/POLAR_3.7u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/POLAR_3.7u.attr deleted file mode 100644 index 4d633f1530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/POLAR_3.7u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.7u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/POLAR_3.9u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/POLAR_3.9u.attr deleted file mode 100644 index 06854db01e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/POLAR_3.9u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.9u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/POLAR_IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/POLAR_IR.attr deleted file mode 100644 index 6a20f7d566..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/POLAR_IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/POLAR_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/POLAR_VIS.attr deleted file mode 100644 index d6578a334f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/POLAR_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar Vis -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/RAIN_RATE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/RAIN_RATE.attr deleted file mode 100644 index 7305eb7685..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/RAIN_RATE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Rain fall rate -displayUnitStr=RainfallRatePixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SCATTEROMETER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SCATTEROMETER.attr deleted file mode 100644 index a05f578deb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SCATTEROMETER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Scatterometer Data -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SFC_WETNESS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SFC_WETNESS.attr deleted file mode 100644 index 9753cf44db..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SFC_WETNESS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wetness -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SFC_WIND_SPD.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SFC_WIND_SPD.attr deleted file mode 100644 index 04808eb1b9..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SFC_WIND_SPD.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wind speeds over oceans and Great Lakes -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_11.03.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_11.03.attr deleted file mode 100644 index 547dd6e061..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_11.03.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 11.03 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_12.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_12.02.attr deleted file mode 100644 index 244de73617..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_12.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_12.66.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_12.66.attr deleted file mode 100644 index 462e666f93..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_12.66.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.66 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_13.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_13.37.attr deleted file mode 100644 index 9cb1aa9c5e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_13.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_13.64.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_13.64.attr deleted file mode 100644 index 9f58a6bac2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_13.64.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.64 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_14.06.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_14.06.attr deleted file mode 100644 index de2a6e2798..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_14.06.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.06 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_14.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_14.37.attr deleted file mode 100644 index da7800808b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_14.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_14.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_14.71.attr deleted file mode 100644 index b4f2c87ea2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_14.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_3.74.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_3.74.attr deleted file mode 100644 index 4b0e26bda5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_3.74.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.74 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_3.98.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_3.98.attr deleted file mode 100644 index db0e925130..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_3.98.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.98 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_4.13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_4.13.attr deleted file mode 100644 index 8e3484d48e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_4.13.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.13 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_4.45.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_4.45.attr deleted file mode 100644 index 4f0b9bce68..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_4.45.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.45 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_4.52.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_4.52.attr deleted file mode 100644 index 54e31f291f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_4.52.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.52 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_4.57.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_4.57.attr deleted file mode 100644 index f8c6a6c828..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_4.57.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.57 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_6.51.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_6.51.attr deleted file mode 100644 index de741eae3a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_6.51.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 6.51 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_7.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_7.02.attr deleted file mode 100644 index ed7f062cf5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_7.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_7.43.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_7.43.attr deleted file mode 100644 index 748ac900d6..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_7.43.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.43 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_9.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_9.71.attr deleted file mode 100644 index 29d901bdfd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_9.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 9.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_LIFTED_INDEX.attr deleted file mode 100644 index e2cf799bbf..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_PRECIP_WATER.attr deleted file mode 100644 index 2c88a0f5d8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Precipitable Water (PW) -displayUnitStr=SounderPrecipWaterPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_SFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_SFC_SKIN_TEMP.attr deleted file mode 100644 index 311972a597..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_SFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_VIS.attr deleted file mode 100644 index d99cea7530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SND_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Visible imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SNOW_IND.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SNOW_IND.attr deleted file mode 100644 index de51b42452..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SNOW_IND.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow indicator -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SNOW_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SNOW_WATER.attr deleted file mode 100644 index 4eec894549..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SNOW_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow-water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SURFACE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SURFACE_TYPE.attr deleted file mode 100644 index 0cc7cca419..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/SURFACE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/VIS.attr deleted file mode 100644 index 56a43a4d7e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/VIS.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager Visible -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/WV.attr deleted file mode 100644 index e34cef65ef..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/WV.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=watvap -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 6.7-6.5 micron IR (WV) -displayUnitStr=DerivedWVPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/default.attr deleted file mode 100644 index 267d61ad67..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES7/default.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/CLOUD_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/CLOUD_WATER.attr deleted file mode 100644 index 4e62b6105c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/CLOUD_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Cloud water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DERIVED_CAPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DERIVED_CAPE.attr deleted file mode 100644 index 98ba73b6fb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DERIVED_CAPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Available Potential Energy (CAPE) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DERIVED_CONV_INH.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DERIVED_CONV_INH.attr deleted file mode 100644 index 57a4f38069..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DERIVED_CONV_INH.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Inhibition -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DERIVED_LAND_SEA_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DERIVED_LAND_SEA_TEMP.attr deleted file mode 100644 index 7a23e38f72..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DERIVED_LAND_SEA_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived land-sea temp -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DERIVED_VOLCANO_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DERIVED_VOLCANO_IMG.attr deleted file mode 100644 index 2229ec1825..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DERIVED_VOLCANO_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Volcano Imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DERIVED_WINDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DERIVED_WINDEX.attr deleted file mode 100644 index 089564cdb4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DERIVED_WINDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Wind Index(WINDEX) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DMPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DMPI.attr deleted file mode 100644 index a899181e1c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/DMPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Dry Microburst Potential Index (DMPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/GRID_CLOUD_AMT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/GRID_CLOUD_AMT.attr deleted file mode 100644 index 8fd34efc0b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/GRID_CLOUD_AMT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Amount -displayUnitStr=SounderCloudAmountPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/GRID_CTOP_PRES_HGHT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/GRID_CTOP_PRES_HGHT.attr deleted file mode 100644 index 1c64cd80c4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/GRID_CTOP_PRES_HGHT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Top Pressure or Height -displayUnitStr=SounderCloudTopHeightPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/ICE_CONC.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/ICE_CONC.attr deleted file mode 100644 index 9efb75ca77..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/ICE_CONC.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice concentrations -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/ICE_EDGE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/ICE_EDGE.attr deleted file mode 100644 index 9379c1e0de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/ICE_EDGE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice edge -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/ICE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/ICE_TYPE.attr deleted file mode 100644 index e8befd0987..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/ICE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/IMG_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/IMG_LIFTED_INDEX.attr deleted file mode 100644 index 4ef5aa938c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/IMG_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/IMG_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/IMG_PRECIP_WATER.attr deleted file mode 100644 index 646aeffd51..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/IMG_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Precipitable Water (PW) -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/IMG_SRFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/IMG_SRFC_SKIN_TEMP.attr deleted file mode 100644 index bdd4ad59a5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/IMG_SRFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/IR.attr deleted file mode 100644 index ab8d27b7e8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/IR.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/IR13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/IR13.attr deleted file mode 100644 index 43b1bf4b32..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/IR13.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 13 micron (IR) -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/LOW_CLOUD_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/LOW_CLOUD_IMG.attr deleted file mode 100644 index d7926c72dd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/LOW_CLOUD_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Low cloud base imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/MDPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/MDPI.attr deleted file mode 100644 index cef6535f0e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/MDPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Microburst Day Potential Index (MDPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/NORMAL_TPW_PERCENT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/NORMAL_TPW_PERCENT.attr deleted file mode 100644 index 6bd99b6f42..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/NORMAL_TPW_PERCENT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Percent of Normal TPW -displayUnitStr=PercentOfNormalTPWPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/POLAR_3.7u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/POLAR_3.7u.attr deleted file mode 100644 index 4d633f1530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/POLAR_3.7u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.7u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/POLAR_3.9u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/POLAR_3.9u.attr deleted file mode 100644 index 06854db01e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/POLAR_3.9u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.9u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/POLAR_IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/POLAR_IR.attr deleted file mode 100644 index 6a20f7d566..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/POLAR_IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/POLAR_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/POLAR_VIS.attr deleted file mode 100644 index d6578a334f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/POLAR_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar Vis -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/RAIN_RATE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/RAIN_RATE.attr deleted file mode 100644 index 7305eb7685..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/RAIN_RATE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Rain fall rate -displayUnitStr=RainfallRatePixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SCATTEROMETER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SCATTEROMETER.attr deleted file mode 100644 index a05f578deb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SCATTEROMETER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Scatterometer Data -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SFC_WETNESS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SFC_WETNESS.attr deleted file mode 100644 index 9753cf44db..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SFC_WETNESS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wetness -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SFC_WIND_SPD.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SFC_WIND_SPD.attr deleted file mode 100644 index 04808eb1b9..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SFC_WIND_SPD.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wind speeds over oceans and Great Lakes -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_11.03.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_11.03.attr deleted file mode 100644 index 547dd6e061..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_11.03.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 11.03 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_12.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_12.02.attr deleted file mode 100644 index 244de73617..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_12.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_12.66.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_12.66.attr deleted file mode 100644 index 462e666f93..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_12.66.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.66 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_13.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_13.37.attr deleted file mode 100644 index 9cb1aa9c5e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_13.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_13.64.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_13.64.attr deleted file mode 100644 index 9f58a6bac2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_13.64.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.64 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_14.06.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_14.06.attr deleted file mode 100644 index de2a6e2798..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_14.06.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.06 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_14.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_14.37.attr deleted file mode 100644 index da7800808b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_14.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_14.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_14.71.attr deleted file mode 100644 index b4f2c87ea2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_14.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_3.74.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_3.74.attr deleted file mode 100644 index 4b0e26bda5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_3.74.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.74 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_3.98.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_3.98.attr deleted file mode 100644 index db0e925130..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_3.98.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.98 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_4.13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_4.13.attr deleted file mode 100644 index 8e3484d48e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_4.13.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.13 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_4.45.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_4.45.attr deleted file mode 100644 index 4f0b9bce68..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_4.45.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.45 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_4.52.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_4.52.attr deleted file mode 100644 index 54e31f291f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_4.52.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.52 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_4.57.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_4.57.attr deleted file mode 100644 index f8c6a6c828..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_4.57.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.57 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_6.51.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_6.51.attr deleted file mode 100644 index de741eae3a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_6.51.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 6.51 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_7.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_7.02.attr deleted file mode 100644 index ed7f062cf5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_7.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_7.43.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_7.43.attr deleted file mode 100644 index 748ac900d6..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_7.43.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.43 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_9.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_9.71.attr deleted file mode 100644 index 29d901bdfd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_9.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 9.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_LIFTED_INDEX.attr deleted file mode 100644 index e2cf799bbf..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_PRECIP_WATER.attr deleted file mode 100644 index 2c88a0f5d8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Precipitable Water (PW) -displayUnitStr=SounderPrecipWaterPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_SFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_SFC_SKIN_TEMP.attr deleted file mode 100644 index 311972a597..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_SFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_VIS.attr deleted file mode 100644 index d99cea7530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SND_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Visible imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SNOW_IND.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SNOW_IND.attr deleted file mode 100644 index de51b42452..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SNOW_IND.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow indicator -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SNOW_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SNOW_WATER.attr deleted file mode 100644 index 4eec894549..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SNOW_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow-water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SURFACE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SURFACE_TYPE.attr deleted file mode 100644 index 0cc7cca419..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/SURFACE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/VIS.attr deleted file mode 100644 index 56a43a4d7e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/VIS.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager Visible -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/WV.attr deleted file mode 100644 index e34cef65ef..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/WV.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=watvap -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 6.7-6.5 micron IR (WV) -displayUnitStr=DerivedWVPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/default.attr deleted file mode 100644 index 267d61ad67..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES8/default.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/CLOUD_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/CLOUD_WATER.attr deleted file mode 100644 index 4e62b6105c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/CLOUD_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Cloud water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DERIVED_CAPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DERIVED_CAPE.attr deleted file mode 100644 index 98ba73b6fb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DERIVED_CAPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Available Potential Energy (CAPE) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DERIVED_CONV_INH.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DERIVED_CONV_INH.attr deleted file mode 100644 index 57a4f38069..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DERIVED_CONV_INH.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Inhibition -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DERIVED_LAND_SEA_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DERIVED_LAND_SEA_TEMP.attr deleted file mode 100644 index 7a23e38f72..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DERIVED_LAND_SEA_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived land-sea temp -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DERIVED_VOLCANO_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DERIVED_VOLCANO_IMG.attr deleted file mode 100644 index 2229ec1825..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DERIVED_VOLCANO_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Volcano Imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DERIVED_WINDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DERIVED_WINDEX.attr deleted file mode 100644 index 089564cdb4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DERIVED_WINDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Wind Index(WINDEX) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DMPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DMPI.attr deleted file mode 100644 index a899181e1c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/DMPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Dry Microburst Potential Index (DMPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/GINI_GOES9.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/GINI_GOES9.xml deleted file mode 100644 index baf01bed7f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/GINI_GOES9.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - GINI_GOES9 - SATELLITE - -! This must match the "creatingEntity" in the -! satellite DB table valid values are -pluginName=satellite -satelliteName=GOES-9(J) -legendColor=RGB {200, 200, 200} - - GiniSatellite - sectorID - - CLOSEST_BEFORE_OR_AFTER - 60 - USE_DATA_TIMES - 10 - 48 - BasicWX_US - diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/GRID_CLOUD_AMT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/GRID_CLOUD_AMT.attr deleted file mode 100644 index 8fd34efc0b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/GRID_CLOUD_AMT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Amount -displayUnitStr=SounderCloudAmountPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/GRID_CTOP_PRES_HGHT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/GRID_CTOP_PRES_HGHT.attr deleted file mode 100644 index 1c64cd80c4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/GRID_CTOP_PRES_HGHT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Top Pressure or Height -displayUnitStr=SounderCloudTopHeightPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/ICE_CONC.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/ICE_CONC.attr deleted file mode 100644 index 9efb75ca77..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/ICE_CONC.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice concentrations -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/ICE_EDGE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/ICE_EDGE.attr deleted file mode 100644 index 9379c1e0de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/ICE_EDGE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice edge -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/ICE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/ICE_TYPE.attr deleted file mode 100644 index e8befd0987..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/ICE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/IMG_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/IMG_LIFTED_INDEX.attr deleted file mode 100644 index 4ef5aa938c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/IMG_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/IMG_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/IMG_PRECIP_WATER.attr deleted file mode 100644 index 646aeffd51..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/IMG_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Precipitable Water (PW) -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/IMG_SRFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/IMG_SRFC_SKIN_TEMP.attr deleted file mode 100644 index bdd4ad59a5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/IMG_SRFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/IR.attr deleted file mode 100644 index ab8d27b7e8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/IR.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/IR13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/IR13.attr deleted file mode 100644 index 43b1bf4b32..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/IR13.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 13 micron (IR) -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/LOW_CLOUD_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/LOW_CLOUD_IMG.attr deleted file mode 100644 index d7926c72dd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/LOW_CLOUD_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Low cloud base imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/MDPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/MDPI.attr deleted file mode 100644 index cef6535f0e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/MDPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Microburst Day Potential Index (MDPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/NORMAL_TPW_PERCENT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/NORMAL_TPW_PERCENT.attr deleted file mode 100644 index 6bd99b6f42..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/NORMAL_TPW_PERCENT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Percent of Normal TPW -displayUnitStr=PercentOfNormalTPWPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/POLAR_3.7u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/POLAR_3.7u.attr deleted file mode 100644 index 4d633f1530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/POLAR_3.7u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.7u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/POLAR_3.9u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/POLAR_3.9u.attr deleted file mode 100644 index 06854db01e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/POLAR_3.9u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.9u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/POLAR_IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/POLAR_IR.attr deleted file mode 100644 index 6a20f7d566..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/POLAR_IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/POLAR_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/POLAR_VIS.attr deleted file mode 100644 index d6578a334f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/POLAR_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar Vis -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/RAIN_RATE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/RAIN_RATE.attr deleted file mode 100644 index 7305eb7685..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/RAIN_RATE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Rain fall rate -displayUnitStr=RainfallRatePixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SCATTEROMETER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SCATTEROMETER.attr deleted file mode 100644 index a05f578deb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SCATTEROMETER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Scatterometer Data -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SFC_WETNESS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SFC_WETNESS.attr deleted file mode 100644 index 9753cf44db..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SFC_WETNESS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wetness -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SFC_WIND_SPD.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SFC_WIND_SPD.attr deleted file mode 100644 index 04808eb1b9..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SFC_WIND_SPD.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wind speeds over oceans and Great Lakes -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_11.03.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_11.03.attr deleted file mode 100644 index 547dd6e061..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_11.03.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 11.03 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_12.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_12.02.attr deleted file mode 100644 index 244de73617..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_12.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_12.66.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_12.66.attr deleted file mode 100644 index 462e666f93..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_12.66.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.66 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_13.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_13.37.attr deleted file mode 100644 index 9cb1aa9c5e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_13.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_13.64.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_13.64.attr deleted file mode 100644 index 9f58a6bac2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_13.64.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.64 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_14.06.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_14.06.attr deleted file mode 100644 index de2a6e2798..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_14.06.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.06 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_14.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_14.37.attr deleted file mode 100644 index da7800808b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_14.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_14.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_14.71.attr deleted file mode 100644 index b4f2c87ea2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_14.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_3.74.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_3.74.attr deleted file mode 100644 index 4b0e26bda5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_3.74.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.74 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_3.98.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_3.98.attr deleted file mode 100644 index db0e925130..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_3.98.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.98 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_4.13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_4.13.attr deleted file mode 100644 index 8e3484d48e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_4.13.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.13 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_4.45.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_4.45.attr deleted file mode 100644 index 4f0b9bce68..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_4.45.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.45 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_4.52.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_4.52.attr deleted file mode 100644 index 54e31f291f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_4.52.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.52 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_4.57.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_4.57.attr deleted file mode 100644 index f8c6a6c828..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_4.57.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.57 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_6.51.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_6.51.attr deleted file mode 100644 index de741eae3a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_6.51.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 6.51 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_7.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_7.02.attr deleted file mode 100644 index ed7f062cf5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_7.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_7.43.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_7.43.attr deleted file mode 100644 index 748ac900d6..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_7.43.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.43 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_9.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_9.71.attr deleted file mode 100644 index 29d901bdfd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_9.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 9.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_LIFTED_INDEX.attr deleted file mode 100644 index e2cf799bbf..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_PRECIP_WATER.attr deleted file mode 100644 index 2c88a0f5d8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Precipitable Water (PW) -displayUnitStr=SounderPrecipWaterPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_SFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_SFC_SKIN_TEMP.attr deleted file mode 100644 index 311972a597..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_SFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_VIS.attr deleted file mode 100644 index d99cea7530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SND_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Visible imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SNOW_IND.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SNOW_IND.attr deleted file mode 100644 index de51b42452..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SNOW_IND.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow indicator -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SNOW_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SNOW_WATER.attr deleted file mode 100644 index 4eec894549..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SNOW_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow-water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SURFACE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SURFACE_TYPE.attr deleted file mode 100644 index 0cc7cca419..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/SURFACE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/VIS.attr deleted file mode 100644 index 56a43a4d7e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/VIS.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager Visible -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/WV.attr deleted file mode 100644 index e34cef65ef..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/WV.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=watvap -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 6.7-6.5 micron IR (WV) -displayUnitStr=DerivedWVPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/default.attr deleted file mode 100644 index 267d61ad67..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES9/default.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/CLOUD_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/CLOUD_WATER.attr deleted file mode 100644 index 4e62b6105c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/CLOUD_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Cloud water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DERIVED_CAPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DERIVED_CAPE.attr deleted file mode 100644 index 98ba73b6fb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DERIVED_CAPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Available Potential Energy (CAPE) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DERIVED_CONV_INH.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DERIVED_CONV_INH.attr deleted file mode 100644 index 57a4f38069..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DERIVED_CONV_INH.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Inhibition -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DERIVED_LAND_SEA_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DERIVED_LAND_SEA_TEMP.attr deleted file mode 100644 index 7a23e38f72..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DERIVED_LAND_SEA_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived land-sea temp -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DERIVED_VOLCANO_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DERIVED_VOLCANO_IMG.attr deleted file mode 100644 index 2229ec1825..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DERIVED_VOLCANO_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Volcano Imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DERIVED_WINDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DERIVED_WINDEX.attr deleted file mode 100644 index 089564cdb4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DERIVED_WINDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Wind Index(WINDEX) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DMPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DMPI.attr deleted file mode 100644 index a899181e1c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/DMPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Dry Microburst Potential Index (DMPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/GRID_CLOUD_AMT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/GRID_CLOUD_AMT.attr deleted file mode 100644 index 8fd34efc0b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/GRID_CLOUD_AMT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Amount -displayUnitStr=SounderCloudAmountPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/GRID_CTOP_PRES_HGHT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/GRID_CTOP_PRES_HGHT.attr deleted file mode 100644 index 1c64cd80c4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/GRID_CTOP_PRES_HGHT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Top Pressure or Height -displayUnitStr=SounderCloudTopHeightPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/ICE_CONC.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/ICE_CONC.attr deleted file mode 100644 index 9efb75ca77..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/ICE_CONC.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice concentrations -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/ICE_EDGE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/ICE_EDGE.attr deleted file mode 100644 index 9379c1e0de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/ICE_EDGE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice edge -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/ICE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/ICE_TYPE.attr deleted file mode 100644 index e8befd0987..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/ICE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/IMG_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/IMG_LIFTED_INDEX.attr deleted file mode 100644 index 4ef5aa938c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/IMG_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/IMG_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/IMG_PRECIP_WATER.attr deleted file mode 100644 index 646aeffd51..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/IMG_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Precipitable Water (PW) -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/IMG_SRFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/IMG_SRFC_SKIN_TEMP.attr deleted file mode 100644 index bdd4ad59a5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/IMG_SRFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/IR.attr deleted file mode 100644 index ab8d27b7e8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/IR.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/IR13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/IR13.attr deleted file mode 100644 index 43b1bf4b32..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/IR13.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 13 micron (IR) -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/LOW_CLOUD_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/LOW_CLOUD_IMG.attr deleted file mode 100644 index d7926c72dd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/LOW_CLOUD_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Low cloud base imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/MDPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/MDPI.attr deleted file mode 100644 index cef6535f0e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/MDPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Microburst Day Potential Index (MDPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/NORMAL_TPW_PERCENT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/NORMAL_TPW_PERCENT.attr deleted file mode 100644 index 6bd99b6f42..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/NORMAL_TPW_PERCENT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Percent of Normal TPW -displayUnitStr=PercentOfNormalTPWPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/POLAR_3.7u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/POLAR_3.7u.attr deleted file mode 100644 index 4d633f1530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/POLAR_3.7u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.7u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/POLAR_3.9u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/POLAR_3.9u.attr deleted file mode 100644 index 06854db01e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/POLAR_3.9u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.9u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/POLAR_IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/POLAR_IR.attr deleted file mode 100644 index 6a20f7d566..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/POLAR_IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/POLAR_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/POLAR_VIS.attr deleted file mode 100644 index d6578a334f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/POLAR_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar Vis -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/RAIN_RATE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/RAIN_RATE.attr deleted file mode 100644 index 7305eb7685..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/RAIN_RATE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Rain fall rate -displayUnitStr=RainfallRatePixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SCATTEROMETER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SCATTEROMETER.attr deleted file mode 100644 index a05f578deb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SCATTEROMETER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Scatterometer Data -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SFC_WETNESS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SFC_WETNESS.attr deleted file mode 100644 index 9753cf44db..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SFC_WETNESS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wetness -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SFC_WIND_SPD.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SFC_WIND_SPD.attr deleted file mode 100644 index 04808eb1b9..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SFC_WIND_SPD.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wind speeds over oceans and Great Lakes -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_11.03.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_11.03.attr deleted file mode 100644 index 547dd6e061..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_11.03.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 11.03 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_12.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_12.02.attr deleted file mode 100644 index 244de73617..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_12.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_12.66.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_12.66.attr deleted file mode 100644 index 462e666f93..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_12.66.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.66 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_13.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_13.37.attr deleted file mode 100644 index 9cb1aa9c5e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_13.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_13.64.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_13.64.attr deleted file mode 100644 index 9f58a6bac2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_13.64.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.64 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_14.06.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_14.06.attr deleted file mode 100644 index de2a6e2798..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_14.06.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.06 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_14.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_14.37.attr deleted file mode 100644 index da7800808b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_14.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_14.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_14.71.attr deleted file mode 100644 index b4f2c87ea2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_14.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_3.74.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_3.74.attr deleted file mode 100644 index 4b0e26bda5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_3.74.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.74 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_3.98.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_3.98.attr deleted file mode 100644 index db0e925130..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_3.98.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.98 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_4.13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_4.13.attr deleted file mode 100644 index 8e3484d48e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_4.13.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.13 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_4.45.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_4.45.attr deleted file mode 100644 index 4f0b9bce68..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_4.45.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.45 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_4.52.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_4.52.attr deleted file mode 100644 index 54e31f291f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_4.52.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.52 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_4.57.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_4.57.attr deleted file mode 100644 index f8c6a6c828..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_4.57.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.57 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_6.51.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_6.51.attr deleted file mode 100644 index de741eae3a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_6.51.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 6.51 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_7.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_7.02.attr deleted file mode 100644 index ed7f062cf5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_7.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_7.43.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_7.43.attr deleted file mode 100644 index 748ac900d6..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_7.43.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.43 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_9.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_9.71.attr deleted file mode 100644 index 29d901bdfd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_9.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 9.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_LIFTED_INDEX.attr deleted file mode 100644 index e2cf799bbf..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_PRECIP_WATER.attr deleted file mode 100644 index 2c88a0f5d8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Precipitable Water (PW) -displayUnitStr=SounderPrecipWaterPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_SFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_SFC_SKIN_TEMP.attr deleted file mode 100644 index 311972a597..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_SFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_VIS.attr deleted file mode 100644 index d99cea7530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SND_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Visible imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SNOW_IND.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SNOW_IND.attr deleted file mode 100644 index de51b42452..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SNOW_IND.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow indicator -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SNOW_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SNOW_WATER.attr deleted file mode 100644 index 4eec894549..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SNOW_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow-water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SURFACE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SURFACE_TYPE.attr deleted file mode 100644 index 0cc7cca419..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/SURFACE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/VIS.attr deleted file mode 100644 index 56a43a4d7e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/VIS.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager Visible -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/WV.attr deleted file mode 100644 index e34cef65ef..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/WV.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=watvap -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 6.7-6.5 micron IR (WV) -displayUnitStr=DerivedWVPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/default.attr deleted file mode 100644 index 267d61ad67..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_JERS/default.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/CLOUD_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/CLOUD_WATER.attr deleted file mode 100644 index 4e62b6105c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/CLOUD_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Cloud water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DERIVED_CAPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DERIVED_CAPE.attr deleted file mode 100644 index 98ba73b6fb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DERIVED_CAPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Available Potential Energy (CAPE) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DERIVED_CONV_INH.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DERIVED_CONV_INH.attr deleted file mode 100644 index 57a4f38069..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DERIVED_CONV_INH.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Inhibition -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DERIVED_LAND_SEA_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DERIVED_LAND_SEA_TEMP.attr deleted file mode 100644 index 7a23e38f72..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DERIVED_LAND_SEA_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived land-sea temp -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DERIVED_VOLCANO_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DERIVED_VOLCANO_IMG.attr deleted file mode 100644 index 2229ec1825..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DERIVED_VOLCANO_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Volcano Imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DERIVED_WINDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DERIVED_WINDEX.attr deleted file mode 100644 index 089564cdb4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DERIVED_WINDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Wind Index(WINDEX) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DMPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DMPI.attr deleted file mode 100644 index a899181e1c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/DMPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Dry Microburst Potential Index (DMPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/GINI_METEOSAT.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/GINI_METEOSAT.xml deleted file mode 100644 index 7831fcdfc5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/GINI_METEOSAT.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - GINI_METEOSAT - SATELLITE - -! This must match the "creatingEntity" in the -! satellite DB table valid values are -pluginName=satellite -satelliteName=METEOSAT -legendColor=RGB {200, 200, 200} - - GiniSatellite - sectorID - - CLOSEST_BEFORE_OR_AFTER - 60 - USE_DATA_TIMES - 10 - 48 - BasicWX_US - diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/GRID_CLOUD_AMT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/GRID_CLOUD_AMT.attr deleted file mode 100644 index 8fd34efc0b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/GRID_CLOUD_AMT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Amount -displayUnitStr=SounderCloudAmountPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/GRID_CTOP_PRES_HGHT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/GRID_CTOP_PRES_HGHT.attr deleted file mode 100644 index 1c64cd80c4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/GRID_CTOP_PRES_HGHT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Top Pressure or Height -displayUnitStr=SounderCloudTopHeightPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/ICE_CONC.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/ICE_CONC.attr deleted file mode 100644 index 9efb75ca77..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/ICE_CONC.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice concentrations -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/ICE_EDGE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/ICE_EDGE.attr deleted file mode 100644 index 9379c1e0de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/ICE_EDGE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice edge -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/ICE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/ICE_TYPE.attr deleted file mode 100644 index e8befd0987..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/ICE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/IMG_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/IMG_LIFTED_INDEX.attr deleted file mode 100644 index 4ef5aa938c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/IMG_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/IMG_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/IMG_PRECIP_WATER.attr deleted file mode 100644 index 646aeffd51..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/IMG_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Precipitable Water (PW) -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/IMG_SRFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/IMG_SRFC_SKIN_TEMP.attr deleted file mode 100644 index bdd4ad59a5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/IMG_SRFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/IR.attr deleted file mode 100644 index ab8d27b7e8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/IR.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/IR13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/IR13.attr deleted file mode 100644 index 43b1bf4b32..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/IR13.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 13 micron (IR) -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/LOW_CLOUD_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/LOW_CLOUD_IMG.attr deleted file mode 100644 index d7926c72dd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/LOW_CLOUD_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Low cloud base imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/MDPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/MDPI.attr deleted file mode 100644 index cef6535f0e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/MDPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Microburst Day Potential Index (MDPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/NORMAL_TPW_PERCENT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/NORMAL_TPW_PERCENT.attr deleted file mode 100644 index 6bd99b6f42..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/NORMAL_TPW_PERCENT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Percent of Normal TPW -displayUnitStr=PercentOfNormalTPWPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/POLAR_3.7u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/POLAR_3.7u.attr deleted file mode 100644 index 4d633f1530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/POLAR_3.7u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.7u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/POLAR_3.9u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/POLAR_3.9u.attr deleted file mode 100644 index 06854db01e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/POLAR_3.9u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.9u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/POLAR_IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/POLAR_IR.attr deleted file mode 100644 index 6a20f7d566..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/POLAR_IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/POLAR_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/POLAR_VIS.attr deleted file mode 100644 index d6578a334f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/POLAR_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar Vis -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/RAIN_RATE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/RAIN_RATE.attr deleted file mode 100644 index 7305eb7685..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/RAIN_RATE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Rain fall rate -displayUnitStr=RainfallRatePixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SCATTEROMETER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SCATTEROMETER.attr deleted file mode 100644 index a05f578deb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SCATTEROMETER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Scatterometer Data -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SFC_WETNESS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SFC_WETNESS.attr deleted file mode 100644 index 9753cf44db..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SFC_WETNESS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wetness -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SFC_WIND_SPD.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SFC_WIND_SPD.attr deleted file mode 100644 index 04808eb1b9..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SFC_WIND_SPD.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wind speeds over oceans and Great Lakes -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_11.03.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_11.03.attr deleted file mode 100644 index 547dd6e061..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_11.03.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 11.03 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_12.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_12.02.attr deleted file mode 100644 index 244de73617..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_12.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_12.66.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_12.66.attr deleted file mode 100644 index 462e666f93..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_12.66.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.66 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_13.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_13.37.attr deleted file mode 100644 index 9cb1aa9c5e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_13.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_13.64.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_13.64.attr deleted file mode 100644 index 9f58a6bac2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_13.64.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.64 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_14.06.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_14.06.attr deleted file mode 100644 index de2a6e2798..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_14.06.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.06 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_14.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_14.37.attr deleted file mode 100644 index da7800808b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_14.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_14.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_14.71.attr deleted file mode 100644 index b4f2c87ea2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_14.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_3.74.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_3.74.attr deleted file mode 100644 index 4b0e26bda5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_3.74.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.74 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_3.98.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_3.98.attr deleted file mode 100644 index db0e925130..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_3.98.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.98 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_4.13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_4.13.attr deleted file mode 100644 index 8e3484d48e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_4.13.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.13 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_4.45.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_4.45.attr deleted file mode 100644 index 4f0b9bce68..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_4.45.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.45 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_4.52.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_4.52.attr deleted file mode 100644 index 54e31f291f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_4.52.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.52 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_4.57.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_4.57.attr deleted file mode 100644 index f8c6a6c828..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_4.57.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.57 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_6.51.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_6.51.attr deleted file mode 100644 index de741eae3a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_6.51.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 6.51 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_7.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_7.02.attr deleted file mode 100644 index ed7f062cf5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_7.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_7.43.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_7.43.attr deleted file mode 100644 index 748ac900d6..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_7.43.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.43 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_9.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_9.71.attr deleted file mode 100644 index 29d901bdfd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_9.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 9.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_LIFTED_INDEX.attr deleted file mode 100644 index e2cf799bbf..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_PRECIP_WATER.attr deleted file mode 100644 index 2c88a0f5d8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Precipitable Water (PW) -displayUnitStr=SounderPrecipWaterPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_SFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_SFC_SKIN_TEMP.attr deleted file mode 100644 index 311972a597..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_SFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_VIS.attr deleted file mode 100644 index d99cea7530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SND_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Visible imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SNOW_IND.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SNOW_IND.attr deleted file mode 100644 index de51b42452..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SNOW_IND.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow indicator -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SNOW_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SNOW_WATER.attr deleted file mode 100644 index 4eec894549..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SNOW_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow-water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SURFACE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SURFACE_TYPE.attr deleted file mode 100644 index 0cc7cca419..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/SURFACE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/VIS.attr deleted file mode 100644 index 56a43a4d7e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/VIS.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager Visible -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/WV.attr deleted file mode 100644 index e34cef65ef..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/WV.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=watvap -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 6.7-6.5 micron IR (WV) -displayUnitStr=DerivedWVPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/default.attr deleted file mode 100644 index 267d61ad67..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_METEOSAT/default.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/CLOUD_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/CLOUD_WATER.attr deleted file mode 100644 index 4e62b6105c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/CLOUD_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Cloud water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DERIVED_CAPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DERIVED_CAPE.attr deleted file mode 100644 index 98ba73b6fb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DERIVED_CAPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Available Potential Energy (CAPE) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DERIVED_CONV_INH.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DERIVED_CONV_INH.attr deleted file mode 100644 index 57a4f38069..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DERIVED_CONV_INH.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Inhibition -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DERIVED_LAND_SEA_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DERIVED_LAND_SEA_TEMP.attr deleted file mode 100644 index 7a23e38f72..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DERIVED_LAND_SEA_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived land-sea temp -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DERIVED_VOLCANO_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DERIVED_VOLCANO_IMG.attr deleted file mode 100644 index 2229ec1825..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DERIVED_VOLCANO_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Volcano Imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DERIVED_WINDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DERIVED_WINDEX.attr deleted file mode 100644 index 089564cdb4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DERIVED_WINDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Wind Index(WINDEX) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DMPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DMPI.attr deleted file mode 100644 index a899181e1c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/DMPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Dry Microburst Potential Index (DMPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/GRID_CLOUD_AMT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/GRID_CLOUD_AMT.attr deleted file mode 100644 index 8fd34efc0b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/GRID_CLOUD_AMT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Amount -displayUnitStr=SounderCloudAmountPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/GRID_CTOP_PRES_HGHT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/GRID_CTOP_PRES_HGHT.attr deleted file mode 100644 index 1c64cd80c4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/GRID_CTOP_PRES_HGHT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Top Pressure or Height -displayUnitStr=SounderCloudTopHeightPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/ICE_CONC.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/ICE_CONC.attr deleted file mode 100644 index 9efb75ca77..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/ICE_CONC.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice concentrations -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/ICE_EDGE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/ICE_EDGE.attr deleted file mode 100644 index 9379c1e0de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/ICE_EDGE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice edge -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/ICE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/ICE_TYPE.attr deleted file mode 100644 index e8befd0987..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/ICE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/IMG_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/IMG_LIFTED_INDEX.attr deleted file mode 100644 index 4ef5aa938c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/IMG_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/IMG_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/IMG_PRECIP_WATER.attr deleted file mode 100644 index 646aeffd51..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/IMG_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Precipitable Water (PW) -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/IMG_SRFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/IMG_SRFC_SKIN_TEMP.attr deleted file mode 100644 index bdd4ad59a5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/IMG_SRFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/IR.attr deleted file mode 100644 index ab8d27b7e8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/IR.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/IR13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/IR13.attr deleted file mode 100644 index 43b1bf4b32..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/IR13.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 13 micron (IR) -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/LOW_CLOUD_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/LOW_CLOUD_IMG.attr deleted file mode 100644 index d7926c72dd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/LOW_CLOUD_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Low cloud base imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/MDPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/MDPI.attr deleted file mode 100644 index cef6535f0e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/MDPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Microburst Day Potential Index (MDPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/POLAR_3.7u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/POLAR_3.7u.attr deleted file mode 100644 index 4d633f1530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/POLAR_3.7u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.7u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/POLAR_3.9u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/POLAR_3.9u.attr deleted file mode 100644 index 06854db01e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/POLAR_3.9u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.9u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/POLAR_IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/POLAR_IR.attr deleted file mode 100644 index 6a20f7d566..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/POLAR_IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/POLAR_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/POLAR_VIS.attr deleted file mode 100644 index d6578a334f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/POLAR_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar Vis -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/RAIN_RATE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/RAIN_RATE.attr deleted file mode 100644 index 7305eb7685..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/RAIN_RATE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Rain fall rate -displayUnitStr=RainfallRatePixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SCATTEROMETER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SCATTEROMETER.attr deleted file mode 100644 index a05f578deb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SCATTEROMETER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Scatterometer Data -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SFC_WETNESS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SFC_WETNESS.attr deleted file mode 100644 index 9753cf44db..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SFC_WETNESS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wetness -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SFC_WIND_SPD.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SFC_WIND_SPD.attr deleted file mode 100644 index 04808eb1b9..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SFC_WIND_SPD.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wind speeds over oceans and Great Lakes -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_11.03.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_11.03.attr deleted file mode 100644 index 547dd6e061..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_11.03.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 11.03 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_12.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_12.02.attr deleted file mode 100644 index 244de73617..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_12.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_12.66.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_12.66.attr deleted file mode 100644 index 462e666f93..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_12.66.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.66 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_13.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_13.37.attr deleted file mode 100644 index 9cb1aa9c5e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_13.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_13.64.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_13.64.attr deleted file mode 100644 index 9f58a6bac2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_13.64.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.64 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_14.06.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_14.06.attr deleted file mode 100644 index de2a6e2798..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_14.06.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.06 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_14.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_14.37.attr deleted file mode 100644 index da7800808b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_14.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_14.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_14.71.attr deleted file mode 100644 index b4f2c87ea2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_14.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_3.74.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_3.74.attr deleted file mode 100644 index 4b0e26bda5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_3.74.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.74 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_3.98.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_3.98.attr deleted file mode 100644 index db0e925130..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_3.98.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.98 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_4.13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_4.13.attr deleted file mode 100644 index 8e3484d48e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_4.13.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.13 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_4.45.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_4.45.attr deleted file mode 100644 index 4f0b9bce68..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_4.45.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.45 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_4.52.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_4.52.attr deleted file mode 100644 index 54e31f291f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_4.52.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.52 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_4.57.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_4.57.attr deleted file mode 100644 index f8c6a6c828..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_4.57.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.57 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_6.51.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_6.51.attr deleted file mode 100644 index de741eae3a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_6.51.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 6.51 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_7.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_7.02.attr deleted file mode 100644 index ed7f062cf5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_7.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_7.43.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_7.43.attr deleted file mode 100644 index 748ac900d6..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_7.43.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.43 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_9.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_9.71.attr deleted file mode 100644 index 29d901bdfd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_9.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 9.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_LIFTED_INDEX.attr deleted file mode 100644 index e2cf799bbf..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_SFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_SFC_SKIN_TEMP.attr deleted file mode 100644 index 311972a597..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_SFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_VIS.attr deleted file mode 100644 index d99cea7530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Visible imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SNOW_IND.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SNOW_IND.attr deleted file mode 100644 index de51b42452..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SNOW_IND.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow indicator -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SNOW_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SNOW_WATER.attr deleted file mode 100644 index 4eec894549..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SNOW_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow-water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SURFACE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SURFACE_TYPE.attr deleted file mode 100644 index 0cc7cca419..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SURFACE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/VIS.attr deleted file mode 100644 index 56a43a4d7e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/VIS.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager Visible -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/WV.attr deleted file mode 100644 index e34cef65ef..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/WV.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=watvap -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 6.7-6.5 micron IR (WV) -displayUnitStr=DerivedWVPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/default.attr deleted file mode 100644 index 267d61ad67..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/default.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/CLOUD_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/CLOUD_WATER.attr deleted file mode 100644 index 4e62b6105c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/CLOUD_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Cloud water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DERIVED_CAPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DERIVED_CAPE.attr deleted file mode 100644 index 98ba73b6fb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DERIVED_CAPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Available Potential Energy (CAPE) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DERIVED_CONV_INH.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DERIVED_CONV_INH.attr deleted file mode 100644 index 57a4f38069..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DERIVED_CONV_INH.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Inhibition -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DERIVED_LAND_SEA_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DERIVED_LAND_SEA_TEMP.attr deleted file mode 100644 index 7a23e38f72..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DERIVED_LAND_SEA_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived land-sea temp -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DERIVED_VOLCANO_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DERIVED_VOLCANO_IMG.attr deleted file mode 100644 index 2229ec1825..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DERIVED_VOLCANO_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Volcano Imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DERIVED_WINDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DERIVED_WINDEX.attr deleted file mode 100644 index 089564cdb4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DERIVED_WINDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Wind Index(WINDEX) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DMPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DMPI.attr deleted file mode 100644 index a899181e1c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/DMPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Dry Microburst Potential Index (DMPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/GRID_CLOUD_AMT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/GRID_CLOUD_AMT.attr deleted file mode 100644 index 8fd34efc0b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/GRID_CLOUD_AMT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Amount -displayUnitStr=SounderCloudAmountPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/GRID_CTOP_PRES_HGHT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/GRID_CTOP_PRES_HGHT.attr deleted file mode 100644 index 1c64cd80c4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/GRID_CTOP_PRES_HGHT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Top Pressure or Height -displayUnitStr=SounderCloudTopHeightPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/ICE_CONC.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/ICE_CONC.attr deleted file mode 100644 index 9efb75ca77..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/ICE_CONC.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice concentrations -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/ICE_EDGE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/ICE_EDGE.attr deleted file mode 100644 index 9379c1e0de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/ICE_EDGE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice edge -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/ICE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/ICE_TYPE.attr deleted file mode 100644 index e8befd0987..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/ICE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/IMG_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/IMG_LIFTED_INDEX.attr deleted file mode 100644 index 4ef5aa938c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/IMG_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/IMG_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/IMG_PRECIP_WATER.attr deleted file mode 100644 index 646aeffd51..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/IMG_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Precipitable Water (PW) -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/IMG_SRFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/IMG_SRFC_SKIN_TEMP.attr deleted file mode 100644 index bdd4ad59a5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/IMG_SRFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/IR.attr deleted file mode 100644 index ab8d27b7e8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/IR.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/IR13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/IR13.attr deleted file mode 100644 index 43b1bf4b32..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/IR13.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 13 micron (IR) -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/LOW_CLOUD_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/LOW_CLOUD_IMG.attr deleted file mode 100644 index d7926c72dd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/LOW_CLOUD_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Low cloud base imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/MDPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/MDPI.attr deleted file mode 100644 index cef6535f0e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/MDPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Microburst Day Potential Index (MDPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/NORMAL_TPW_PERCENT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/NORMAL_TPW_PERCENT.attr deleted file mode 100644 index 6bd99b6f42..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/NORMAL_TPW_PERCENT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Percent of Normal TPW -displayUnitStr=PercentOfNormalTPWPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/POLAR_3.7u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/POLAR_3.7u.attr deleted file mode 100644 index 4d633f1530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/POLAR_3.7u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.7u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/POLAR_3.9u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/POLAR_3.9u.attr deleted file mode 100644 index 06854db01e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/POLAR_3.9u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.9u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/POLAR_IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/POLAR_IR.attr deleted file mode 100644 index 6a20f7d566..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/POLAR_IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/POLAR_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/POLAR_VIS.attr deleted file mode 100644 index d6578a334f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/POLAR_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar Vis -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/RAIN_RATE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/RAIN_RATE.attr deleted file mode 100644 index 7305eb7685..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/RAIN_RATE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Rain fall rate -displayUnitStr=RainfallRatePixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SCATTEROMETER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SCATTEROMETER.attr deleted file mode 100644 index a05f578deb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SCATTEROMETER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Scatterometer Data -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SFC_WETNESS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SFC_WETNESS.attr deleted file mode 100644 index 9753cf44db..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SFC_WETNESS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wetness -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SFC_WIND_SPD.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SFC_WIND_SPD.attr deleted file mode 100644 index 04808eb1b9..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SFC_WIND_SPD.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wind speeds over oceans and Great Lakes -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_11.03.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_11.03.attr deleted file mode 100644 index 547dd6e061..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_11.03.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 11.03 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_12.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_12.02.attr deleted file mode 100644 index 244de73617..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_12.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_12.66.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_12.66.attr deleted file mode 100644 index 462e666f93..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_12.66.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.66 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_13.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_13.37.attr deleted file mode 100644 index 9cb1aa9c5e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_13.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_13.64.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_13.64.attr deleted file mode 100644 index 9f58a6bac2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_13.64.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.64 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_14.06.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_14.06.attr deleted file mode 100644 index de2a6e2798..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_14.06.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.06 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_14.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_14.37.attr deleted file mode 100644 index da7800808b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_14.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_14.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_14.71.attr deleted file mode 100644 index b4f2c87ea2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_14.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_3.74.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_3.74.attr deleted file mode 100644 index 4b0e26bda5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_3.74.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.74 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_3.98.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_3.98.attr deleted file mode 100644 index db0e925130..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_3.98.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.98 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_4.13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_4.13.attr deleted file mode 100644 index 8e3484d48e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_4.13.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.13 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_4.45.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_4.45.attr deleted file mode 100644 index 4f0b9bce68..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_4.45.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.45 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_4.52.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_4.52.attr deleted file mode 100644 index 54e31f291f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_4.52.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.52 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_4.57.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_4.57.attr deleted file mode 100644 index f8c6a6c828..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_4.57.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.57 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_6.51.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_6.51.attr deleted file mode 100644 index de741eae3a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_6.51.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 6.51 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_7.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_7.02.attr deleted file mode 100644 index ed7f062cf5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_7.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_7.43.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_7.43.attr deleted file mode 100644 index 748ac900d6..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_7.43.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.43 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_9.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_9.71.attr deleted file mode 100644 index 29d901bdfd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_9.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 9.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_LIFTED_INDEX.attr deleted file mode 100644 index e2cf799bbf..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_PRECIP_WATER.attr deleted file mode 100644 index 2c88a0f5d8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Precipitable Water (PW) -displayUnitStr=SounderPrecipWaterPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_SFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_SFC_SKIN_TEMP.attr deleted file mode 100644 index 311972a597..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_SFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_VIS.attr deleted file mode 100644 index d99cea7530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SND_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Visible imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SNOW_IND.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SNOW_IND.attr deleted file mode 100644 index de51b42452..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SNOW_IND.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow indicator -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SNOW_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SNOW_WATER.attr deleted file mode 100644 index 4eec894549..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SNOW_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow-water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SURFACE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SURFACE_TYPE.attr deleted file mode 100644 index 0cc7cca419..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/SURFACE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/VIS.attr deleted file mode 100644 index 56a43a4d7e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/VIS.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager Visible -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/WV.attr deleted file mode 100644 index e34cef65ef..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/WV.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=watvap -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 6.7-6.5 micron IR (WV) -displayUnitStr=DerivedWVPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/default.attr deleted file mode 100644 index 267d61ad67..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA16/default.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/CLOUD_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/CLOUD_WATER.attr deleted file mode 100644 index 4e62b6105c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/CLOUD_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Cloud water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DERIVED_CAPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DERIVED_CAPE.attr deleted file mode 100644 index 98ba73b6fb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DERIVED_CAPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Available Potential Energy (CAPE) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DERIVED_CONV_INH.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DERIVED_CONV_INH.attr deleted file mode 100644 index 57a4f38069..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DERIVED_CONV_INH.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Inhibition -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DERIVED_LAND_SEA_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DERIVED_LAND_SEA_TEMP.attr deleted file mode 100644 index 7a23e38f72..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DERIVED_LAND_SEA_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived land-sea temp -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DERIVED_VOLCANO_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DERIVED_VOLCANO_IMG.attr deleted file mode 100644 index 2229ec1825..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DERIVED_VOLCANO_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Volcano Imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DERIVED_WINDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DERIVED_WINDEX.attr deleted file mode 100644 index 089564cdb4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DERIVED_WINDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Wind Index(WINDEX) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DMPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DMPI.attr deleted file mode 100644 index a899181e1c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/DMPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Dry Microburst Potential Index (DMPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/GINI_NOAA17.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/GINI_NOAA17.xml deleted file mode 100644 index b8d914028c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/GINI_NOAA17.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - GINI_NOAA17 - SATELLITE - -! This must match the "creatingEntity" in the -! satellite DB table valid values are -pluginName=satellite -satelliteName=NOAA17 -legendColor=RGB {200, 200, 200} - - GiniSatellite - sectorID - - CLOSEST_BEFORE_OR_AFTER - 60 - USE_DATA_TIMES - 10 - 48 - BasicWX_US - diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/GRID_CLOUD_AMT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/GRID_CLOUD_AMT.attr deleted file mode 100644 index 8fd34efc0b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/GRID_CLOUD_AMT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Amount -displayUnitStr=SounderCloudAmountPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/GRID_CTOP_PRES_HGHT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/GRID_CTOP_PRES_HGHT.attr deleted file mode 100644 index 1c64cd80c4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/GRID_CTOP_PRES_HGHT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Top Pressure or Height -displayUnitStr=SounderCloudTopHeightPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/ICE_CONC.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/ICE_CONC.attr deleted file mode 100644 index 9efb75ca77..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/ICE_CONC.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice concentrations -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/ICE_EDGE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/ICE_EDGE.attr deleted file mode 100644 index 9379c1e0de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/ICE_EDGE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice edge -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/ICE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/ICE_TYPE.attr deleted file mode 100644 index e8befd0987..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/ICE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/IMG_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/IMG_LIFTED_INDEX.attr deleted file mode 100644 index 4ef5aa938c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/IMG_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/IMG_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/IMG_PRECIP_WATER.attr deleted file mode 100644 index 646aeffd51..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/IMG_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Precipitable Water (PW) -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/IMG_SRFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/IMG_SRFC_SKIN_TEMP.attr deleted file mode 100644 index bdd4ad59a5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/IMG_SRFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/IR.attr deleted file mode 100644 index ab8d27b7e8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/IR.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/IR13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/IR13.attr deleted file mode 100644 index 43b1bf4b32..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/IR13.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 13 micron (IR) -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/LOW_CLOUD_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/LOW_CLOUD_IMG.attr deleted file mode 100644 index d7926c72dd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/LOW_CLOUD_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Low cloud base imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/MDPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/MDPI.attr deleted file mode 100644 index cef6535f0e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/MDPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Microburst Day Potential Index (MDPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/NORMAL_TPW_PERCENT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/NORMAL_TPW_PERCENT.attr deleted file mode 100644 index 6bd99b6f42..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/NORMAL_TPW_PERCENT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Percent of Normal TPW -displayUnitStr=PercentOfNormalTPWPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/POLAR_3.7u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/POLAR_3.7u.attr deleted file mode 100644 index 4d633f1530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/POLAR_3.7u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.7u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/POLAR_3.9u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/POLAR_3.9u.attr deleted file mode 100644 index 06854db01e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/POLAR_3.9u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.9u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/POLAR_IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/POLAR_IR.attr deleted file mode 100644 index 6a20f7d566..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/POLAR_IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/POLAR_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/POLAR_VIS.attr deleted file mode 100644 index d6578a334f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/POLAR_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar Vis -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/RAIN_RATE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/RAIN_RATE.attr deleted file mode 100644 index 7305eb7685..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/RAIN_RATE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Rain fall rate -displayUnitStr=RainfallRatePixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SCATTEROMETER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SCATTEROMETER.attr deleted file mode 100644 index a05f578deb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SCATTEROMETER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Scatterometer Data -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SFC_WETNESS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SFC_WETNESS.attr deleted file mode 100644 index 9753cf44db..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SFC_WETNESS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wetness -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SFC_WIND_SPD.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SFC_WIND_SPD.attr deleted file mode 100644 index 04808eb1b9..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SFC_WIND_SPD.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wind speeds over oceans and Great Lakes -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_11.03.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_11.03.attr deleted file mode 100644 index 547dd6e061..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_11.03.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 11.03 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_12.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_12.02.attr deleted file mode 100644 index 244de73617..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_12.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_12.66.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_12.66.attr deleted file mode 100644 index 462e666f93..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_12.66.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.66 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_13.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_13.37.attr deleted file mode 100644 index 9cb1aa9c5e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_13.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_13.64.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_13.64.attr deleted file mode 100644 index 9f58a6bac2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_13.64.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.64 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_14.06.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_14.06.attr deleted file mode 100644 index de2a6e2798..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_14.06.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.06 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_14.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_14.37.attr deleted file mode 100644 index da7800808b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_14.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_14.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_14.71.attr deleted file mode 100644 index b4f2c87ea2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_14.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_3.74.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_3.74.attr deleted file mode 100644 index 4b0e26bda5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_3.74.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.74 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_3.98.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_3.98.attr deleted file mode 100644 index db0e925130..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_3.98.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.98 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_4.13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_4.13.attr deleted file mode 100644 index 8e3484d48e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_4.13.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.13 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_4.45.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_4.45.attr deleted file mode 100644 index 4f0b9bce68..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_4.45.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.45 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_4.52.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_4.52.attr deleted file mode 100644 index 54e31f291f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_4.52.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.52 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_4.57.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_4.57.attr deleted file mode 100644 index f8c6a6c828..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_4.57.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.57 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_6.51.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_6.51.attr deleted file mode 100644 index de741eae3a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_6.51.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 6.51 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_7.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_7.02.attr deleted file mode 100644 index ed7f062cf5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_7.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_7.43.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_7.43.attr deleted file mode 100644 index 748ac900d6..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_7.43.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.43 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_9.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_9.71.attr deleted file mode 100644 index 29d901bdfd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_9.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 9.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_LIFTED_INDEX.attr deleted file mode 100644 index e2cf799bbf..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_PRECIP_WATER.attr deleted file mode 100644 index 2c88a0f5d8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Precipitable Water (PW) -displayUnitStr=SounderPrecipWaterPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_SFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_SFC_SKIN_TEMP.attr deleted file mode 100644 index 311972a597..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_SFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_VIS.attr deleted file mode 100644 index d99cea7530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SND_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Visible imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SNOW_IND.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SNOW_IND.attr deleted file mode 100644 index de51b42452..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SNOW_IND.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow indicator -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SNOW_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SNOW_WATER.attr deleted file mode 100644 index 4eec894549..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SNOW_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow-water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SURFACE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SURFACE_TYPE.attr deleted file mode 100644 index 0cc7cca419..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/SURFACE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/VIS.attr deleted file mode 100644 index 56a43a4d7e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/VIS.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager Visible -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/WV.attr deleted file mode 100644 index e34cef65ef..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/WV.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=watvap -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 6.7-6.5 micron IR (WV) -displayUnitStr=DerivedWVPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/default.attr deleted file mode 100644 index 267d61ad67..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA17/default.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/CLOUD_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/CLOUD_WATER.attr deleted file mode 100644 index 4e62b6105c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/CLOUD_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Cloud water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DERIVED_CAPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DERIVED_CAPE.attr deleted file mode 100644 index 98ba73b6fb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DERIVED_CAPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Available Potential Energy (CAPE) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DERIVED_CONV_INH.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DERIVED_CONV_INH.attr deleted file mode 100644 index 57a4f38069..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DERIVED_CONV_INH.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Inhibition -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DERIVED_LAND_SEA_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DERIVED_LAND_SEA_TEMP.attr deleted file mode 100644 index 7a23e38f72..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DERIVED_LAND_SEA_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived land-sea temp -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DERIVED_VOLCANO_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DERIVED_VOLCANO_IMG.attr deleted file mode 100644 index 2229ec1825..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DERIVED_VOLCANO_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Volcano Imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DERIVED_WINDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DERIVED_WINDEX.attr deleted file mode 100644 index 089564cdb4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DERIVED_WINDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Wind Index(WINDEX) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DMPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DMPI.attr deleted file mode 100644 index a899181e1c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/DMPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Dry Microburst Potential Index (DMPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/GINI_NOAA18.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/GINI_NOAA18.xml deleted file mode 100644 index 18c473b074..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/GINI_NOAA18.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - GINI_NOAA18 - SATELLITE - -! This must match the "creatingEntity" in the -! satellite DB table valid values are -pluginName=satellite -satelliteName=NOAA18 -legendColor=RGB {200, 200, 200} - - GiniSatellite - sectorID - - CLOSEST_BEFORE_OR_AFTER - 60 - USE_DATA_TIMES - 10 - 48 - BasicWX_US - diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/GRID_CLOUD_AMT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/GRID_CLOUD_AMT.attr deleted file mode 100644 index 8fd34efc0b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/GRID_CLOUD_AMT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Amount -displayUnitStr=SounderCloudAmountPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/GRID_CTOP_PRES_HGHT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/GRID_CTOP_PRES_HGHT.attr deleted file mode 100644 index 1c64cd80c4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/GRID_CTOP_PRES_HGHT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Top Pressure or Height -displayUnitStr=SounderCloudTopHeightPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/ICE_CONC.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/ICE_CONC.attr deleted file mode 100644 index 9efb75ca77..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/ICE_CONC.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice concentrations -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/ICE_EDGE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/ICE_EDGE.attr deleted file mode 100644 index 9379c1e0de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/ICE_EDGE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice edge -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/ICE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/ICE_TYPE.attr deleted file mode 100644 index e8befd0987..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/ICE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/IMG_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/IMG_LIFTED_INDEX.attr deleted file mode 100644 index 4ef5aa938c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/IMG_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/IMG_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/IMG_PRECIP_WATER.attr deleted file mode 100644 index 646aeffd51..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/IMG_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Precipitable Water (PW) -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/IMG_SRFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/IMG_SRFC_SKIN_TEMP.attr deleted file mode 100644 index bdd4ad59a5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/IMG_SRFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/IR.attr deleted file mode 100644 index ab8d27b7e8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/IR.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/IR13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/IR13.attr deleted file mode 100644 index 43b1bf4b32..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/IR13.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 13 micron (IR) -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/LOW_CLOUD_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/LOW_CLOUD_IMG.attr deleted file mode 100644 index d7926c72dd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/LOW_CLOUD_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Low cloud base imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/MDPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/MDPI.attr deleted file mode 100644 index cef6535f0e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/MDPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Microburst Day Potential Index (MDPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/NORMAL_TPW_PERCENT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/NORMAL_TPW_PERCENT.attr deleted file mode 100644 index 6bd99b6f42..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/NORMAL_TPW_PERCENT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Percent of Normal TPW -displayUnitStr=PercentOfNormalTPWPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/POLAR_3.7u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/POLAR_3.7u.attr deleted file mode 100644 index 4d633f1530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/POLAR_3.7u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.7u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/POLAR_3.9u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/POLAR_3.9u.attr deleted file mode 100644 index 06854db01e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/POLAR_3.9u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.9u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/POLAR_IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/POLAR_IR.attr deleted file mode 100644 index 6a20f7d566..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/POLAR_IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/POLAR_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/POLAR_VIS.attr deleted file mode 100644 index d6578a334f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/POLAR_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar Vis -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/RAIN_RATE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/RAIN_RATE.attr deleted file mode 100644 index 7305eb7685..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/RAIN_RATE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Rain fall rate -displayUnitStr=RainfallRatePixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SCATTEROMETER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SCATTEROMETER.attr deleted file mode 100644 index a05f578deb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SCATTEROMETER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Scatterometer Data -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SFC_WETNESS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SFC_WETNESS.attr deleted file mode 100644 index 9753cf44db..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SFC_WETNESS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wetness -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SFC_WIND_SPD.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SFC_WIND_SPD.attr deleted file mode 100644 index 04808eb1b9..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SFC_WIND_SPD.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wind speeds over oceans and Great Lakes -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_11.03.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_11.03.attr deleted file mode 100644 index 547dd6e061..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_11.03.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 11.03 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_12.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_12.02.attr deleted file mode 100644 index 244de73617..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_12.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_12.66.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_12.66.attr deleted file mode 100644 index 462e666f93..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_12.66.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.66 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_13.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_13.37.attr deleted file mode 100644 index 9cb1aa9c5e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_13.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_13.64.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_13.64.attr deleted file mode 100644 index 9f58a6bac2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_13.64.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.64 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_14.06.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_14.06.attr deleted file mode 100644 index de2a6e2798..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_14.06.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.06 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_14.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_14.37.attr deleted file mode 100644 index da7800808b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_14.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_14.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_14.71.attr deleted file mode 100644 index b4f2c87ea2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_14.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_3.74.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_3.74.attr deleted file mode 100644 index 4b0e26bda5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_3.74.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.74 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_3.98.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_3.98.attr deleted file mode 100644 index db0e925130..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_3.98.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.98 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_4.13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_4.13.attr deleted file mode 100644 index 8e3484d48e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_4.13.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.13 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_4.45.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_4.45.attr deleted file mode 100644 index 4f0b9bce68..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_4.45.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.45 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_4.52.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_4.52.attr deleted file mode 100644 index 54e31f291f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_4.52.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.52 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_4.57.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_4.57.attr deleted file mode 100644 index f8c6a6c828..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_4.57.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.57 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_6.51.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_6.51.attr deleted file mode 100644 index de741eae3a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_6.51.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 6.51 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_7.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_7.02.attr deleted file mode 100644 index ed7f062cf5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_7.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_7.43.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_7.43.attr deleted file mode 100644 index 748ac900d6..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_7.43.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.43 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_9.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_9.71.attr deleted file mode 100644 index 29d901bdfd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_9.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 9.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_LIFTED_INDEX.attr deleted file mode 100644 index e2cf799bbf..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_PRECIP_WATER.attr deleted file mode 100644 index 2c88a0f5d8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Precipitable Water (PW) -displayUnitStr=SounderPrecipWaterPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_SFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_SFC_SKIN_TEMP.attr deleted file mode 100644 index 311972a597..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_SFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_VIS.attr deleted file mode 100644 index d99cea7530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SND_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Visible imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SNOW_IND.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SNOW_IND.attr deleted file mode 100644 index de51b42452..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SNOW_IND.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow indicator -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SNOW_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SNOW_WATER.attr deleted file mode 100644 index 4eec894549..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SNOW_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow-water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SURFACE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SURFACE_TYPE.attr deleted file mode 100644 index 0cc7cca419..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/SURFACE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/VIS.attr deleted file mode 100644 index 56a43a4d7e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/VIS.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager Visible -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/WV.attr deleted file mode 100644 index e34cef65ef..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/WV.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=watvap -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 6.7-6.5 micron IR (WV) -displayUnitStr=DerivedWVPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/default.attr deleted file mode 100644 index 267d61ad67..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA18/default.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/CLOUD_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/CLOUD_WATER.attr deleted file mode 100644 index 4e62b6105c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/CLOUD_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Cloud water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DERIVED_CAPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DERIVED_CAPE.attr deleted file mode 100644 index 98ba73b6fb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DERIVED_CAPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Available Potential Energy (CAPE) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DERIVED_CONV_INH.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DERIVED_CONV_INH.attr deleted file mode 100644 index 57a4f38069..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DERIVED_CONV_INH.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Inhibition -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DERIVED_LAND_SEA_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DERIVED_LAND_SEA_TEMP.attr deleted file mode 100644 index 7a23e38f72..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DERIVED_LAND_SEA_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived land-sea temp -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DERIVED_VOLCANO_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DERIVED_VOLCANO_IMG.attr deleted file mode 100644 index 2229ec1825..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DERIVED_VOLCANO_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Volcano Imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DERIVED_WINDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DERIVED_WINDEX.attr deleted file mode 100644 index 089564cdb4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DERIVED_WINDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Wind Index(WINDEX) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DMPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DMPI.attr deleted file mode 100644 index a899181e1c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/DMPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Dry Microburst Potential Index (DMPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/GINI_NOAA19.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/GINI_NOAA19.xml deleted file mode 100644 index 9054a3d6b6..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/GINI_NOAA19.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - GINI_NOAA19 - SATELLITE - -! This must match the "creatingEntity" in the -! satellite DB table valid values are -pluginName=satellite -satelliteName=NOAA19 -legendColor=RGB {200, 200, 200} - - GiniSatellite - sectorID - - CLOSEST_BEFORE_OR_AFTER - 60 - USE_DATA_TIMES - 10 - 48 - BasicWX_US - diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/GRID_CLOUD_AMT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/GRID_CLOUD_AMT.attr deleted file mode 100644 index 8fd34efc0b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/GRID_CLOUD_AMT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Amount -displayUnitStr=SounderCloudAmountPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/GRID_CTOP_PRES_HGHT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/GRID_CTOP_PRES_HGHT.attr deleted file mode 100644 index 1c64cd80c4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/GRID_CTOP_PRES_HGHT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Top Pressure or Height -displayUnitStr=SounderCloudTopHeightPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/ICE_CONC.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/ICE_CONC.attr deleted file mode 100644 index 9efb75ca77..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/ICE_CONC.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice concentrations -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/ICE_EDGE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/ICE_EDGE.attr deleted file mode 100644 index 9379c1e0de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/ICE_EDGE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice edge -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/ICE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/ICE_TYPE.attr deleted file mode 100644 index e8befd0987..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/ICE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/IMG_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/IMG_LIFTED_INDEX.attr deleted file mode 100644 index 4ef5aa938c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/IMG_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/IMG_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/IMG_PRECIP_WATER.attr deleted file mode 100644 index 646aeffd51..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/IMG_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Precipitable Water (PW) -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/IMG_SRFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/IMG_SRFC_SKIN_TEMP.attr deleted file mode 100644 index bdd4ad59a5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/IMG_SRFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/IR.attr deleted file mode 100644 index ab8d27b7e8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/IR.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/IR13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/IR13.attr deleted file mode 100644 index 43b1bf4b32..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/IR13.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 13 micron (IR) -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/LOW_CLOUD_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/LOW_CLOUD_IMG.attr deleted file mode 100644 index d7926c72dd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/LOW_CLOUD_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Low cloud base imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/MDPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/MDPI.attr deleted file mode 100644 index cef6535f0e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/MDPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Microburst Day Potential Index (MDPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/NORMAL_TPW_PERCENT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/NORMAL_TPW_PERCENT.attr deleted file mode 100644 index 6bd99b6f42..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/NORMAL_TPW_PERCENT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Percent of Normal TPW -displayUnitStr=PercentOfNormalTPWPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/POLAR_3.7u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/POLAR_3.7u.attr deleted file mode 100644 index 4d633f1530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/POLAR_3.7u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.7u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/POLAR_3.9u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/POLAR_3.9u.attr deleted file mode 100644 index 06854db01e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/POLAR_3.9u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.9u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/POLAR_IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/POLAR_IR.attr deleted file mode 100644 index 6a20f7d566..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/POLAR_IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/POLAR_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/POLAR_VIS.attr deleted file mode 100644 index d6578a334f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/POLAR_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar Vis -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/RAIN_RATE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/RAIN_RATE.attr deleted file mode 100644 index 7305eb7685..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/RAIN_RATE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Rain fall rate -displayUnitStr=RainfallRatePixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SCATTEROMETER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SCATTEROMETER.attr deleted file mode 100644 index a05f578deb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SCATTEROMETER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Scatterometer Data -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SFC_WETNESS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SFC_WETNESS.attr deleted file mode 100644 index 9753cf44db..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SFC_WETNESS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wetness -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SFC_WIND_SPD.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SFC_WIND_SPD.attr deleted file mode 100644 index 04808eb1b9..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SFC_WIND_SPD.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wind speeds over oceans and Great Lakes -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_11.03.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_11.03.attr deleted file mode 100644 index 547dd6e061..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_11.03.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 11.03 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_12.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_12.02.attr deleted file mode 100644 index 244de73617..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_12.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_12.66.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_12.66.attr deleted file mode 100644 index 462e666f93..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_12.66.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.66 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_13.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_13.37.attr deleted file mode 100644 index 9cb1aa9c5e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_13.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_13.64.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_13.64.attr deleted file mode 100644 index 9f58a6bac2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_13.64.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.64 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_14.06.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_14.06.attr deleted file mode 100644 index de2a6e2798..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_14.06.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.06 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_14.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_14.37.attr deleted file mode 100644 index da7800808b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_14.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_14.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_14.71.attr deleted file mode 100644 index b4f2c87ea2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_14.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_3.74.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_3.74.attr deleted file mode 100644 index 4b0e26bda5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_3.74.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.74 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_3.98.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_3.98.attr deleted file mode 100644 index db0e925130..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_3.98.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.98 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_4.13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_4.13.attr deleted file mode 100644 index 8e3484d48e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_4.13.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.13 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_4.45.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_4.45.attr deleted file mode 100644 index 4f0b9bce68..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_4.45.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.45 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_4.52.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_4.52.attr deleted file mode 100644 index 54e31f291f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_4.52.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.52 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_4.57.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_4.57.attr deleted file mode 100644 index f8c6a6c828..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_4.57.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.57 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_6.51.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_6.51.attr deleted file mode 100644 index de741eae3a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_6.51.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 6.51 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_7.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_7.02.attr deleted file mode 100644 index ed7f062cf5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_7.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_7.43.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_7.43.attr deleted file mode 100644 index 748ac900d6..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_7.43.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.43 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_9.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_9.71.attr deleted file mode 100644 index 29d901bdfd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_9.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 9.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_LIFTED_INDEX.attr deleted file mode 100644 index e2cf799bbf..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_PRECIP_WATER.attr deleted file mode 100644 index 2c88a0f5d8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Precipitable Water (PW) -displayUnitStr=SounderPrecipWaterPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_SFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_SFC_SKIN_TEMP.attr deleted file mode 100644 index 311972a597..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_SFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_VIS.attr deleted file mode 100644 index d99cea7530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SND_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Visible imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SNOW_IND.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SNOW_IND.attr deleted file mode 100644 index de51b42452..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SNOW_IND.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow indicator -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SNOW_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SNOW_WATER.attr deleted file mode 100644 index 4eec894549..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SNOW_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow-water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SURFACE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SURFACE_TYPE.attr deleted file mode 100644 index 0cc7cca419..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/SURFACE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/VIS.attr deleted file mode 100644 index 56a43a4d7e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/VIS.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager Visible -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/WV.attr deleted file mode 100644 index e34cef65ef..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/WV.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=watvap -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 6.7-6.5 micron IR (WV) -displayUnitStr=DerivedWVPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/default.attr deleted file mode 100644 index 267d61ad67..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_NOAA19/default.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/CLOUD_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/CLOUD_WATER.attr deleted file mode 100644 index 4e62b6105c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/CLOUD_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Cloud water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DERIVED_CAPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DERIVED_CAPE.attr deleted file mode 100644 index 98ba73b6fb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DERIVED_CAPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Available Potential Energy (CAPE) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DERIVED_CONV_INH.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DERIVED_CONV_INH.attr deleted file mode 100644 index 57a4f38069..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DERIVED_CONV_INH.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Convective Inhibition -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DERIVED_LAND_SEA_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DERIVED_LAND_SEA_TEMP.attr deleted file mode 100644 index 7a23e38f72..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DERIVED_LAND_SEA_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived land-sea temp -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DERIVED_VOLCANO_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DERIVED_VOLCANO_IMG.attr deleted file mode 100644 index 2229ec1825..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DERIVED_VOLCANO_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Volcano Imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DERIVED_WINDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DERIVED_WINDEX.attr deleted file mode 100644 index 089564cdb4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DERIVED_WINDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Wind Index(WINDEX) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DMPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DMPI.attr deleted file mode 100644 index a899181e1c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/DMPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Dry Microburst Potential Index (DMPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/GRID_CLOUD_AMT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/GRID_CLOUD_AMT.attr deleted file mode 100644 index 8fd34efc0b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/GRID_CLOUD_AMT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Amount -displayUnitStr=SounderCloudAmountPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/GRID_CTOP_PRES_HGHT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/GRID_CTOP_PRES_HGHT.attr deleted file mode 100644 index 1c64cd80c4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/GRID_CTOP_PRES_HGHT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Gridded Cloud Top Pressure or Height -displayUnitStr=SounderCloudTopHeightPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/ICE_CONC.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/ICE_CONC.attr deleted file mode 100644 index 9efb75ca77..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/ICE_CONC.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice concentrations -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/ICE_EDGE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/ICE_EDGE.attr deleted file mode 100644 index 9379c1e0de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/ICE_EDGE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice edge -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/ICE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/ICE_TYPE.attr deleted file mode 100644 index e8befd0987..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/ICE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Ice type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/IMG_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/IMG_LIFTED_INDEX.attr deleted file mode 100644 index 4ef5aa938c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/IMG_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/IMG_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/IMG_PRECIP_WATER.attr deleted file mode 100644 index 646aeffd51..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/IMG_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Precipitable Water (PW) -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/IMG_SRFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/IMG_SRFC_SKIN_TEMP.attr deleted file mode 100644 index bdd4ad59a5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/IMG_SRFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/IR.attr deleted file mode 100644 index ab8d27b7e8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/IR.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/IR13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/IR13.attr deleted file mode 100644 index 43b1bf4b32..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/IR13.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 13 micron (IR) -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/LOW_CLOUD_IMG.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/LOW_CLOUD_IMG.attr deleted file mode 100644 index d7926c72dd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/LOW_CLOUD_IMG.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Low cloud base imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/MDPI.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/MDPI.attr deleted file mode 100644 index cef6535f0e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/MDPI.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Derived Microburst Day Potential Index (MDPI) -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/NORMAL_TPW_PERCENT.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/NORMAL_TPW_PERCENT.attr deleted file mode 100644 index 6bd99b6f42..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/NORMAL_TPW_PERCENT.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Percent of Normal TPW -displayUnitStr=PercentOfNormalTPWPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/POLAR_3.7u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/POLAR_3.7u.attr deleted file mode 100644 index 4d633f1530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/POLAR_3.7u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.7u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/POLAR_3.9u.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/POLAR_3.9u.attr deleted file mode 100644 index 06854db01e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/POLAR_3.9u.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar 3.9u -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/POLAR_IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/POLAR_IR.attr deleted file mode 100644 index 6a20f7d566..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/POLAR_IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/POLAR_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/POLAR_VIS.attr deleted file mode 100644 index d6578a334f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/POLAR_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Polar Vis -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SCATTEROMETER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SCATTEROMETER.attr deleted file mode 100644 index a05f578deb..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SCATTEROMETER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Scatterometer Data -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SFC_WETNESS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SFC_WETNESS.attr deleted file mode 100644 index 9753cf44db..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SFC_WETNESS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wetness -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SFC_WIND_SPD.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SFC_WIND_SPD.attr deleted file mode 100644 index 04808eb1b9..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SFC_WIND_SPD.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface wind speeds over oceans and Great Lakes -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_11.03.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_11.03.attr deleted file mode 100644 index 547dd6e061..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_11.03.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 11.03 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_12.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_12.02.attr deleted file mode 100644 index 244de73617..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_12.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_12.66.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_12.66.attr deleted file mode 100644 index 462e666f93..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_12.66.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 12.66 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_13.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_13.37.attr deleted file mode 100644 index 9cb1aa9c5e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_13.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_13.64.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_13.64.attr deleted file mode 100644 index 9f58a6bac2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_13.64.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 13.64 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_14.06.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_14.06.attr deleted file mode 100644 index de2a6e2798..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_14.06.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.06 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_14.37.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_14.37.attr deleted file mode 100644 index da7800808b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_14.37.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.37 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_14.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_14.71.attr deleted file mode 100644 index b4f2c87ea2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_14.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 14.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_3.74.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_3.74.attr deleted file mode 100644 index 4b0e26bda5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_3.74.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.74 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_3.98.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_3.98.attr deleted file mode 100644 index db0e925130..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_3.98.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 3.98 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_4.13.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_4.13.attr deleted file mode 100644 index 8e3484d48e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_4.13.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.13 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_4.45.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_4.45.attr deleted file mode 100644 index 4f0b9bce68..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_4.45.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.45 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_4.52.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_4.52.attr deleted file mode 100644 index 54e31f291f..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_4.52.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.52 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_4.57.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_4.57.attr deleted file mode 100644 index f8c6a6c828..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_4.57.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 4.57 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_6.51.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_6.51.attr deleted file mode 100644 index de741eae3a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_6.51.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 6.51 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_7.02.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_7.02.attr deleted file mode 100644 index ed7f062cf5..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_7.02.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.02 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_7.43.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_7.43.attr deleted file mode 100644 index 748ac900d6..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_7.43.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 7.43 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_9.71.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_9.71.attr deleted file mode 100644 index 29d901bdfd..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_9.71.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder 9.71 micron imagery -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_LIFTED_INDEX.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_LIFTED_INDEX.attr deleted file mode 100644 index e2cf799bbf..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_LIFTED_INDEX.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Lifted Index (LI) -displayUnitStr=SounderLiftedIndexPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_PRECIP_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_PRECIP_WATER.attr deleted file mode 100644 index 2c88a0f5d8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_PRECIP_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Precipitable Water (PW) -displayUnitStr=SounderPrecipWaterPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_SFC_SKIN_TEMP.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_SFC_SKIN_TEMP.attr deleted file mode 100644 index 311972a597..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_SFC_SKIN_TEMP.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Based Derived Surface Skin Temp (SFC Skin) -displayUnitStr=SounderSkinTempPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_VIS.attr deleted file mode 100644 index d99cea7530..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SND_VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Sounder Visible imagery -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SNOW_IND.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SNOW_IND.attr deleted file mode 100644 index de51b42452..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SNOW_IND.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow indicator -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SNOW_WATER.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SNOW_WATER.attr deleted file mode 100644 index 4eec894549..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SNOW_WATER.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Snow-water content -displayUnitStr=PrecipPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SURFACE_TYPE.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SURFACE_TYPE.attr deleted file mode 100644 index 0cc7cca419..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/SURFACE_TYPE.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Surface type -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/VIS.attr deleted file mode 100644 index 56a43a4d7e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/VIS.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager Visible -displayUnitStr=GenericPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/WV.attr deleted file mode 100644 index e34cef65ef..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/WV.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=watvap -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=Imager 6.7-6.5 micron IR (WV) -displayUnitStr=DerivedWVPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/default.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/default.attr deleted file mode 100644 index 267d61ad67..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/default.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=Imager 11 micron IR -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GMS/GMS.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GMS/GMS.xml deleted file mode 100644 index 68858715e1..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GMS/GMS.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - GMS - SATELLITE - -! This must match the value in the -! mcidas DB table valid values are -! (GOES12, GOES13, .....) -satelliteName=GMS -pluginName=mcidas -legendColor=RGB {200, 200, 200} - - McidasSatellite - areaName,resolution - - CLOSEST_BEFORE_OR_AFTER - 60 - USE_DATA_TIMES - 10 - 48 - BasicWX_US - diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GMS/IR2.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GMS/IR2.attr deleted file mode 100644 index ca1a5231de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GMS/IR2.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR2 -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GMS/IR3.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GMS/IR3.attr deleted file mode 100644 index 9754808068..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GMS/IR3.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR3 -displayUnitStr=C -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GMS/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GMS/VIS.attr deleted file mode 100644 index b7e1bd693a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GMS/VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=VIS -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/GOES10.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/GOES10.xml deleted file mode 100644 index 8cdbbc1d47..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/GOES10.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - GOES10 - SATELLITE - -! This must match the value in the -! mcidas DB table valid values are -! (GOES12, GOES13, .....) -satelliteName=GOES10 -pluginName=mcidas -legendColor=RGB {200, 200, 200} - - McidasSatellite - areaName,resolution - - CLOSEST_BEFORE_OR_AFTER - 60 - USE_DATA_TIMES - 10 - 48 - BasicWX_US - diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/IR.attr deleted file mode 100644 index 33b222506e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR -displayUnitStr=C -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/IR2.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/IR2.attr deleted file mode 100644 index ca1a5231de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/IR2.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR2 -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/IR3.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/IR3.attr deleted file mode 100644 index 9754808068..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/IR3.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR3 -displayUnitStr=C -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/IR4.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/IR4.attr deleted file mode 100644 index 8aee7c020c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/IR4.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR4 -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/VIS.attr deleted file mode 100644 index b7e1bd693a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=VIS -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/GOES11.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/GOES11.xml deleted file mode 100644 index e4265a33e8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/GOES11.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - GOES11 - SATELLITE - -! This must match the value in the -! mcidas DB table valid values are -! (GOES12, GOES13, .....) -satelliteName=GOES11 -pluginName=mcidas -legendColor=RGB {200, 200, 200} - - McidasSatellite - areaName,resolution - - CLOSEST_BEFORE_OR_AFTER - 60 - USE_DATA_TIMES - 10 - 48 - BasicWX_US - diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/IR.attr deleted file mode 100644 index 33b222506e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR -displayUnitStr=C -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/IR2.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/IR2.attr deleted file mode 100644 index ca1a5231de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/IR2.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR2 -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/IR3.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/IR3.attr deleted file mode 100644 index 9754808068..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/IR3.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR3 -displayUnitStr=C -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/IR4.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/IR4.attr deleted file mode 100644 index 8aee7c020c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/IR4.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR4 -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/VIS.attr deleted file mode 100644 index b7e1bd693a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=VIS -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES12/IR3.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES12/IR3.attr deleted file mode 100644 index 9754808068..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES12/IR3.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR3 -displayUnitStr=C -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES12/IR4.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES12/IR4.attr deleted file mode 100644 index 8aee7c020c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES12/IR4.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR4 -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES13/IR3.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES13/IR3.attr deleted file mode 100644 index 9754808068..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES13/IR3.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR3 -displayUnitStr=C -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES13/IR4.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES13/IR4.attr deleted file mode 100644 index 8aee7c020c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES13/IR4.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR4 -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/FYC/FYC.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES14/GOES14.xml similarity index 92% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/FYC/FYC.xml rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES14/GOES14.xml index 7e788d64a8..a866fd86b3 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/FYC/FYC.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES14/GOES14.xml @@ -1,12 +1,12 @@ - FYC + GOES14 SATELLITE ! This must match the value in the ! mcidas DB table valid values are ! (GOES12, GOES13, .....) -satelliteName=FYC +satelliteName=GOES14 pluginName=mcidas legendColor=RGB {200, 200, 200} diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/FYC/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES14/IR.attr similarity index 100% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/FYC/IR.attr rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES14/IR.attr diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/DPD/IR2.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES14/IR2.attr similarity index 100% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/DPD/IR2.attr rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES14/IR2.attr diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/FYC/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES14/VIS.attr similarity index 100% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/FYC/VIS.attr rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES14/VIS.attr diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GMS/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES14/WV.attr similarity index 100% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GMS/WV.attr rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES14/WV.attr diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES15/IR3.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES15/IR3.attr deleted file mode 100644 index 9754808068..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES15/IR3.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR3 -displayUnitStr=C -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES15/IR4.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES15/IR4.attr deleted file mode 100644 index 8aee7c020c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES15/IR4.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR4 -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES6/GOES6.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES6/GOES6.xml deleted file mode 100644 index f8392feca4..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES6/GOES6.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - GOES6 - SATELLITE - -! This must match the value in the -! mcidas DB table valid values are -! (GOES12, GOES13, .....) -satelliteName=GOES6 -pluginName=mcidas -legendColor=RGB {200, 200, 200} - - McidasSatellite - areaName,resolution - - CLOSEST_BEFORE_OR_AFTER - 60 - USE_DATA_TIMES - 10 - 48 - BasicWX_US - diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES6/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES6/IR.attr deleted file mode 100644 index 33b222506e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES6/IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR -displayUnitStr=C -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES6/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES6/VIS.attr deleted file mode 100644 index b7e1bd693a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES6/VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=VIS -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES7/GOES7.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES7/GOES7.xml deleted file mode 100644 index 1f2a28349c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES7/GOES7.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - GOES7 - SATELLITE - -! This must match the value in the -! mcidas DB table valid values are -! (GOES12, GOES13, .....) -satelliteName=GOES7 -pluginName=mcidas -legendColor=RGB {200, 200, 200} - - McidasSatellite - areaName,resolution - - CLOSEST_BEFORE_OR_AFTER - 60 - USE_DATA_TIMES - 10 - 48 - BasicWX_US - diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES7/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES7/IR.attr deleted file mode 100644 index 33b222506e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES7/IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR -displayUnitStr=C -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES7/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES7/VIS.attr deleted file mode 100644 index b7e1bd693a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES7/VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=VIS -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES7/VISPC.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES7/VISPC.attr deleted file mode 100644 index b25c7e0046..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES7/VISPC.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=VISPC -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES7/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES7/WV.attr deleted file mode 100644 index 76b1ae905b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES7/WV.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=watvap -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=WV -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/GOES8.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/GOES8.xml deleted file mode 100644 index 4f4ccaab9a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/GOES8.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - GOES8 - SATELLITE - -! This must match the value in the -! mcidas DB table valid values are -! (GOES12, GOES13, .....) -satelliteName=GOES8 -pluginName=mcidas -legendColor=RGB {200, 200, 200} - - McidasSatellite - areaName,resolution - - CLOSEST_BEFORE_OR_AFTER - 60 - USE_DATA_TIMES - 10 - 48 - BasicWX_US - diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/IR.attr deleted file mode 100644 index 33b222506e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR -displayUnitStr=C -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/IR2.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/IR2.attr deleted file mode 100644 index ca1a5231de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/IR2.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR2 -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/IR3.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/IR3.attr deleted file mode 100644 index 9754808068..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/IR3.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR3 -displayUnitStr=C -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/IR4.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/IR4.attr deleted file mode 100644 index 8aee7c020c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/IR4.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR4 -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/VIS.attr deleted file mode 100644 index b7e1bd693a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=VIS -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/WV.attr deleted file mode 100644 index 76b1ae905b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES8/WV.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=watvap -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=WV -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/GOES9.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/GOES9.xml deleted file mode 100644 index b951209e86..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/GOES9.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - GOES9 - SATELLITE - -! This must match the value in the -! mcidas DB table valid values are -! (GOES12, GOES13, .....) -satelliteName=GOES9 -pluginName=mcidas -legendColor=RGB {200, 200, 200} - - McidasSatellite - areaName,resolution - - CLOSEST_BEFORE_OR_AFTER - 60 - USE_DATA_TIMES - 10 - 48 - BasicWX_US - diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/IR.attr deleted file mode 100644 index 33b222506e..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR -displayUnitStr=C -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/IR2.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/IR2.attr deleted file mode 100644 index ca1a5231de..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/IR2.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR2 -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/IR3.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/IR3.attr deleted file mode 100644 index 9754808068..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/IR3.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR3 -displayUnitStr=C -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/IR4.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/IR4.attr deleted file mode 100644 index 8aee7c020c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/IR4.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR4 -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/VIS.attr deleted file mode 100644 index b7e1bd693a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=VIS -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/WV.attr deleted file mode 100644 index 76b1ae905b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES9/WV.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=watvap -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=WV -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/Global/GPS.attr similarity index 76% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/WV.attr rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/Global/GPS.attr index 76b1ae905b..75bd6592ab 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES11/WV.attr +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/Global/GPS.attr @@ -1,6 +1,6 @@ -colorMapName=watvap +colorMapName=gdpipw colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=WV +imageType=GPS displayUnitStr=BRIT alpha=1.0 brightness=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GMS/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/Global/IR.attr similarity index 100% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GMS/IR.attr rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/Global/IR.attr diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES6/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/Global/PCT.attr similarity index 76% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES6/WV.attr rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/Global/PCT.attr index 76b1ae905b..1ca281adef 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES6/WV.attr +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/Global/PCT.attr @@ -1,6 +1,6 @@ -colorMapName=watvap +colorMapName=gdpipw colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=WV +imageType=PCT displayUnitStr=BRIT alpha=1.0 brightness=1.0 diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/Global/WV.attr similarity index 100% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES10/WV.attr rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/Global/WV.attr diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/HRVIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/HRVIS.attr deleted file mode 100644 index b00333aad0..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/HRVIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=HRVIS -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/IR.attr deleted file mode 100644 index 9af1e721f0..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/IR_12.0.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/IR_12.0.attr deleted file mode 100644 index 8688bfdb38..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/IR_12.0.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR-12.0 -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/IR_8.7.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/IR_8.7.attr deleted file mode 100644 index 5a4da2fc84..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/IR_8.7.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR-8.7 -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/NIR_1.6.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/NIR_1.6.attr deleted file mode 100644 index bfa6e31447..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/NIR_1.6.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=visgray2 -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=NIR-1.6 -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/VIS_0.8.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/VIS_0.8.attr deleted file mode 100644 index f2c8c48a95..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/VIS_0.8.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=VIS-0.8 -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/WV_7.3.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/WV_7.3.attr deleted file mode 100644 index a4fe8e8f93..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/WV_7.3.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=wv_tpc -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=WV-7.3 -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT3/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT3/IR.attr deleted file mode 100644 index 9af1e721f0..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT3/IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT3/METEOSAT3.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT3/METEOSAT3.xml deleted file mode 100644 index 6dabce2438..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT3/METEOSAT3.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - METEOSAT3 - SATELLITE - -! This must match the value in the -! mcidas DB table valid values are -! (GOES12, GOES13, .....) -satelliteName=METEOSAT3 -pluginName=mcidas -legendColor=RGB {200, 200, 200} - - McidasSatellite - areaName,resolution - - CLOSEST_BEFORE_OR_AFTER - 60 - USE_DATA_TIMES - 10 - 48 - BasicWX_US - diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT3/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT3/VIS.attr deleted file mode 100644 index b7e1bd693a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT3/VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=VIS -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT3/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT3/WV.attr deleted file mode 100644 index 76b1ae905b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT3/WV.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=watvap -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=WV -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT5/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT5/IR.attr deleted file mode 100644 index 9af1e721f0..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT5/IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT5/IR3.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT5/IR3.attr deleted file mode 100644 index 9754808068..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT5/IR3.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR3 -displayUnitStr=C -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT5/METEOSAT5.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT5/METEOSAT5.xml deleted file mode 100644 index 90f5a820d8..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT5/METEOSAT5.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - METEOSAT5 - SATELLITE - -! This must match the value in the -! mcidas DB table valid values are -! (GOES12, GOES13, .....) -satelliteName=METEOSAT5 -pluginName=mcidas -legendColor=RGB {200, 200, 200} - - McidasSatellite - areaName,resolution - - CLOSEST_BEFORE_OR_AFTER - 60 - USE_DATA_TIMES - 10 - 48 - BasicWX_US - diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT5/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT5/VIS.attr deleted file mode 100644 index b7e1bd693a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT5/VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=VIS -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT5/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT5/WV.attr deleted file mode 100644 index 76b1ae905b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT5/WV.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=watvap -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=WV -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT6/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT6/IR.attr deleted file mode 100644 index 9af1e721f0..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT6/IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT6/METEOSAT6.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT6/METEOSAT6.xml deleted file mode 100644 index 5ce72c7290..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT6/METEOSAT6.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - METEOSAT6 - SATELLITE - -! This must match the value in the -! mcidas DB table valid values are -! (GOES12, GOES13, .....) -satelliteName=METEOSAT6 -pluginName=mcidas -legendColor=RGB {200, 200, 200} - - McidasSatellite - areaName,resolution - - CLOSEST_BEFORE_OR_AFTER - 60 - USE_DATA_TIMES - 10 - 48 - BasicWX_US - diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT6/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT6/VIS.attr deleted file mode 100644 index b7e1bd693a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT6/VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=VIS -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT6/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT6/WV.attr deleted file mode 100644 index 76b1ae905b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT6/WV.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=watvap -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=WV -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT7/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT7/IR.attr deleted file mode 100644 index 9af1e721f0..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT7/IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT7/IR3.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT7/IR3.attr deleted file mode 100644 index 9754808068..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT7/IR3.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR3 -displayUnitStr=C -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT7/METEOSAT7.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT7/METEOSAT7.xml deleted file mode 100644 index 7f4b8fc74c..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT7/METEOSAT7.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - METEOSAT7 - SATELLITE - -! This must match the value in the -! mcidas DB table valid values are -! (GOES12, GOES13, .....) -satelliteName=METEOSAT7 -pluginName=mcidas -legendColor=RGB {200, 200, 200} - - McidasSatellite - areaName,resolution - - CLOSEST_BEFORE_OR_AFTER - 60 - USE_DATA_TIMES - 10 - 48 - BasicWX_US - diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT7/VIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT7/VIS.attr deleted file mode 100644 index b7e1bd693a..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT7/VIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=VIS -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT7/WV.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT7/WV.attr deleted file mode 100644 index 76b1ae905b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT7/WV.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=watvap -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=WV -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/HRVIS.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/HRVIS.attr deleted file mode 100644 index b00333aad0..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/HRVIS.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=HRVIS -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/IR.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/IR.attr deleted file mode 100644 index 9af1e721f0..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/IR.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/IR_12.0.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/IR_12.0.attr deleted file mode 100644 index 8688bfdb38..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/IR_12.0.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR-12.0 -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/IR_8.7.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/IR_8.7.attr deleted file mode 100644 index 5a4da2fc84..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/IR_8.7.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=IR-8.7 -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/NIR_1.6.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/NIR_1.6.attr deleted file mode 100644 index bfa6e31447..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/NIR_1.6.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=visgray2 -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=NIR-1.6 -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/VIS_0.8.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/VIS_0.8.attr deleted file mode 100644 index f2c8c48a95..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/VIS_0.8.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=lingray -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=VIS-0.8 -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/WV_7.3.attr b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/WV_7.3.attr deleted file mode 100644 index a4fe8e8f93..0000000000 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/WV_7.3.attr +++ /dev/null @@ -1,7 +0,0 @@ -colorMapName=wv_tpc -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -imageType=WV-7.3 -displayUnitStr=BRIT -alpha=1.0 -brightness=1.0 -contrast=1.0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/basemaps/snap.lpi b/cave/build/static/common/cave/etc/ncep/basemaps/snap.lpi index 6447988dfc..f14b8a27de 100644 --- a/cave/build/static/common/cave/etc/ncep/basemaps/snap.lpi +++ b/cave/build/static/common/cave/etc/ncep/basemaps/snap.lpi @@ -21329,1910 +21329,6 @@ 54.63 -104.89 60 220NNW_YQV 54.78 -105.01 60 230NNW_YQV 54.93 -105.13 60 240NNW_YQV -0.00 0.00 60 ANN -0.33 0.00 60 20N_ANN -0.50 0.00 60 30N_ANN -0.67 0.00 60 40N_ANN -0.83 0.00 60 50N_ANN -1.00 0.00 60 60N_ANN -1.17 0.00 60 70N_ANN -1.33 0.00 60 80N_ANN -1.50 0.00 60 90N_ANN -1.67 0.00 60 100N_ANN -1.83 0.00 60 110N_ANN -2.00 0.00 60 120N_ANN -2.17 0.00 60 130N_ANN -2.33 0.00 60 140N_ANN -2.50 0.00 60 150N_ANN -2.66 0.00 60 160N_ANN -2.83 0.00 60 170N_ANN -3.00 0.00 60 180N_ANN -3.16 0.00 60 190N_ANN -3.33 0.00 60 200N_ANN -3.50 0.00 60 210N_ANN -3.66 0.00 60 220N_ANN -3.83 0.00 60 230N_ANN -4.00 0.00 60 240N_ANN -4.16 0.00 60 250N_ANN -0.31 0.13 60 20NNE_ANN -0.46 0.19 60 30NNE_ANN -0.62 0.25 60 40NNE_ANN -0.77 0.32 60 50NNE_ANN -0.92 0.38 60 60NNE_ANN -1.08 0.45 60 70NNE_ANN -1.23 0.51 60 80NNE_ANN -1.38 0.57 60 90NNE_ANN -1.54 0.64 60 100NNE_ANN -1.69 0.70 60 110NNE_ANN -1.85 0.77 60 120NNE_ANN -2.00 0.83 60 130NNE_ANN -2.15 0.89 60 140NNE_ANN -2.31 0.96 60 150NNE_ANN -2.46 1.02 60 160NNE_ANN -2.62 1.08 60 170NNE_ANN -2.77 1.15 60 180NNE_ANN -2.92 1.21 60 190NNE_ANN -3.08 1.28 60 200NNE_ANN -3.23 1.34 60 210NNE_ANN -3.38 1.40 60 220NNE_ANN -3.54 1.47 60 230NNE_ANN -3.69 1.53 60 240NNE_ANN -0.24 0.24 60 20NE_ANN -0.35 0.35 60 30NE_ANN -0.47 0.47 60 40NE_ANN -0.59 0.59 60 50NE_ANN -0.71 0.71 60 60NE_ANN -0.82 0.82 60 70NE_ANN -0.94 0.94 60 80NE_ANN -1.06 1.06 60 90NE_ANN -1.18 1.18 60 100NE_ANN -1.30 1.30 60 110NE_ANN -1.41 1.41 60 120NE_ANN -1.53 1.53 60 130NE_ANN -1.65 1.65 60 140NE_ANN -1.77 1.77 60 150NE_ANN -1.88 1.88 60 160NE_ANN -2.00 2.00 60 170NE_ANN -2.12 2.12 60 180NE_ANN -2.24 2.24 60 190NE_ANN -2.35 2.36 60 200NE_ANN -2.47 2.47 60 210NE_ANN -2.59 2.59 60 220NE_ANN -2.71 2.71 60 230NE_ANN -2.83 2.83 60 240NE_ANN -2.94 2.95 60 250NE_ANN -0.24 -0.24 60 20NW_ANN -0.35 -0.35 60 30NW_ANN -0.47 -0.47 60 40NW_ANN -0.59 -0.59 60 50NW_ANN -0.71 -0.71 60 60NW_ANN -0.82 -0.82 60 70NW_ANN -0.94 -0.94 60 80NW_ANN -1.06 -1.06 60 90NW_ANN -1.18 -1.18 60 100NW_ANN -1.30 -1.30 60 110NW_ANN -1.41 -1.41 60 120NW_ANN -1.53 -1.53 60 130NW_ANN -1.65 -1.65 60 140NW_ANN -1.77 -1.77 60 150NW_ANN -1.88 -1.88 60 160NW_ANN -2.00 -2.00 60 170NW_ANN -2.12 -2.12 60 180NW_ANN -2.24 -2.24 60 190NW_ANN -2.35 -2.36 60 200NW_ANN -2.47 -2.47 60 210NW_ANN -2.59 -2.59 60 220NW_ANN -2.71 -2.71 60 230NW_ANN -2.83 -2.83 60 240NW_ANN -2.94 -2.95 60 250NW_ANN -0.31 -0.13 60 20NNW_ANN -0.46 -0.19 60 30NNW_ANN -0.62 -0.25 60 40NNW_ANN -0.77 -0.32 60 50NNW_ANN -0.92 -0.38 60 60NNW_ANN -1.08 -0.45 60 70NNW_ANN -1.23 -0.51 60 80NNW_ANN -1.38 -0.57 60 90NNW_ANN -1.54 -0.64 60 100NNW_ANN -1.69 -0.70 60 110NNW_ANN -1.85 -0.77 60 120NNW_ANN -2.00 -0.83 60 130NNW_ANN -2.15 -0.89 60 140NNW_ANN -2.31 -0.96 60 150NNW_ANN -2.46 -1.02 60 160NNW_ANN -2.62 -1.08 60 170NNW_ANN -2.77 -1.15 60 180NNW_ANN -2.92 -1.21 60 190NNW_ANN -3.08 -1.28 60 200NNW_ANN -3.23 -1.34 60 210NNW_ANN -3.38 -1.40 60 220NNW_ANN -3.54 -1.47 60 230NNW_ANN -3.69 -1.53 60 240NNW_ANN -0.00 0.00 60 LVD -0.33 0.00 60 20N_LVD -0.50 0.00 60 30N_LVD -0.67 0.00 60 40N_LVD -0.83 0.00 60 50N_LVD -1.00 0.00 60 60N_LVD -1.17 0.00 60 70N_LVD -1.33 0.00 60 80N_LVD -1.50 0.00 60 90N_LVD -1.67 0.00 60 100N_LVD -1.83 0.00 60 110N_LVD -2.00 0.00 60 120N_LVD -2.17 0.00 60 130N_LVD -2.33 0.00 60 140N_LVD -2.50 0.00 60 150N_LVD -2.66 0.00 60 160N_LVD -2.83 0.00 60 170N_LVD -3.00 0.00 60 180N_LVD -3.16 0.00 60 190N_LVD -3.33 0.00 60 200N_LVD -3.50 0.00 60 210N_LVD -3.66 0.00 60 220N_LVD -3.83 0.00 60 230N_LVD -4.00 0.00 60 240N_LVD -4.16 0.00 60 250N_LVD -0.31 0.13 60 20NNE_LVD -0.46 0.19 60 30NNE_LVD -0.62 0.25 60 40NNE_LVD -0.77 0.32 60 50NNE_LVD -0.92 0.38 60 60NNE_LVD -1.08 0.45 60 70NNE_LVD -1.23 0.51 60 80NNE_LVD -1.38 0.57 60 90NNE_LVD -1.54 0.64 60 100NNE_LVD -1.69 0.70 60 110NNE_LVD -1.85 0.77 60 120NNE_LVD -2.00 0.83 60 130NNE_LVD -2.15 0.89 60 140NNE_LVD -2.31 0.96 60 150NNE_LVD -2.46 1.02 60 160NNE_LVD -2.62 1.08 60 170NNE_LVD -2.77 1.15 60 180NNE_LVD -2.92 1.21 60 190NNE_LVD -3.08 1.28 60 200NNE_LVD -3.23 1.34 60 210NNE_LVD -3.38 1.40 60 220NNE_LVD -3.54 1.47 60 230NNE_LVD -3.69 1.53 60 240NNE_LVD -0.24 0.24 60 20NE_LVD -0.35 0.35 60 30NE_LVD -0.47 0.47 60 40NE_LVD -0.59 0.59 60 50NE_LVD -0.71 0.71 60 60NE_LVD -0.82 0.82 60 70NE_LVD -0.94 0.94 60 80NE_LVD -1.06 1.06 60 90NE_LVD -1.18 1.18 60 100NE_LVD -1.30 1.30 60 110NE_LVD -1.41 1.41 60 120NE_LVD -1.53 1.53 60 130NE_LVD -1.65 1.65 60 140NE_LVD -1.77 1.77 60 150NE_LVD -1.88 1.88 60 160NE_LVD -2.00 2.00 60 170NE_LVD -2.12 2.12 60 180NE_LVD -2.24 2.24 60 190NE_LVD -2.35 2.36 60 200NE_LVD -2.47 2.47 60 210NE_LVD -2.59 2.59 60 220NE_LVD -2.71 2.71 60 230NE_LVD -2.83 2.83 60 240NE_LVD -2.94 2.95 60 250NE_LVD -0.24 -0.24 60 20NW_LVD -0.35 -0.35 60 30NW_LVD -0.47 -0.47 60 40NW_LVD -0.59 -0.59 60 50NW_LVD -0.71 -0.71 60 60NW_LVD -0.82 -0.82 60 70NW_LVD -0.94 -0.94 60 80NW_LVD -1.06 -1.06 60 90NW_LVD -1.18 -1.18 60 100NW_LVD -1.30 -1.30 60 110NW_LVD -1.41 -1.41 60 120NW_LVD -1.53 -1.53 60 130NW_LVD -1.65 -1.65 60 140NW_LVD -1.77 -1.77 60 150NW_LVD -1.88 -1.88 60 160NW_LVD -2.00 -2.00 60 170NW_LVD -2.12 -2.12 60 180NW_LVD -2.24 -2.24 60 190NW_LVD -2.35 -2.36 60 200NW_LVD -2.47 -2.47 60 210NW_LVD -2.59 -2.59 60 220NW_LVD -2.71 -2.71 60 230NW_LVD -2.83 -2.83 60 240NW_LVD -2.94 -2.95 60 250NW_LVD -0.31 -0.13 60 20NNW_LVD -0.46 -0.19 60 30NNW_LVD -0.62 -0.25 60 40NNW_LVD -0.77 -0.32 60 50NNW_LVD -0.92 -0.38 60 60NNW_LVD -1.08 -0.45 60 70NNW_LVD -1.23 -0.51 60 80NNW_LVD -1.38 -0.57 60 90NNW_LVD -1.54 -0.64 60 100NNW_LVD -1.69 -0.70 60 110NNW_LVD -1.85 -0.77 60 120NNW_LVD -2.00 -0.83 60 130NNW_LVD -2.15 -0.89 60 140NNW_LVD -2.31 -0.96 60 150NNW_LVD -2.46 -1.02 60 160NNW_LVD -2.62 -1.08 60 170NNW_LVD -2.77 -1.15 60 180NNW_LVD -2.92 -1.21 60 190NNW_LVD -3.08 -1.28 60 200NNW_LVD -3.23 -1.34 60 210NNW_LVD -3.38 -1.40 60 220NNW_LVD -3.54 -1.47 60 230NNW_LVD -3.69 -1.53 60 240NNW_LVD -0.00 0.00 60 BKA -0.33 0.00 60 20N_BKA -0.50 0.00 60 30N_BKA -0.67 0.00 60 40N_BKA -0.83 0.00 60 50N_BKA -1.00 0.00 60 60N_BKA -1.17 0.00 60 70N_BKA -1.33 0.00 60 80N_BKA -1.50 0.00 60 90N_BKA -1.67 0.00 60 100N_BKA -1.83 0.00 60 110N_BKA -2.00 0.00 60 120N_BKA -2.17 0.00 60 130N_BKA -2.33 0.00 60 140N_BKA -2.50 0.00 60 150N_BKA -2.66 0.00 60 160N_BKA -2.83 0.00 60 170N_BKA -3.00 0.00 60 180N_BKA -3.16 0.00 60 190N_BKA -3.33 0.00 60 200N_BKA -3.50 0.00 60 210N_BKA -3.66 0.00 60 220N_BKA -3.83 0.00 60 230N_BKA -4.00 0.00 60 240N_BKA -4.16 0.00 60 250N_BKA -0.31 0.13 60 20NNE_BKA -0.46 0.19 60 30NNE_BKA -0.62 0.25 60 40NNE_BKA -0.77 0.32 60 50NNE_BKA -0.92 0.38 60 60NNE_BKA -1.08 0.45 60 70NNE_BKA -1.23 0.51 60 80NNE_BKA -1.38 0.57 60 90NNE_BKA -1.54 0.64 60 100NNE_BKA -1.69 0.70 60 110NNE_BKA -1.85 0.77 60 120NNE_BKA -2.00 0.83 60 130NNE_BKA -2.15 0.89 60 140NNE_BKA -2.31 0.96 60 150NNE_BKA -2.46 1.02 60 160NNE_BKA -2.62 1.08 60 170NNE_BKA -2.77 1.15 60 180NNE_BKA -2.92 1.21 60 190NNE_BKA -3.08 1.28 60 200NNE_BKA -3.23 1.34 60 210NNE_BKA -3.38 1.40 60 220NNE_BKA -3.54 1.47 60 230NNE_BKA -3.69 1.53 60 240NNE_BKA -0.24 0.24 60 20NE_BKA -0.35 0.35 60 30NE_BKA -0.47 0.47 60 40NE_BKA -0.59 0.59 60 50NE_BKA -0.71 0.71 60 60NE_BKA -0.82 0.82 60 70NE_BKA -0.94 0.94 60 80NE_BKA -1.06 1.06 60 90NE_BKA -1.18 1.18 60 100NE_BKA -1.30 1.30 60 110NE_BKA -1.41 1.41 60 120NE_BKA -1.53 1.53 60 130NE_BKA -1.65 1.65 60 140NE_BKA -1.77 1.77 60 150NE_BKA -1.88 1.88 60 160NE_BKA -2.00 2.00 60 170NE_BKA -2.12 2.12 60 180NE_BKA -2.24 2.24 60 190NE_BKA -2.35 2.36 60 200NE_BKA -2.47 2.47 60 210NE_BKA -2.59 2.59 60 220NE_BKA -2.71 2.71 60 230NE_BKA -2.83 2.83 60 240NE_BKA -2.94 2.95 60 250NE_BKA -0.24 -0.24 60 20NW_BKA -0.35 -0.35 60 30NW_BKA -0.47 -0.47 60 40NW_BKA -0.59 -0.59 60 50NW_BKA -0.71 -0.71 60 60NW_BKA -0.82 -0.82 60 70NW_BKA -0.94 -0.94 60 80NW_BKA -1.06 -1.06 60 90NW_BKA -1.18 -1.18 60 100NW_BKA -1.30 -1.30 60 110NW_BKA -1.41 -1.41 60 120NW_BKA -1.53 -1.53 60 130NW_BKA -1.65 -1.65 60 140NW_BKA -1.77 -1.77 60 150NW_BKA -1.88 -1.88 60 160NW_BKA -2.00 -2.00 60 170NW_BKA -2.12 -2.12 60 180NW_BKA -2.24 -2.24 60 190NW_BKA -2.35 -2.36 60 200NW_BKA -2.47 -2.47 60 210NW_BKA -2.59 -2.59 60 220NW_BKA -2.71 -2.71 60 230NW_BKA -2.83 -2.83 60 240NW_BKA -2.94 -2.95 60 250NW_BKA -0.31 -0.13 60 20NNW_BKA -0.46 -0.19 60 30NNW_BKA -0.62 -0.25 60 40NNW_BKA -0.77 -0.32 60 50NNW_BKA -0.92 -0.38 60 60NNW_BKA -1.08 -0.45 60 70NNW_BKA -1.23 -0.51 60 80NNW_BKA -1.38 -0.57 60 90NNW_BKA -1.54 -0.64 60 100NNW_BKA -1.69 -0.70 60 110NNW_BKA -1.85 -0.77 60 120NNW_BKA -2.00 -0.83 60 130NNW_BKA -2.15 -0.89 60 140NNW_BKA -2.31 -0.96 60 150NNW_BKA -2.46 -1.02 60 160NNW_BKA -2.62 -1.08 60 170NNW_BKA -2.77 -1.15 60 180NNW_BKA -2.92 -1.21 60 190NNW_BKA -3.08 -1.28 60 200NNW_BKA -3.23 -1.34 60 210NNW_BKA -3.38 -1.40 60 220NNW_BKA -3.54 -1.47 60 230NNW_BKA -3.69 -1.53 60 240NNW_BKA -0.00 0.00 60 SSR -0.33 0.00 60 20N_SSR -0.50 0.00 60 30N_SSR -0.67 0.00 60 40N_SSR -0.83 0.00 60 50N_SSR -1.00 0.00 60 60N_SSR -1.17 0.00 60 70N_SSR -1.33 0.00 60 80N_SSR -1.50 0.00 60 90N_SSR -1.67 0.00 60 100N_SSR -1.83 0.00 60 110N_SSR -2.00 0.00 60 120N_SSR -2.17 0.00 60 130N_SSR -2.33 0.00 60 140N_SSR -2.50 0.00 60 150N_SSR -2.66 0.00 60 160N_SSR -2.83 0.00 60 170N_SSR -3.00 0.00 60 180N_SSR -3.16 0.00 60 190N_SSR -3.33 0.00 60 200N_SSR -3.50 0.00 60 210N_SSR -3.66 0.00 60 220N_SSR -3.83 0.00 60 230N_SSR -4.00 0.00 60 240N_SSR -4.16 0.00 60 250N_SSR -0.31 0.13 60 20NNE_SSR -0.46 0.19 60 30NNE_SSR -0.62 0.25 60 40NNE_SSR -0.77 0.32 60 50NNE_SSR -0.92 0.38 60 60NNE_SSR -1.08 0.45 60 70NNE_SSR -1.23 0.51 60 80NNE_SSR -1.38 0.57 60 90NNE_SSR -1.54 0.64 60 100NNE_SSR -1.69 0.70 60 110NNE_SSR -1.85 0.77 60 120NNE_SSR -2.00 0.83 60 130NNE_SSR -2.15 0.89 60 140NNE_SSR -2.31 0.96 60 150NNE_SSR -2.46 1.02 60 160NNE_SSR -2.62 1.08 60 170NNE_SSR -2.77 1.15 60 180NNE_SSR -2.92 1.21 60 190NNE_SSR -3.08 1.28 60 200NNE_SSR -3.23 1.34 60 210NNE_SSR -3.38 1.40 60 220NNE_SSR -3.54 1.47 60 230NNE_SSR -3.69 1.53 60 240NNE_SSR -0.24 0.24 60 20NE_SSR -0.35 0.35 60 30NE_SSR -0.47 0.47 60 40NE_SSR -0.59 0.59 60 50NE_SSR -0.71 0.71 60 60NE_SSR -0.82 0.82 60 70NE_SSR -0.94 0.94 60 80NE_SSR -1.06 1.06 60 90NE_SSR -1.18 1.18 60 100NE_SSR -1.30 1.30 60 110NE_SSR -1.41 1.41 60 120NE_SSR -1.53 1.53 60 130NE_SSR -1.65 1.65 60 140NE_SSR -1.77 1.77 60 150NE_SSR -1.88 1.88 60 160NE_SSR -2.00 2.00 60 170NE_SSR -2.12 2.12 60 180NE_SSR -2.24 2.24 60 190NE_SSR -2.35 2.36 60 200NE_SSR -2.47 2.47 60 210NE_SSR -2.59 2.59 60 220NE_SSR -2.71 2.71 60 230NE_SSR -2.83 2.83 60 240NE_SSR -2.94 2.95 60 250NE_SSR -0.24 -0.24 60 20NW_SSR -0.35 -0.35 60 30NW_SSR -0.47 -0.47 60 40NW_SSR -0.59 -0.59 60 50NW_SSR -0.71 -0.71 60 60NW_SSR -0.82 -0.82 60 70NW_SSR -0.94 -0.94 60 80NW_SSR -1.06 -1.06 60 90NW_SSR -1.18 -1.18 60 100NW_SSR -1.30 -1.30 60 110NW_SSR -1.41 -1.41 60 120NW_SSR -1.53 -1.53 60 130NW_SSR -1.65 -1.65 60 140NW_SSR -1.77 -1.77 60 150NW_SSR -1.88 -1.88 60 160NW_SSR -2.00 -2.00 60 170NW_SSR -2.12 -2.12 60 180NW_SSR -2.24 -2.24 60 190NW_SSR -2.35 -2.36 60 200NW_SSR -2.47 -2.47 60 210NW_SSR -2.59 -2.59 60 220NW_SSR -2.71 -2.71 60 230NW_SSR -2.83 -2.83 60 240NW_SSR -2.94 -2.95 60 250NW_SSR -0.31 -0.13 60 20NNW_SSR -0.46 -0.19 60 30NNW_SSR -0.62 -0.25 60 40NNW_SSR -0.77 -0.32 60 50NNW_SSR -0.92 -0.38 60 60NNW_SSR -1.08 -0.45 60 70NNW_SSR -1.23 -0.51 60 80NNW_SSR -1.38 -0.57 60 90NNW_SSR -1.54 -0.64 60 100NNW_SSR -1.69 -0.70 60 110NNW_SSR -1.85 -0.77 60 120NNW_SSR -2.00 -0.83 60 130NNW_SSR -2.15 -0.89 60 140NNW_SSR -2.31 -0.96 60 150NNW_SSR -2.46 -1.02 60 160NNW_SSR -2.62 -1.08 60 170NNW_SSR -2.77 -1.15 60 180NNW_SSR -2.92 -1.21 60 190NNW_SSR -3.08 -1.28 60 200NNW_SSR -3.23 -1.34 60 210NNW_SSR -3.38 -1.40 60 220NNW_SSR -3.54 -1.47 60 230NNW_SSR -3.69 -1.53 60 240NNW_SSR -0.00 0.00 60 JNU -0.33 0.00 60 20N_JNU -0.50 0.00 60 30N_JNU -0.67 0.00 60 40N_JNU -0.83 0.00 60 50N_JNU -1.00 0.00 60 60N_JNU -1.17 0.00 60 70N_JNU -1.33 0.00 60 80N_JNU -1.50 0.00 60 90N_JNU -1.67 0.00 60 100N_JNU -1.83 0.00 60 110N_JNU -2.00 0.00 60 120N_JNU -2.17 0.00 60 130N_JNU -2.33 0.00 60 140N_JNU -2.50 0.00 60 150N_JNU -2.66 0.00 60 160N_JNU -2.83 0.00 60 170N_JNU -3.00 0.00 60 180N_JNU -3.16 0.00 60 190N_JNU -3.33 0.00 60 200N_JNU -3.50 0.00 60 210N_JNU -3.66 0.00 60 220N_JNU -3.83 0.00 60 230N_JNU -4.00 0.00 60 240N_JNU -4.16 0.00 60 250N_JNU -0.31 0.13 60 20NNE_JNU -0.46 0.19 60 30NNE_JNU -0.62 0.25 60 40NNE_JNU -0.77 0.32 60 50NNE_JNU -0.92 0.38 60 60NNE_JNU -1.08 0.45 60 70NNE_JNU -1.23 0.51 60 80NNE_JNU -1.38 0.57 60 90NNE_JNU -1.54 0.64 60 100NNE_JNU -1.69 0.70 60 110NNE_JNU -1.85 0.77 60 120NNE_JNU -2.00 0.83 60 130NNE_JNU -2.15 0.89 60 140NNE_JNU -2.31 0.96 60 150NNE_JNU -2.46 1.02 60 160NNE_JNU -2.62 1.08 60 170NNE_JNU -2.77 1.15 60 180NNE_JNU -2.92 1.21 60 190NNE_JNU -3.08 1.28 60 200NNE_JNU -3.23 1.34 60 210NNE_JNU -3.38 1.40 60 220NNE_JNU -3.54 1.47 60 230NNE_JNU -3.69 1.53 60 240NNE_JNU -0.24 0.24 60 20NE_JNU -0.35 0.35 60 30NE_JNU -0.47 0.47 60 40NE_JNU -0.59 0.59 60 50NE_JNU -0.71 0.71 60 60NE_JNU -0.82 0.82 60 70NE_JNU -0.94 0.94 60 80NE_JNU -1.06 1.06 60 90NE_JNU -1.18 1.18 60 100NE_JNU -1.30 1.30 60 110NE_JNU -1.41 1.41 60 120NE_JNU -1.53 1.53 60 130NE_JNU -1.65 1.65 60 140NE_JNU -1.77 1.77 60 150NE_JNU -1.88 1.88 60 160NE_JNU -2.00 2.00 60 170NE_JNU -2.12 2.12 60 180NE_JNU -2.24 2.24 60 190NE_JNU -2.35 2.36 60 200NE_JNU -2.47 2.47 60 210NE_JNU -2.59 2.59 60 220NE_JNU -2.71 2.71 60 230NE_JNU -2.83 2.83 60 240NE_JNU -2.94 2.95 60 250NE_JNU -0.24 -0.24 60 20NW_JNU -0.35 -0.35 60 30NW_JNU -0.47 -0.47 60 40NW_JNU -0.59 -0.59 60 50NW_JNU -0.71 -0.71 60 60NW_JNU -0.82 -0.82 60 70NW_JNU -0.94 -0.94 60 80NW_JNU -1.06 -1.06 60 90NW_JNU -1.18 -1.18 60 100NW_JNU -1.30 -1.30 60 110NW_JNU -1.41 -1.41 60 120NW_JNU -1.53 -1.53 60 130NW_JNU -1.65 -1.65 60 140NW_JNU -1.77 -1.77 60 150NW_JNU -1.88 -1.88 60 160NW_JNU -2.00 -2.00 60 170NW_JNU -2.12 -2.12 60 180NW_JNU -2.24 -2.24 60 190NW_JNU -2.35 -2.36 60 200NW_JNU -2.47 -2.47 60 210NW_JNU -2.59 -2.59 60 220NW_JNU -2.71 -2.71 60 230NW_JNU -2.83 -2.83 60 240NW_JNU -2.94 -2.95 60 250NW_JNU -0.31 -0.13 60 20NNW_JNU -0.46 -0.19 60 30NNW_JNU -0.62 -0.25 60 40NNW_JNU -0.77 -0.32 60 50NNW_JNU -0.92 -0.38 60 60NNW_JNU -1.08 -0.45 60 70NNW_JNU -1.23 -0.51 60 80NNW_JNU -1.38 -0.57 60 90NNW_JNU -1.54 -0.64 60 100NNW_JNU -1.69 -0.70 60 110NNW_JNU -1.85 -0.77 60 120NNW_JNU -2.00 -0.83 60 130NNW_JNU -2.15 -0.89 60 140NNW_JNU -2.31 -0.96 60 150NNW_JNU -2.46 -1.02 60 160NNW_JNU -2.62 -1.08 60 170NNW_JNU -2.77 -1.15 60 180NNW_JNU -2.92 -1.21 60 190NNW_JNU -3.08 -1.28 60 200NNW_JNU -3.23 -1.34 60 210NNW_JNU -3.38 -1.40 60 220NNW_JNU -3.54 -1.47 60 230NNW_JNU -3.69 -1.53 60 240NNW_JNU -0.00 0.00 60 YAK -0.33 0.00 60 20N_YAK -0.50 0.00 60 30N_YAK -0.67 0.00 60 40N_YAK -0.83 0.00 60 50N_YAK -1.00 0.00 60 60N_YAK -1.17 0.00 60 70N_YAK -1.33 0.00 60 80N_YAK -1.50 0.00 60 90N_YAK -1.67 0.00 60 100N_YAK -1.83 0.00 60 110N_YAK -2.00 0.00 60 120N_YAK -2.17 0.00 60 130N_YAK -2.33 0.00 60 140N_YAK -2.50 0.00 60 150N_YAK -2.66 0.00 60 160N_YAK -2.83 0.00 60 170N_YAK -3.00 0.00 60 180N_YAK -3.16 0.00 60 190N_YAK -3.33 0.00 60 200N_YAK -3.50 0.00 60 210N_YAK -3.66 0.00 60 220N_YAK -3.83 0.00 60 230N_YAK -4.00 0.00 60 240N_YAK -4.16 0.00 60 250N_YAK -0.31 0.13 60 20NNE_YAK -0.46 0.19 60 30NNE_YAK -0.62 0.25 60 40NNE_YAK -0.77 0.32 60 50NNE_YAK -0.92 0.38 60 60NNE_YAK -1.08 0.45 60 70NNE_YAK -1.23 0.51 60 80NNE_YAK -1.38 0.57 60 90NNE_YAK -1.54 0.64 60 100NNE_YAK -1.69 0.70 60 110NNE_YAK -1.85 0.77 60 120NNE_YAK -2.00 0.83 60 130NNE_YAK -2.15 0.89 60 140NNE_YAK -2.31 0.96 60 150NNE_YAK -2.46 1.02 60 160NNE_YAK -2.62 1.08 60 170NNE_YAK -2.77 1.15 60 180NNE_YAK -2.92 1.21 60 190NNE_YAK -3.08 1.28 60 200NNE_YAK -3.23 1.34 60 210NNE_YAK -3.38 1.40 60 220NNE_YAK -3.54 1.47 60 230NNE_YAK -3.69 1.53 60 240NNE_YAK -0.24 0.24 60 20NE_YAK -0.35 0.35 60 30NE_YAK -0.47 0.47 60 40NE_YAK -0.59 0.59 60 50NE_YAK -0.71 0.71 60 60NE_YAK -0.82 0.82 60 70NE_YAK -0.94 0.94 60 80NE_YAK -1.06 1.06 60 90NE_YAK -1.18 1.18 60 100NE_YAK -1.30 1.30 60 110NE_YAK -1.41 1.41 60 120NE_YAK -1.53 1.53 60 130NE_YAK -1.65 1.65 60 140NE_YAK -1.77 1.77 60 150NE_YAK -1.88 1.88 60 160NE_YAK -2.00 2.00 60 170NE_YAK -2.12 2.12 60 180NE_YAK -2.24 2.24 60 190NE_YAK -2.35 2.36 60 200NE_YAK -2.47 2.47 60 210NE_YAK -2.59 2.59 60 220NE_YAK -2.71 2.71 60 230NE_YAK -2.83 2.83 60 240NE_YAK -2.94 2.95 60 250NE_YAK -0.24 -0.24 60 20NW_YAK -0.35 -0.35 60 30NW_YAK -0.47 -0.47 60 40NW_YAK -0.59 -0.59 60 50NW_YAK -0.71 -0.71 60 60NW_YAK -0.82 -0.82 60 70NW_YAK -0.94 -0.94 60 80NW_YAK -1.06 -1.06 60 90NW_YAK -1.18 -1.18 60 100NW_YAK -1.30 -1.30 60 110NW_YAK -1.41 -1.41 60 120NW_YAK -1.53 -1.53 60 130NW_YAK -1.65 -1.65 60 140NW_YAK -1.77 -1.77 60 150NW_YAK -1.88 -1.88 60 160NW_YAK -2.00 -2.00 60 170NW_YAK -2.12 -2.12 60 180NW_YAK -2.24 -2.24 60 190NW_YAK -2.35 -2.36 60 200NW_YAK -2.47 -2.47 60 210NW_YAK -2.59 -2.59 60 220NW_YAK -2.71 -2.71 60 230NW_YAK -2.83 -2.83 60 240NW_YAK -2.94 -2.95 60 250NW_YAK -0.31 -0.13 60 20NNW_YAK -0.46 -0.19 60 30NNW_YAK -0.62 -0.25 60 40NNW_YAK -0.77 -0.32 60 50NNW_YAK -0.92 -0.38 60 60NNW_YAK -1.08 -0.45 60 70NNW_YAK -1.23 -0.51 60 80NNW_YAK -1.38 -0.57 60 90NNW_YAK -1.54 -0.64 60 100NNW_YAK -1.69 -0.70 60 110NNW_YAK -1.85 -0.77 60 120NNW_YAK -2.00 -0.83 60 130NNW_YAK -2.15 -0.89 60 140NNW_YAK -2.31 -0.96 60 150NNW_YAK -2.46 -1.02 60 160NNW_YAK -2.62 -1.08 60 170NNW_YAK -2.77 -1.15 60 180NNW_YAK -2.92 -1.21 60 190NNW_YAK -3.08 -1.28 60 200NNW_YAK -3.23 -1.34 60 210NNW_YAK -3.38 -1.40 60 220NNW_YAK -3.54 -1.47 60 230NNW_YAK -3.69 -1.53 60 240NNW_YAK -0.00 0.00 60 MDO -0.33 0.00 60 20N_MDO -0.50 0.00 60 30N_MDO -0.67 0.00 60 40N_MDO -0.83 0.00 60 50N_MDO -1.00 0.00 60 60N_MDO -1.17 0.00 60 70N_MDO -1.33 0.00 60 80N_MDO -1.50 0.00 60 90N_MDO -1.67 0.00 60 100N_MDO -1.83 0.00 60 110N_MDO -2.00 0.00 60 120N_MDO -2.17 0.00 60 130N_MDO -2.33 0.00 60 140N_MDO -2.50 0.00 60 150N_MDO -2.66 0.00 60 160N_MDO -2.83 0.00 60 170N_MDO -3.00 0.00 60 180N_MDO -3.16 0.00 60 190N_MDO -3.33 0.00 60 200N_MDO -3.50 0.00 60 210N_MDO -3.66 0.00 60 220N_MDO -3.83 0.00 60 230N_MDO -4.00 0.00 60 240N_MDO -4.16 0.00 60 250N_MDO -0.31 0.13 60 20NNE_MDO -0.46 0.19 60 30NNE_MDO -0.62 0.25 60 40NNE_MDO -0.77 0.32 60 50NNE_MDO -0.92 0.38 60 60NNE_MDO -1.08 0.45 60 70NNE_MDO -1.23 0.51 60 80NNE_MDO -1.38 0.57 60 90NNE_MDO -1.54 0.64 60 100NNE_MDO -1.69 0.70 60 110NNE_MDO -1.85 0.77 60 120NNE_MDO -2.00 0.83 60 130NNE_MDO -2.15 0.89 60 140NNE_MDO -2.31 0.96 60 150NNE_MDO -2.46 1.02 60 160NNE_MDO -2.62 1.08 60 170NNE_MDO -2.77 1.15 60 180NNE_MDO -2.92 1.21 60 190NNE_MDO -3.08 1.28 60 200NNE_MDO -3.23 1.34 60 210NNE_MDO -3.38 1.40 60 220NNE_MDO -3.54 1.47 60 230NNE_MDO -3.69 1.53 60 240NNE_MDO -0.24 0.24 60 20NE_MDO -0.35 0.35 60 30NE_MDO -0.47 0.47 60 40NE_MDO -0.59 0.59 60 50NE_MDO -0.71 0.71 60 60NE_MDO -0.82 0.82 60 70NE_MDO -0.94 0.94 60 80NE_MDO -1.06 1.06 60 90NE_MDO -1.18 1.18 60 100NE_MDO -1.30 1.30 60 110NE_MDO -1.41 1.41 60 120NE_MDO -1.53 1.53 60 130NE_MDO -1.65 1.65 60 140NE_MDO -1.77 1.77 60 150NE_MDO -1.88 1.88 60 160NE_MDO -2.00 2.00 60 170NE_MDO -2.12 2.12 60 180NE_MDO -2.24 2.24 60 190NE_MDO -2.35 2.36 60 200NE_MDO -2.47 2.47 60 210NE_MDO -2.59 2.59 60 220NE_MDO -2.71 2.71 60 230NE_MDO -2.83 2.83 60 240NE_MDO -2.94 2.95 60 250NE_MDO -0.24 -0.24 60 20NW_MDO -0.35 -0.35 60 30NW_MDO -0.47 -0.47 60 40NW_MDO -0.59 -0.59 60 50NW_MDO -0.71 -0.71 60 60NW_MDO -0.82 -0.82 60 70NW_MDO -0.94 -0.94 60 80NW_MDO -1.06 -1.06 60 90NW_MDO -1.18 -1.18 60 100NW_MDO -1.30 -1.30 60 110NW_MDO -1.41 -1.41 60 120NW_MDO -1.53 -1.53 60 130NW_MDO -1.65 -1.65 60 140NW_MDO -1.77 -1.77 60 150NW_MDO -1.88 -1.88 60 160NW_MDO -2.00 -2.00 60 170NW_MDO -2.12 -2.12 60 180NW_MDO -2.24 -2.24 60 190NW_MDO -2.35 -2.36 60 200NW_MDO -2.47 -2.47 60 210NW_MDO -2.59 -2.59 60 220NW_MDO -2.71 -2.71 60 230NW_MDO -2.83 -2.83 60 240NW_MDO -2.94 -2.95 60 250NW_MDO -0.31 -0.13 60 20NNW_MDO -0.46 -0.19 60 30NNW_MDO -0.62 -0.25 60 40NNW_MDO -0.77 -0.32 60 50NNW_MDO -0.92 -0.38 60 60NNW_MDO -1.08 -0.45 60 70NNW_MDO -1.23 -0.51 60 80NNW_MDO -1.38 -0.57 60 90NNW_MDO -1.54 -0.64 60 100NNW_MDO -1.69 -0.70 60 110NNW_MDO -1.85 -0.77 60 120NNW_MDO -2.00 -0.83 60 130NNW_MDO -2.15 -0.89 60 140NNW_MDO -2.31 -0.96 60 150NNW_MDO -2.46 -1.02 60 160NNW_MDO -2.62 -1.08 60 170NNW_MDO -2.77 -1.15 60 180NNW_MDO -2.92 -1.21 60 190NNW_MDO -3.08 -1.28 60 200NNW_MDO -3.23 -1.34 60 210NNW_MDO -3.38 -1.40 60 220NNW_MDO -3.54 -1.47 60 230NNW_MDO -3.69 -1.53 60 240NNW_MDO -0.00 0.00 60 JOH -0.33 0.00 60 20N_JOH -0.50 0.00 60 30N_JOH -0.67 0.00 60 40N_JOH -0.83 0.00 60 50N_JOH -1.00 0.00 60 60N_JOH -1.17 0.00 60 70N_JOH -1.33 0.00 60 80N_JOH -1.50 0.00 60 90N_JOH -1.67 0.00 60 100N_JOH -1.83 0.00 60 110N_JOH -2.00 0.00 60 120N_JOH -2.17 0.00 60 130N_JOH -2.33 0.00 60 140N_JOH -2.50 0.00 60 150N_JOH -2.66 0.00 60 160N_JOH -2.83 0.00 60 170N_JOH -3.00 0.00 60 180N_JOH -3.16 0.00 60 190N_JOH -3.33 0.00 60 200N_JOH -3.50 0.00 60 210N_JOH -3.66 0.00 60 220N_JOH -3.83 0.00 60 230N_JOH -4.00 0.00 60 240N_JOH -4.16 0.00 60 250N_JOH -0.31 0.13 60 20NNE_JOH -0.46 0.19 60 30NNE_JOH -0.62 0.25 60 40NNE_JOH -0.77 0.32 60 50NNE_JOH -0.92 0.38 60 60NNE_JOH -1.08 0.45 60 70NNE_JOH -1.23 0.51 60 80NNE_JOH -1.38 0.57 60 90NNE_JOH -1.54 0.64 60 100NNE_JOH -1.69 0.70 60 110NNE_JOH -1.85 0.77 60 120NNE_JOH -2.00 0.83 60 130NNE_JOH -2.15 0.89 60 140NNE_JOH -2.31 0.96 60 150NNE_JOH -2.46 1.02 60 160NNE_JOH -2.62 1.08 60 170NNE_JOH -2.77 1.15 60 180NNE_JOH -2.92 1.21 60 190NNE_JOH -3.08 1.28 60 200NNE_JOH -3.23 1.34 60 210NNE_JOH -3.38 1.40 60 220NNE_JOH -3.54 1.47 60 230NNE_JOH -3.69 1.53 60 240NNE_JOH -0.24 0.24 60 20NE_JOH -0.35 0.35 60 30NE_JOH -0.47 0.47 60 40NE_JOH -0.59 0.59 60 50NE_JOH -0.71 0.71 60 60NE_JOH -0.82 0.82 60 70NE_JOH -0.94 0.94 60 80NE_JOH -1.06 1.06 60 90NE_JOH -1.18 1.18 60 100NE_JOH -1.30 1.30 60 110NE_JOH -1.41 1.41 60 120NE_JOH -1.53 1.53 60 130NE_JOH -1.65 1.65 60 140NE_JOH -1.77 1.77 60 150NE_JOH -1.88 1.88 60 160NE_JOH -2.00 2.00 60 170NE_JOH -2.12 2.12 60 180NE_JOH -2.24 2.24 60 190NE_JOH -2.35 2.36 60 200NE_JOH -2.47 2.47 60 210NE_JOH -2.59 2.59 60 220NE_JOH -2.71 2.71 60 230NE_JOH -2.83 2.83 60 240NE_JOH -2.94 2.95 60 250NE_JOH -0.24 -0.24 60 20NW_JOH -0.35 -0.35 60 30NW_JOH -0.47 -0.47 60 40NW_JOH -0.59 -0.59 60 50NW_JOH -0.71 -0.71 60 60NW_JOH -0.82 -0.82 60 70NW_JOH -0.94 -0.94 60 80NW_JOH -1.06 -1.06 60 90NW_JOH -1.18 -1.18 60 100NW_JOH -1.30 -1.30 60 110NW_JOH -1.41 -1.41 60 120NW_JOH -1.53 -1.53 60 130NW_JOH -1.65 -1.65 60 140NW_JOH -1.77 -1.77 60 150NW_JOH -1.88 -1.88 60 160NW_JOH -2.00 -2.00 60 170NW_JOH -2.12 -2.12 60 180NW_JOH -2.24 -2.24 60 190NW_JOH -2.35 -2.36 60 200NW_JOH -2.47 -2.47 60 210NW_JOH -2.59 -2.59 60 220NW_JOH -2.71 -2.71 60 230NW_JOH -2.83 -2.83 60 240NW_JOH -2.94 -2.95 60 250NW_JOH -0.31 -0.13 60 20NNW_JOH -0.46 -0.19 60 30NNW_JOH -0.62 -0.25 60 40NNW_JOH -0.77 -0.32 60 50NNW_JOH -0.92 -0.38 60 60NNW_JOH -1.08 -0.45 60 70NNW_JOH -1.23 -0.51 60 80NNW_JOH -1.38 -0.57 60 90NNW_JOH -1.54 -0.64 60 100NNW_JOH -1.69 -0.70 60 110NNW_JOH -1.85 -0.77 60 120NNW_JOH -2.00 -0.83 60 130NNW_JOH -2.15 -0.89 60 140NNW_JOH -2.31 -0.96 60 150NNW_JOH -2.46 -1.02 60 160NNW_JOH -2.62 -1.08 60 170NNW_JOH -2.77 -1.15 60 180NNW_JOH -2.92 -1.21 60 190NNW_JOH -3.08 -1.28 60 200NNW_JOH -3.23 -1.34 60 210NNW_JOH -3.38 -1.40 60 220NNW_JOH -3.54 -1.47 60 230NNW_JOH -3.69 -1.53 60 240NNW_JOH -0.00 0.00 60 ODK -0.33 0.00 60 20N_ODK -0.50 0.00 60 30N_ODK -0.67 0.00 60 40N_ODK -0.83 0.00 60 50N_ODK -1.00 0.00 60 60N_ODK -1.17 0.00 60 70N_ODK -1.33 0.00 60 80N_ODK -1.50 0.00 60 90N_ODK -1.67 0.00 60 100N_ODK -1.83 0.00 60 110N_ODK -2.00 0.00 60 120N_ODK -2.17 0.00 60 130N_ODK -2.33 0.00 60 140N_ODK -2.50 0.00 60 150N_ODK -2.66 0.00 60 160N_ODK -2.83 0.00 60 170N_ODK -3.00 0.00 60 180N_ODK -3.16 0.00 60 190N_ODK -3.33 0.00 60 200N_ODK -3.50 0.00 60 210N_ODK -3.66 0.00 60 220N_ODK -3.83 0.00 60 230N_ODK -4.00 0.00 60 240N_ODK -4.16 0.00 60 250N_ODK -0.31 0.13 60 20NNE_ODK -0.46 0.19 60 30NNE_ODK -0.62 0.25 60 40NNE_ODK -0.77 0.32 60 50NNE_ODK -0.92 0.38 60 60NNE_ODK -1.08 0.45 60 70NNE_ODK -1.23 0.51 60 80NNE_ODK -1.38 0.57 60 90NNE_ODK -1.54 0.64 60 100NNE_ODK -1.69 0.70 60 110NNE_ODK -1.85 0.77 60 120NNE_ODK -2.00 0.83 60 130NNE_ODK -2.15 0.89 60 140NNE_ODK -2.31 0.96 60 150NNE_ODK -2.46 1.02 60 160NNE_ODK -2.62 1.08 60 170NNE_ODK -2.77 1.15 60 180NNE_ODK -2.92 1.21 60 190NNE_ODK -3.08 1.28 60 200NNE_ODK -3.23 1.34 60 210NNE_ODK -3.38 1.40 60 220NNE_ODK -3.54 1.47 60 230NNE_ODK -3.69 1.53 60 240NNE_ODK -0.24 0.24 60 20NE_ODK -0.35 0.35 60 30NE_ODK -0.47 0.47 60 40NE_ODK -0.59 0.59 60 50NE_ODK -0.71 0.71 60 60NE_ODK -0.82 0.82 60 70NE_ODK -0.94 0.94 60 80NE_ODK -1.06 1.06 60 90NE_ODK -1.18 1.18 60 100NE_ODK -1.30 1.30 60 110NE_ODK -1.41 1.41 60 120NE_ODK -1.53 1.53 60 130NE_ODK -1.65 1.65 60 140NE_ODK -1.77 1.77 60 150NE_ODK -1.88 1.88 60 160NE_ODK -2.00 2.00 60 170NE_ODK -2.12 2.12 60 180NE_ODK -2.24 2.24 60 190NE_ODK -2.35 2.36 60 200NE_ODK -2.47 2.47 60 210NE_ODK -2.59 2.59 60 220NE_ODK -2.71 2.71 60 230NE_ODK -2.83 2.83 60 240NE_ODK -2.94 2.95 60 250NE_ODK -0.24 -0.24 60 20NW_ODK -0.35 -0.35 60 30NW_ODK -0.47 -0.47 60 40NW_ODK -0.59 -0.59 60 50NW_ODK -0.71 -0.71 60 60NW_ODK -0.82 -0.82 60 70NW_ODK -0.94 -0.94 60 80NW_ODK -1.06 -1.06 60 90NW_ODK -1.18 -1.18 60 100NW_ODK -1.30 -1.30 60 110NW_ODK -1.41 -1.41 60 120NW_ODK -1.53 -1.53 60 130NW_ODK -1.65 -1.65 60 140NW_ODK -1.77 -1.77 60 150NW_ODK -1.88 -1.88 60 160NW_ODK -2.00 -2.00 60 170NW_ODK -2.12 -2.12 60 180NW_ODK -2.24 -2.24 60 190NW_ODK -2.35 -2.36 60 200NW_ODK -2.47 -2.47 60 210NW_ODK -2.59 -2.59 60 220NW_ODK -2.71 -2.71 60 230NW_ODK -2.83 -2.83 60 240NW_ODK -2.94 -2.95 60 250NW_ODK -0.31 -0.13 60 20NNW_ODK -0.46 -0.19 60 30NNW_ODK -0.62 -0.25 60 40NNW_ODK -0.77 -0.32 60 50NNW_ODK -0.92 -0.38 60 60NNW_ODK -1.08 -0.45 60 70NNW_ODK -1.23 -0.51 60 80NNW_ODK -1.38 -0.57 60 90NNW_ODK -1.54 -0.64 60 100NNW_ODK -1.69 -0.70 60 110NNW_ODK -1.85 -0.77 60 120NNW_ODK -2.00 -0.83 60 130NNW_ODK -2.15 -0.89 60 140NNW_ODK -2.31 -0.96 60 150NNW_ODK -2.46 -1.02 60 160NNW_ODK -2.62 -1.08 60 170NNW_ODK -2.77 -1.15 60 180NNW_ODK -2.92 -1.21 60 190NNW_ODK -3.08 -1.28 60 200NNW_ODK -3.23 -1.34 60 210NNW_ODK -3.38 -1.40 60 220NNW_ODK -3.54 -1.47 60 230NNW_ODK -3.69 -1.53 60 240NNW_ODK -0.00 0.00 60 HOM -0.33 0.00 60 20N_HOM -0.50 0.00 60 30N_HOM -0.67 0.00 60 40N_HOM -0.83 0.00 60 50N_HOM -1.00 0.00 60 60N_HOM -1.17 0.00 60 70N_HOM -1.33 0.00 60 80N_HOM -1.50 0.00 60 90N_HOM -1.67 0.00 60 100N_HOM -1.83 0.00 60 110N_HOM -2.00 0.00 60 120N_HOM -2.17 0.00 60 130N_HOM -2.33 0.00 60 140N_HOM -2.50 0.00 60 150N_HOM -2.66 0.00 60 160N_HOM -2.83 0.00 60 170N_HOM -3.00 0.00 60 180N_HOM -3.16 0.00 60 190N_HOM -3.33 0.00 60 200N_HOM -3.50 0.00 60 210N_HOM -3.66 0.00 60 220N_HOM -3.83 0.00 60 230N_HOM -4.00 0.00 60 240N_HOM -4.16 0.00 60 250N_HOM -0.31 0.13 60 20NNE_HOM -0.46 0.19 60 30NNE_HOM -0.62 0.25 60 40NNE_HOM -0.77 0.32 60 50NNE_HOM -0.92 0.38 60 60NNE_HOM -1.08 0.45 60 70NNE_HOM -1.23 0.51 60 80NNE_HOM -1.38 0.57 60 90NNE_HOM -1.54 0.64 60 100NNE_HOM -1.69 0.70 60 110NNE_HOM -1.85 0.77 60 120NNE_HOM -2.00 0.83 60 130NNE_HOM -2.15 0.89 60 140NNE_HOM -2.31 0.96 60 150NNE_HOM -2.46 1.02 60 160NNE_HOM -2.62 1.08 60 170NNE_HOM -2.77 1.15 60 180NNE_HOM -2.92 1.21 60 190NNE_HOM -3.08 1.28 60 200NNE_HOM -3.23 1.34 60 210NNE_HOM -3.38 1.40 60 220NNE_HOM -3.54 1.47 60 230NNE_HOM -3.69 1.53 60 240NNE_HOM -0.24 0.24 60 20NE_HOM -0.35 0.35 60 30NE_HOM -0.47 0.47 60 40NE_HOM -0.59 0.59 60 50NE_HOM -0.71 0.71 60 60NE_HOM -0.82 0.82 60 70NE_HOM -0.94 0.94 60 80NE_HOM -1.06 1.06 60 90NE_HOM -1.18 1.18 60 100NE_HOM -1.30 1.30 60 110NE_HOM -1.41 1.41 60 120NE_HOM -1.53 1.53 60 130NE_HOM -1.65 1.65 60 140NE_HOM -1.77 1.77 60 150NE_HOM -1.88 1.88 60 160NE_HOM -2.00 2.00 60 170NE_HOM -2.12 2.12 60 180NE_HOM -2.24 2.24 60 190NE_HOM -2.35 2.36 60 200NE_HOM -2.47 2.47 60 210NE_HOM -2.59 2.59 60 220NE_HOM -2.71 2.71 60 230NE_HOM -2.83 2.83 60 240NE_HOM -2.94 2.95 60 250NE_HOM -0.24 -0.24 60 20NW_HOM -0.35 -0.35 60 30NW_HOM -0.47 -0.47 60 40NW_HOM -0.59 -0.59 60 50NW_HOM -0.71 -0.71 60 60NW_HOM -0.82 -0.82 60 70NW_HOM -0.94 -0.94 60 80NW_HOM -1.06 -1.06 60 90NW_HOM -1.18 -1.18 60 100NW_HOM -1.30 -1.30 60 110NW_HOM -1.41 -1.41 60 120NW_HOM -1.53 -1.53 60 130NW_HOM -1.65 -1.65 60 140NW_HOM -1.77 -1.77 60 150NW_HOM -1.88 -1.88 60 160NW_HOM -2.00 -2.00 60 170NW_HOM -2.12 -2.12 60 180NW_HOM -2.24 -2.24 60 190NW_HOM -2.35 -2.36 60 200NW_HOM -2.47 -2.47 60 210NW_HOM -2.59 -2.59 60 220NW_HOM -2.71 -2.71 60 230NW_HOM -2.83 -2.83 60 240NW_HOM -2.94 -2.95 60 250NW_HOM -0.31 -0.13 60 20NNW_HOM -0.46 -0.19 60 30NNW_HOM -0.62 -0.25 60 40NNW_HOM -0.77 -0.32 60 50NNW_HOM -0.92 -0.38 60 60NNW_HOM -1.08 -0.45 60 70NNW_HOM -1.23 -0.51 60 80NNW_HOM -1.38 -0.57 60 90NNW_HOM -1.54 -0.64 60 100NNW_HOM -1.69 -0.70 60 110NNW_HOM -1.85 -0.77 60 120NNW_HOM -2.00 -0.83 60 130NNW_HOM -2.15 -0.89 60 140NNW_HOM -2.31 -0.96 60 150NNW_HOM -2.46 -1.02 60 160NNW_HOM -2.62 -1.08 60 170NNW_HOM -2.77 -1.15 60 180NNW_HOM -2.92 -1.21 60 190NNW_HOM -3.08 -1.28 60 200NNW_HOM -3.23 -1.34 60 210NNW_HOM -3.38 -1.40 60 220NNW_HOM -3.54 -1.47 60 230NNW_HOM -3.69 -1.53 60 240NNW_HOM -0.00 0.00 60 ENA -0.33 0.00 60 20N_ENA -0.50 0.00 60 30N_ENA -0.67 0.00 60 40N_ENA -0.83 0.00 60 50N_ENA -1.00 0.00 60 60N_ENA -1.17 0.00 60 70N_ENA -1.33 0.00 60 80N_ENA -1.50 0.00 60 90N_ENA -1.67 0.00 60 100N_ENA -1.83 0.00 60 110N_ENA -2.00 0.00 60 120N_ENA -2.17 0.00 60 130N_ENA -2.33 0.00 60 140N_ENA -2.50 0.00 60 150N_ENA -2.66 0.00 60 160N_ENA -2.83 0.00 60 170N_ENA -3.00 0.00 60 180N_ENA -3.16 0.00 60 190N_ENA -3.33 0.00 60 200N_ENA -3.50 0.00 60 210N_ENA -3.66 0.00 60 220N_ENA -3.83 0.00 60 230N_ENA -4.00 0.00 60 240N_ENA -4.16 0.00 60 250N_ENA -0.31 0.13 60 20NNE_ENA -0.46 0.19 60 30NNE_ENA -0.62 0.25 60 40NNE_ENA -0.77 0.32 60 50NNE_ENA -0.92 0.38 60 60NNE_ENA -1.08 0.45 60 70NNE_ENA -1.23 0.51 60 80NNE_ENA -1.38 0.57 60 90NNE_ENA -1.54 0.64 60 100NNE_ENA -1.69 0.70 60 110NNE_ENA -1.85 0.77 60 120NNE_ENA -2.00 0.83 60 130NNE_ENA -2.15 0.89 60 140NNE_ENA -2.31 0.96 60 150NNE_ENA -2.46 1.02 60 160NNE_ENA -2.62 1.08 60 170NNE_ENA -2.77 1.15 60 180NNE_ENA -2.92 1.21 60 190NNE_ENA -3.08 1.28 60 200NNE_ENA -3.23 1.34 60 210NNE_ENA -3.38 1.40 60 220NNE_ENA -3.54 1.47 60 230NNE_ENA -3.69 1.53 60 240NNE_ENA -0.24 0.24 60 20NE_ENA -0.35 0.35 60 30NE_ENA -0.47 0.47 60 40NE_ENA -0.59 0.59 60 50NE_ENA -0.71 0.71 60 60NE_ENA -0.82 0.82 60 70NE_ENA -0.94 0.94 60 80NE_ENA -1.06 1.06 60 90NE_ENA -1.18 1.18 60 100NE_ENA -1.30 1.30 60 110NE_ENA -1.41 1.41 60 120NE_ENA -1.53 1.53 60 130NE_ENA -1.65 1.65 60 140NE_ENA -1.77 1.77 60 150NE_ENA -1.88 1.88 60 160NE_ENA -2.00 2.00 60 170NE_ENA -2.12 2.12 60 180NE_ENA -2.24 2.24 60 190NE_ENA -2.35 2.36 60 200NE_ENA -2.47 2.47 60 210NE_ENA -2.59 2.59 60 220NE_ENA -2.71 2.71 60 230NE_ENA -2.83 2.83 60 240NE_ENA -2.94 2.95 60 250NE_ENA -0.24 -0.24 60 20NW_ENA -0.35 -0.35 60 30NW_ENA -0.47 -0.47 60 40NW_ENA -0.59 -0.59 60 50NW_ENA -0.71 -0.71 60 60NW_ENA -0.82 -0.82 60 70NW_ENA -0.94 -0.94 60 80NW_ENA -1.06 -1.06 60 90NW_ENA -1.18 -1.18 60 100NW_ENA -1.30 -1.30 60 110NW_ENA -1.41 -1.41 60 120NW_ENA -1.53 -1.53 60 130NW_ENA -1.65 -1.65 60 140NW_ENA -1.77 -1.77 60 150NW_ENA -1.88 -1.88 60 160NW_ENA -2.00 -2.00 60 170NW_ENA -2.12 -2.12 60 180NW_ENA -2.24 -2.24 60 190NW_ENA -2.35 -2.36 60 200NW_ENA -2.47 -2.47 60 210NW_ENA -2.59 -2.59 60 220NW_ENA -2.71 -2.71 60 230NW_ENA -2.83 -2.83 60 240NW_ENA -2.94 -2.95 60 250NW_ENA -0.31 -0.13 60 20NNW_ENA -0.46 -0.19 60 30NNW_ENA -0.62 -0.25 60 40NNW_ENA -0.77 -0.32 60 50NNW_ENA -0.92 -0.38 60 60NNW_ENA -1.08 -0.45 60 70NNW_ENA -1.23 -0.51 60 80NNW_ENA -1.38 -0.57 60 90NNW_ENA -1.54 -0.64 60 100NNW_ENA -1.69 -0.70 60 110NNW_ENA -1.85 -0.77 60 120NNW_ENA -2.00 -0.83 60 130NNW_ENA -2.15 -0.89 60 140NNW_ENA -2.31 -0.96 60 150NNW_ENA -2.46 -1.02 60 160NNW_ENA -2.62 -1.08 60 170NNW_ENA -2.77 -1.15 60 180NNW_ENA -2.92 -1.21 60 190NNW_ENA -3.08 -1.28 60 200NNW_ENA -3.23 -1.34 60 210NNW_ENA -3.38 -1.40 60 220NNW_ENA -3.54 -1.47 60 230NNW_ENA -3.69 -1.53 60 240NNW_ENA -0.00 0.00 60 ANC -0.33 0.00 60 20N_ANC -0.50 0.00 60 30N_ANC -0.67 0.00 60 40N_ANC -0.83 0.00 60 50N_ANC -1.00 0.00 60 60N_ANC -1.17 0.00 60 70N_ANC -1.33 0.00 60 80N_ANC -1.50 0.00 60 90N_ANC -1.67 0.00 60 100N_ANC -1.83 0.00 60 110N_ANC -2.00 0.00 60 120N_ANC -2.17 0.00 60 130N_ANC -2.33 0.00 60 140N_ANC -2.50 0.00 60 150N_ANC -2.66 0.00 60 160N_ANC -2.83 0.00 60 170N_ANC -3.00 0.00 60 180N_ANC -3.16 0.00 60 190N_ANC -3.33 0.00 60 200N_ANC -3.50 0.00 60 210N_ANC -3.66 0.00 60 220N_ANC -3.83 0.00 60 230N_ANC -4.00 0.00 60 240N_ANC -4.16 0.00 60 250N_ANC -0.31 0.13 60 20NNE_ANC -0.46 0.19 60 30NNE_ANC -0.62 0.25 60 40NNE_ANC -0.77 0.32 60 50NNE_ANC -0.92 0.38 60 60NNE_ANC -1.08 0.45 60 70NNE_ANC -1.23 0.51 60 80NNE_ANC -1.38 0.57 60 90NNE_ANC -1.54 0.64 60 100NNE_ANC -1.69 0.70 60 110NNE_ANC -1.85 0.77 60 120NNE_ANC -2.00 0.83 60 130NNE_ANC -2.15 0.89 60 140NNE_ANC -2.31 0.96 60 150NNE_ANC -2.46 1.02 60 160NNE_ANC -2.62 1.08 60 170NNE_ANC -2.77 1.15 60 180NNE_ANC -2.92 1.21 60 190NNE_ANC -3.08 1.28 60 200NNE_ANC -3.23 1.34 60 210NNE_ANC -3.38 1.40 60 220NNE_ANC -3.54 1.47 60 230NNE_ANC -3.69 1.53 60 240NNE_ANC -0.24 0.24 60 20NE_ANC -0.35 0.35 60 30NE_ANC -0.47 0.47 60 40NE_ANC -0.59 0.59 60 50NE_ANC -0.71 0.71 60 60NE_ANC -0.82 0.82 60 70NE_ANC -0.94 0.94 60 80NE_ANC -1.06 1.06 60 90NE_ANC -1.18 1.18 60 100NE_ANC -1.30 1.30 60 110NE_ANC -1.41 1.41 60 120NE_ANC -1.53 1.53 60 130NE_ANC -1.65 1.65 60 140NE_ANC -1.77 1.77 60 150NE_ANC -1.88 1.88 60 160NE_ANC -2.00 2.00 60 170NE_ANC -2.12 2.12 60 180NE_ANC -2.24 2.24 60 190NE_ANC -2.35 2.36 60 200NE_ANC -2.47 2.47 60 210NE_ANC -2.59 2.59 60 220NE_ANC -2.71 2.71 60 230NE_ANC -2.83 2.83 60 240NE_ANC -2.94 2.95 60 250NE_ANC -0.24 -0.24 60 20NW_ANC -0.35 -0.35 60 30NW_ANC -0.47 -0.47 60 40NW_ANC -0.59 -0.59 60 50NW_ANC -0.71 -0.71 60 60NW_ANC -0.82 -0.82 60 70NW_ANC -0.94 -0.94 60 80NW_ANC -1.06 -1.06 60 90NW_ANC -1.18 -1.18 60 100NW_ANC -1.30 -1.30 60 110NW_ANC -1.41 -1.41 60 120NW_ANC -1.53 -1.53 60 130NW_ANC -1.65 -1.65 60 140NW_ANC -1.77 -1.77 60 150NW_ANC -1.88 -1.88 60 160NW_ANC -2.00 -2.00 60 170NW_ANC -2.12 -2.12 60 180NW_ANC -2.24 -2.24 60 190NW_ANC -2.35 -2.36 60 200NW_ANC -2.47 -2.47 60 210NW_ANC -2.59 -2.59 60 220NW_ANC -2.71 -2.71 60 230NW_ANC -2.83 -2.83 60 240NW_ANC -2.94 -2.95 60 250NW_ANC -0.31 -0.13 60 20NNW_ANC -0.46 -0.19 60 30NNW_ANC -0.62 -0.25 60 40NNW_ANC -0.77 -0.32 60 50NNW_ANC -0.92 -0.38 60 60NNW_ANC -1.08 -0.45 60 70NNW_ANC -1.23 -0.51 60 80NNW_ANC -1.38 -0.57 60 90NNW_ANC -1.54 -0.64 60 100NNW_ANC -1.69 -0.70 60 110NNW_ANC -1.85 -0.77 60 120NNW_ANC -2.00 -0.83 60 130NNW_ANC -2.15 -0.89 60 140NNW_ANC -2.31 -0.96 60 150NNW_ANC -2.46 -1.02 60 160NNW_ANC -2.62 -1.08 60 170NNW_ANC -2.77 -1.15 60 180NNW_ANC -2.92 -1.21 60 190NNW_ANC -3.08 -1.28 60 200NNW_ANC -3.23 -1.34 60 210NNW_ANC -3.38 -1.40 60 220NNW_ANC -3.54 -1.47 60 230NNW_ANC -3.69 -1.53 60 240NNW_ANC -0.00 0.00 60 BGQ -0.33 0.00 60 20N_BGQ -0.50 0.00 60 30N_BGQ -0.67 0.00 60 40N_BGQ -0.83 0.00 60 50N_BGQ -1.00 0.00 60 60N_BGQ -1.17 0.00 60 70N_BGQ -1.33 0.00 60 80N_BGQ -1.50 0.00 60 90N_BGQ -1.67 0.00 60 100N_BGQ -1.83 0.00 60 110N_BGQ -2.00 0.00 60 120N_BGQ -2.17 0.00 60 130N_BGQ -2.33 0.00 60 140N_BGQ -2.50 0.00 60 150N_BGQ -2.66 0.00 60 160N_BGQ -2.83 0.00 60 170N_BGQ -3.00 0.00 60 180N_BGQ -3.16 0.00 60 190N_BGQ -3.33 0.00 60 200N_BGQ -3.50 0.00 60 210N_BGQ -3.66 0.00 60 220N_BGQ -3.83 0.00 60 230N_BGQ -4.00 0.00 60 240N_BGQ -4.16 0.00 60 250N_BGQ -0.31 0.13 60 20NNE_BGQ -0.46 0.19 60 30NNE_BGQ -0.62 0.25 60 40NNE_BGQ -0.77 0.32 60 50NNE_BGQ -0.92 0.38 60 60NNE_BGQ -1.08 0.45 60 70NNE_BGQ -1.23 0.51 60 80NNE_BGQ -1.38 0.57 60 90NNE_BGQ -1.54 0.64 60 100NNE_BGQ -1.69 0.70 60 110NNE_BGQ -1.85 0.77 60 120NNE_BGQ -2.00 0.83 60 130NNE_BGQ -2.15 0.89 60 140NNE_BGQ -2.31 0.96 60 150NNE_BGQ -2.46 1.02 60 160NNE_BGQ -2.62 1.08 60 170NNE_BGQ -2.77 1.15 60 180NNE_BGQ -2.92 1.21 60 190NNE_BGQ -3.08 1.28 60 200NNE_BGQ -3.23 1.34 60 210NNE_BGQ -3.38 1.40 60 220NNE_BGQ -3.54 1.47 60 230NNE_BGQ -3.69 1.53 60 240NNE_BGQ -0.24 0.24 60 20NE_BGQ -0.35 0.35 60 30NE_BGQ -0.47 0.47 60 40NE_BGQ -0.59 0.59 60 50NE_BGQ -0.71 0.71 60 60NE_BGQ -0.82 0.82 60 70NE_BGQ -0.94 0.94 60 80NE_BGQ -1.06 1.06 60 90NE_BGQ -1.18 1.18 60 100NE_BGQ -1.30 1.30 60 110NE_BGQ -1.41 1.41 60 120NE_BGQ -1.53 1.53 60 130NE_BGQ -1.65 1.65 60 140NE_BGQ -1.77 1.77 60 150NE_BGQ -1.88 1.88 60 160NE_BGQ -2.00 2.00 60 170NE_BGQ -2.12 2.12 60 180NE_BGQ -2.24 2.24 60 190NE_BGQ -2.35 2.36 60 200NE_BGQ -2.47 2.47 60 210NE_BGQ -2.59 2.59 60 220NE_BGQ -2.71 2.71 60 230NE_BGQ -2.83 2.83 60 240NE_BGQ -2.94 2.95 60 250NE_BGQ -0.24 -0.24 60 20NW_BGQ -0.35 -0.35 60 30NW_BGQ -0.47 -0.47 60 40NW_BGQ -0.59 -0.59 60 50NW_BGQ -0.71 -0.71 60 60NW_BGQ -0.82 -0.82 60 70NW_BGQ -0.94 -0.94 60 80NW_BGQ -1.06 -1.06 60 90NW_BGQ -1.18 -1.18 60 100NW_BGQ -1.30 -1.30 60 110NW_BGQ -1.41 -1.41 60 120NW_BGQ -1.53 -1.53 60 130NW_BGQ -1.65 -1.65 60 140NW_BGQ -1.77 -1.77 60 150NW_BGQ -1.88 -1.88 60 160NW_BGQ -2.00 -2.00 60 170NW_BGQ -2.12 -2.12 60 180NW_BGQ -2.24 -2.24 60 190NW_BGQ -2.35 -2.36 60 200NW_BGQ -2.47 -2.47 60 210NW_BGQ -2.59 -2.59 60 220NW_BGQ -2.71 -2.71 60 230NW_BGQ -2.83 -2.83 60 240NW_BGQ -2.94 -2.95 60 250NW_BGQ -0.31 -0.13 60 20NNW_BGQ -0.46 -0.19 60 30NNW_BGQ -0.62 -0.25 60 40NNW_BGQ -0.77 -0.32 60 50NNW_BGQ -0.92 -0.38 60 60NNW_BGQ -1.08 -0.45 60 70NNW_BGQ -1.23 -0.51 60 80NNW_BGQ -1.38 -0.57 60 90NNW_BGQ -1.54 -0.64 60 100NNW_BGQ -1.69 -0.70 60 110NNW_BGQ -1.85 -0.77 60 120NNW_BGQ -2.00 -0.83 60 130NNW_BGQ -2.15 -0.89 60 140NNW_BGQ -2.31 -0.96 60 150NNW_BGQ -2.46 -1.02 60 160NNW_BGQ -2.62 -1.08 60 170NNW_BGQ -2.77 -1.15 60 180NNW_BGQ -2.92 -1.21 60 190NNW_BGQ -3.08 -1.28 60 200NNW_BGQ -3.23 -1.34 60 210NNW_BGQ -3.38 -1.40 60 220NNW_BGQ -3.54 -1.47 60 230NNW_BGQ -3.69 -1.53 60 240NNW_BGQ -0.00 0.00 60 ORT -0.33 0.00 60 20N_ORT -0.50 0.00 60 30N_ORT -0.67 0.00 60 40N_ORT -0.83 0.00 60 50N_ORT -1.00 0.00 60 60N_ORT -1.17 0.00 60 70N_ORT -1.33 0.00 60 80N_ORT -1.50 0.00 60 90N_ORT -1.67 0.00 60 100N_ORT -1.83 0.00 60 110N_ORT -2.00 0.00 60 120N_ORT -2.17 0.00 60 130N_ORT -2.33 0.00 60 140N_ORT -2.50 0.00 60 150N_ORT -2.66 0.00 60 160N_ORT -2.83 0.00 60 170N_ORT -3.00 0.00 60 180N_ORT -3.16 0.00 60 190N_ORT -3.33 0.00 60 200N_ORT -3.50 0.00 60 210N_ORT -3.66 0.00 60 220N_ORT -3.83 0.00 60 230N_ORT -4.00 0.00 60 240N_ORT -4.16 0.00 60 250N_ORT -0.31 0.13 60 20NNE_ORT -0.46 0.19 60 30NNE_ORT -0.62 0.25 60 40NNE_ORT -0.77 0.32 60 50NNE_ORT -0.92 0.38 60 60NNE_ORT -1.08 0.45 60 70NNE_ORT -1.23 0.51 60 80NNE_ORT -1.38 0.57 60 90NNE_ORT -1.54 0.64 60 100NNE_ORT -1.69 0.70 60 110NNE_ORT -1.85 0.77 60 120NNE_ORT -2.00 0.83 60 130NNE_ORT -2.15 0.89 60 140NNE_ORT -2.31 0.96 60 150NNE_ORT -2.46 1.02 60 160NNE_ORT -2.62 1.08 60 170NNE_ORT -2.77 1.15 60 180NNE_ORT -2.92 1.21 60 190NNE_ORT -3.08 1.28 60 200NNE_ORT -3.23 1.34 60 210NNE_ORT -3.38 1.40 60 220NNE_ORT -3.54 1.47 60 230NNE_ORT -3.69 1.53 60 240NNE_ORT -0.24 0.24 60 20NE_ORT -0.35 0.35 60 30NE_ORT -0.47 0.47 60 40NE_ORT -0.59 0.59 60 50NE_ORT -0.71 0.71 60 60NE_ORT -0.82 0.82 60 70NE_ORT -0.94 0.94 60 80NE_ORT -1.06 1.06 60 90NE_ORT -1.18 1.18 60 100NE_ORT -1.30 1.30 60 110NE_ORT -1.41 1.41 60 120NE_ORT -1.53 1.53 60 130NE_ORT -1.65 1.65 60 140NE_ORT -1.77 1.77 60 150NE_ORT -1.88 1.88 60 160NE_ORT -2.00 2.00 60 170NE_ORT -2.12 2.12 60 180NE_ORT -2.24 2.24 60 190NE_ORT -2.35 2.36 60 200NE_ORT -2.47 2.47 60 210NE_ORT -2.59 2.59 60 220NE_ORT -2.71 2.71 60 230NE_ORT -2.83 2.83 60 240NE_ORT -2.94 2.95 60 250NE_ORT -0.24 -0.24 60 20NW_ORT -0.35 -0.35 60 30NW_ORT -0.47 -0.47 60 40NW_ORT -0.59 -0.59 60 50NW_ORT -0.71 -0.71 60 60NW_ORT -0.82 -0.82 60 70NW_ORT -0.94 -0.94 60 80NW_ORT -1.06 -1.06 60 90NW_ORT -1.18 -1.18 60 100NW_ORT -1.30 -1.30 60 110NW_ORT -1.41 -1.41 60 120NW_ORT -1.53 -1.53 60 130NW_ORT -1.65 -1.65 60 140NW_ORT -1.77 -1.77 60 150NW_ORT -1.88 -1.88 60 160NW_ORT -2.00 -2.00 60 170NW_ORT -2.12 -2.12 60 180NW_ORT -2.24 -2.24 60 190NW_ORT -2.35 -2.36 60 200NW_ORT -2.47 -2.47 60 210NW_ORT -2.59 -2.59 60 220NW_ORT -2.71 -2.71 60 230NW_ORT -2.83 -2.83 60 240NW_ORT -2.94 -2.95 60 250NW_ORT -0.31 -0.13 60 20NNW_ORT -0.46 -0.19 60 30NNW_ORT -0.62 -0.25 60 40NNW_ORT -0.77 -0.32 60 50NNW_ORT -0.92 -0.38 60 60NNW_ORT -1.08 -0.45 60 70NNW_ORT -1.23 -0.51 60 80NNW_ORT -1.38 -0.57 60 90NNW_ORT -1.54 -0.64 60 100NNW_ORT -1.69 -0.70 60 110NNW_ORT -1.85 -0.77 60 120NNW_ORT -2.00 -0.83 60 130NNW_ORT -2.15 -0.89 60 140NNW_ORT -2.31 -0.96 60 150NNW_ORT -2.46 -1.02 60 160NNW_ORT -2.62 -1.08 60 170NNW_ORT -2.77 -1.15 60 180NNW_ORT -2.92 -1.21 60 190NNW_ORT -3.08 -1.28 60 200NNW_ORT -3.23 -1.34 60 210NNW_ORT -3.38 -1.40 60 220NNW_ORT -3.54 -1.47 60 230NNW_ORT -3.69 -1.53 60 240NNW_ORT -0.00 0.00 60 GKN -0.33 0.00 60 20N_GKN -0.50 0.00 60 30N_GKN -0.67 0.00 60 40N_GKN -0.83 0.00 60 50N_GKN -1.00 0.00 60 60N_GKN -1.17 0.00 60 70N_GKN -1.33 0.00 60 80N_GKN -1.50 0.00 60 90N_GKN -1.67 0.00 60 100N_GKN -1.83 0.00 60 110N_GKN -2.00 0.00 60 120N_GKN -2.17 0.00 60 130N_GKN -2.33 0.00 60 140N_GKN -2.50 0.00 60 150N_GKN -2.66 0.00 60 160N_GKN -2.83 0.00 60 170N_GKN -3.00 0.00 60 180N_GKN -3.16 0.00 60 190N_GKN -3.33 0.00 60 200N_GKN -3.50 0.00 60 210N_GKN -3.66 0.00 60 220N_GKN -3.83 0.00 60 230N_GKN -4.00 0.00 60 240N_GKN -4.16 0.00 60 250N_GKN -0.31 0.13 60 20NNE_GKN -0.46 0.19 60 30NNE_GKN -0.62 0.25 60 40NNE_GKN -0.77 0.32 60 50NNE_GKN -0.92 0.38 60 60NNE_GKN -1.08 0.45 60 70NNE_GKN -1.23 0.51 60 80NNE_GKN -1.38 0.57 60 90NNE_GKN -1.54 0.64 60 100NNE_GKN -1.69 0.70 60 110NNE_GKN -1.85 0.77 60 120NNE_GKN -2.00 0.83 60 130NNE_GKN -2.15 0.89 60 140NNE_GKN -2.31 0.96 60 150NNE_GKN -2.46 1.02 60 160NNE_GKN -2.62 1.08 60 170NNE_GKN -2.77 1.15 60 180NNE_GKN -2.92 1.21 60 190NNE_GKN -3.08 1.28 60 200NNE_GKN -3.23 1.34 60 210NNE_GKN -3.38 1.40 60 220NNE_GKN -3.54 1.47 60 230NNE_GKN -3.69 1.53 60 240NNE_GKN -0.24 0.24 60 20NE_GKN -0.35 0.35 60 30NE_GKN -0.47 0.47 60 40NE_GKN -0.59 0.59 60 50NE_GKN -0.71 0.71 60 60NE_GKN -0.82 0.82 60 70NE_GKN -0.94 0.94 60 80NE_GKN -1.06 1.06 60 90NE_GKN -1.18 1.18 60 100NE_GKN -1.30 1.30 60 110NE_GKN -1.41 1.41 60 120NE_GKN -1.53 1.53 60 130NE_GKN -1.65 1.65 60 140NE_GKN -1.77 1.77 60 150NE_GKN -1.88 1.88 60 160NE_GKN -2.00 2.00 60 170NE_GKN -2.12 2.12 60 180NE_GKN -2.24 2.24 60 190NE_GKN -2.35 2.36 60 200NE_GKN -2.47 2.47 60 210NE_GKN -2.59 2.59 60 220NE_GKN -2.71 2.71 60 230NE_GKN -2.83 2.83 60 240NE_GKN -2.94 2.95 60 250NE_GKN -0.24 -0.24 60 20NW_GKN -0.35 -0.35 60 30NW_GKN -0.47 -0.47 60 40NW_GKN -0.59 -0.59 60 50NW_GKN -0.71 -0.71 60 60NW_GKN -0.82 -0.82 60 70NW_GKN -0.94 -0.94 60 80NW_GKN -1.06 -1.06 60 90NW_GKN -1.18 -1.18 60 100NW_GKN -1.30 -1.30 60 110NW_GKN -1.41 -1.41 60 120NW_GKN -1.53 -1.53 60 130NW_GKN -1.65 -1.65 60 140NW_GKN -1.77 -1.77 60 150NW_GKN -1.88 -1.88 60 160NW_GKN -2.00 -2.00 60 170NW_GKN -2.12 -2.12 60 180NW_GKN -2.24 -2.24 60 190NW_GKN -2.35 -2.36 60 200NW_GKN -2.47 -2.47 60 210NW_GKN -2.59 -2.59 60 220NW_GKN -2.71 -2.71 60 230NW_GKN -2.83 -2.83 60 240NW_GKN -2.94 -2.95 60 250NW_GKN -0.31 -0.13 60 20NNW_GKN -0.46 -0.19 60 30NNW_GKN -0.62 -0.25 60 40NNW_GKN -0.77 -0.32 60 50NNW_GKN -0.92 -0.38 60 60NNW_GKN -1.08 -0.45 60 70NNW_GKN -1.23 -0.51 60 80NNW_GKN -1.38 -0.57 60 90NNW_GKN -1.54 -0.64 60 100NNW_GKN -1.69 -0.70 60 110NNW_GKN -1.85 -0.77 60 120NNW_GKN -2.00 -0.83 60 130NNW_GKN -2.15 -0.89 60 140NNW_GKN -2.31 -0.96 60 150NNW_GKN -2.46 -1.02 60 160NNW_GKN -2.62 -1.08 60 170NNW_GKN -2.77 -1.15 60 180NNW_GKN -2.92 -1.21 60 190NNW_GKN -3.08 -1.28 60 200NNW_GKN -3.23 -1.34 60 210NNW_GKN -3.38 -1.40 60 220NNW_GKN -3.54 -1.47 60 230NNW_GKN -3.69 -1.53 60 240NNW_GKN -0.00 0.00 60 TKA -0.33 0.00 60 20N_TKA -0.50 0.00 60 30N_TKA -0.67 0.00 60 40N_TKA -0.83 0.00 60 50N_TKA -1.00 0.00 60 60N_TKA -1.17 0.00 60 70N_TKA -1.33 0.00 60 80N_TKA -1.50 0.00 60 90N_TKA -1.67 0.00 60 100N_TKA -1.83 0.00 60 110N_TKA -2.00 0.00 60 120N_TKA -2.17 0.00 60 130N_TKA -2.33 0.00 60 140N_TKA -2.50 0.00 60 150N_TKA -2.66 0.00 60 160N_TKA -2.83 0.00 60 170N_TKA -3.00 0.00 60 180N_TKA -3.16 0.00 60 190N_TKA -3.33 0.00 60 200N_TKA -3.50 0.00 60 210N_TKA -3.66 0.00 60 220N_TKA -3.83 0.00 60 230N_TKA -4.00 0.00 60 240N_TKA -4.16 0.00 60 250N_TKA -0.31 0.13 60 20NNE_TKA -0.46 0.19 60 30NNE_TKA -0.62 0.25 60 40NNE_TKA -0.77 0.32 60 50NNE_TKA -0.92 0.38 60 60NNE_TKA -1.08 0.45 60 70NNE_TKA -1.23 0.51 60 80NNE_TKA -1.38 0.57 60 90NNE_TKA -1.54 0.64 60 100NNE_TKA -1.69 0.70 60 110NNE_TKA -1.85 0.77 60 120NNE_TKA -2.00 0.83 60 130NNE_TKA -2.15 0.89 60 140NNE_TKA -2.31 0.96 60 150NNE_TKA -2.46 1.02 60 160NNE_TKA -2.62 1.08 60 170NNE_TKA -2.77 1.15 60 180NNE_TKA -2.92 1.21 60 190NNE_TKA -3.08 1.28 60 200NNE_TKA -3.23 1.34 60 210NNE_TKA -3.38 1.40 60 220NNE_TKA -3.54 1.47 60 230NNE_TKA -3.69 1.53 60 240NNE_TKA -0.24 0.24 60 20NE_TKA -0.35 0.35 60 30NE_TKA -0.47 0.47 60 40NE_TKA -0.59 0.59 60 50NE_TKA -0.71 0.71 60 60NE_TKA -0.82 0.82 60 70NE_TKA -0.94 0.94 60 80NE_TKA -1.06 1.06 60 90NE_TKA -1.18 1.18 60 100NE_TKA -1.30 1.30 60 110NE_TKA -1.41 1.41 60 120NE_TKA -1.53 1.53 60 130NE_TKA -1.65 1.65 60 140NE_TKA -1.77 1.77 60 150NE_TKA -1.88 1.88 60 160NE_TKA -2.00 2.00 60 170NE_TKA -2.12 2.12 60 180NE_TKA -2.24 2.24 60 190NE_TKA -2.35 2.36 60 200NE_TKA -2.47 2.47 60 210NE_TKA -2.59 2.59 60 220NE_TKA -2.71 2.71 60 230NE_TKA -2.83 2.83 60 240NE_TKA -2.94 2.95 60 250NE_TKA -0.24 -0.24 60 20NW_TKA -0.35 -0.35 60 30NW_TKA -0.47 -0.47 60 40NW_TKA -0.59 -0.59 60 50NW_TKA -0.71 -0.71 60 60NW_TKA -0.82 -0.82 60 70NW_TKA -0.94 -0.94 60 80NW_TKA -1.06 -1.06 60 90NW_TKA -1.18 -1.18 60 100NW_TKA -1.30 -1.30 60 110NW_TKA -1.41 -1.41 60 120NW_TKA -1.53 -1.53 60 130NW_TKA -1.65 -1.65 60 140NW_TKA -1.77 -1.77 60 150NW_TKA -1.88 -1.88 60 160NW_TKA -2.00 -2.00 60 170NW_TKA -2.12 -2.12 60 180NW_TKA -2.24 -2.24 60 190NW_TKA -2.35 -2.36 60 200NW_TKA -2.47 -2.47 60 210NW_TKA -2.59 -2.59 60 220NW_TKA -2.71 -2.71 60 230NW_TKA -2.83 -2.83 60 240NW_TKA -2.94 -2.95 60 250NW_TKA -0.31 -0.13 60 20NNW_TKA -0.46 -0.19 60 30NNW_TKA -0.62 -0.25 60 40NNW_TKA -0.77 -0.32 60 50NNW_TKA -0.92 -0.38 60 60NNW_TKA -1.08 -0.45 60 70NNW_TKA -1.23 -0.51 60 80NNW_TKA -1.38 -0.57 60 90NNW_TKA -1.54 -0.64 60 100NNW_TKA -1.69 -0.70 60 110NNW_TKA -1.85 -0.77 60 120NNW_TKA -2.00 -0.83 60 130NNW_TKA -2.15 -0.89 60 140NNW_TKA -2.31 -0.96 60 150NNW_TKA -2.46 -1.02 60 160NNW_TKA -2.62 -1.08 60 170NNW_TKA -2.77 -1.15 60 180NNW_TKA -2.92 -1.21 60 190NNW_TKA -3.08 -1.28 60 200NNW_TKA -3.23 -1.34 60 210NNW_TKA -3.38 -1.40 60 220NNW_TKA -3.54 -1.47 60 230NNW_TKA -3.69 -1.53 60 240NNW_TKA 49.27 -116.95 60 50WSW_YXC 42.00 -117.08 60 50SE_REO 42.02 -119.87 60 40SE_LKV diff --git a/cave/build/static/common/cave/etc/ncep/basemaps/volcanoes.lpi b/cave/build/static/common/cave/etc/ncep/basemaps/volcanoes.lpi new file mode 100644 index 0000000000..48086d27f5 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/basemaps/volcanoes.lpi @@ -0,0 +1,1483 @@ +50.17 6.85 500 West_Eifel_Volc_Field +45.5 2.75 900 Chaine_des_Puys +42.17 2.53 500 Olot_Volc_Field +43.25 10.87 300 Larderello +42.9 11.63 200 Amiata +42.6 11.93 900 Vulsini +41.73 12.7 500 Albano;Monte +40.827 14.139 300 Campi_Flegrei +40.821 14.426 200 Vesuvius +40.73 13.897 1500 Ischia +38.789 15.213 500 Stromboli +38.48 14.95 900 Lipari +38.404 14.962 500 Vulcano +37.734 15.004 300 Etna +36.77 12.02 200 Pantelleria +37.615 23.336 900 Methana +36.699 24.439 500 Milos +36.404 25.396 300 Santorini +36.58 27.18 200 Nisyros +36.63 27.1 1500 Yali +36.829 27.257 500 Kos +38.58 28.52 900 Kula +37.67 33.65 500 Karapinar_Field +38.13 34.17 300 Hasan_Dagi +38.25 34.57 200 Gollu_Dag +38.57 34.52 900 Acigol-Nevsehir +38.52 35.48 500 Erciyes_Dagi +37.67 39.83 300 Karacalidag +38.65 42.02 200 Nemrut_Dagi +38.92 42.82 1500 Suphan_Dagi +39.17 43.33 500 Girekol +39.33 43.83 900 Tenduruk_Dagi +39.7 44.28 500 Ararat +40.75 42.9 300 Kars_Plateau +43.33 42.45 200 Elbrus +42.7 44.5 900 Kasbek +42.55 44.0 500 Kabargin_Oth_Group +42.45 44.25 300 Unnamed37 +41.55 43.6 200 Unnamed38 +40.55 44.12 1500 Aragats +40.275 44.75 500 Agmagan-Karadag +39.7 45.542 900 Dar-Alages +15.7 41.742 500 Tair;Jebel_at +15.05 42.18 300 Zubair;Jebel +14.02 42.75 200 Zukur +13.72 42.73 900 Hanish +15.042 39.82 500 Jalua +14.88 39.92 300 Alid +13.975 40.408 200 Gada_Ale +13.82 40.55 1500 Alu +13.792 40.55 500 Dalaffilla +13.725 40.6 900 Borale_Ale +13.6 40.67 500 Erta_Ale +13.52 40.63 300 Ale_Bagu +13.5 40.72 200 Hayli_Gubbi +13.58 41.808 900 Dubbi +13.37 41.7 500 Nabro +13.27 41.65 300 Mallahle +13.18 41.725 200 Sorkale +13.07 41.6 1500 Asavyo +13.1 41.15 500 Mat_Ala +13.28 41.07 900 Tat_Ali +13.3 40.98 500 Borawli +13.08 40.85 300 Afdera +13.02 40.2 200 Ma_Alalta +12.88 40.57 900 Alayta +12.6 40.48 500 Dabbahu +12.38 40.07 300 Dabbayra +12.17 40.82 200 Manda_Hararo +11.73 40.25 1500 Groppo +11.63 41.45 500 Borawli_Complex +12.38 42.2 900 Manda-Inakir +12.47 42.4 500 Mousa_Alli +12.55 42.53 300 Gufa +12.95 42.43 200 Assab_Volc_Field +11.58 42.47 900 Ardoukoba +11.53 42.05 500 Tiho +11.42 42.2 300 Garbes +11.25 41.83 200 Boina +11.28 41.63 1500 Dama_Ali +11.27 41.52 500 Asmara +11.08 41.27 900 Gabillema +10.58 41.042 500 Yangudi +10.082 40.702 300 Ayelu +10.07 40.84 200 Adwa +9.78 40.33 900 Hertali +9.57 40.28 500 Liado_Hayk_Field +9.35 40.13 300 Dofen +8.975 39.93 200 Fentale +8.95 39.75 1500 Beru +8.8 39.692 500 Kone +8.7 39.63 900 Unnamed91 +8.558 39.475 500 Boset-Bericha +8.78 38.98 300 Bishoftu_Volc_Field +8.62 38.95 200 Unnamed94 +8.43 39.35 900 Sodore +8.35 39.18 500 Gedamsa_Caldera +8.27 39.03 300 Bora-Bericcio_Complex +8.158 39.13 200 Tullu_Moje +8.07 39.07 1500 Unnamed99 +7.95 38.93 500 Unnamed100 +8.05 38.35 900 Butajiri-Silti_Field +7.77 38.78 500 Alutu +7.47 38.55 300 Shala +7.18 38.43 200 Corbetti_Caldera +7.07 38.1 900 Bilate_River_Field +7.42 35.43 500 Tepi +6.78 37.83 300 Hobicha_Caldera +6.65 38.12 200 Chiracha +5.92 37.57 1500 Tosa_Sucha +5.65 37.67 500 Unnamed110 +5.1 35.88 900 Korath_Range +4.08 37.42 500 Mega_Basalt_Field +4.07 36.05 300 North_Island +3.5 36.042 200 Central_Island +2.63 36.6 900 South_Island +2.32 37.97 500 Marsabit +2.32 36.57 300 Barrier;The +1.9 36.27 200 Namarunu +1.57 37.9 1500 Segererua_Plateau +1.5 36.33 500 Emuruangogolak +1.15 36.23 900 Silali +0.92 36.18 500 Paka +0.77 36.12 300 Korosi +0.63 36.08 200 Ol_Kokwe +0.23 37.87 900 Nyambeni_Hills +-0.2 36.07 500 Menengai +-0.38 34.5 300 Homa_Mountain +-0.52 36.27 200 Elmenteita_Badlands +-0.63 36.23 1500 Eburru;Ol_Doinyo +-0.904 36.292 500 Olkaria +-0.92 36.45 900 Longonot +-1.175 36.35 500 Suswa +-2.751 35.902 300 Lengai;Ol_Doinyo +-2.68 37.88 200 Chyulu_Hills +-3.07 37.35 900 Kilimanjaro +-3.25 36.75 500 Meru +-4.87 31.92 300 Igwisi_Hills +-8.63 33.57 200 Unnamed138 +-8.75 33.8 1500 SW_Usangu_Basin +-8.97 33.57 500 Ngozi +-8.93 33.4 900 Izumbwe-Mpoli +-9.13 33.67 500 Rungwe +-9.23 33.78 300 Kieyo +0.7 30.25 200 Fort_Portal_Field +0.45 30.25 900 Kyatwa_Volc_Field +-0.08 29.92 500 Katwe-Kikorongo_Field +-0.2 30.08 300 Bunyaruguru_Field +-0.47 30.18 200 Katunga +-0.93 29.33 1500 May-ya-moto +-1.408 29.2 500 Nyamuragira +-1.52 29.25 900 Nyiragongo +-1.5 29.45 500 Karisimbi +-1.47 29.492 300 Visoke +-1.38 29.67 200 Muhavura +-1.23 29.72 900 Bufumbira +-2.32 28.75 500 Tshibinda +0.32 6.72 300 Sao_Tome +3.35 8.52 200 San_Carlos +3.35 8.63 1500 San_Joaquin +3.58 8.75 500 Santa_Isabel160 +4.203 9.17 900 Cameroon;Mt. +5.03 9.83 500 Manengouba +6.25 10.5 300 Oku_Volc_Field +7.25 13.67 200 Ngaoundere_Plateau +10.75 12.0 900 Biu_Plateau +27.25 17.5 500 Haruj +21.33 16.33 300 Toh;Tarso +21.03 16.45 200 Tousside;Tarso +20.92 17.28 1500 Voon;Tarso +19.8 18.53 500 Koussi;Emi +12.95 24.27 900 Marra;Jebel +14.5 25.8 500 Kutum_Volc_Field +15.32 26.47 300 Meidob_Volc_Field +18.33 32.75 200 Bayuda_Volc_Field +18.17 33.83 900 Umm_Arafieb;Jebel +36.53 40.85 500 Sharat_Kovakab +36.67 37.0 300 Unnamed177 +33.308 36.925 200 Unnamed178 +33.15 36.258 1500 Unnamed179 +33.08 37.15 500 Es_Safa +32.658 36.425 900 Unnamed181 +27.8 36.17 500 Rahah;Harrat_ar +27.08 37.25 300 'Uwayrid;Harrat +25.17 37.75 200 Lunayyir;Harrat +26.58 40.2 900 Ithnayn;Harrat +25.0 39.92 500 Khaybar;Harrat +23.08 39.78 300 Rahat;Harrat +22.8 41.38 200 Kishb;Harrat +17.05 42.83 1500 Yar;Jabal +15.63 44.08 500 Arhab;Harra_of +15.28 44.22 900 Marha;Jabal_el +15.43 44.78 500 Haylan;Jabal +14.57 44.67 300 Dhamar;Harras_of +14.05 44.75 200 Hamman_Demt;Jabal +12.25 45.0 900 Unnamed195 +13.58 46.12 500 Sawad;Harra_Es +14.05 48.33 300 Bal_Haf;Harra_of +15.55 50.63 200 Bir_Borhut +35.951 52.109 1500 Damavand +29.4 57.57 500 Qal'eh_Hasan_Ali +28.07 60.0 900 Bazman +28.17 60.67 500 Unnamed202 +28.6 61.6 300 Taftan +33.95 67.92 200 Dacht-I-Navar_Group +34.25 67.97 900 Vakak_Group +-11.47 43.33 500 Grille;La +-11.75 43.38 300 Karthala +-12.48 49.1 200 Ambre-Bobaomby +-13.32 48.48 1500 Nosy-Be +-14.3 48.67 500 Ankaizina_Field +-19.0 46.77 900 Itasy_Volc_Field +-19.4 47.2 500 Ankaratra_Field +-21.229 55.713 300 Fournaise;Piton_de_la +-37.83 77.52 200 Amsterdam_Island +-38.72 77.53 900 St.Paul +-53.106 73.513 500 Heard +-53.03 72.6 300 McDonald_Islands +-49.58 69.5 200 Kerguelen_Islands +-46.43 52.2 1500 Est;Ile_de_l' +-46.42 51.63 500 Possession;Ile_de_la +-46.1 50.23 900 Cochons;Ile_Aux +-46.63 37.95 500 Prince_Edward_Island +-46.9 37.75 300 Marion_Island +11.75 80.75 200 Unnamed224 +-35.3 173.9 900 Kaikohe-Bay_of_Islands +-35.75 174.27 500 Whangarei +-36.9 174.87 300 Auckland_Field +-37.28 176.25 200 Mayor_Island +-39.3 174.07 1500 Egmont +-37.52 177.18 500 White_Island +-37.858 176.98 900 Whale_Island +-38.08 176.27 500 Rotorua +-38.12 176.5 300 Okataina +-38.42 176.33 200 Reporoa +-38.42 176.08 900 Maroa +-38.82 176.0 500 Taupo +-39.13 175.642 300 Tongariro +-39.28 175.57 200 Ruapehu +-30.542 -178.561 1500 Curtis_Island +-30.23 178.92 500 Brimstone_Island +-30.2 -178.47 900 Macauley_Island +-29.27 -177.92 500 Raoul_Island +-20.57 -175.38 300 Hunga_Tonga-Hunga_Ha'apai +-19.75 -175.07 200 Tofua +-19.18 -174.87 900 Metis_Shoal +-18.806 -174.65 500 Late +-18.02 -174.325 300 Fonualei +-15.6 -175.63 200 Niuafo'ou +-14.23 -169.454 1500 Ta'u +-14.175 -169.618 500 Ofu-Olosega +-14.295 -170.7 900 Tutuila +-13.935 -171.72 500 Upolu +-13.612 -172.525 300 Savai'i +-13.3 -176.17 200 Wallis_Islands +-16.82 -179.97 900 Taveuni +-17.32 179.4 500 Koro +-2.38 147.35 300 St.Andrew_Strait +-2.57 147.28 200 Baluan +-3.03 147.78 1500 Unnamed259 +-3.508 144.62 500 Blup_Blup +-3.62 144.62 900 Kadovar +-3.6 144.85 500 Bam +-3.994 144.963 300 Boisa +-4.1 145.061 200 Manam +-4.649 145.964 900 Karkar +-4.311 146.256 500 Unnamed266 +-4.92 146.75 300 Yomba +-5.358 147.12 200 Long_Island +-5.589 147.875 1500 Umboi +-5.52 148.121 500 Ritter_Island +-5.414 148.094 900 Sakar +-5.2 148.57 500 Unnamed272 +-5.525 148.42 300 Langila +-4.55 149.125 200 Narage +-4.63 149.35 900 Mundua +-4.692 149.5 500 Garove +-5.056 150.108 300 Dakataua +-5.15 150.03 200 Bola +-5.269 150.088 1500 Garua_Harbour +-5.45 150.03 500 Garbuna_Group +-5.47 150.5 900 Lolo +-5.58 150.52 500 Pago +-5.53 150.9 300 Walo +-5.33 151.1 200 Hargy +-5.2 151.23 900 Bamus +-5.05 151.33 500 Ulawun +-4.92 151.158 300 Lolobau +-4.75 150.85 200 Unnamed288 +-4.271 152.203 1500 Rabaul +-5.9 143.15 500 Doma_Peaks +-6.58 145.08 900 Crater_Mountain +-7.05 145.858 500 Yelia +-7.33 146.708 300 Koranga +-9.2 147.57 200 Madilogo +-8.95 148.15 900 Lamington +-9.0 148.37 500 Hydrographers_Range +-9.308 148.13 300 Musa_River +-9.08 148.33 200 Managlase_Plateau +-9.2 149.07 1500 Victory +-9.48 149.13 500 Sessagara +-9.57 149.075 900 Waiowa +-9.48 150.35 500 Goodenough +-9.52 150.53 300 Iamalele +-9.62 150.88 200 Dawson_Strait_Group +-3.125 152.642 900 Lihir +-4.08 153.65 500 Ambitle +-5.83 154.93 300 Tore +-5.83 154.98 200 Balbi +-6.092 155.225 1500 Billy_Mitchell +-6.14 155.195 500 Bagana +-6.442 155.608 900 Takuan_Group +-6.52 155.62 500 Loloru +-7.67 156.6 300 Nonda +-8.292 156.52 200 Simbo +-8.83 157.17 900 Coleman_Seamount +-9.35 159.73 500 Gallego +-9.13 159.82 300 Savo +-10.38 165.8 200 Tinakula +-13.67 167.67 1500 Motlav +-13.8 167.47 500 Suretamatai +-14.27 167.5 900 Gaua +-14.45 168.05 500 Mere_Lava +-15.4 167.83 300 Aoba +-16.25 168.12 200 Ambrym +-16.507 168.346 900 Lopevi +-16.68 168.37 500 Epi +-16.992 168.592 300 Unnamed327 +-17.45 168.33 200 North_Vate +-18.75 169.23 1500 Traitor's_Head +-19.52 169.425 500 Yasur +-20.2 169.83 900 Aneityum +-22.33 171.32 500 Matthew_Island +-22.4 172.05 300 Hunter_Island +-25.78 168.63 200 Unnamed334 +-37.77 142.5 900 Newer_Volcanics_Prov +13.43 94.25 500 Narcondum +12.292 93.875 300 Barren_Island +5.82 95.28 200 Pulau_Weh +5.448 95.658 1500 Seulawah_Agam +4.914 96.329 500 Peuet_Sague +4.813 96.82 900 Geureudong +3.85 97.664 500 Kembar +3.2 98.52 300 Sibayak +3.17 98.392 200 Sinabung +2.58 98.83 900 Toba +2.03 98.93 500 Helatoba-Tarutung +2.15 98.93 300 Imun +1.556 99.255 200 Sibualbuali +1.478 99.209 1500 Lubukraya +0.686 99.539 500 Sorikmarapi +0.079 99.98 900 Talakmau +0.08 100.2 500 Sarik-Gajah +-0.381 100.473 300 Marapi +-0.433 100.317 200 Tandikat +-0.978 100.679 900 Talang +-1.814 101.264 500 Kerinci +-2.33 101.6 300 Hutapanjang +-2.414 101.728 200 Sumbing358 +-2.592 101.63 1500 Kunyit +-2.82 102.02 500 Pendan +-2.82 102.18 900 Belirang-Beriti +-3.38 102.37 500 Daun;Bukit +-3.52 102.62 300 Kaba +-4.03 103.13 200 Dempo +-4.27 103.3 900 Patah +-4.22 103.62 500 Lumut_Balai;Bukit +-4.43 103.67 300 Besar +-4.83 103.92 200 Ranau +-5.12 104.32 1500 Sekincau_Belirang +-5.25 104.27 500 Suoh +-5.35 104.6 900 Hulubelu +-5.78 105.625 500 Rajabasa +-6.102 105.423 300 Krakatau +-6.2 105.97 200 Danau_Complex +-6.27 106.042 900 Karang +-6.73 106.65 500 Kiaraberes-Gagak +-6.75 106.68 300 Perbakti +-6.72 106.73 200 Salak +-6.78 106.98 1500 Gede +-7.15 107.37 500 Patuha +-7.208 107.63 900 Wayang-Windu +-7.13 107.65 500 Malabar +-6.77 107.6 300 Tangkubanparahu +-7.32 107.73 200 Papandayan +-7.23 107.72 900 Kendang +-7.125 107.8 500 Kamojang;Kawah +-7.13 107.83 300 Guntur +-6.77 107.95 200 Tampomas +-7.25 108.05 1500 Galunggung +-7.208 108.07 500 Talagabodas +-7.12 108.08 900 Karaha;Kawah +-6.892 108.4 500 Cereme +-7.242 109.208 300 Slamet +-7.2 109.92 200 Dieng_Volc_Complex +-7.3 109.992 900 Sundoro +-7.38 110.058 500 Sumbing396 +-7.18 110.33 300 Ungaran +-7.37 110.4 200 Telomoyo +-7.45 110.43 1500 Merbabu +-7.542 110.442 500 Merapi +-7.625 111.192 900 Lawu +-7.808 111.758 500 Wilis +-7.93 112.308 300 Kelut +-7.92 112.45 200 Kawi-Butak +-7.725 112.58 900 Arjuno-Welirang +-7.62 112.63 500 Penanggungan +-8.02 112.68 300 Malang_Plain +-8.108 112.92 200 Semeru +-7.942 112.95 1500 Tengger_Caldera(Bromo) +-8.0 113.342 500 Lamongan +-7.7 113.58 900 Lurus +-7.97 113.57 500 Iyang-Argapura +-8.125 114.042 300 Raung +-8.058 114.242 200 Ijen +-7.85 114.37 900 Baluran +-8.28 115.13 500 Bratan +-8.242 115.375 300 Batur +-8.342 115.508 200 Agung +-8.42 116.47 1500 Rinjani +-8.25 118.0 500 Tambora +-8.18 119.058 900 Sangeang_Api +-8.68 120.025 500 Sano;Wai +-8.68 120.48 300 Poco_Leok +-8.62 120.52 200 Ranakah +-8.875 120.95 900 Inierie +-8.73 120.98 500 Inielika +-8.808 121.18 300 Ebulobo +-8.88 121.63 200 Iya +-8.792 121.77 1500 Sukaria_Caldera +-8.72 121.78 500 Ndete_Napu +-8.758 121.83 900 Kelimutu +-8.32 121.708 500 Paluweh +-8.67 122.45 300 Egon +-8.478 122.671 200 Ilimuda +-8.53 122.775 900 Lewotobi +-8.358 122.842 500 Leroboleng +-8.3 122.892 300 Riang_Kotang +-8.342 123.258 200 Iliboleng +-8.272 123.505 1500 Lewotolo +-8.53 123.42 500 Ililabalekan +-8.54 123.59 900 Iliwerung +-7.792 123.579 500 Tara;Batu +-8.51 124.148 300 Sirung +-7.53 123.95 200 Yersey +-6.62 124.22 900 Emperor_of_China +-6.6 124.675 500 Nieuwerkerk +-6.642 126.65 300 Gunungapi_Wetar +-7.125 128.675 200 Wurlali +-6.92 129.125 1500 Teon +-6.73 129.5 500 Nila +-6.3 130.0 900 Serua +-5.53 130.292 500 Manuk +-4.525 129.871 300 Banda_Api +-0.17 121.608 200 Colo[Una_Una] +0.75 124.42 900 Ambang +1.108 124.725 500 Soputan +1.142 124.73 300 Sempu +1.23 124.83 200 Tondano_Caldera +1.358 124.792 1500 Lokon-Empung +1.358 124.858 500 Mahawu +1.47 125.03 900 Klabat +1.52 125.2 500 Tongkoko +2.28 125.425 300 Ruang +2.78 125.48 200 Karangetang[Api_Siau] +3.67 125.5 900 Awu +3.97 124.17 500 Unnamed466 +1.78 127.792 300 Tarakan +1.68 127.88 200 Dukono +1.625 127.675 1500 Tobaru +1.475 127.642 500 Ibu +1.375 127.52 900 Gamkonora +1.22 127.43 500 Todoko-Ranu +1.08 127.42 300 Jailolo +0.88 127.32 200 Hiri +0.8 127.325 900 Gamalama +0.65 127.4 500 Tidore +0.57 127.4 300 Mare +0.45 127.4 200 Moti +0.32 127.4 1500 Makian +0.07 127.42 500 Tigalalu +-0.55 127.5 900 Amasing +-0.78 127.72 500 Bibinoi +4.4 117.88 300 Bombalai +5.95 121.07 200 Bud_Dajo +5.4 125.375 900 Balut +6.12 124.892 500 Parker +6.37 125.108 300 Matutum +6.987 125.273 200 Apo +7.393 126.397 1500 Leonard_Range +7.443 126.073 500 Unnamed490 +7.647 124.32 900 Makaturing +7.65 124.47 500 Latukan +7.67 124.5 300 Ragang +7.95 124.8 200 Kalatungan +7.877 125.068 900 Calayo +8.22 123.63 500 Malindang +8.8 124.92 300 Balatocan +9.203 124.673 200 Hibok-Hibok +9.593 125.52 1500 Paco +9.258 123.175 500 Magaso +10.412 123.132 900 Canlaon +10.615 123.22 500 Mandalagan +10.77 123.23 300 Silay +10.287 125.22 200 Cabalian +10.872 124.853 900 Mahagnoa +11.523 124.534 500 Biliran +12.77 124.05 300 Bulusan +13.05 123.958 200 Pocdol_Mountains +13.257 123.685 1500 Mayon +13.32 123.6 500 Masaraga +13.422 123.597 900 Malinao +13.457 123.457 500 Iriga +13.658 123.37 300 Isarog +14.02 122.792 200 Labo +13.24 122.018 900 Malindig +13.723 120.893 500 Panay +14.07 121.48 300 Banahao +14.12 121.3 200 Laguna_Volc_Field +14.13 121.2 1500 Maquiling +14.002 120.993 500 Taal +14.35 121.33 900 Jalajala +14.5 120.5 500 Mariveles +14.705 120.4 300 Natib +15.13 120.35 200 Pinatubo +15.2 120.742 900 Arayat +15.828 120.805 500 Amorong +16.33 120.55 300 Santo_Tomas527 +17.147 120.98 200 Patoc +17.32 121.1 1500 Ambalatungan_Group +18.222 122.123 500 Cagua +18.83 121.86 900 Camiguin_de_Babuyanes +19.077 122.202 500 Didicas +19.523 121.94 300 Babuyan_Claro +20.469 122.01 200 Iraya +20.83 109.78 900 Leizhou_Bandao +15.38 109.12 500 Cu-Lao_Re_Group +14.93 108.0 300 Toroeng_Prong +11.6 108.2 200 Haut_Dong_Nai +10.8 107.2 1500 Bas_Dong_Nai +9.83 109.05 500 Veteran +20.87 95.23 900 Popa +22.28 95.1 500 Lower_Chindwin +22.7 95.98 300 Singu_Plateau +25.32 98.47 200 Tengchong +20.93 134.75 900 Unnamed545 +24.0 121.83 500 Unnamed546 +24.85 121.92 300 Kuei-Shan-Tao +25.17 121.52 200 Tatun_Group +25.63 122.07 1500 Peng-Chia-Hsu +27.85 128.25 500 Iwo-Tori-shima +29.45 129.6 900 Akuseki-jima +29.53 129.72 500 Suwanose-jima +29.85 129.87 300 Nakano-shima +29.97 129.93 200 Kuchino-shima +30.43 130.22 900 Kuchinoerabu-jima +30.78 130.28 500 Kikai +31.22 130.57 300 Ibusuki_Volc_Field +31.58 130.67 200 Sakura-jima +31.768 130.594 1500 Sumiyoshi-ike +31.93 130.87 500 Kirishima +32.75 130.3 900 Unzen +32.88 131.1 500 Aso +33.08 131.25 300 Kuju_Group +33.28 131.43 200 Tsurumi +34.5 131.6 900 Abu +35.13 132.62 500 Sanbe +36.17 133.33 300 Oki-Dogo +34.92 139.12 200 Izu-Tobu +35.22 139.02 1500 Hakone +35.35 138.73 500 Fuji +36.1 138.3 900 Tateshina +35.9 137.48 500 On-take +36.15 136.78 300 Haku-san +36.12 137.55 200 Norikura +36.22 137.58 900 Yake-dake +36.4 137.5 500 Washiba-Kumonotaira +36.57 137.6 300 Tate-yama +36.92 138.03 200 Niigata-Yake-yama +36.88 138.12 1500 Myoko +36.4 138.53 500 Asama +36.62 138.55 900 Kusatsu-Shirane +36.7 138.52 500 Shiga +36.47 138.88 300 Haruna +36.53 139.18 200 Akagi +36.95 139.28 900 Hiuchi +36.8 139.38 500 Nikko-Shirane +36.77 139.5 300 Nantai +36.78 139.5 200 Omanago_Group +36.9 139.78 1500 Takahara +37.12 139.97 500 Nasu +37.43 139.58 900 Numazawa +37.6 140.08 500 Bandai +37.62 140.28 300 Adatara +37.73 140.25 200 Azuma +38.15 140.45 900 Zao +38.6 140.18 500 Hijiori +38.73 140.73 300 Narugo +38.95 140.78 200 Kurikoma +39.08 140.03 1500 Chokai +39.75 140.8 500 Akita-Komaga-take +39.85 141.0 900 Iwate +39.95 140.85 500 Hachimantai +39.97 140.77 300 Akita-Yake-yama +39.93 139.88 200 Kanpu +39.95 139.73 900 Megata +40.65 140.3 500 Iwaki +40.47 140.92 300 Towada +40.65 140.88 200 Hakkoda_Group +41.32 141.08 1500 Osore-yama +41.43 141.07 500 Mutsu-Hiuchi-dake +34.73 139.38 900 Oshima +34.52 139.28 500 To-shima +34.37 139.27 300 Nii-jima +34.22 139.15 200 Kozu-shima +34.08 139.53 900 Miyake-jima +33.13 139.77 500 Hachijo-jima +32.45 139.77 300 Aoga-shima +31.92 139.92 200 Bayonnaise_Rocks +31.32 140.05 1500 Smith_Rock +30.48 140.32 500 Tori-shima +29.22 140.8 900 Omachi_Seamount +27.243 140.877 500 Nishino-shima +26.13 144.48 300 Unnamed623 +25.43 141.23 200 Kita-Iwo-jima +24.75 141.33 900 Iwo-jima +21.0 142.9 500 Unnamed626 +20.3 143.2 300 Unnamed627 +20.53 144.9 200 Farallon_de_Pajaros +19.67 145.4 1500 Asuncion +18.77 145.67 500 Agrigan +18.13 145.8 900 Pagan +17.6 145.83 500 Alamagan +17.32 145.85 300 Guguan +16.708 145.78 200 Sarigan +16.35 145.67 900 Anatahan +41.5 139.37 500 Oshima-Oshima +41.8 141.17 300 E-san +42.07 140.68 200 Komaga-take +42.12 140.45 1500 Nigorigawa +42.53 140.83 500 Usu +42.88 140.63 900 Niseko +42.83 140.82 500 Yotei +42.767 140.916 300 Shiribetsu +42.5 141.18 200 Kuttara +42.7 141.33 900 Shikotsu +45.18 141.25 500 Rishiri +43.42 142.68 300 Tokachi +43.68 142.88 200 Daisetsu +43.45 143.03 1500 Nipesotsu-Upepesanke +43.28 143.08 500 Shikaribetsu_Group +43.38 144.02 900 Akan +43.55 144.43 500 Kutcharo +43.57 144.57 300 Mashu +44.073 145.125 200 Rausu +44.13 145.17 900 Shiretoko-Iwo-zan +43.85 145.5 500 Golovnin_(Kunashir_Is.) +43.98 145.73 300 Mendeleev_(Kunashir_Is.) +44.43 146.13 200 Smirnov +44.45 146.25 1500 Tyatya_(Kunashir_Is.) +44.45 146.93 500 Berutarube_(Iturup_Is.) +44.62 147.0 900 Lvinaya_Past +44.8 147.13 500 Atsonupuri_(Iturup_Is.) +44.83 147.37 300 Bogatyr_Ridge +45.02 147.87 200 Grozny_Group +45.1 148.02 900 Baransky_(Iturup_Is.) +45.38 147.92 500 Chirip_(Bogdan_Khmelnitzky_Iturup_Is.) +45.25 148.35 300 Golets-Tornyi_Group +45.38 148.83 200 Kudryavy_(Medvezhia_Iturup_Is.) +45.5 148.85 1500 Demon +45.77 149.68 500 Ivao_Group +45.88 149.83 900 Rudakov +45.93 149.92 500 Tri_Sestry +46.05 150.05 300 Kolokol_Group_(Urup_Is.) +46.52 150.87 200 Cherny_(Chirpoi_Is.) +46.82 151.78 900 Milne +46.83 151.75 500 Goryachaya_sopka_(Simushur_Is.) +46.92 151.95 300 Zavaritzky_(Simushur_Is.) +47.02 152.12 200 Prevo_Peak_(Simushur_Is.) +47.12 152.23 1500 Urataman +47.33 152.48 500 Ketoi_(Pallas_Peak_Ketoi_Is.) +47.52 152.8 900 Ushishir_(Yankiche_Is.) +47.6 152.92 500 Srednii +47.75 153.02 300 Rasshua_(Rasshua_Is.) +48.1 153.2 200 Sarychev_Peak_(Matua_Is.) +48.28 153.25 900 Raikoke_(Raikoke_Is.) +48.98 153.47 500 Chirinkotan_(Chirinkotan_Is.) +48.95 153.93 300 Ekarma_(Ekarma_Is.) +48.75 154.02 200 Kuntomintar_(Shiashkotan_Is.) +48.87 154.18 1500 Sinarka_(Shiashkotan_Is.) +49.12 154.508 500 Kharimkotan +49.35 154.7 900 Tao-Rusyr_Caldera +49.57 154.8 500 Nemo_Peak_(Onekotan_Is.) +50.2 154.98 300 Shirinki +50.27 155.25 200 Fuss_Peak_(Paramushir_Is.) +50.13 155.37 900 Karpinsky_Group_(Paramushir_Is.) +50.25 155.43 500 Lomonosov_Group +50.32 155.47 300 Chikurachki_(Paramushir_Is.) +50.55 155.97 200 Vernadskii_Ridge +50.68 156.02 1500 Ebeko_(Paramushir_Is.) +50.87 155.57 500 Alaid_(Atlasova_Is.) +51.1 156.72 900 Mashkovtsev +51.3 156.9 500 Kambalny +51.35 156.75 300 Koshelev +51.6 156.55 200 Unnamed704 +51.43 157.0 900 Diky_Greben +51.47 157.1 500 Kurile_Lake +51.5 157.2 300 Iliyinsky +51.58 157.33 200 Zheltovsky +51.65 157.35 900 Kell +51.75 157.27 500 Belenkaya +51.82 157.53 900 Ksudach +51.88 157.38 500 Ozernoy +52.02 157.53 300 Plosky_Volc_Group +52.07 157.7 200 Khodutka +52.113 157.849 900 Piratkovsky +52.077 157.477 500 Olkoviy +52.146 157.322 300 Ostanets +52.22 157.428 200 Otdelniy +52.33 157.33 1500 Unnamed719 +52.25 157.6 500 Tundroviy +52.45 158.2 900 Mutnovsky +52.263 157.787 500 Golaya +52.355 157.827 300 Asacha +52.43 157.93 200 Visokiy +52.55 158.03 900 Gorely +52.53 157.33 500 Opala +52.57 157.02 300 Unnamed727 +52.63 157.58 200 Tolmachev_Dol +52.68 158.3 900 Vilyuchik +52.823 158.27 500 Barkhatnaya_Sopka +52.92 158.52 900 Unnamed731 +52.88 158.3 500 Unnamed732 +52.9 157.78 300 Bolshe-Bannaya +53.32 158.68 200 Koryaksky +53.25 158.85 900 Avachinsky +53.63 158.1 500 Unnamed736 +53.63 158.42 300 Veer +53.62 159.0 200 Dzenzursky +53.58 159.13 1500 Zhupanovsky +53.905 158.385 500 Zavaritsky +53.905 158.07 900 Bakenin +53.98 159.45 500 Akademia_Nauk +54.05 159.45 300 Karymsky +54.13 159.67 200 Maly_Semiachik +54.32 160.02 900 Bolshoi_Semiachik +54.53 159.8 500 Taunshits +54.5 159.92 300 Uzon +54.48 160.23 200 Kikhpinych +54.58 160.27 900 Krasheninnikov +54.75 160.5 500 Kronotsky +54.97 160.7 900 Gamchen +55.07 160.72 500 Komarov +55.07 160.77 300 Kolkhozhny +55.2 160.32 200 Kizimen +55.23 160.587 900 Iult +55.92 161.75 500 Unnamed756 +55.83 160.33 300 Tolbachik +55.755 160.527 200 Udina +55.862 160.603 1500 Zimina +55.97 160.6 500 Bezymianny +56.02 160.593 900 Kamen +56.05 160.65 500 Klyuchevskoy +56.07 160.48 300 Ushkovsky +56.38 160.83 200 Zarechny +56.53 160.87 900 Unnamed765 +56.65 161.35 500 Sheveluch +54.75 157.37 300 Khangar +55.67 157.72 200 Ichinsky +55.82 157.98 900 Maly_Payalpan +55.88 157.78 500 Bolshoi_Payalpan +55.2 158.47 900 Plosky771 +55.43 158.65 500 Akhtang +55.58 158.38 300 Kozyrevsky +55.65 158.8 200 Romanovka +56.08 158.38 900 Uksichan +56.47 157.8 500 Bolshoi-Kekuknaysky +56.37 158.37 300 Kulkev +56.33 158.67 200 Geodesistoy +56.32 158.83 1500 Anaun +56.37 159.03 500 Krainy +56.4 158.85 900 Kekurny +56.57 158.52 500 Eggella +56.82 158.95 300 Unnamed783 +56.52 159.53 200 Verkhovoy +56.7 159.65 900 Alney-Chashakondzha +56.82 159.67 500 Cherny +56.85 159.8 300 Pogranychny +56.88 159.95 200 Zaozerny +56.97 159.78 1500 Bliznets +57.1 159.93 500 Kebeney +57.13 160.4 900 Fedotych +57.23 160.08 500 Sedankinsky +57.33 160.2 300 Gorny_Institute +57.3 159.83 200 Leutongey +57.32 159.97 900 Tuzovsky +57.4 160.1 500 Titila +57.47 160.25 300 Mezhdusopochny +57.45 160.37 200 Shishel +57.53 160.53 900 Elovsky +57.7 160.4 500 Alngey +57.7 160.58 900 Uka +57.8 160.67 500 Kaileney +57.83 160.25 300 Plosky803 +57.88 160.53 200 Bely +57.97 160.65 900 Atlasova +58.02 160.75 500 Snezhniy +58.08 160.77 300 Iktunup +58.18 160.82 200 Ostry +58.2 160.97 1500 Snegovoy +58.28 160.87 500 Severny +58.4 161.08 900 Iettunup +58.37 160.62 500 Voyampolsky +66.12 165.63 300 Aluchin_Group +67.17 165.2 200 Anjuisky +66.43 143.73 900 Balagan-Tas +44.5 135.5 500 Southern_Sikhote-Alin +56.33 118.07 300 NE_Udokan_Plateau +56.18 117.47 200 Udokan_Volc_Field +50.52 103.25 900 Dgida_Basin +51.5 102.5 500 Tunkin_Depression +52.7 98.98 900 Oka_Volc_Field +52.33 98.0 500 Ulug-Arginsky +48.17 99.7 300 Taryatu-Chulutu +48.67 102.75 200 Khanuy_Gol +47.12 109.08 900 Bus-Obo +45.33 114.0 500 Dariganga_Volc_Field +45.28 106.7 300 Middle_Gobi +42.9 89.25 200 Turfan +42.5 82.5 1500 Tianshan_Volc_Group +35.52 80.2 500 Kunlun_Volc_Group +35.85 91.7 900 Unnamed831 +41.47 113.0 500 Honggeertu +49.37 125.92 300 Keluo_Group +48.72 126.12 200 Wudalianchi +44.08 128.83 900 Jingpohu +42.33 126.5 500 Longgang_Group +41.98 128.08 300 Baitoushan +41.33 128.0 200 Xianjindao +38.33 127.33 1500 Ch'uga-ryong +37.5 130.87 500 Ulreung +33.37 126.53 900 Halla +52.37 175.98 500 Buldir +52.1 177.6 300 Kiska +52.02 178.13 200 Segula +51.97 178.33 900 Davidof +51.95 178.53 500 Little_Sitkin +51.93 179.58 300 Cerberus_(Semisopochnoi) +51.78 -178.8 200 Gareloi +51.88 -178.13 1500 Tanaga +51.87 -178.02 500 Takawangha +51.9 -177.43 900 Bobrof +51.92 -177.17 500 Kanaga +51.93 -176.75 300 Moffett +51.98 -176.6 200 Adagdak +52.08 -176.13 900 Great_Sitkin +52.18 -175.5 500 Kasatochi +52.22 -175.13 300 Koniuji +52.03 -174.93 200 Sergief +52.38 -174.15 1500 Korovin_(Atka_Is.) +52.32 -172.52 500 Seguam_(Pyre_Peak) +52.5 -171.25 900 Amukta +52.57 -171.13 500 Chagulak +52.63 -170.63 300 Yunaska +52.75 -170.12 200 Herbert +52.9 -170.05 900 Carlisle +52.82 -169.95 500 Cleveland +53.07 -169.77 300 Uliaga +52.97 -169.72 200 Kagamil +53.13 -168.68 900 Vsevidof +53.15 -168.55 500 Recheschnoi +53.4 -168.17 900 Okmok +53.93 -168.03 500 Bogoslof +53.88 -166.93 300 Makushin +53.98 -166.67 200 Table_Top-Wide_Bay +54.13 -165.97 900 Akutan +54.52 -164.65 500 Westdahl +54.65 -164.43 300 Fisher +54.75 -163.97 200 Shishaldin +54.75 -163.73 1500 Isanotski +54.8 -163.6 500 Roundtop +55.42 -163.15 900 Amak +55.07 -162.82 500 Frosty +55.18 -162.27 300 Dutton +55.33 -162.07 200 Emmons_Lake +55.42 -161.9 900 Pavlof +55.45 -161.87 500 Pavlof_Sister +55.62 -161.22 300 Dana +55.93 -160.0 200 Unnamed888 +56.02 -159.8 900 Kupreanof +56.17 -159.38 500 Veniaminof +56.53 -158.8 900 Black_Peak +56.88 -158.17 500 Aniakchak +57.02 -157.18 300 Yantarni +57.13 -157.0 200 Chiginagak +57.38 -156.75 900 Kialagvik +57.75 -156.35 500 Peulik +57.83 -156.5 300 Ukinrek +57.87 -155.42 200 Unnamed898 +58.17 -155.35 1500 Martin +58.18 -155.23 500 Mageik +58.23 -155.08 900 Trident +58.27 -154.98 500 Katmai +58.27 -155.16 300 Novarupta +58.35 -155.1 200 Griggs +58.33 -154.68 900 Snowy +58.42 -154.45 500 Denison +58.43 -154.4 300 Steller +58.47 -154.35 200 Kukak +58.48 -154.3 1500 Devils_Desk +58.62 -154.05 500 Kaguyak +58.77 -153.68 900 Fourpeaked +58.87 -153.55 500 Douglas +59.37 -153.42 300 Augustine +60.03 -153.08 200 Iliamna +60.48 -152.75 900 Redoubt +61.3 -152.25 500 Spurr +61.62 -152.48 300 Hayes +66.35 -164.33 200 Espenberg +65.6 -163.92 1500 Imuruk_Lake +63.6 -170.43 500 Kookooligit_Mountains +63.45 -162.12 900 St.Michael +61.43 -164.47 500 Ingakslugwat_Hills +60.02 -166.33 300 Nunivak_Island +57.18 -170.3 200 St.Paul_Island +64.07 -148.42 900 Buzzard_Creek +62.22 -144.13 500 Sanford +62.0 -144.02 300 Wrangell +62.13 -143.08 200 Gordon +61.38 -141.75 1500 Bona-Churchill +57.05 -135.75 500 Edgecumbe +56.5 -133.1 900 Duncan_Canal +55.25 -133.3 500 Tlevak_Strait-Suemez_Is. +55.32 -131.05 300 Behm_Canal-Rudyerd_Bay +62.93 -137.38 200 Fort_Selkirk +60.42 -135.42 900 Alligator_Lake +59.68 -133.32 500 Ruby_Mountain +58.6 -131.97 300 Heart_Peaks +58.42 -131.35 200 Level_Mountain +57.72 -130.63 1500 Edziza +57.43 -130.68 500 Spectrum_Range +56.78 -131.28 900 Hoodoo_Mountain +56.58 -130.55 500 Iskut-Unuk_River_Cones +55.12 -128.9 300 Tseax_River_Cone +54.7 -130.23 200 Crow_Lagoon +52.5 -128.73 900 Milbanke_Sound_Group +52.47 -124.7 500 Satah_Mountain +52.9 -123.73 300 Nazko +52.33 -120.57 200 Wells_Gray-Clearwater +51.43 -126.3 1500 Silverthrone +50.8 -123.4 500 Bridge_River_Cones +50.63 -123.5 900 Meager +49.92 -123.03 500 Garibaldi_Lake +49.85 -123.0 300 Garibaldi;Mt. +48.786 -121.82 200 Baker +48.112 -121.113 900 Glacier_Peak +46.87 -121.758 500 Rainier +46.206 -121.49 300 Adams +46.2 -122.18 200 St.Helens +45.88 -122.08 1500 West_Crater +45.93 -121.82 500 Indian_Heaven +45.374 -121.694 900 Hood +44.692 -121.8 500 Jefferson +44.42 -121.77 300 Blue_Lake_Crater +44.38 -121.93 200 Sand_Mountain_Field +44.332 -121.837 900 Washington +44.285 -121.841 500 Belknap +44.17 -121.77 300 North_Sister_Field +44.1 -121.77 200 South_Sister +43.979 -121.688 1500 Bachelor +43.57 -121.82 500 Davis_Lake +43.722 -121.229 900 Newberry_Volcano +43.512 -120.861 500 Devils_Garden +43.472 -120.754 300 Squaw_Ridge_Field +43.361 -120.669 200 Four_Craters_Lava_Field +43.241 -122.108 900 Cinnamon_Butte +42.93 -122.12 500 Crater_Lake +42.552 -122.201 300 Imagination_Peak +43.1 -118.75 200 Diamond_Craters +43.0 -117.8 1500 Saddle_Butte +43.03 -117.42 500 Jordan_Craters +42.606 -117.589 900 Jackies_Butte +41.42 -122.2 500 Shasta +41.58 -121.57 300 Medicine_Lake +41.178 -121.443 1500 Brushy_Butte +40.955 -121.365 900 Big_Cave +40.78 -121.6 500 Twin_Buttes +40.68 -121.55 1500 Tumble_Buttes +40.63 -121.43 300 Potato_Butte +40.492 -121.508 1500 Lassen_Volc_Center +40.63 -120.83 500 Eagle_Lake_Field +38.97 -122.77 900 Clear_Lake +38.0 -119.03 500 Mono_Lake_Volc_Field +37.88 -119.0 1500 Mono_Craters +37.692 -119.02 300 Inyo_Craters +37.7 -118.87 900 Long_Valley +37.58 -119.05 500 Red_Cones +37.02 -117.45 1500 Ubehebe_Craters +36.358 -118.32 300 Golden_Trout_Creek +36.03 -117.82 1500 Coso_Volc_Field +34.75 -116.625 500 Lavic_Lake +34.55 -115.78 900 Amboy +43.07 -114.43 500 Shoshone_Lava_Field +43.42 -113.5 1500 Craters_of_the_Moon +42.88 -113.22 300 Wapi_Lava_Field +43.5 -112.45 900 Hell's_Half_Acre +44.43 -110.67 500 Yellowstone +39.375 -119.72 1500 Steamboat_Springs +37.257 -113.625 300 Santa_Clara +37.33 -113.12 1500 Kolob +37.328 -112.408 500 Bald_Knoll +37.58 -112.67 900 Markagunt_Plateau +38.97 -112.5 500 Black_Rock_Desert +39.65 -107.03 300 Dotsero +36.38 -113.13 200 Uinkaret_Field +35.37 -111.5 900 Sunset_Crater +33.78 -105.93 500 Carrizozo +34.8 -108.0 1500 Zuni-Bandera +35.87 -106.57 300 Valles_Caldera +46.52 129.58 1500 CoAxial_Segment +45.95 130.0 500 Axial_Seamount +44.83 130.3 900 Cleft_Segment +42.67 126.78 500 North_Gorda_Ridge +31.75 124.25 300 Unnamed1023 +19.425 -155.292 1500 Kilauea +19.475 -155.608 900 Mauna_Loa +19.82 -155.47 500 Mauna_Kea +19.692 -155.87 1500 Hualalai +20.57 -156.57 300 Kahoolawe +20.708 -156.25 1500 Haleakala +21.37 -157.8 500 Koolau +21.75 158.75 900 Unnamed1031 +23.58 163.83 200 Unnamed1032 +9.82 104.3 200 Unnamed1033 +0.792 86.15 500 Galapagos_Rift +-17.57 148.85 900 Teahitia +-17.642 148.6 500 Rocard +-17.87 -148.07 300 Mehetia +-17.436 113.206 200 Unnamed1038 +-27.12 -109.45 1500 Easter_Island +-49.68 178.77 500 Antipodes_Island +-53.9 140.3 200 Unnamed1041 +-55.97 -143.17 200 Unnamed1042 +32.418 -115.305 900 Prieto;Cerro +31.772 -113.498 900 Pinacate +30.468 -115.996 900 San_Quintin_Volc_Field +29.814 -114.384 500 San_Luis;Isla +29.33 -114.5 300 Jaraguay_Volc_Field +29.08 -113.513 200 Coronado +29.07 -118.28 1500 Guadalupe +28.5 -113.75 500 San_Borja_Volc_Field +28.0 -115.0 200 Unnamed1051 +27.47 -112.591 1500 Tres_Virgenes +27.392 -111.858 300 Tortuga;_Isla +26.0 -111.92 200 Comondu-La_Purisima +19.3 -110.82 900 Barcena +18.78 -110.95 500 Socorro +24.15 -104.45 1500 Durango_Volc_Field +21.45 -104.73 900 Sanganguey +21.125 -104.508 1500 Ceboruco +20.62 -104.83 500 Mascota_Volc_Field +19.514 -103.62 900 Colima +19.48 -102.25 500 Michoacan-Guanajuato +19.724 -99.757 300 Jocotitlan +19.108 -99.758 200 Toluca;Nevado_de_ +19.08 -99.13 900 Chichinautzin +19.308 -98.7 500 Papayo +19.179 -98.642 300 Iztaccihuatl +19.023 -98.622 200 Popocatepetl +19.23 -98.03 1500 Malinche;La +19.27 -97.47 500 Serdan-Oriental +19.68 -97.45 900 Humeros;Los +19.809 -96.526 500 Atlixcos;Cerro_Los +19.67 -96.75 300 Naolinco_Volc_Field +19.492 -97.15 200 Cofre_de_Perote +19.33 -97.25 900 Gloria;La +19.15 -97.27 500 Cumbres;Las +19.03 -97.268 300 Orizaba;Pico_de +18.572 -95.169 200 San_Martin +17.36 -93.228 1500 Chichon;El +15.13 -92.112 500 Tacana +15.034 -91.903 900 Tajumulco +14.756 -91.552 500 Santa_Maria +14.82 -91.48 300 Almolonga +14.71 -91.479 200 Santo_Tomas1084 +14.583 -91.186 900 Atitlan +14.612 -91.189 500 Toliman +14.501 -90.876 300 Acatenango +14.473 -90.88 200 Fuego +14.465 -90.743 1500 Agua +14.381 -90.601 500 Pacaya +14.156 -90.407 900 Tecuamburro +14.33 -90.4 500 Cuilapa-Barbarena +14.03 -90.1 300 Moyuta +14.3 -90.0 200 Flores1094 +14.12 -89.73 900 Chingo_Volc_Field +14.33 -89.87 500 Santiago;Cerro +14.4 -89.78 300 Suchitan_Volc_Field +14.42 -89.68 200 Ixtepeque +14.55 -89.63 1500 Ipala_Volc_Field +14.83 -89.55 500 Chiquimula_Volc_Field +14.65 -89.35 900 Quezaltepeque +14.27 -89.48 500 San_Diego +14.03 -89.7 300 Singuil;Cerro +13.891 -89.786 200 Apaneca_Range +13.853 -89.63 900 Santa_Ana +13.813 -89.633 500 Izalco +13.87 -89.55 300 Coatepeque_Caldera +13.736 -89.286 200 San_Salvador +14.02 -89.25 1500 Cinotepec;Cerro +13.9 -89.12 500 Guazapa +13.672 -89.053 900 Ilopango +13.623 -88.852 500 San_Vicente1112 +13.72 -88.77 300 Apastepeque_Field +13.435 -88.532 200 Taburete +13.494 -88.502 900 Tecapa +13.419 -88.471 500 Usulutan +13.475 -88.32 300 Chinameca +13.431 -88.272 200 San_Miguel +13.428 -88.105 1500 Aramuaca;Laguna +13.277 -87.853 500 Conchagua +13.22 -87.765 900 Conchaguita +13.27 -87.63 500 Tigre;Isla_El +13.33 -87.63 300 Zacate_Grande;Isla +14.98 -87.98 200 Yojoa;Lake +16.1 -86.9 900 Utila_Island +12.98 -87.57 500 Cosiguina +12.702 -87.004 300 San_Cristobal1127 +12.602 -86.845 200 Telica +12.55 -86.75 1500 Rota +12.506 -86.702 500 Negro;Cerro +12.495 -86.688 900 Pilas;Las +12.422 -86.54 500 Momotombo +12.242 -86.342 300 Apoyeque +12.12 -86.32 200 Nejapa-Miraflores +11.984 -86.161 900 Masaya +11.92 -85.98 500 Joya;La +11.826 -85.968 300 Mombacho +11.73 -85.82 200 Zapatera +11.538 -85.622 1500 Concepcion +11.446 -85.515 500 Maderas +13.17 -86.4 900 Esteli +12.53 -86.142 500 Ciguatepe;Cerro_El +12.3 -85.73 300 Lajas;Las +12.53 -83.87 200 Azul;Volcan +10.98 -85.473 900 Orosi +10.83 -85.324 500 Rincon_de_la_Vieja +10.748 -85.153 300 Miravalles +10.673 -85.015 200 Tenorio +10.451 -84.978 1500 Tilaran;Cerro +10.463 -84.703 500 Arenal +10.3 -84.366 900 Platanar +10.2 -84.233 500 Poas +10.135 -84.1 300 Barva +9.979 -83.852 200 Irazu +10.03 -83.77 900 Turrialba +8.8 -82.558 500 Baru +8.523 -80.91 300 Yeguada;La +5.092 -75.3 200 Bravo;Cerro +4.895 -75.322 1500 Ruiz +4.82 -75.37 500 Santa_Isabel1160 +4.67 -75.33 900 Tolima +4.48 -75.4 500 Machin;Cerro +2.92 -76.05 300 Huila +2.32 -76.4 200 Purace +2.12 -76.58 900 Sotara +1.57 -76.78 500 Petacas +1.47 -76.92 300 Dona_Juana +1.22 -77.37 200 Galeras +1.08 -77.68 1500 Azufral;Volcan +0.98 -77.88 500 Cumbal +0.828 -77.964 900 Negro_de_Mayasquer;Cerro +0.552 -77.58 500 Soche +0.308 -78.364 300 Cuicocha +0.13 -78.27 200 Mojanda +0.029 -77.986 900 Cayambe +-0.078 -77.656 500 Reventador +0.038 -78.463 300 Pululagua +-0.171 -78.598 200 Guagua_Pichincha +-0.353 -78.617 1500 Atacazo +-0.375 -78.25 500 Chacana +-0.481 -78.141 900 Antisana +-0.43 -77.72 500 Pan_de_Azucar +-0.538 -77.626 300 Sumaco +-0.659 -78.714 200 Illiniza +-0.677 -78.436 900 Cotopaxi +-0.85 -78.9 500 Quilotoa +-1.467 -78.442 300 Tungurahua +-1.78 -78.613 200 Tulabug +-2.03 -78.33 1500 Sangay +-0.37 -91.55 500 Fernandina +-0.02 -91.546 900 Ecuador;Volcan +0.02 -91.35 500 Wolf;Volcan +-0.18 -91.28 300 Darwin;Volcan +-0.43 -91.12 200 Alcedo;Volcan +-0.83 -91.17 900 Negra;Sierra +-0.9 -91.42 500 Azul;Cerro +0.58 -90.75 300 Pinta +0.33 -90.47 200 Marchena +0.32 -89.958 1500 Genovesa +-0.22 -90.77 500 Santiago +-0.62 -90.33 900 Santa_Cruz +-1.3 -90.45 500 Floreana +-0.88 -89.5 300 San_Cristobal1203 +-15.23 -72.63 200 Firura;Nevados +-15.52 -72.65 900 Coropuna +-15.42 -72.33 500 Andahua_Valley +-15.78 -71.85 300 Sabancaya +-14.37 -71.17 200 Quimsachata +-16.191 -71.53 1500 Chachani;Nevado +-16.294 -71.409 500 Misti;El +-16.355 -70.903 900 Ubinas +-16.608 -70.85 500 Huaynaputina +-16.755 -70.595 300 Ticsani +-17.025 -70.358 200 Tutupaca +-17.18 -70.2 900 Yucamane +-17.47 -69.82 500 Casiri;Nevados +-17.72 -69.77 300 Tacora +-17.87 -69.48 200 Lexone +-18.05 -69.03 1500 Patilla_Pata +-17.92 -68.92 500 Anallajsi;Nevado +-18.25 -68.53 900 Macizo_de_Larancagua +-18.32 -68.8 500 Macizo_de_Pacuni +-18.17 -69.15 300 Parinacota +-18.37 -69.05 200 Acotango +-18.42 -69.17 900 Guallatiri +-18.5 -68.07 500 Colluma;Cerro +-18.62 -68.75 300 Sacabaya;Volcan_de +-18.73 -69.05 200 Arintica +-19.13 -68.53 1500 Tata_Sabaya +-19.15 -68.83 500 Isluga +-19.42 -68.97 900 Puchuldiza +-19.492 -68.65 500 Pina;Cerro +-19.78 -66.48 300 Nuevo_Mundo +-20.73 -68.55 200 Irruputuncu +-20.83 -68.63 900 Unnamed1235 +-20.85 -68.2 500 Pampa_Luxsar +-20.93 -68.48 300 Olca-Paruma +-21.22 -68.47 200 Aucanquilcha;Cerro +-21.25 -67.75 1500 San_Agustin;Cerro +-21.3 -68.18 500 Ollague +-21.5 -67.5 900 Yumia;Cerro +-21.6 -66.88 500 Escala +-21.67 -66.5 300 Santa_Isabel;Cerro +-21.68 -67.47 200 Moiro;Cerro +-21.78 -68.23 900 Azufre;Cerro_del +-21.88 -68.4 500 San_Pedro +-21.88 -67.9 300 Chascon;Cerro +-22.12 -68.15 200 Chao +-22.2 -68.1 1500 Toconce;Cerro +-22.25 -67.42 500 Quetena +-22.27 -67.22 900 Uturuncu +-22.35 -68.03 500 Tatio;El +-22.43 -67.9 300 Tocorpuri;Cerros_de +-22.57 -67.87 200 Putana +-22.73 -67.88 900 Sairecabur +-22.83 -67.88 500 Licancabur +-22.88 -67.58 300 Guayaques +-23.0 -67.75 200 Purico_Complex +-23.23 -67.65 1500 Colachi +-23.3 -67.62 500 Acamarachi +-23.35 -67.67 900 Overo;Cerro +-23.37 -67.73 500 Lascar +-23.58 -67.7 300 Chiliques +-23.75 -67.53 200 Cordon_de_Puntas_Negras +-23.85 -67.62 900 Cordon_Chalviri +-23.83 -67.95 500 Tujle;Cerro +-24.18 -68.05 300 Pular +-24.18 -68.25 200 Negrillar;El +-24.27 -67.77 1500 Aracar +-24.4 -68.25 500 Socompa +-24.28 -68.6 900 Negrillar;La +-24.72 -68.53 500 Llullaillaco +-24.05 -66.48 300 Tuzgle;Cerro +-25.08 -68.37 200 Escorial;Cerro +-25.17 -68.5 900 Lastarria +-25.33 -68.52 500 Cordon_del_Azufre +-25.42 -68.58 300 Bayo;Cerro +-25.53 -68.0 200 Antofalla +-26.08 -67.5 1500 Antofagasta_de_la_Sierra +-26.48 -68.58 500 Nevada;Sierra +-26.62 -68.35 900 Condor;Cerro_El +-26.62 -68.15 500 Peinado +-26.77 -67.72 300 Robledo +-26.8 -68.37 200 Falso_Azufre +-27.12 -68.53 900 Ojos_del_Salado;Nevados +-27.2 -68.55 500 Tipas +-27.3 -69.13 300 Copiapo +-26.27 -80.12 200 San_Felix +-33.658 -78.85 1500 Robinson_Crusoe +-33.4 -69.8 500 Tupungatito +-33.782 -69.897 900 San_Jose +-34.161 -69.833 500 Maipo +-34.608 -70.295 300 Palomo +-34.814 -70.352 200 Tinguiririca +-35.24 -70.57 900 Planchon-Peteroa +-35.464 -70.8 500 Mondaca +-35.558 -70.496 300 Calabozos +-35.58 -70.75 200 Descabezado_Grande +-35.653 -70.761 1500 Azul;Cerro[Quizapu] +-36.02 -70.58 500 Maule;Laguna_del +-35.989 -70.849 900 San_Pedro-Pellado +-36.193 -71.161 500 Longavi;Nevado_de +-36.286 -71.009 300 Blanca;Loma +-36.45 -70.92 200 Resago;Volcan +-36.42 -69.2 900 Payun_Matru;Cerro +-36.63 -70.42 500 Domuyo +-36.863 -71.377 300 Chillan;Nevados_de +-37.142 -70.03 200 Tromen +-37.55 -69.62 1500 Puesto_Cortaderas +-37.406 -71.349 500 Antuco +-37.85 -71.17 900 Copahue +-37.92 -71.45 500 Callaqui +-38.31 -71.645 300 Tolguaca +-38.377 -71.58 200 Lonquimay +-38.37 -71.08 900 Chapulul;Cerro +-38.692 -71.729 500 Llaima +-38.97 -71.52 300 Sollipulli +-39.2 -71.83 200 Caburga +-39.27 -71.7 1500 Redondo;Cerro +-39.3 -71.82 500 Huelemolle +-39.42 -71.93 900 Villarrica +-39.5 -71.7 500 Quetrupillan +-39.633 -71.5 300 Lanin +-39.87 -71.55 200 Huanquihue_Group +-39.927 -72.027 900 Mocho-Choshuenco +-40.35 -72.07 500 Carran-Los_Venados +-40.52 -72.2 300 Cordon_Caulle +-40.59 -72.117 200 Puyehue +-40.534 -72.038 1500 Mencheca +-40.77 -71.95 500 Pantoja;Cerro +-40.771 -72.153 900 Antillanca_Group +-40.969 -72.264 500 Puntiagudo-Cordon_Cenizos +-41.1 -72.493 300 Osorno +-41.326 -72.614 200 Calbuco +-41.25 -72.27 900 Cayute-La_Vigueria +-41.755 -72.396 500 Yate +-41.874 -72.431 300 Hornopiren +-42.07 -71.65 200 Volcanico;Cerro +-42.377 -72.578 1500 Huequi +-42.78 -72.43 500 Minchinmavida +-42.833 -72.646 900 Chaiten +-43.18 -72.8 500 Corcovado +-43.42 -72.83 300 Yanteles;Cerro +-43.68 -72.5 200 Palena_Volc_Group +-44.08 -72.88 900 Melimoyu +-44.3 -72.53 500 Puyuhuapi +-44.67 -73.08 300 Mentolat +-45.1 -73.2 200 Maca +-45.9 -72.97 1500 Hudson;Cerro +-49.02 -73.55 500 Lautaro +-49.358 -73.28 900 Viedma;Volcan +-50.17 -73.83 500 Aguilera +-50.98 -73.7 300 Reclus +-52.33 -73.4 200 Burney;Monte +-52.0 -70.0 900 Palei-Aike_Volc_Field +-54.95 -70.27 500 Cook;Isla +17.63 -63.23 300 Saba +17.48 -62.95 200 Quill;The +17.37 -62.8 1500 Liamuiga +17.15 -62.58 500 Nevis_Peak +16.72 -62.18 900 Soufriere_Hills +16.05 -61.67 500 Soufriere_Guadeloupe +15.62 -61.45 300 Diable;Morne_Au +15.5 -61.42 200 Diablotins;Morne +15.33 -61.33 900 Micotrin +15.22 -61.37 500 Patates;Morne +14.82 -61.17 300 Pelee +13.83 -61.05 200 Qualibou +13.33 -61.18 1500 Soufriere_St.Vincent +12.15 -61.67 500 St.Catherine +64.8 -23.78 900 Snaefellsjokull +64.87 -23.25 500 Lysuholl +64.87 -22.23 300 Ljosufjoll +63.67 -23.33 200 Reykjaneshryggur +63.88 -22.5 900 Reykjanes +63.93 -22.1 500 Krisuvik +63.92 -21.83 300 Brennisteinsfjoll +64.18 -21.33 200 Hengill +64.03 -20.87 1500 Grimsnes +64.6 -20.58 500 Prestahnukur +64.75 -19.98 900 Langjokull +64.78 -18.92 500 Hofsjokull +64.63 -19.32 300 Kerlingarfjoll +63.43 -20.28 200 Vestmannaeyjar +63.63 -19.62 900 Eyjafjoll +63.63 -19.05 500 Katla +63.78 -19.57 300 Tindfjallajokull +63.92 -19.17 200 Torfajokull +63.92 -19.67 1500 Vatnafjoll +63.98 -19.7 500 Hekla +64.42 -17.33 900 Grimsvotn +64.48 -17.8 500 Loki-Fogrufjoll +64.63 -17.53 300 Bardarbunga +64.73 -17.92 200 Tungnafellsjokull +64.65 -16.72 900 Kverkfjoll +65.03 -16.75 500 Askja +65.43 -16.65 300 Fremrinamur +65.73 -16.78 200 Krafla +65.88 -16.83 1500 Theistareykjarbunga +66.3 -17.1 500 Tjornes_Fracture_Zone +64.0 -16.65 900 Oraefajokull +64.27 -16.65 500 Esjufjoll +66.67 -18.5 300 Kolbeinsey_Ridge +71.08 -8.17 200 Jan_Mayen +88.27 65.6 900 Unnamed1405 +49.0 34.5 500 Unnamed1406 +39.95 25.83 300 Unnamed1407 +38.75 38.08 200 Unnamed1408 +39.4 -31.17 1500 Flores1409 +39.67 -31.07 500 Corvo +38.6 -28.73 900 Fayal +38.47 -28.4 500 Pico +38.65 -28.08 300 San_Jorge +39.02 -27.97 200 Graciosa +38.73 -27.32 900 Terceira +37.87 -25.78 500 Sete_Cidades +37.78 -25.67 300 Unnamed1417 +37.77 -25.47 200 Agua_de_Pau +37.77 -25.32 1500 Furnas +28.58 -17.83 500 La_Palma +27.73 -18.03 900 Hierro +28.271 -16.641 500 Tenerife +28.0 -15.58 300 Gran_Canaria +28.358 -14.02 200 Fuerteventura +29.03 -13.63 900 Lanzarote +14.95 -24.35 500 Fogo +14.85 -24.72 300 Brava +17.07 -25.17 200 Santo_Antao +16.85 -24.97 1500 San_Vicente1429 +7.0 21.83 500 Unnamed1430 +4.2 21.45 900 Unnamed1431 +-0.58 15.83 500 Unnamed1432 +-3.5 24.5 300 Unnamed1433 +-7.95 -14.37 200 Ascension +-20.514 -29.331 900 Trindade +-37.092 -12.28 500 Tristan_da_Cunha +-54.42 3.35 300 Bouvet +-53.93 5.5 200 Thompson_Island +-66.8 163.25 1500 Buckle_Island +-66.42 162.45 500 Young_Island +-67.4 164.83 900 Sturge_Island +-72.67 165.5 500 Pleiades;The +-73.45 164.58 300 Unnamed1443 +-74.35 164.7 200 Melbourne +-77.53 167.17 900 Erebus +-78.25 163.6 500 Royal_Society_Range +-76.05 -136.0 300 Berlin +-75.8 -132.33 200 Andrus +-77.17 -126.88 1500 Waesche +-73.43 -126.67 500 Siple +-75.8 -115.83 900 Toney_Mountain +-76.28 -112.08 500 Takahe +-74.33 -99.42 300 Hudson_Mountains +-68.85 -90.58 200 Peter_I_Island +-62.97 -60.65 900 Deception_Island +-62.1 -57.93 500 Penguin_Island +-62.05 -56.75 300 Bridgeman_Island +-63.58 -55.77 200 Paulet +-65.03 -60.05 1500 Seal_Nunataks_Group +-56.25 -72.17 500 Unnamed1460 +-59.45 -27.37 900 Thule_Islands +-59.03 -26.58 500 Bristol_Island +-57.78 -26.45 300 Michael +-57.08 -26.67 200 Candlemas_Island +-56.7 -27.15 900 Hodson +-56.67 -28.13 500 Leskov_Island +-56.3 -27.57 300 Zavodovski +90.0 75.0 200 UNKNOWN +55.82 160.4 1500 Plosky_Tolbachik +55.5 160.2 500 New_Tolbachik +50.3 155.45 900 Tatarinova_(Paramushir_Is.) +49.35 154.7 500 Krenitzyn_Peak_(Tau-Rusyr_Caldera_Onekotan_Is.) +49.12 154.5 300 Severgin_(Harimkotan_Is.) +46.52 150.87 200 Snow_(Chirpoi_Is.) +46.47 150.8 900 Brat_Chirpoi_(Brat_Chirpoi_Is.) +46.05 150.05 500 Trezubetz_(Kolokol_Grp_Urup_Is.) +46.05 150.07 300 Berg_(Kolokol_Grp_Urup_Is.) +45.38 148.78 200 Menshy_Brat_(Iturup_Is.) +45.02 147.87 1500 Tebenkov_(Iturup_Is.) +45.02 147.87 500 Ivan_Grozny_(Iturup_Is.) +44.83 147.33 900 Stokap_(Iturup_Is.) +44.45 146.13 500 Ruruy_(Kunashir_Is.) diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java index 4c50e5f50e..4ec28a35af 100644 --- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java +++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java @@ -78,6 +78,8 @@ import com.raytheon.uf.viz.core.time.TimeMatchingJob; * Aug 15, 2007 chammack Initial Creation. * Nov 30, 2007 461 bphillip Using VizTime now for time matching * Oct 22, 2009 #3348 bsteffen added ability to limit number of frames + * July 20, 2013 NCEP #1015 Greg Hull check for rotated/derived CRS in getWorldToCRSTransform() + * * * * @author chammack @@ -874,6 +876,13 @@ public abstract class AbstractDescriptor extends ResourceGroup implements if (crs instanceof GeneralDerivedCRS) { GeneralDerivedCRS projCRS = (GeneralDerivedCRS) crs; CoordinateReferenceSystem worldCRS = projCRS.getBaseCRS(); + + // NCEP #1015 : support of for ICAO-B PredefinedArea which + // has a FITTED_CS (ie rotated) CRS + if( worldCRS instanceof GeneralDerivedCRS ) { + worldCRS = ((GeneralDerivedCRS)worldCRS).getBaseCRS(); + } + try { return CRS.findMathTransform(worldCRS, crs); } catch (FactoryException e) { diff --git a/cave/com.raytheon.uf.viz.ncep.dataplugins.feature/feature.xml b/cave/com.raytheon.uf.viz.ncep.dataplugins.feature/feature.xml index e6c9832ff4..414da7b814 100644 --- a/cave/com.raytheon.uf.viz.ncep.dataplugins.feature/feature.xml +++ b/cave/com.raytheon.uf.viz.ncep.dataplugins.feature/feature.xml @@ -233,4 +233,11 @@ version="0.0.0" unpack="false"/> + + diff --git a/cave/com.raytheon.uf.viz.ncep.displays.feature/feature.xml b/cave/com.raytheon.uf.viz.ncep.displays.feature/feature.xml index 356494ac4e..6abdcf192f 100644 --- a/cave/com.raytheon.uf.viz.ncep.displays.feature/feature.xml +++ b/cave/com.raytheon.uf.viz.ncep.displays.feature/feature.xml @@ -108,13 +108,6 @@ version="0.0.0" unpack="false"/> - - - - - - - - - - - - + + diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java index b989664b0b..20bae8b075 100644 --- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java +++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java @@ -381,6 +381,7 @@ public class ChooseDataPeriodDialog extends CaveJFACEDialog { final QcPrecipOptionsDialog dialog = new QcPrecipOptionsDialog( getParentShell().getShell()); display.asyncExec(new Runnable() { + @Override public void run() { dialog.open(); } @@ -407,6 +408,7 @@ public class ChooseDataPeriodDialog extends CaveJFACEDialog { final QcTempOptionsDialog dialog = new QcTempOptionsDialog( getParentShell().getShell()); display.asyncExec(new Runnable() { + @Override public void run() { dialog.open(); } @@ -433,6 +435,7 @@ public class ChooseDataPeriodDialog extends CaveJFACEDialog { final QcFreezeOptionsDialog dialog = new QcFreezeOptionsDialog( getParentShell().getShell()); display.asyncExec(new Runnable() { + @Override public void run() { dialog.open(); } @@ -559,7 +562,7 @@ public class ChooseDataPeriodDialog extends CaveJFACEDialog { j = area_names.length(); } aList.add(area_names.substring(i, j)); - i += j + 1; + i = j + 1; } } else { aList.add(0, area_names.trim()); diff --git a/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/GetBasinData.java b/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/GetBasinData.java index d3b41b1b97..b06d3d8ece 100644 --- a/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/GetBasinData.java +++ b/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/GetBasinData.java @@ -55,6 +55,8 @@ import com.raytheon.viz.mpe.util.DailyQcUtils.Maps; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Mar 4, 2009 snaples Initial creation + * Aug 12, 2013 16490 snaples Fixed mapping of hrap grid to basins + * in get_basin_data * * * @@ -75,7 +77,6 @@ public class GetBasinData { int ib, l, numpts, ip, x, y, ip2, ip3, ip4, i; int hrap_basin_flag = 1; double lat, lon; - int m; int mm; int num_points; File basin_f = new File(basin_file); @@ -150,20 +151,14 @@ public class GetBasinData { ib++; } - // mean_areal_precip_global[ib] = dc.new Maps(); - // mean_areal_precip_global[ib].hb5 = ""; maxib = ib; System.out.println("Size of map array is : " + maxib + " basins"); s.close(); in.close(); } catch (FileNotFoundException e) { - // TODO Auto-generated catch block. Please revise as - // appropriate. statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e); return false; } catch (IOException e) { - // TODO Auto-generated catch block. Please revise as - // appropriate. statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e); return false; } catch (NumberFormatException e) { @@ -192,7 +187,6 @@ public class GetBasinData { mean_areal_precip_global[ib].tmaps_done = new int[200]; mean_areal_precip_global[ib].zmaps_done = new int[200]; - // for (m = 0; m < 200; m++) { Arrays.fill(mean_areal_precip_global[ib].gz, -1); Arrays.fill(mean_areal_precip_global[ib].uz, -1); Arrays.fill(mean_areal_precip_global[ib].mz, -1); @@ -209,30 +203,31 @@ public class GetBasinData { Arrays.fill(mean_areal_precip_global[ib].tmaps_done, -1); Arrays.fill(mean_areal_precip_global[ib].zmaps_done, -1); - // } } if (hrap_basin_flag == 1) { try { - System.out.println("Reading basin data from file."); + System.out.println("Reading hrap basin data from file."); long basin_start = System.currentTimeMillis(); in = new BufferedReader(new FileReader(hrap_f)); - char eb[] = new char[100]; + Scanner s = new Scanner(in); + String eb = new String(); for (ib = 0; ib < maxib; ib++) { - in.read(eb, 0, 80); - int p = new String(eb).indexOf('\n'); + eb = in.readLine(); //(eb, 0, 80); + int p = eb.length(); //new String(eb).indexOf('\n'); if (p != -1) { p = 0; } - String t = new String(eb); - Scanner s = new Scanner(t); + eb = eb.trim(); + s = new Scanner(eb); + Pattern pc = Pattern.compile("\\s*[A-Z]+$"); numpts = s.nextInt(); mean_areal_precip_global[ib].hrap_points = numpts; String bchar = ""; - bchar = s.findInLine("*$"); - mean_areal_precip_global[ib].bchar = bchar; + bchar = s.findInLine(pc); + mean_areal_precip_global[ib].bchar = bchar.trim(); mean_areal_precip_global[ib].hrap_data = new Hrap_Data[numpts]; for (mm = 0; mm < 4; mm++) { @@ -240,42 +235,34 @@ public class GetBasinData { } for (l = 0; l < numpts; l++) { - + Hrap_Data d = dc.new Hrap_Data(); + mean_areal_precip_global[ib].hrap_data[l] = d; + for (mm = 0; mm < 4; mm++) { mean_areal_precip_global[ib].hrap_data[l].zone[mm] = -1; } - p = in.read(eb, 0, 100); + eb = in.readLine(); //(eb, 0, 100); + eb = eb.trim(); + p = eb.length(); if (p == 0) { break; } - t = new String(eb); - - // ier = sscanf (ibuf, "%d %d %d %d %d %d\n", &x, &y, - // &ip, &ip2, &ip3,&ip4); - + s = new Scanner(eb); x = s.nextInt(); y = s.nextInt(); if (s.hasNextInt()) { ip = s.nextInt(); - if (ip < 0 || ip > 4) { - System.out - .println("HRAP error in read_basin_data routine.\n"); - return false; - } - ip2 = s.nextInt(); - ip3 = s.nextInt(); - ip4 = s.nextInt(); - mean_areal_precip_global[ib].hrap_data[l].x = x; mean_areal_precip_global[ib].hrap_data[l].y = y; mean_areal_precip_global[ib].hrap_data[l].zone[ip - 1] = 1; mean_areal_precip_global[ib].zones[0] = 1; if (s.hasNextInt()) { + ip2 = s.nextInt(); if (ip2 < 0 || ip2 > 4) { System.out .println("HRAP error in read_basin_data routine.\n"); @@ -288,7 +275,7 @@ public class GetBasinData { } if (s.hasNextInt()) { - + ip3 = s.nextInt(); if (ip3 < 0 || ip3 > 4) { System.out .println("HRAP error in read_basin_data routine.\n"); @@ -301,7 +288,7 @@ public class GetBasinData { } if (s.hasNextInt()) { - + ip4 = s.nextInt(); if (ip4 < 0 || ip4 > 4) { System.out .println("HRAP error in read_basin_data routine.\n"); @@ -315,22 +302,18 @@ public class GetBasinData { } } - System.out - .println("Finished reading basin data from file, elapsed time: " - + (System.currentTimeMillis() - basin_start) - + " ms"); - s.close(); - in.close(); } + System.out + .println("Finished reading basin data from file, elapsed time: " + + (System.currentTimeMillis() - basin_start) + + " ms"); + s.close(); + in.close(); } catch (FileNotFoundException e) { - // TODO Auto-generated catch block. Please revise as - // appropriate. statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e); return false; } catch (IOException e) { - // TODO Auto-generated catch block. Please revise as - // appropriate. statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e); return false; diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/command/ProductQueryJob.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/command/ProductQueryJob.java index 97c99ad177..d3e08acae2 100644 --- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/command/ProductQueryJob.java +++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/command/ProductQueryJob.java @@ -20,8 +20,9 @@ package com.raytheon.viz.texteditor.command; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; -import java.util.concurrent.atomic.AtomicBoolean; +import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -46,6 +47,7 @@ import com.raytheon.viz.texteditor.util.TextEditorUtil; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Jan 18, 2013 rferrel Initial creation + * Aug 23, 2013 DR 16514 D. Friedman Fix accum/cancel logic. * * * @@ -59,82 +61,53 @@ public class ProductQueryJob extends Job { private final IProductQueryCallback callback; - /** - * flag to indicate request accumulate. - */ - private boolean accumulate; - /** * List queries to perform. */ private final List requests; + /** + * Set of queries main thread is waiting for. + */ + private final Set expected; + /** * Transport to use for the queries. */ private final IQueryTransport queryTransport; - /** - * Flag to indicate cancel is being performed. - */ - private final AtomicBoolean canceled; - public ProductQueryJob(IProductQueryCallback callback) { super("Product Query"); setSystem(true); this.callback = callback; - accumulate = false; requests = new ArrayList(); + expected = new HashSet(); queryTransport = TextEditorUtil.getTextDbsrvTransport(); - canceled = new AtomicBoolean(false); } /** - * Add request to queue and determine what needs to be done to schedule the - * request. + * Add request to queue. If not an incremental update, cancel + * existing requests. * * @param command * @param isObsUpdated - */ - public synchronized void addRequest(ICommand command, boolean isObsUpdated) { - Request request = new Request(command, isObsUpdated); - if (accumulate) { - requests.add(request); - if (getState() == Job.NONE) { - schedule(); - } - } else { - requests.clear(); - requests.add(request); - if (getState() == Job.NONE) { - schedule(); - } else { - cancel(); - } - } - } - - public boolean isAccumulate() { - return accumulate; - } - - /** - * When set to true requests will accumulate and be processed in the order - * received; otherwise the queue is purged and any current request is - * canceled if a new request is received. - * * @param accumulate */ - public void setAccumulate(boolean accumulate) { - if (this.accumulate != accumulate) { - synchronized (this) { - requests.clear(); - if (getState() != Job.NONE) { - cancel(); - } - this.accumulate = accumulate; - } + public synchronized void addRequest(ICommand command, boolean isObsUpdated, + boolean accumulate) { + Request request = new Request(command, isObsUpdated); + if (! accumulate && ! isObsUpdated) { + // Cancel existing requests. + expected.clear(); + requests.clear(); } + requests.add(request); + expected.add(request); + schedule(); + } + + public boolean isExpectingRequests() { + return ! expected.isEmpty(); } /* @@ -149,65 +122,44 @@ public class ProductQueryJob extends Job { return Status.OK_STATUS; } - Request request = null; - try { - while (true) { - synchronized (this) { - if (requests.size() > 0) { - request = requests.remove(0); - } else { - break; - } + while (true) { + final Request request; + synchronized (this) { + if (requests.size() > 0) { + request = requests.remove(0); + } else { + break; } + } + List prodList = null; + try { try { - final ICommand command = request.getCommand(); - final boolean isObsUpdated = request.isObsUpdated(); - final List prodList = command - .executeCommand(queryTransport); - // User may have canceled during long query. - if (!canceled.get()) { - VizApp.runAsync(new Runnable() { - - @Override - public void run() { - callback.requestDone(command, prodList, - isObsUpdated); - } - }); - } else { - break; - } + prodList = request.getCommand(). + executeCommand(queryTransport); } catch (CommandFailedException e) { statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e); - if (!canceled.get()) { - VizApp.runAsync(new Runnable() { - - @Override - public void run() { - callback.requestDone(null, null, false); - } - }); - } } + } finally { + final List resultProdList = prodList; + VizApp.runAsync(new Runnable() { + + @Override + public void run() { + if (expected.remove(request) && resultProdList != null) { + callback.requestDone(request.getCommand(), resultProdList, + request.isObsUpdated()); + } else { + callback.requestDone(null, null, false); + } + } + }); } - } finally { - canceled.set(false); } return Status.OK_STATUS; } - /* - * (non-Javadoc) - * - * @see org.eclipse.core.runtime.jobs.Job#canceling() - */ - @Override - protected void canceling() { - canceled.set(true); - } - /* * Class to hold the query command and isObsUpdated flag needed for the * query and its callback. diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java index 6f448b23e7..aa0aca4ee0 100644 --- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java +++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java @@ -329,6 +329,8 @@ import com.raytheon.viz.ui.dialogs.SWTMessageBox; * add selection listener to catch the highlight words and * set the highlight colors. * 25July2013 15733 GHull Read font and color prefs from TextEditorCfg. + * 23Aug2013 DR 16514 D. Friedman Fix handling of completed product requests. Do not change + * command history or close browser window for "update obs". * * * @@ -1101,11 +1103,6 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, */ private boolean overwriteMode = false; - /** - * flag to indicate it a product request is from the GUI or an updated ob. - */ - private final AtomicInteger updateCount = new AtomicInteger(0); - /** * The expire notification when editing a warn gen product. */ @@ -3098,12 +3095,6 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, accumChkBtn = new Button(topBtnRowComp, SWT.CHECK); accumChkBtn.setText("Accum"); accumChkBtn.setLayoutData(rd); - accumChkBtn.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent event) { - productQueryJob.setAccumulate(accumChkBtn.getSelection()); - } - }); // Add the Update Observation check button. rd = new RowData(BUTTON_WIDTH, BUTTON_HEIGHT); @@ -5896,12 +5887,15 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, return; } - if (browser != null) { - browser.close(); - browser = null; + if (! isObsUpdated) { + if (browser != null) { + browser.close(); + browser = null; + } + + commandHistory.addCommand(command); } - commandHistory.addCommand(command); statusBarLabel.setText("Loading " + TextEditorUtil.getCommandText(command)); statusBarLabel.update(); @@ -5910,7 +5904,8 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, if (queryTransport == null) { queryTransport = TextEditorUtil.getTextDbsrvTransport(); } - productQueryJob.addRequest(command, isObsUpdated); + productQueryJob.addRequest(command, isObsUpdated, + accumChkBtn.getSelection()); } /** @@ -5991,7 +5986,7 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, stripWMOHeaders(prod); } - if (updateCount.get() > 0) { + if (isObsUpdated) { updateDisplayedProduct(prod); } else { setDisplayedProduct(prod); @@ -6086,13 +6081,15 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, private void postExecute(boolean hasAttachment, boolean enterEditor, boolean validExecuteCommand, String attachedFilename) { if (!this.isDisposed()) { - if (hasAttachment) { - statusBarLabel.setText("Attachment: " + attachedFilename); - } else { - statusBarLabel.setText(""); + if (! productQueryJob.isExpectingRequests()) { + if (hasAttachment) { + statusBarLabel.setText("Attachment: " + attachedFilename); + } else { + statusBarLabel.setText(""); + } + statusBarLabel.update(); + setBusy(false); } - statusBarLabel.update(); - setBusy(false); // Automatically open the editor window with returned data. if (enterEditor) { enterEditor(); @@ -6471,7 +6468,6 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, @Override public void setAccumulation(boolean flag) { this.accumChkBtn.setSelection(flag); - productQueryJob.setAccumulate(flag); } /* @@ -6958,7 +6954,6 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, // retrieved for display in this text editor dialog // instance. TextDisplayModel.getInstance().setStdTextProduct(token, product); - updateCount.addAndGet(-1); } /* @@ -7309,7 +7304,6 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, msgPIL = ""; } if (isObsDisplayed(msgPIL)) { - updateCount.addAndGet(1); ICommand command = CommandFactory.getAfosCommand(msgPIL); UpdateObsRun run = new UpdateObsRun(command); VizApp.runSync(run); diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenAction.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenAction.java index 1f3acfd098..f2a27ce707 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenAction.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenAction.java @@ -26,6 +26,7 @@ import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.uf.viz.core.rsc.LoadProperties; import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData; import com.raytheon.uf.viz.core.rsc.tools.action.AbstractGenericToolAction; +import com.raytheon.viz.ui.input.EditableManager; /** * Simple action for loading the warngen layer @@ -38,6 +39,7 @@ import com.raytheon.uf.viz.core.rsc.tools.action.AbstractGenericToolAction; * May 4, 2010 mschenke Initial creation * Oct 10, 2010 6990 Qinglu Lin Used D. Friedman short solution, * with minor changes. + * Aug 15, 2013 DR 16418 D. Friedman Always show the dialog. * * * @@ -65,16 +67,16 @@ public class WarngenAction extends AbstractGenericToolAction { for (IDisplayPane pane : getSelectedPanes()) { for (ResourcePair rp : pane.getDescriptor().getResourceList()) { if (rp.getResource() instanceof WarngenLayer) { + EditableManager.makeEditable(rp.getResource(), true); ((WarngenLayer) rp.getResource()) - .showDialog(((WarngenLayer) rp.getResource()) - .isEditable()); + .showDialog(true); return (WarngenLayer) rp.getResource(); } } } WarngenLayer layer = super.getResource(loadProperties, descriptor); - layer.createDialog(); + layer.showDialog(true); return layer; } } diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java index 02b319c787..6525feec70 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java @@ -52,9 +52,11 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.List; +import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.MessageBox; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; @@ -82,6 +84,7 @@ import com.raytheon.viz.texteditor.util.VtecUtil; import com.raytheon.viz.ui.EditorUtil; import com.raytheon.viz.ui.dialogs.CaveSWTDialog; import com.raytheon.viz.ui.dialogs.ICloseCallback; +import com.raytheon.viz.ui.input.EditableManager; import com.raytheon.viz.warngen.Activator; import com.raytheon.viz.warngen.WarngenConstants; import com.raytheon.viz.warngen.comm.WarningSender; @@ -144,6 +147,7 @@ import com.vividsolutions.jts.geom.Polygon; * Jul 16, 2013 DR 16387 Qinglu Lin Reset totalSegments for each followup product. * Jul 29, 2013 DR 16352 D. Friedman Move 'result' to okPressed(). * Aug 6, 2013 2243 jsanchez Refreshed the follow up list every minute. + * Aug 15, 2013 DR 16418 D. Friedman Make dialog visibility match editable state. * * * @author chammack @@ -306,6 +310,14 @@ public class WarngenDialog extends CaveSWTDialog implements */ @Override protected void initializeComponents(Shell shell) { + shell.addListener(SWT.Close, new Listener() { + @Override + public void handleEvent(Event event) { + event.doit = false; + closePressed(); + } + }); + Composite mainComposite = new Composite(shell, SWT.NONE); GridLayout gl = new GridLayout(1, false); gl.verticalSpacing = 2; @@ -1256,7 +1268,8 @@ public class WarngenDialog extends CaveSWTDialog implements * Action for Close button */ private void closePressed() { - close(); + EditableManager.makeEditable(warngenLayer, false); + hide(); } /** @@ -2194,6 +2207,8 @@ public class WarngenDialog extends CaveSWTDialog implements } // Move above parent shell if we are showing it shell.moveAbove(getParent()); + } else { + shell.setVisible(false); } } } diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIManager.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIManager.java index f46990fcd3..8ce0946894 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIManager.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIManager.java @@ -65,6 +65,7 @@ import com.vividsolutions.jts.geom.Polygon; * when c2 is null for "case SINGLE_POINT" in move(). * Mar 28, 2013 DR 15974 D. Friedman Do not track removed GIDs. * Jun 25, 2013 DR 16013 Qinglu Lin Called setUniqueFip() in handleMouseUp(). + * Aug 15, 2013 DR 16418 D. Friedman Only raise dialog if editable. Don't call featureEdit if not editable. * * * @@ -131,7 +132,9 @@ public class WarngenUIManager extends InputAdapter { */ @Override public boolean handleMouseDown(int x, int y, int button) { - warngenLayer.showDialog(true); + if (warngenLayer.isEditable()) { + warngenLayer.showDialog(true); + } lastMouseX = x; lastMouseY = y; if (!handleInput || warngenLayer.isBoxEditable() == false) { @@ -207,7 +210,7 @@ public class WarngenUIManager extends InputAdapter { return super.handleMouseUp(x, y, mouseButton); } - if (mouseButton == 3 && menuMove == false) { + if (mouseButton == 3 && menuMove == false && warngenLayer.isEditable()) { Coordinate c = container.translateClick(x, y); WarngenUIState state = warngenLayer.getWarngenState(); boolean geomsEqual = true; diff --git a/edexOsgi/build.edex/opt/db/ddl/ncep/loadSnap.sql b/edexOsgi/build.edex/opt/db/ddl/ncep/loadSnap.sql index 749139e5d4..81010d51c9 100644 --- a/edexOsgi/build.edex/opt/db/ddl/ncep/loadSnap.sql +++ b/edexOsgi/build.edex/opt/db/ddl/ncep/loadSnap.sql @@ -21330,1910 +21330,6 @@ YQV00227, 9,210NNW_YQV ,54.48,-104.77, 2 YQV00228, 9,220NNW_YQV ,54.63,-104.89, 2 YQV00229, 9,230NNW_YQV ,54.78,-105.01, 2 YQV00230, 9,240NNW_YQV ,54.93,-105.13, 2 -ANN00000, 9,ANN ,0.00,0.00, 1 -ANN00001, 9,20N_ANN ,0.33,0.00, 2 -ANN00002, 9,30N_ANN ,0.50,0.00, 2 -ANN00003, 9,40N_ANN ,0.67,0.00, 2 -ANN00004, 9,50N_ANN ,0.83,0.00, 2 -ANN00005, 9,60N_ANN ,1.00,0.00, 2 -ANN00006, 9,70N_ANN ,1.17,0.00, 2 -ANN00007, 9,80N_ANN ,1.33,0.00, 2 -ANN00008, 9,90N_ANN ,1.50,0.00, 2 -ANN00009, 9,100N_ANN ,1.67,0.00, 2 -ANN00010, 9,110N_ANN ,1.83,0.00, 2 -ANN00011, 9,120N_ANN ,2.00,0.00, 2 -ANN00012, 9,130N_ANN ,2.17,0.00, 2 -ANN00013, 9,140N_ANN ,2.33,0.00, 2 -ANN00014, 9,150N_ANN ,2.50,0.00, 2 -ANN00015, 9,160N_ANN ,2.66,0.00, 2 -ANN00016, 9,170N_ANN ,2.83,0.00, 2 -ANN00017, 9,180N_ANN ,3.00,0.00, 2 -ANN00018, 9,190N_ANN ,3.16,0.00, 2 -ANN00019, 9,200N_ANN ,3.33,0.00, 2 -ANN00020, 9,210N_ANN ,3.50,0.00, 2 -ANN00021, 9,220N_ANN ,3.66,0.00, 2 -ANN00022, 9,230N_ANN ,3.83,0.00, 2 -ANN00023, 9,240N_ANN ,4.00,0.00, 2 -ANN00024, 9,250N_ANN ,4.16,0.00, 2 -ANN00025, 9,20NNE_ANN ,0.31,0.13, 2 -ANN00026, 9,30NNE_ANN ,0.46,0.19, 2 -ANN00027, 9,40NNE_ANN ,0.62,0.25, 2 -ANN00028, 9,50NNE_ANN ,0.77,0.32, 2 -ANN00029, 9,60NNE_ANN ,0.92,0.38, 2 -ANN00030, 9,70NNE_ANN ,1.08,0.45, 2 -ANN00031, 9,80NNE_ANN ,1.23,0.51, 2 -ANN00032, 9,90NNE_ANN ,1.38,0.57, 2 -ANN00033, 9,100NNE_ANN ,1.54,0.64, 2 -ANN00034, 9,110NNE_ANN ,1.69,0.70, 2 -ANN00035, 9,120NNE_ANN ,1.85,0.77, 2 -ANN00036, 9,130NNE_ANN ,2.00,0.83, 2 -ANN00037, 9,140NNE_ANN ,2.15,0.89, 2 -ANN00038, 9,150NNE_ANN ,2.31,0.96, 2 -ANN00039, 9,160NNE_ANN ,2.46,1.02, 2 -ANN00040, 9,170NNE_ANN ,2.62,1.08, 2 -ANN00041, 9,180NNE_ANN ,2.77,1.15, 2 -ANN00042, 9,190NNE_ANN ,2.92,1.21, 2 -ANN00043, 9,200NNE_ANN ,3.08,1.28, 2 -ANN00044, 9,210NNE_ANN ,3.23,1.34, 2 -ANN00045, 9,220NNE_ANN ,3.38,1.40, 2 -ANN00046, 9,230NNE_ANN ,3.54,1.47, 2 -ANN00047, 9,240NNE_ANN ,3.69,1.53, 2 -ANN00048, 9,20NE_ANN ,0.24,0.24, 2 -ANN00049, 9,30NE_ANN ,0.35,0.35, 2 -ANN00050, 9,40NE_ANN ,0.47,0.47, 2 -ANN00051, 9,50NE_ANN ,0.59,0.59, 2 -ANN00052, 9,60NE_ANN ,0.71,0.71, 2 -ANN00053, 9,70NE_ANN ,0.82,0.82, 2 -ANN00054, 9,80NE_ANN ,0.94,0.94, 2 -ANN00055, 9,90NE_ANN ,1.06,1.06, 2 -ANN00056, 9,100NE_ANN ,1.18,1.18, 2 -ANN00057, 9,110NE_ANN ,1.30,1.30, 2 -ANN00058, 9,120NE_ANN ,1.41,1.41, 2 -ANN00059, 9,130NE_ANN ,1.53,1.53, 2 -ANN00060, 9,140NE_ANN ,1.65,1.65, 2 -ANN00061, 9,150NE_ANN ,1.77,1.77, 2 -ANN00062, 9,160NE_ANN ,1.88,1.88, 2 -ANN00063, 9,170NE_ANN ,2.00,2.00, 2 -ANN00064, 9,180NE_ANN ,2.12,2.12, 2 -ANN00065, 9,190NE_ANN ,2.24,2.24, 2 -ANN00066, 9,200NE_ANN ,2.35,2.36, 2 -ANN00067, 9,210NE_ANN ,2.47,2.47, 2 -ANN00068, 9,220NE_ANN ,2.59,2.59, 2 -ANN00069, 9,230NE_ANN ,2.71,2.71, 2 -ANN00070, 9,240NE_ANN ,2.83,2.83, 2 -ANN00071, 9,250NE_ANN ,2.94,2.95, 2 -ANN00072, 9,20NW_ANN ,0.24,-0.24, 2 -ANN00073, 9,30NW_ANN ,0.35,-0.35, 2 -ANN00074, 9,40NW_ANN ,0.47,-0.47, 2 -ANN00075, 9,50NW_ANN ,0.59,-0.59, 2 -ANN00076, 9,60NW_ANN ,0.71,-0.71, 2 -ANN00077, 9,70NW_ANN ,0.82,-0.82, 2 -ANN00078, 9,80NW_ANN ,0.94,-0.94, 2 -ANN00079, 9,90NW_ANN ,1.06,-1.06, 2 -ANN00080, 9,100NW_ANN ,1.18,-1.18, 2 -ANN00081, 9,110NW_ANN ,1.30,-1.30, 2 -ANN00082, 9,120NW_ANN ,1.41,-1.41, 2 -ANN00083, 9,130NW_ANN ,1.53,-1.53, 2 -ANN00084, 9,140NW_ANN ,1.65,-1.65, 2 -ANN00085, 9,150NW_ANN ,1.77,-1.77, 2 -ANN00086, 9,160NW_ANN ,1.88,-1.88, 2 -ANN00087, 9,170NW_ANN ,2.00,-2.00, 2 -ANN00088, 9,180NW_ANN ,2.12,-2.12, 2 -ANN00089, 9,190NW_ANN ,2.24,-2.24, 2 -ANN00090, 9,200NW_ANN ,2.35,-2.36, 2 -ANN00091, 9,210NW_ANN ,2.47,-2.47, 2 -ANN00092, 9,220NW_ANN ,2.59,-2.59, 2 -ANN00093, 9,230NW_ANN ,2.71,-2.71, 2 -ANN00094, 9,240NW_ANN ,2.83,-2.83, 2 -ANN00095, 9,250NW_ANN ,2.94,-2.95, 2 -ANN00096, 9,20NNW_ANN ,0.31,-0.13, 2 -ANN00097, 9,30NNW_ANN ,0.46,-0.19, 2 -ANN00098, 9,40NNW_ANN ,0.62,-0.25, 2 -ANN00099, 9,50NNW_ANN ,0.77,-0.32, 2 -ANN00100, 9,60NNW_ANN ,0.92,-0.38, 2 -ANN00101, 9,70NNW_ANN ,1.08,-0.45, 2 -ANN00102, 9,80NNW_ANN ,1.23,-0.51, 2 -ANN00103, 9,90NNW_ANN ,1.38,-0.57, 2 -ANN00104, 9,100NNW_ANN ,1.54,-0.64, 2 -ANN00105, 9,110NNW_ANN ,1.69,-0.70, 2 -ANN00106, 9,120NNW_ANN ,1.85,-0.77, 2 -ANN00107, 9,130NNW_ANN ,2.00,-0.83, 2 -ANN00108, 9,140NNW_ANN ,2.15,-0.89, 2 -ANN00109, 9,150NNW_ANN ,2.31,-0.96, 2 -ANN00110, 9,160NNW_ANN ,2.46,-1.02, 2 -ANN00111, 9,170NNW_ANN ,2.62,-1.08, 2 -ANN00112, 9,180NNW_ANN ,2.77,-1.15, 2 -ANN00113, 9,190NNW_ANN ,2.92,-1.21, 2 -ANN00114, 9,200NNW_ANN ,3.08,-1.28, 2 -ANN00115, 9,210NNW_ANN ,3.23,-1.34, 2 -ANN00116, 9,220NNW_ANN ,3.38,-1.40, 2 -ANN00117, 9,230NNW_ANN ,3.54,-1.47, 2 -ANN00118, 9,240NNW_ANN ,3.69,-1.53, 2 -LVD00000, 9,LVD ,0.00,0.00, 1 -LVD00001, 9,20N_LVD ,0.33,0.00, 2 -LVD00002, 9,30N_LVD ,0.50,0.00, 2 -LVD00003, 9,40N_LVD ,0.67,0.00, 2 -LVD00004, 9,50N_LVD ,0.83,0.00, 2 -LVD00005, 9,60N_LVD ,1.00,0.00, 2 -LVD00006, 9,70N_LVD ,1.17,0.00, 2 -LVD00007, 9,80N_LVD ,1.33,0.00, 2 -LVD00008, 9,90N_LVD ,1.50,0.00, 2 -LVD00009, 9,100N_LVD ,1.67,0.00, 2 -LVD00010, 9,110N_LVD ,1.83,0.00, 2 -LVD00011, 9,120N_LVD ,2.00,0.00, 2 -LVD00012, 9,130N_LVD ,2.17,0.00, 2 -LVD00013, 9,140N_LVD ,2.33,0.00, 2 -LVD00014, 9,150N_LVD ,2.50,0.00, 2 -LVD00015, 9,160N_LVD ,2.66,0.00, 2 -LVD00016, 9,170N_LVD ,2.83,0.00, 2 -LVD00017, 9,180N_LVD ,3.00,0.00, 2 -LVD00018, 9,190N_LVD ,3.16,0.00, 2 -LVD00019, 9,200N_LVD ,3.33,0.00, 2 -LVD00020, 9,210N_LVD ,3.50,0.00, 2 -LVD00021, 9,220N_LVD ,3.66,0.00, 2 -LVD00022, 9,230N_LVD ,3.83,0.00, 2 -LVD00023, 9,240N_LVD ,4.00,0.00, 2 -LVD00024, 9,250N_LVD ,4.16,0.00, 2 -LVD00025, 9,20NNE_LVD ,0.31,0.13, 2 -LVD00026, 9,30NNE_LVD ,0.46,0.19, 2 -LVD00027, 9,40NNE_LVD ,0.62,0.25, 2 -LVD00028, 9,50NNE_LVD ,0.77,0.32, 2 -LVD00029, 9,60NNE_LVD ,0.92,0.38, 2 -LVD00030, 9,70NNE_LVD ,1.08,0.45, 2 -LVD00031, 9,80NNE_LVD ,1.23,0.51, 2 -LVD00032, 9,90NNE_LVD ,1.38,0.57, 2 -LVD00033, 9,100NNE_LVD ,1.54,0.64, 2 -LVD00034, 9,110NNE_LVD ,1.69,0.70, 2 -LVD00035, 9,120NNE_LVD ,1.85,0.77, 2 -LVD00036, 9,130NNE_LVD ,2.00,0.83, 2 -LVD00037, 9,140NNE_LVD ,2.15,0.89, 2 -LVD00038, 9,150NNE_LVD ,2.31,0.96, 2 -LVD00039, 9,160NNE_LVD ,2.46,1.02, 2 -LVD00040, 9,170NNE_LVD ,2.62,1.08, 2 -LVD00041, 9,180NNE_LVD ,2.77,1.15, 2 -LVD00042, 9,190NNE_LVD ,2.92,1.21, 2 -LVD00043, 9,200NNE_LVD ,3.08,1.28, 2 -LVD00044, 9,210NNE_LVD ,3.23,1.34, 2 -LVD00045, 9,220NNE_LVD ,3.38,1.40, 2 -LVD00046, 9,230NNE_LVD ,3.54,1.47, 2 -LVD00047, 9,240NNE_LVD ,3.69,1.53, 2 -LVD00048, 9,20NE_LVD ,0.24,0.24, 2 -LVD00049, 9,30NE_LVD ,0.35,0.35, 2 -LVD00050, 9,40NE_LVD ,0.47,0.47, 2 -LVD00051, 9,50NE_LVD ,0.59,0.59, 2 -LVD00052, 9,60NE_LVD ,0.71,0.71, 2 -LVD00053, 9,70NE_LVD ,0.82,0.82, 2 -LVD00054, 9,80NE_LVD ,0.94,0.94, 2 -LVD00055, 9,90NE_LVD ,1.06,1.06, 2 -LVD00056, 9,100NE_LVD ,1.18,1.18, 2 -LVD00057, 9,110NE_LVD ,1.30,1.30, 2 -LVD00058, 9,120NE_LVD ,1.41,1.41, 2 -LVD00059, 9,130NE_LVD ,1.53,1.53, 2 -LVD00060, 9,140NE_LVD ,1.65,1.65, 2 -LVD00061, 9,150NE_LVD ,1.77,1.77, 2 -LVD00062, 9,160NE_LVD ,1.88,1.88, 2 -LVD00063, 9,170NE_LVD ,2.00,2.00, 2 -LVD00064, 9,180NE_LVD ,2.12,2.12, 2 -LVD00065, 9,190NE_LVD ,2.24,2.24, 2 -LVD00066, 9,200NE_LVD ,2.35,2.36, 2 -LVD00067, 9,210NE_LVD ,2.47,2.47, 2 -LVD00068, 9,220NE_LVD ,2.59,2.59, 2 -LVD00069, 9,230NE_LVD ,2.71,2.71, 2 -LVD00070, 9,240NE_LVD ,2.83,2.83, 2 -LVD00071, 9,250NE_LVD ,2.94,2.95, 2 -LVD00072, 9,20NW_LVD ,0.24,-0.24, 2 -LVD00073, 9,30NW_LVD ,0.35,-0.35, 2 -LVD00074, 9,40NW_LVD ,0.47,-0.47, 2 -LVD00075, 9,50NW_LVD ,0.59,-0.59, 2 -LVD00076, 9,60NW_LVD ,0.71,-0.71, 2 -LVD00077, 9,70NW_LVD ,0.82,-0.82, 2 -LVD00078, 9,80NW_LVD ,0.94,-0.94, 2 -LVD00079, 9,90NW_LVD ,1.06,-1.06, 2 -LVD00080, 9,100NW_LVD ,1.18,-1.18, 2 -LVD00081, 9,110NW_LVD ,1.30,-1.30, 2 -LVD00082, 9,120NW_LVD ,1.41,-1.41, 2 -LVD00083, 9,130NW_LVD ,1.53,-1.53, 2 -LVD00084, 9,140NW_LVD ,1.65,-1.65, 2 -LVD00085, 9,150NW_LVD ,1.77,-1.77, 2 -LVD00086, 9,160NW_LVD ,1.88,-1.88, 2 -LVD00087, 9,170NW_LVD ,2.00,-2.00, 2 -LVD00088, 9,180NW_LVD ,2.12,-2.12, 2 -LVD00089, 9,190NW_LVD ,2.24,-2.24, 2 -LVD00090, 9,200NW_LVD ,2.35,-2.36, 2 -LVD00091, 9,210NW_LVD ,2.47,-2.47, 2 -LVD00092, 9,220NW_LVD ,2.59,-2.59, 2 -LVD00093, 9,230NW_LVD ,2.71,-2.71, 2 -LVD00094, 9,240NW_LVD ,2.83,-2.83, 2 -LVD00095, 9,250NW_LVD ,2.94,-2.95, 2 -LVD00096, 9,20NNW_LVD ,0.31,-0.13, 2 -LVD00097, 9,30NNW_LVD ,0.46,-0.19, 2 -LVD00098, 9,40NNW_LVD ,0.62,-0.25, 2 -LVD00099, 9,50NNW_LVD ,0.77,-0.32, 2 -LVD00100, 9,60NNW_LVD ,0.92,-0.38, 2 -LVD00101, 9,70NNW_LVD ,1.08,-0.45, 2 -LVD00102, 9,80NNW_LVD ,1.23,-0.51, 2 -LVD00103, 9,90NNW_LVD ,1.38,-0.57, 2 -LVD00104, 9,100NNW_LVD ,1.54,-0.64, 2 -LVD00105, 9,110NNW_LVD ,1.69,-0.70, 2 -LVD00106, 9,120NNW_LVD ,1.85,-0.77, 2 -LVD00107, 9,130NNW_LVD ,2.00,-0.83, 2 -LVD00108, 9,140NNW_LVD ,2.15,-0.89, 2 -LVD00109, 9,150NNW_LVD ,2.31,-0.96, 2 -LVD00110, 9,160NNW_LVD ,2.46,-1.02, 2 -LVD00111, 9,170NNW_LVD ,2.62,-1.08, 2 -LVD00112, 9,180NNW_LVD ,2.77,-1.15, 2 -LVD00113, 9,190NNW_LVD ,2.92,-1.21, 2 -LVD00114, 9,200NNW_LVD ,3.08,-1.28, 2 -LVD00115, 9,210NNW_LVD ,3.23,-1.34, 2 -LVD00116, 9,220NNW_LVD ,3.38,-1.40, 2 -LVD00117, 9,230NNW_LVD ,3.54,-1.47, 2 -LVD00118, 9,240NNW_LVD ,3.69,-1.53, 2 -BKA00000, 9,BKA ,0.00,0.00, 1 -BKA00001, 9,20N_BKA ,0.33,0.00, 2 -BKA00002, 9,30N_BKA ,0.50,0.00, 2 -BKA00003, 9,40N_BKA ,0.67,0.00, 2 -BKA00004, 9,50N_BKA ,0.83,0.00, 2 -BKA00005, 9,60N_BKA ,1.00,0.00, 2 -BKA00006, 9,70N_BKA ,1.17,0.00, 2 -BKA00007, 9,80N_BKA ,1.33,0.00, 2 -BKA00008, 9,90N_BKA ,1.50,0.00, 2 -BKA00009, 9,100N_BKA ,1.67,0.00, 2 -BKA00010, 9,110N_BKA ,1.83,0.00, 2 -BKA00011, 9,120N_BKA ,2.00,0.00, 2 -BKA00012, 9,130N_BKA ,2.17,0.00, 2 -BKA00013, 9,140N_BKA ,2.33,0.00, 2 -BKA00014, 9,150N_BKA ,2.50,0.00, 2 -BKA00015, 9,160N_BKA ,2.66,0.00, 2 -BKA00016, 9,170N_BKA ,2.83,0.00, 2 -BKA00017, 9,180N_BKA ,3.00,0.00, 2 -BKA00018, 9,190N_BKA ,3.16,0.00, 2 -BKA00019, 9,200N_BKA ,3.33,0.00, 2 -BKA00020, 9,210N_BKA ,3.50,0.00, 2 -BKA00021, 9,220N_BKA ,3.66,0.00, 2 -BKA00022, 9,230N_BKA ,3.83,0.00, 2 -BKA00023, 9,240N_BKA ,4.00,0.00, 2 -BKA00024, 9,250N_BKA ,4.16,0.00, 2 -BKA00025, 9,20NNE_BKA ,0.31,0.13, 2 -BKA00026, 9,30NNE_BKA ,0.46,0.19, 2 -BKA00027, 9,40NNE_BKA ,0.62,0.25, 2 -BKA00028, 9,50NNE_BKA ,0.77,0.32, 2 -BKA00029, 9,60NNE_BKA ,0.92,0.38, 2 -BKA00030, 9,70NNE_BKA ,1.08,0.45, 2 -BKA00031, 9,80NNE_BKA ,1.23,0.51, 2 -BKA00032, 9,90NNE_BKA ,1.38,0.57, 2 -BKA00033, 9,100NNE_BKA ,1.54,0.64, 2 -BKA00034, 9,110NNE_BKA ,1.69,0.70, 2 -BKA00035, 9,120NNE_BKA ,1.85,0.77, 2 -BKA00036, 9,130NNE_BKA ,2.00,0.83, 2 -BKA00037, 9,140NNE_BKA ,2.15,0.89, 2 -BKA00038, 9,150NNE_BKA ,2.31,0.96, 2 -BKA00039, 9,160NNE_BKA ,2.46,1.02, 2 -BKA00040, 9,170NNE_BKA ,2.62,1.08, 2 -BKA00041, 9,180NNE_BKA ,2.77,1.15, 2 -BKA00042, 9,190NNE_BKA ,2.92,1.21, 2 -BKA00043, 9,200NNE_BKA ,3.08,1.28, 2 -BKA00044, 9,210NNE_BKA ,3.23,1.34, 2 -BKA00045, 9,220NNE_BKA ,3.38,1.40, 2 -BKA00046, 9,230NNE_BKA ,3.54,1.47, 2 -BKA00047, 9,240NNE_BKA ,3.69,1.53, 2 -BKA00048, 9,20NE_BKA ,0.24,0.24, 2 -BKA00049, 9,30NE_BKA ,0.35,0.35, 2 -BKA00050, 9,40NE_BKA ,0.47,0.47, 2 -BKA00051, 9,50NE_BKA ,0.59,0.59, 2 -BKA00052, 9,60NE_BKA ,0.71,0.71, 2 -BKA00053, 9,70NE_BKA ,0.82,0.82, 2 -BKA00054, 9,80NE_BKA ,0.94,0.94, 2 -BKA00055, 9,90NE_BKA ,1.06,1.06, 2 -BKA00056, 9,100NE_BKA ,1.18,1.18, 2 -BKA00057, 9,110NE_BKA ,1.30,1.30, 2 -BKA00058, 9,120NE_BKA ,1.41,1.41, 2 -BKA00059, 9,130NE_BKA ,1.53,1.53, 2 -BKA00060, 9,140NE_BKA ,1.65,1.65, 2 -BKA00061, 9,150NE_BKA ,1.77,1.77, 2 -BKA00062, 9,160NE_BKA ,1.88,1.88, 2 -BKA00063, 9,170NE_BKA ,2.00,2.00, 2 -BKA00064, 9,180NE_BKA ,2.12,2.12, 2 -BKA00065, 9,190NE_BKA ,2.24,2.24, 2 -BKA00066, 9,200NE_BKA ,2.35,2.36, 2 -BKA00067, 9,210NE_BKA ,2.47,2.47, 2 -BKA00068, 9,220NE_BKA ,2.59,2.59, 2 -BKA00069, 9,230NE_BKA ,2.71,2.71, 2 -BKA00070, 9,240NE_BKA ,2.83,2.83, 2 -BKA00071, 9,250NE_BKA ,2.94,2.95, 2 -BKA00072, 9,20NW_BKA ,0.24,-0.24, 2 -BKA00073, 9,30NW_BKA ,0.35,-0.35, 2 -BKA00074, 9,40NW_BKA ,0.47,-0.47, 2 -BKA00075, 9,50NW_BKA ,0.59,-0.59, 2 -BKA00076, 9,60NW_BKA ,0.71,-0.71, 2 -BKA00077, 9,70NW_BKA ,0.82,-0.82, 2 -BKA00078, 9,80NW_BKA ,0.94,-0.94, 2 -BKA00079, 9,90NW_BKA ,1.06,-1.06, 2 -BKA00080, 9,100NW_BKA ,1.18,-1.18, 2 -BKA00081, 9,110NW_BKA ,1.30,-1.30, 2 -BKA00082, 9,120NW_BKA ,1.41,-1.41, 2 -BKA00083, 9,130NW_BKA ,1.53,-1.53, 2 -BKA00084, 9,140NW_BKA ,1.65,-1.65, 2 -BKA00085, 9,150NW_BKA ,1.77,-1.77, 2 -BKA00086, 9,160NW_BKA ,1.88,-1.88, 2 -BKA00087, 9,170NW_BKA ,2.00,-2.00, 2 -BKA00088, 9,180NW_BKA ,2.12,-2.12, 2 -BKA00089, 9,190NW_BKA ,2.24,-2.24, 2 -BKA00090, 9,200NW_BKA ,2.35,-2.36, 2 -BKA00091, 9,210NW_BKA ,2.47,-2.47, 2 -BKA00092, 9,220NW_BKA ,2.59,-2.59, 2 -BKA00093, 9,230NW_BKA ,2.71,-2.71, 2 -BKA00094, 9,240NW_BKA ,2.83,-2.83, 2 -BKA00095, 9,250NW_BKA ,2.94,-2.95, 2 -BKA00096, 9,20NNW_BKA ,0.31,-0.13, 2 -BKA00097, 9,30NNW_BKA ,0.46,-0.19, 2 -BKA00098, 9,40NNW_BKA ,0.62,-0.25, 2 -BKA00099, 9,50NNW_BKA ,0.77,-0.32, 2 -BKA00100, 9,60NNW_BKA ,0.92,-0.38, 2 -BKA00101, 9,70NNW_BKA ,1.08,-0.45, 2 -BKA00102, 9,80NNW_BKA ,1.23,-0.51, 2 -BKA00103, 9,90NNW_BKA ,1.38,-0.57, 2 -BKA00104, 9,100NNW_BKA ,1.54,-0.64, 2 -BKA00105, 9,110NNW_BKA ,1.69,-0.70, 2 -BKA00106, 9,120NNW_BKA ,1.85,-0.77, 2 -BKA00107, 9,130NNW_BKA ,2.00,-0.83, 2 -BKA00108, 9,140NNW_BKA ,2.15,-0.89, 2 -BKA00109, 9,150NNW_BKA ,2.31,-0.96, 2 -BKA00110, 9,160NNW_BKA ,2.46,-1.02, 2 -BKA00111, 9,170NNW_BKA ,2.62,-1.08, 2 -BKA00112, 9,180NNW_BKA ,2.77,-1.15, 2 -BKA00113, 9,190NNW_BKA ,2.92,-1.21, 2 -BKA00114, 9,200NNW_BKA ,3.08,-1.28, 2 -BKA00115, 9,210NNW_BKA ,3.23,-1.34, 2 -BKA00116, 9,220NNW_BKA ,3.38,-1.40, 2 -BKA00117, 9,230NNW_BKA ,3.54,-1.47, 2 -BKA00118, 9,240NNW_BKA ,3.69,-1.53, 2 -SSR00000, 9,SSR ,0.00,0.00, 1 -SSR00001, 9,20N_SSR ,0.33,0.00, 2 -SSR00002, 9,30N_SSR ,0.50,0.00, 2 -SSR00003, 9,40N_SSR ,0.67,0.00, 2 -SSR00004, 9,50N_SSR ,0.83,0.00, 2 -SSR00005, 9,60N_SSR ,1.00,0.00, 2 -SSR00006, 9,70N_SSR ,1.17,0.00, 2 -SSR00007, 9,80N_SSR ,1.33,0.00, 2 -SSR00008, 9,90N_SSR ,1.50,0.00, 2 -SSR00009, 9,100N_SSR ,1.67,0.00, 2 -SSR00010, 9,110N_SSR ,1.83,0.00, 2 -SSR00011, 9,120N_SSR ,2.00,0.00, 2 -SSR00012, 9,130N_SSR ,2.17,0.00, 2 -SSR00013, 9,140N_SSR ,2.33,0.00, 2 -SSR00014, 9,150N_SSR ,2.50,0.00, 2 -SSR00015, 9,160N_SSR ,2.66,0.00, 2 -SSR00016, 9,170N_SSR ,2.83,0.00, 2 -SSR00017, 9,180N_SSR ,3.00,0.00, 2 -SSR00018, 9,190N_SSR ,3.16,0.00, 2 -SSR00019, 9,200N_SSR ,3.33,0.00, 2 -SSR00020, 9,210N_SSR ,3.50,0.00, 2 -SSR00021, 9,220N_SSR ,3.66,0.00, 2 -SSR00022, 9,230N_SSR ,3.83,0.00, 2 -SSR00023, 9,240N_SSR ,4.00,0.00, 2 -SSR00024, 9,250N_SSR ,4.16,0.00, 2 -SSR00025, 9,20NNE_SSR ,0.31,0.13, 2 -SSR00026, 9,30NNE_SSR ,0.46,0.19, 2 -SSR00027, 9,40NNE_SSR ,0.62,0.25, 2 -SSR00028, 9,50NNE_SSR ,0.77,0.32, 2 -SSR00029, 9,60NNE_SSR ,0.92,0.38, 2 -SSR00030, 9,70NNE_SSR ,1.08,0.45, 2 -SSR00031, 9,80NNE_SSR ,1.23,0.51, 2 -SSR00032, 9,90NNE_SSR ,1.38,0.57, 2 -SSR00033, 9,100NNE_SSR ,1.54,0.64, 2 -SSR00034, 9,110NNE_SSR ,1.69,0.70, 2 -SSR00035, 9,120NNE_SSR ,1.85,0.77, 2 -SSR00036, 9,130NNE_SSR ,2.00,0.83, 2 -SSR00037, 9,140NNE_SSR ,2.15,0.89, 2 -SSR00038, 9,150NNE_SSR ,2.31,0.96, 2 -SSR00039, 9,160NNE_SSR ,2.46,1.02, 2 -SSR00040, 9,170NNE_SSR ,2.62,1.08, 2 -SSR00041, 9,180NNE_SSR ,2.77,1.15, 2 -SSR00042, 9,190NNE_SSR ,2.92,1.21, 2 -SSR00043, 9,200NNE_SSR ,3.08,1.28, 2 -SSR00044, 9,210NNE_SSR ,3.23,1.34, 2 -SSR00045, 9,220NNE_SSR ,3.38,1.40, 2 -SSR00046, 9,230NNE_SSR ,3.54,1.47, 2 -SSR00047, 9,240NNE_SSR ,3.69,1.53, 2 -SSR00048, 9,20NE_SSR ,0.24,0.24, 2 -SSR00049, 9,30NE_SSR ,0.35,0.35, 2 -SSR00050, 9,40NE_SSR ,0.47,0.47, 2 -SSR00051, 9,50NE_SSR ,0.59,0.59, 2 -SSR00052, 9,60NE_SSR ,0.71,0.71, 2 -SSR00053, 9,70NE_SSR ,0.82,0.82, 2 -SSR00054, 9,80NE_SSR ,0.94,0.94, 2 -SSR00055, 9,90NE_SSR ,1.06,1.06, 2 -SSR00056, 9,100NE_SSR ,1.18,1.18, 2 -SSR00057, 9,110NE_SSR ,1.30,1.30, 2 -SSR00058, 9,120NE_SSR ,1.41,1.41, 2 -SSR00059, 9,130NE_SSR ,1.53,1.53, 2 -SSR00060, 9,140NE_SSR ,1.65,1.65, 2 -SSR00061, 9,150NE_SSR ,1.77,1.77, 2 -SSR00062, 9,160NE_SSR ,1.88,1.88, 2 -SSR00063, 9,170NE_SSR ,2.00,2.00, 2 -SSR00064, 9,180NE_SSR ,2.12,2.12, 2 -SSR00065, 9,190NE_SSR ,2.24,2.24, 2 -SSR00066, 9,200NE_SSR ,2.35,2.36, 2 -SSR00067, 9,210NE_SSR ,2.47,2.47, 2 -SSR00068, 9,220NE_SSR ,2.59,2.59, 2 -SSR00069, 9,230NE_SSR ,2.71,2.71, 2 -SSR00070, 9,240NE_SSR ,2.83,2.83, 2 -SSR00071, 9,250NE_SSR ,2.94,2.95, 2 -SSR00072, 9,20NW_SSR ,0.24,-0.24, 2 -SSR00073, 9,30NW_SSR ,0.35,-0.35, 2 -SSR00074, 9,40NW_SSR ,0.47,-0.47, 2 -SSR00075, 9,50NW_SSR ,0.59,-0.59, 2 -SSR00076, 9,60NW_SSR ,0.71,-0.71, 2 -SSR00077, 9,70NW_SSR ,0.82,-0.82, 2 -SSR00078, 9,80NW_SSR ,0.94,-0.94, 2 -SSR00079, 9,90NW_SSR ,1.06,-1.06, 2 -SSR00080, 9,100NW_SSR ,1.18,-1.18, 2 -SSR00081, 9,110NW_SSR ,1.30,-1.30, 2 -SSR00082, 9,120NW_SSR ,1.41,-1.41, 2 -SSR00083, 9,130NW_SSR ,1.53,-1.53, 2 -SSR00084, 9,140NW_SSR ,1.65,-1.65, 2 -SSR00085, 9,150NW_SSR ,1.77,-1.77, 2 -SSR00086, 9,160NW_SSR ,1.88,-1.88, 2 -SSR00087, 9,170NW_SSR ,2.00,-2.00, 2 -SSR00088, 9,180NW_SSR ,2.12,-2.12, 2 -SSR00089, 9,190NW_SSR ,2.24,-2.24, 2 -SSR00090, 9,200NW_SSR ,2.35,-2.36, 2 -SSR00091, 9,210NW_SSR ,2.47,-2.47, 2 -SSR00092, 9,220NW_SSR ,2.59,-2.59, 2 -SSR00093, 9,230NW_SSR ,2.71,-2.71, 2 -SSR00094, 9,240NW_SSR ,2.83,-2.83, 2 -SSR00095, 9,250NW_SSR ,2.94,-2.95, 2 -SSR00096, 9,20NNW_SSR ,0.31,-0.13, 2 -SSR00097, 9,30NNW_SSR ,0.46,-0.19, 2 -SSR00098, 9,40NNW_SSR ,0.62,-0.25, 2 -SSR00099, 9,50NNW_SSR ,0.77,-0.32, 2 -SSR00100, 9,60NNW_SSR ,0.92,-0.38, 2 -SSR00101, 9,70NNW_SSR ,1.08,-0.45, 2 -SSR00102, 9,80NNW_SSR ,1.23,-0.51, 2 -SSR00103, 9,90NNW_SSR ,1.38,-0.57, 2 -SSR00104, 9,100NNW_SSR ,1.54,-0.64, 2 -SSR00105, 9,110NNW_SSR ,1.69,-0.70, 2 -SSR00106, 9,120NNW_SSR ,1.85,-0.77, 2 -SSR00107, 9,130NNW_SSR ,2.00,-0.83, 2 -SSR00108, 9,140NNW_SSR ,2.15,-0.89, 2 -SSR00109, 9,150NNW_SSR ,2.31,-0.96, 2 -SSR00110, 9,160NNW_SSR ,2.46,-1.02, 2 -SSR00111, 9,170NNW_SSR ,2.62,-1.08, 2 -SSR00112, 9,180NNW_SSR ,2.77,-1.15, 2 -SSR00113, 9,190NNW_SSR ,2.92,-1.21, 2 -SSR00114, 9,200NNW_SSR ,3.08,-1.28, 2 -SSR00115, 9,210NNW_SSR ,3.23,-1.34, 2 -SSR00116, 9,220NNW_SSR ,3.38,-1.40, 2 -SSR00117, 9,230NNW_SSR ,3.54,-1.47, 2 -SSR00118, 9,240NNW_SSR ,3.69,-1.53, 2 -JNU00000, 9,JNU ,0.00,0.00, 1 -JNU00001, 9,20N_JNU ,0.33,0.00, 2 -JNU00002, 9,30N_JNU ,0.50,0.00, 2 -JNU00003, 9,40N_JNU ,0.67,0.00, 2 -JNU00004, 9,50N_JNU ,0.83,0.00, 2 -JNU00005, 9,60N_JNU ,1.00,0.00, 2 -JNU00006, 9,70N_JNU ,1.17,0.00, 2 -JNU00007, 9,80N_JNU ,1.33,0.00, 2 -JNU00008, 9,90N_JNU ,1.50,0.00, 2 -JNU00009, 9,100N_JNU ,1.67,0.00, 2 -JNU00010, 9,110N_JNU ,1.83,0.00, 2 -JNU00011, 9,120N_JNU ,2.00,0.00, 2 -JNU00012, 9,130N_JNU ,2.17,0.00, 2 -JNU00013, 9,140N_JNU ,2.33,0.00, 2 -JNU00014, 9,150N_JNU ,2.50,0.00, 2 -JNU00015, 9,160N_JNU ,2.66,0.00, 2 -JNU00016, 9,170N_JNU ,2.83,0.00, 2 -JNU00017, 9,180N_JNU ,3.00,0.00, 2 -JNU00018, 9,190N_JNU ,3.16,0.00, 2 -JNU00019, 9,200N_JNU ,3.33,0.00, 2 -JNU00020, 9,210N_JNU ,3.50,0.00, 2 -JNU00021, 9,220N_JNU ,3.66,0.00, 2 -JNU00022, 9,230N_JNU ,3.83,0.00, 2 -JNU00023, 9,240N_JNU ,4.00,0.00, 2 -JNU00024, 9,250N_JNU ,4.16,0.00, 2 -JNU00025, 9,20NNE_JNU ,0.31,0.13, 2 -JNU00026, 9,30NNE_JNU ,0.46,0.19, 2 -JNU00027, 9,40NNE_JNU ,0.62,0.25, 2 -JNU00028, 9,50NNE_JNU ,0.77,0.32, 2 -JNU00029, 9,60NNE_JNU ,0.92,0.38, 2 -JNU00030, 9,70NNE_JNU ,1.08,0.45, 2 -JNU00031, 9,80NNE_JNU ,1.23,0.51, 2 -JNU00032, 9,90NNE_JNU ,1.38,0.57, 2 -JNU00033, 9,100NNE_JNU ,1.54,0.64, 2 -JNU00034, 9,110NNE_JNU ,1.69,0.70, 2 -JNU00035, 9,120NNE_JNU ,1.85,0.77, 2 -JNU00036, 9,130NNE_JNU ,2.00,0.83, 2 -JNU00037, 9,140NNE_JNU ,2.15,0.89, 2 -JNU00038, 9,150NNE_JNU ,2.31,0.96, 2 -JNU00039, 9,160NNE_JNU ,2.46,1.02, 2 -JNU00040, 9,170NNE_JNU ,2.62,1.08, 2 -JNU00041, 9,180NNE_JNU ,2.77,1.15, 2 -JNU00042, 9,190NNE_JNU ,2.92,1.21, 2 -JNU00043, 9,200NNE_JNU ,3.08,1.28, 2 -JNU00044, 9,210NNE_JNU ,3.23,1.34, 2 -JNU00045, 9,220NNE_JNU ,3.38,1.40, 2 -JNU00046, 9,230NNE_JNU ,3.54,1.47, 2 -JNU00047, 9,240NNE_JNU ,3.69,1.53, 2 -JNU00048, 9,20NE_JNU ,0.24,0.24, 2 -JNU00049, 9,30NE_JNU ,0.35,0.35, 2 -JNU00050, 9,40NE_JNU ,0.47,0.47, 2 -JNU00051, 9,50NE_JNU ,0.59,0.59, 2 -JNU00052, 9,60NE_JNU ,0.71,0.71, 2 -JNU00053, 9,70NE_JNU ,0.82,0.82, 2 -JNU00054, 9,80NE_JNU ,0.94,0.94, 2 -JNU00055, 9,90NE_JNU ,1.06,1.06, 2 -JNU00056, 9,100NE_JNU ,1.18,1.18, 2 -JNU00057, 9,110NE_JNU ,1.30,1.30, 2 -JNU00058, 9,120NE_JNU ,1.41,1.41, 2 -JNU00059, 9,130NE_JNU ,1.53,1.53, 2 -JNU00060, 9,140NE_JNU ,1.65,1.65, 2 -JNU00061, 9,150NE_JNU ,1.77,1.77, 2 -JNU00062, 9,160NE_JNU ,1.88,1.88, 2 -JNU00063, 9,170NE_JNU ,2.00,2.00, 2 -JNU00064, 9,180NE_JNU ,2.12,2.12, 2 -JNU00065, 9,190NE_JNU ,2.24,2.24, 2 -JNU00066, 9,200NE_JNU ,2.35,2.36, 2 -JNU00067, 9,210NE_JNU ,2.47,2.47, 2 -JNU00068, 9,220NE_JNU ,2.59,2.59, 2 -JNU00069, 9,230NE_JNU ,2.71,2.71, 2 -JNU00070, 9,240NE_JNU ,2.83,2.83, 2 -JNU00071, 9,250NE_JNU ,2.94,2.95, 2 -JNU00072, 9,20NW_JNU ,0.24,-0.24, 2 -JNU00073, 9,30NW_JNU ,0.35,-0.35, 2 -JNU00074, 9,40NW_JNU ,0.47,-0.47, 2 -JNU00075, 9,50NW_JNU ,0.59,-0.59, 2 -JNU00076, 9,60NW_JNU ,0.71,-0.71, 2 -JNU00077, 9,70NW_JNU ,0.82,-0.82, 2 -JNU00078, 9,80NW_JNU ,0.94,-0.94, 2 -JNU00079, 9,90NW_JNU ,1.06,-1.06, 2 -JNU00080, 9,100NW_JNU ,1.18,-1.18, 2 -JNU00081, 9,110NW_JNU ,1.30,-1.30, 2 -JNU00082, 9,120NW_JNU ,1.41,-1.41, 2 -JNU00083, 9,130NW_JNU ,1.53,-1.53, 2 -JNU00084, 9,140NW_JNU ,1.65,-1.65, 2 -JNU00085, 9,150NW_JNU ,1.77,-1.77, 2 -JNU00086, 9,160NW_JNU ,1.88,-1.88, 2 -JNU00087, 9,170NW_JNU ,2.00,-2.00, 2 -JNU00088, 9,180NW_JNU ,2.12,-2.12, 2 -JNU00089, 9,190NW_JNU ,2.24,-2.24, 2 -JNU00090, 9,200NW_JNU ,2.35,-2.36, 2 -JNU00091, 9,210NW_JNU ,2.47,-2.47, 2 -JNU00092, 9,220NW_JNU ,2.59,-2.59, 2 -JNU00093, 9,230NW_JNU ,2.71,-2.71, 2 -JNU00094, 9,240NW_JNU ,2.83,-2.83, 2 -JNU00095, 9,250NW_JNU ,2.94,-2.95, 2 -JNU00096, 9,20NNW_JNU ,0.31,-0.13, 2 -JNU00097, 9,30NNW_JNU ,0.46,-0.19, 2 -JNU00098, 9,40NNW_JNU ,0.62,-0.25, 2 -JNU00099, 9,50NNW_JNU ,0.77,-0.32, 2 -JNU00100, 9,60NNW_JNU ,0.92,-0.38, 2 -JNU00101, 9,70NNW_JNU ,1.08,-0.45, 2 -JNU00102, 9,80NNW_JNU ,1.23,-0.51, 2 -JNU00103, 9,90NNW_JNU ,1.38,-0.57, 2 -JNU00104, 9,100NNW_JNU ,1.54,-0.64, 2 -JNU00105, 9,110NNW_JNU ,1.69,-0.70, 2 -JNU00106, 9,120NNW_JNU ,1.85,-0.77, 2 -JNU00107, 9,130NNW_JNU ,2.00,-0.83, 2 -JNU00108, 9,140NNW_JNU ,2.15,-0.89, 2 -JNU00109, 9,150NNW_JNU ,2.31,-0.96, 2 -JNU00110, 9,160NNW_JNU ,2.46,-1.02, 2 -JNU00111, 9,170NNW_JNU ,2.62,-1.08, 2 -JNU00112, 9,180NNW_JNU ,2.77,-1.15, 2 -JNU00113, 9,190NNW_JNU ,2.92,-1.21, 2 -JNU00114, 9,200NNW_JNU ,3.08,-1.28, 2 -JNU00115, 9,210NNW_JNU ,3.23,-1.34, 2 -JNU00116, 9,220NNW_JNU ,3.38,-1.40, 2 -JNU00117, 9,230NNW_JNU ,3.54,-1.47, 2 -JNU00118, 9,240NNW_JNU ,3.69,-1.53, 2 -YAK00000, 9,YAK ,0.00,0.00, 1 -YAK00001, 9,20N_YAK ,0.33,0.00, 2 -YAK00002, 9,30N_YAK ,0.50,0.00, 2 -YAK00003, 9,40N_YAK ,0.67,0.00, 2 -YAK00004, 9,50N_YAK ,0.83,0.00, 2 -YAK00005, 9,60N_YAK ,1.00,0.00, 2 -YAK00006, 9,70N_YAK ,1.17,0.00, 2 -YAK00007, 9,80N_YAK ,1.33,0.00, 2 -YAK00008, 9,90N_YAK ,1.50,0.00, 2 -YAK00009, 9,100N_YAK ,1.67,0.00, 2 -YAK00010, 9,110N_YAK ,1.83,0.00, 2 -YAK00011, 9,120N_YAK ,2.00,0.00, 2 -YAK00012, 9,130N_YAK ,2.17,0.00, 2 -YAK00013, 9,140N_YAK ,2.33,0.00, 2 -YAK00014, 9,150N_YAK ,2.50,0.00, 2 -YAK00015, 9,160N_YAK ,2.66,0.00, 2 -YAK00016, 9,170N_YAK ,2.83,0.00, 2 -YAK00017, 9,180N_YAK ,3.00,0.00, 2 -YAK00018, 9,190N_YAK ,3.16,0.00, 2 -YAK00019, 9,200N_YAK ,3.33,0.00, 2 -YAK00020, 9,210N_YAK ,3.50,0.00, 2 -YAK00021, 9,220N_YAK ,3.66,0.00, 2 -YAK00022, 9,230N_YAK ,3.83,0.00, 2 -YAK00023, 9,240N_YAK ,4.00,0.00, 2 -YAK00024, 9,250N_YAK ,4.16,0.00, 2 -YAK00025, 9,20NNE_YAK ,0.31,0.13, 2 -YAK00026, 9,30NNE_YAK ,0.46,0.19, 2 -YAK00027, 9,40NNE_YAK ,0.62,0.25, 2 -YAK00028, 9,50NNE_YAK ,0.77,0.32, 2 -YAK00029, 9,60NNE_YAK ,0.92,0.38, 2 -YAK00030, 9,70NNE_YAK ,1.08,0.45, 2 -YAK00031, 9,80NNE_YAK ,1.23,0.51, 2 -YAK00032, 9,90NNE_YAK ,1.38,0.57, 2 -YAK00033, 9,100NNE_YAK ,1.54,0.64, 2 -YAK00034, 9,110NNE_YAK ,1.69,0.70, 2 -YAK00035, 9,120NNE_YAK ,1.85,0.77, 2 -YAK00036, 9,130NNE_YAK ,2.00,0.83, 2 -YAK00037, 9,140NNE_YAK ,2.15,0.89, 2 -YAK00038, 9,150NNE_YAK ,2.31,0.96, 2 -YAK00039, 9,160NNE_YAK ,2.46,1.02, 2 -YAK00040, 9,170NNE_YAK ,2.62,1.08, 2 -YAK00041, 9,180NNE_YAK ,2.77,1.15, 2 -YAK00042, 9,190NNE_YAK ,2.92,1.21, 2 -YAK00043, 9,200NNE_YAK ,3.08,1.28, 2 -YAK00044, 9,210NNE_YAK ,3.23,1.34, 2 -YAK00045, 9,220NNE_YAK ,3.38,1.40, 2 -YAK00046, 9,230NNE_YAK ,3.54,1.47, 2 -YAK00047, 9,240NNE_YAK ,3.69,1.53, 2 -YAK00048, 9,20NE_YAK ,0.24,0.24, 2 -YAK00049, 9,30NE_YAK ,0.35,0.35, 2 -YAK00050, 9,40NE_YAK ,0.47,0.47, 2 -YAK00051, 9,50NE_YAK ,0.59,0.59, 2 -YAK00052, 9,60NE_YAK ,0.71,0.71, 2 -YAK00053, 9,70NE_YAK ,0.82,0.82, 2 -YAK00054, 9,80NE_YAK ,0.94,0.94, 2 -YAK00055, 9,90NE_YAK ,1.06,1.06, 2 -YAK00056, 9,100NE_YAK ,1.18,1.18, 2 -YAK00057, 9,110NE_YAK ,1.30,1.30, 2 -YAK00058, 9,120NE_YAK ,1.41,1.41, 2 -YAK00059, 9,130NE_YAK ,1.53,1.53, 2 -YAK00060, 9,140NE_YAK ,1.65,1.65, 2 -YAK00061, 9,150NE_YAK ,1.77,1.77, 2 -YAK00062, 9,160NE_YAK ,1.88,1.88, 2 -YAK00063, 9,170NE_YAK ,2.00,2.00, 2 -YAK00064, 9,180NE_YAK ,2.12,2.12, 2 -YAK00065, 9,190NE_YAK ,2.24,2.24, 2 -YAK00066, 9,200NE_YAK ,2.35,2.36, 2 -YAK00067, 9,210NE_YAK ,2.47,2.47, 2 -YAK00068, 9,220NE_YAK ,2.59,2.59, 2 -YAK00069, 9,230NE_YAK ,2.71,2.71, 2 -YAK00070, 9,240NE_YAK ,2.83,2.83, 2 -YAK00071, 9,250NE_YAK ,2.94,2.95, 2 -YAK00072, 9,20NW_YAK ,0.24,-0.24, 2 -YAK00073, 9,30NW_YAK ,0.35,-0.35, 2 -YAK00074, 9,40NW_YAK ,0.47,-0.47, 2 -YAK00075, 9,50NW_YAK ,0.59,-0.59, 2 -YAK00076, 9,60NW_YAK ,0.71,-0.71, 2 -YAK00077, 9,70NW_YAK ,0.82,-0.82, 2 -YAK00078, 9,80NW_YAK ,0.94,-0.94, 2 -YAK00079, 9,90NW_YAK ,1.06,-1.06, 2 -YAK00080, 9,100NW_YAK ,1.18,-1.18, 2 -YAK00081, 9,110NW_YAK ,1.30,-1.30, 2 -YAK00082, 9,120NW_YAK ,1.41,-1.41, 2 -YAK00083, 9,130NW_YAK ,1.53,-1.53, 2 -YAK00084, 9,140NW_YAK ,1.65,-1.65, 2 -YAK00085, 9,150NW_YAK ,1.77,-1.77, 2 -YAK00086, 9,160NW_YAK ,1.88,-1.88, 2 -YAK00087, 9,170NW_YAK ,2.00,-2.00, 2 -YAK00088, 9,180NW_YAK ,2.12,-2.12, 2 -YAK00089, 9,190NW_YAK ,2.24,-2.24, 2 -YAK00090, 9,200NW_YAK ,2.35,-2.36, 2 -YAK00091, 9,210NW_YAK ,2.47,-2.47, 2 -YAK00092, 9,220NW_YAK ,2.59,-2.59, 2 -YAK00093, 9,230NW_YAK ,2.71,-2.71, 2 -YAK00094, 9,240NW_YAK ,2.83,-2.83, 2 -YAK00095, 9,250NW_YAK ,2.94,-2.95, 2 -YAK00096, 9,20NNW_YAK ,0.31,-0.13, 2 -YAK00097, 9,30NNW_YAK ,0.46,-0.19, 2 -YAK00098, 9,40NNW_YAK ,0.62,-0.25, 2 -YAK00099, 9,50NNW_YAK ,0.77,-0.32, 2 -YAK00100, 9,60NNW_YAK ,0.92,-0.38, 2 -YAK00101, 9,70NNW_YAK ,1.08,-0.45, 2 -YAK00102, 9,80NNW_YAK ,1.23,-0.51, 2 -YAK00103, 9,90NNW_YAK ,1.38,-0.57, 2 -YAK00104, 9,100NNW_YAK ,1.54,-0.64, 2 -YAK00105, 9,110NNW_YAK ,1.69,-0.70, 2 -YAK00106, 9,120NNW_YAK ,1.85,-0.77, 2 -YAK00107, 9,130NNW_YAK ,2.00,-0.83, 2 -YAK00108, 9,140NNW_YAK ,2.15,-0.89, 2 -YAK00109, 9,150NNW_YAK ,2.31,-0.96, 2 -YAK00110, 9,160NNW_YAK ,2.46,-1.02, 2 -YAK00111, 9,170NNW_YAK ,2.62,-1.08, 2 -YAK00112, 9,180NNW_YAK ,2.77,-1.15, 2 -YAK00113, 9,190NNW_YAK ,2.92,-1.21, 2 -YAK00114, 9,200NNW_YAK ,3.08,-1.28, 2 -YAK00115, 9,210NNW_YAK ,3.23,-1.34, 2 -YAK00116, 9,220NNW_YAK ,3.38,-1.40, 2 -YAK00117, 9,230NNW_YAK ,3.54,-1.47, 2 -YAK00118, 9,240NNW_YAK ,3.69,-1.53, 2 -MDO00000, 9,MDO ,0.00,0.00, 1 -MDO00001, 9,20N_MDO ,0.33,0.00, 2 -MDO00002, 9,30N_MDO ,0.50,0.00, 2 -MDO00003, 9,40N_MDO ,0.67,0.00, 2 -MDO00004, 9,50N_MDO ,0.83,0.00, 2 -MDO00005, 9,60N_MDO ,1.00,0.00, 2 -MDO00006, 9,70N_MDO ,1.17,0.00, 2 -MDO00007, 9,80N_MDO ,1.33,0.00, 2 -MDO00008, 9,90N_MDO ,1.50,0.00, 2 -MDO00009, 9,100N_MDO ,1.67,0.00, 2 -MDO00010, 9,110N_MDO ,1.83,0.00, 2 -MDO00011, 9,120N_MDO ,2.00,0.00, 2 -MDO00012, 9,130N_MDO ,2.17,0.00, 2 -MDO00013, 9,140N_MDO ,2.33,0.00, 2 -MDO00014, 9,150N_MDO ,2.50,0.00, 2 -MDO00015, 9,160N_MDO ,2.66,0.00, 2 -MDO00016, 9,170N_MDO ,2.83,0.00, 2 -MDO00017, 9,180N_MDO ,3.00,0.00, 2 -MDO00018, 9,190N_MDO ,3.16,0.00, 2 -MDO00019, 9,200N_MDO ,3.33,0.00, 2 -MDO00020, 9,210N_MDO ,3.50,0.00, 2 -MDO00021, 9,220N_MDO ,3.66,0.00, 2 -MDO00022, 9,230N_MDO ,3.83,0.00, 2 -MDO00023, 9,240N_MDO ,4.00,0.00, 2 -MDO00024, 9,250N_MDO ,4.16,0.00, 2 -MDO00025, 9,20NNE_MDO ,0.31,0.13, 2 -MDO00026, 9,30NNE_MDO ,0.46,0.19, 2 -MDO00027, 9,40NNE_MDO ,0.62,0.25, 2 -MDO00028, 9,50NNE_MDO ,0.77,0.32, 2 -MDO00029, 9,60NNE_MDO ,0.92,0.38, 2 -MDO00030, 9,70NNE_MDO ,1.08,0.45, 2 -MDO00031, 9,80NNE_MDO ,1.23,0.51, 2 -MDO00032, 9,90NNE_MDO ,1.38,0.57, 2 -MDO00033, 9,100NNE_MDO ,1.54,0.64, 2 -MDO00034, 9,110NNE_MDO ,1.69,0.70, 2 -MDO00035, 9,120NNE_MDO ,1.85,0.77, 2 -MDO00036, 9,130NNE_MDO ,2.00,0.83, 2 -MDO00037, 9,140NNE_MDO ,2.15,0.89, 2 -MDO00038, 9,150NNE_MDO ,2.31,0.96, 2 -MDO00039, 9,160NNE_MDO ,2.46,1.02, 2 -MDO00040, 9,170NNE_MDO ,2.62,1.08, 2 -MDO00041, 9,180NNE_MDO ,2.77,1.15, 2 -MDO00042, 9,190NNE_MDO ,2.92,1.21, 2 -MDO00043, 9,200NNE_MDO ,3.08,1.28, 2 -MDO00044, 9,210NNE_MDO ,3.23,1.34, 2 -MDO00045, 9,220NNE_MDO ,3.38,1.40, 2 -MDO00046, 9,230NNE_MDO ,3.54,1.47, 2 -MDO00047, 9,240NNE_MDO ,3.69,1.53, 2 -MDO00048, 9,20NE_MDO ,0.24,0.24, 2 -MDO00049, 9,30NE_MDO ,0.35,0.35, 2 -MDO00050, 9,40NE_MDO ,0.47,0.47, 2 -MDO00051, 9,50NE_MDO ,0.59,0.59, 2 -MDO00052, 9,60NE_MDO ,0.71,0.71, 2 -MDO00053, 9,70NE_MDO ,0.82,0.82, 2 -MDO00054, 9,80NE_MDO ,0.94,0.94, 2 -MDO00055, 9,90NE_MDO ,1.06,1.06, 2 -MDO00056, 9,100NE_MDO ,1.18,1.18, 2 -MDO00057, 9,110NE_MDO ,1.30,1.30, 2 -MDO00058, 9,120NE_MDO ,1.41,1.41, 2 -MDO00059, 9,130NE_MDO ,1.53,1.53, 2 -MDO00060, 9,140NE_MDO ,1.65,1.65, 2 -MDO00061, 9,150NE_MDO ,1.77,1.77, 2 -MDO00062, 9,160NE_MDO ,1.88,1.88, 2 -MDO00063, 9,170NE_MDO ,2.00,2.00, 2 -MDO00064, 9,180NE_MDO ,2.12,2.12, 2 -MDO00065, 9,190NE_MDO ,2.24,2.24, 2 -MDO00066, 9,200NE_MDO ,2.35,2.36, 2 -MDO00067, 9,210NE_MDO ,2.47,2.47, 2 -MDO00068, 9,220NE_MDO ,2.59,2.59, 2 -MDO00069, 9,230NE_MDO ,2.71,2.71, 2 -MDO00070, 9,240NE_MDO ,2.83,2.83, 2 -MDO00071, 9,250NE_MDO ,2.94,2.95, 2 -MDO00072, 9,20NW_MDO ,0.24,-0.24, 2 -MDO00073, 9,30NW_MDO ,0.35,-0.35, 2 -MDO00074, 9,40NW_MDO ,0.47,-0.47, 2 -MDO00075, 9,50NW_MDO ,0.59,-0.59, 2 -MDO00076, 9,60NW_MDO ,0.71,-0.71, 2 -MDO00077, 9,70NW_MDO ,0.82,-0.82, 2 -MDO00078, 9,80NW_MDO ,0.94,-0.94, 2 -MDO00079, 9,90NW_MDO ,1.06,-1.06, 2 -MDO00080, 9,100NW_MDO ,1.18,-1.18, 2 -MDO00081, 9,110NW_MDO ,1.30,-1.30, 2 -MDO00082, 9,120NW_MDO ,1.41,-1.41, 2 -MDO00083, 9,130NW_MDO ,1.53,-1.53, 2 -MDO00084, 9,140NW_MDO ,1.65,-1.65, 2 -MDO00085, 9,150NW_MDO ,1.77,-1.77, 2 -MDO00086, 9,160NW_MDO ,1.88,-1.88, 2 -MDO00087, 9,170NW_MDO ,2.00,-2.00, 2 -MDO00088, 9,180NW_MDO ,2.12,-2.12, 2 -MDO00089, 9,190NW_MDO ,2.24,-2.24, 2 -MDO00090, 9,200NW_MDO ,2.35,-2.36, 2 -MDO00091, 9,210NW_MDO ,2.47,-2.47, 2 -MDO00092, 9,220NW_MDO ,2.59,-2.59, 2 -MDO00093, 9,230NW_MDO ,2.71,-2.71, 2 -MDO00094, 9,240NW_MDO ,2.83,-2.83, 2 -MDO00095, 9,250NW_MDO ,2.94,-2.95, 2 -MDO00096, 9,20NNW_MDO ,0.31,-0.13, 2 -MDO00097, 9,30NNW_MDO ,0.46,-0.19, 2 -MDO00098, 9,40NNW_MDO ,0.62,-0.25, 2 -MDO00099, 9,50NNW_MDO ,0.77,-0.32, 2 -MDO00100, 9,60NNW_MDO ,0.92,-0.38, 2 -MDO00101, 9,70NNW_MDO ,1.08,-0.45, 2 -MDO00102, 9,80NNW_MDO ,1.23,-0.51, 2 -MDO00103, 9,90NNW_MDO ,1.38,-0.57, 2 -MDO00104, 9,100NNW_MDO ,1.54,-0.64, 2 -MDO00105, 9,110NNW_MDO ,1.69,-0.70, 2 -MDO00106, 9,120NNW_MDO ,1.85,-0.77, 2 -MDO00107, 9,130NNW_MDO ,2.00,-0.83, 2 -MDO00108, 9,140NNW_MDO ,2.15,-0.89, 2 -MDO00109, 9,150NNW_MDO ,2.31,-0.96, 2 -MDO00110, 9,160NNW_MDO ,2.46,-1.02, 2 -MDO00111, 9,170NNW_MDO ,2.62,-1.08, 2 -MDO00112, 9,180NNW_MDO ,2.77,-1.15, 2 -MDO00113, 9,190NNW_MDO ,2.92,-1.21, 2 -MDO00114, 9,200NNW_MDO ,3.08,-1.28, 2 -MDO00115, 9,210NNW_MDO ,3.23,-1.34, 2 -MDO00116, 9,220NNW_MDO ,3.38,-1.40, 2 -MDO00117, 9,230NNW_MDO ,3.54,-1.47, 2 -MDO00118, 9,240NNW_MDO ,3.69,-1.53, 2 -JOH00000, 9,JOH ,0.00,0.00, 1 -JOH00001, 9,20N_JOH ,0.33,0.00, 2 -JOH00002, 9,30N_JOH ,0.50,0.00, 2 -JOH00003, 9,40N_JOH ,0.67,0.00, 2 -JOH00004, 9,50N_JOH ,0.83,0.00, 2 -JOH00005, 9,60N_JOH ,1.00,0.00, 2 -JOH00006, 9,70N_JOH ,1.17,0.00, 2 -JOH00007, 9,80N_JOH ,1.33,0.00, 2 -JOH00008, 9,90N_JOH ,1.50,0.00, 2 -JOH00009, 9,100N_JOH ,1.67,0.00, 2 -JOH00010, 9,110N_JOH ,1.83,0.00, 2 -JOH00011, 9,120N_JOH ,2.00,0.00, 2 -JOH00012, 9,130N_JOH ,2.17,0.00, 2 -JOH00013, 9,140N_JOH ,2.33,0.00, 2 -JOH00014, 9,150N_JOH ,2.50,0.00, 2 -JOH00015, 9,160N_JOH ,2.66,0.00, 2 -JOH00016, 9,170N_JOH ,2.83,0.00, 2 -JOH00017, 9,180N_JOH ,3.00,0.00, 2 -JOH00018, 9,190N_JOH ,3.16,0.00, 2 -JOH00019, 9,200N_JOH ,3.33,0.00, 2 -JOH00020, 9,210N_JOH ,3.50,0.00, 2 -JOH00021, 9,220N_JOH ,3.66,0.00, 2 -JOH00022, 9,230N_JOH ,3.83,0.00, 2 -JOH00023, 9,240N_JOH ,4.00,0.00, 2 -JOH00024, 9,250N_JOH ,4.16,0.00, 2 -JOH00025, 9,20NNE_JOH ,0.31,0.13, 2 -JOH00026, 9,30NNE_JOH ,0.46,0.19, 2 -JOH00027, 9,40NNE_JOH ,0.62,0.25, 2 -JOH00028, 9,50NNE_JOH ,0.77,0.32, 2 -JOH00029, 9,60NNE_JOH ,0.92,0.38, 2 -JOH00030, 9,70NNE_JOH ,1.08,0.45, 2 -JOH00031, 9,80NNE_JOH ,1.23,0.51, 2 -JOH00032, 9,90NNE_JOH ,1.38,0.57, 2 -JOH00033, 9,100NNE_JOH ,1.54,0.64, 2 -JOH00034, 9,110NNE_JOH ,1.69,0.70, 2 -JOH00035, 9,120NNE_JOH ,1.85,0.77, 2 -JOH00036, 9,130NNE_JOH ,2.00,0.83, 2 -JOH00037, 9,140NNE_JOH ,2.15,0.89, 2 -JOH00038, 9,150NNE_JOH ,2.31,0.96, 2 -JOH00039, 9,160NNE_JOH ,2.46,1.02, 2 -JOH00040, 9,170NNE_JOH ,2.62,1.08, 2 -JOH00041, 9,180NNE_JOH ,2.77,1.15, 2 -JOH00042, 9,190NNE_JOH ,2.92,1.21, 2 -JOH00043, 9,200NNE_JOH ,3.08,1.28, 2 -JOH00044, 9,210NNE_JOH ,3.23,1.34, 2 -JOH00045, 9,220NNE_JOH ,3.38,1.40, 2 -JOH00046, 9,230NNE_JOH ,3.54,1.47, 2 -JOH00047, 9,240NNE_JOH ,3.69,1.53, 2 -JOH00048, 9,20NE_JOH ,0.24,0.24, 2 -JOH00049, 9,30NE_JOH ,0.35,0.35, 2 -JOH00050, 9,40NE_JOH ,0.47,0.47, 2 -JOH00051, 9,50NE_JOH ,0.59,0.59, 2 -JOH00052, 9,60NE_JOH ,0.71,0.71, 2 -JOH00053, 9,70NE_JOH ,0.82,0.82, 2 -JOH00054, 9,80NE_JOH ,0.94,0.94, 2 -JOH00055, 9,90NE_JOH ,1.06,1.06, 2 -JOH00056, 9,100NE_JOH ,1.18,1.18, 2 -JOH00057, 9,110NE_JOH ,1.30,1.30, 2 -JOH00058, 9,120NE_JOH ,1.41,1.41, 2 -JOH00059, 9,130NE_JOH ,1.53,1.53, 2 -JOH00060, 9,140NE_JOH ,1.65,1.65, 2 -JOH00061, 9,150NE_JOH ,1.77,1.77, 2 -JOH00062, 9,160NE_JOH ,1.88,1.88, 2 -JOH00063, 9,170NE_JOH ,2.00,2.00, 2 -JOH00064, 9,180NE_JOH ,2.12,2.12, 2 -JOH00065, 9,190NE_JOH ,2.24,2.24, 2 -JOH00066, 9,200NE_JOH ,2.35,2.36, 2 -JOH00067, 9,210NE_JOH ,2.47,2.47, 2 -JOH00068, 9,220NE_JOH ,2.59,2.59, 2 -JOH00069, 9,230NE_JOH ,2.71,2.71, 2 -JOH00070, 9,240NE_JOH ,2.83,2.83, 2 -JOH00071, 9,250NE_JOH ,2.94,2.95, 2 -JOH00072, 9,20NW_JOH ,0.24,-0.24, 2 -JOH00073, 9,30NW_JOH ,0.35,-0.35, 2 -JOH00074, 9,40NW_JOH ,0.47,-0.47, 2 -JOH00075, 9,50NW_JOH ,0.59,-0.59, 2 -JOH00076, 9,60NW_JOH ,0.71,-0.71, 2 -JOH00077, 9,70NW_JOH ,0.82,-0.82, 2 -JOH00078, 9,80NW_JOH ,0.94,-0.94, 2 -JOH00079, 9,90NW_JOH ,1.06,-1.06, 2 -JOH00080, 9,100NW_JOH ,1.18,-1.18, 2 -JOH00081, 9,110NW_JOH ,1.30,-1.30, 2 -JOH00082, 9,120NW_JOH ,1.41,-1.41, 2 -JOH00083, 9,130NW_JOH ,1.53,-1.53, 2 -JOH00084, 9,140NW_JOH ,1.65,-1.65, 2 -JOH00085, 9,150NW_JOH ,1.77,-1.77, 2 -JOH00086, 9,160NW_JOH ,1.88,-1.88, 2 -JOH00087, 9,170NW_JOH ,2.00,-2.00, 2 -JOH00088, 9,180NW_JOH ,2.12,-2.12, 2 -JOH00089, 9,190NW_JOH ,2.24,-2.24, 2 -JOH00090, 9,200NW_JOH ,2.35,-2.36, 2 -JOH00091, 9,210NW_JOH ,2.47,-2.47, 2 -JOH00092, 9,220NW_JOH ,2.59,-2.59, 2 -JOH00093, 9,230NW_JOH ,2.71,-2.71, 2 -JOH00094, 9,240NW_JOH ,2.83,-2.83, 2 -JOH00095, 9,250NW_JOH ,2.94,-2.95, 2 -JOH00096, 9,20NNW_JOH ,0.31,-0.13, 2 -JOH00097, 9,30NNW_JOH ,0.46,-0.19, 2 -JOH00098, 9,40NNW_JOH ,0.62,-0.25, 2 -JOH00099, 9,50NNW_JOH ,0.77,-0.32, 2 -JOH00100, 9,60NNW_JOH ,0.92,-0.38, 2 -JOH00101, 9,70NNW_JOH ,1.08,-0.45, 2 -JOH00102, 9,80NNW_JOH ,1.23,-0.51, 2 -JOH00103, 9,90NNW_JOH ,1.38,-0.57, 2 -JOH00104, 9,100NNW_JOH ,1.54,-0.64, 2 -JOH00105, 9,110NNW_JOH ,1.69,-0.70, 2 -JOH00106, 9,120NNW_JOH ,1.85,-0.77, 2 -JOH00107, 9,130NNW_JOH ,2.00,-0.83, 2 -JOH00108, 9,140NNW_JOH ,2.15,-0.89, 2 -JOH00109, 9,150NNW_JOH ,2.31,-0.96, 2 -JOH00110, 9,160NNW_JOH ,2.46,-1.02, 2 -JOH00111, 9,170NNW_JOH ,2.62,-1.08, 2 -JOH00112, 9,180NNW_JOH ,2.77,-1.15, 2 -JOH00113, 9,190NNW_JOH ,2.92,-1.21, 2 -JOH00114, 9,200NNW_JOH ,3.08,-1.28, 2 -JOH00115, 9,210NNW_JOH ,3.23,-1.34, 2 -JOH00116, 9,220NNW_JOH ,3.38,-1.40, 2 -JOH00117, 9,230NNW_JOH ,3.54,-1.47, 2 -JOH00118, 9,240NNW_JOH ,3.69,-1.53, 2 -ODK00000, 9,ODK ,0.00,0.00, 1 -ODK00001, 9,20N_ODK ,0.33,0.00, 2 -ODK00002, 9,30N_ODK ,0.50,0.00, 2 -ODK00003, 9,40N_ODK ,0.67,0.00, 2 -ODK00004, 9,50N_ODK ,0.83,0.00, 2 -ODK00005, 9,60N_ODK ,1.00,0.00, 2 -ODK00006, 9,70N_ODK ,1.17,0.00, 2 -ODK00007, 9,80N_ODK ,1.33,0.00, 2 -ODK00008, 9,90N_ODK ,1.50,0.00, 2 -ODK00009, 9,100N_ODK ,1.67,0.00, 2 -ODK00010, 9,110N_ODK ,1.83,0.00, 2 -ODK00011, 9,120N_ODK ,2.00,0.00, 2 -ODK00012, 9,130N_ODK ,2.17,0.00, 2 -ODK00013, 9,140N_ODK ,2.33,0.00, 2 -ODK00014, 9,150N_ODK ,2.50,0.00, 2 -ODK00015, 9,160N_ODK ,2.66,0.00, 2 -ODK00016, 9,170N_ODK ,2.83,0.00, 2 -ODK00017, 9,180N_ODK ,3.00,0.00, 2 -ODK00018, 9,190N_ODK ,3.16,0.00, 2 -ODK00019, 9,200N_ODK ,3.33,0.00, 2 -ODK00020, 9,210N_ODK ,3.50,0.00, 2 -ODK00021, 9,220N_ODK ,3.66,0.00, 2 -ODK00022, 9,230N_ODK ,3.83,0.00, 2 -ODK00023, 9,240N_ODK ,4.00,0.00, 2 -ODK00024, 9,250N_ODK ,4.16,0.00, 2 -ODK00025, 9,20NNE_ODK ,0.31,0.13, 2 -ODK00026, 9,30NNE_ODK ,0.46,0.19, 2 -ODK00027, 9,40NNE_ODK ,0.62,0.25, 2 -ODK00028, 9,50NNE_ODK ,0.77,0.32, 2 -ODK00029, 9,60NNE_ODK ,0.92,0.38, 2 -ODK00030, 9,70NNE_ODK ,1.08,0.45, 2 -ODK00031, 9,80NNE_ODK ,1.23,0.51, 2 -ODK00032, 9,90NNE_ODK ,1.38,0.57, 2 -ODK00033, 9,100NNE_ODK ,1.54,0.64, 2 -ODK00034, 9,110NNE_ODK ,1.69,0.70, 2 -ODK00035, 9,120NNE_ODK ,1.85,0.77, 2 -ODK00036, 9,130NNE_ODK ,2.00,0.83, 2 -ODK00037, 9,140NNE_ODK ,2.15,0.89, 2 -ODK00038, 9,150NNE_ODK ,2.31,0.96, 2 -ODK00039, 9,160NNE_ODK ,2.46,1.02, 2 -ODK00040, 9,170NNE_ODK ,2.62,1.08, 2 -ODK00041, 9,180NNE_ODK ,2.77,1.15, 2 -ODK00042, 9,190NNE_ODK ,2.92,1.21, 2 -ODK00043, 9,200NNE_ODK ,3.08,1.28, 2 -ODK00044, 9,210NNE_ODK ,3.23,1.34, 2 -ODK00045, 9,220NNE_ODK ,3.38,1.40, 2 -ODK00046, 9,230NNE_ODK ,3.54,1.47, 2 -ODK00047, 9,240NNE_ODK ,3.69,1.53, 2 -ODK00048, 9,20NE_ODK ,0.24,0.24, 2 -ODK00049, 9,30NE_ODK ,0.35,0.35, 2 -ODK00050, 9,40NE_ODK ,0.47,0.47, 2 -ODK00051, 9,50NE_ODK ,0.59,0.59, 2 -ODK00052, 9,60NE_ODK ,0.71,0.71, 2 -ODK00053, 9,70NE_ODK ,0.82,0.82, 2 -ODK00054, 9,80NE_ODK ,0.94,0.94, 2 -ODK00055, 9,90NE_ODK ,1.06,1.06, 2 -ODK00056, 9,100NE_ODK ,1.18,1.18, 2 -ODK00057, 9,110NE_ODK ,1.30,1.30, 2 -ODK00058, 9,120NE_ODK ,1.41,1.41, 2 -ODK00059, 9,130NE_ODK ,1.53,1.53, 2 -ODK00060, 9,140NE_ODK ,1.65,1.65, 2 -ODK00061, 9,150NE_ODK ,1.77,1.77, 2 -ODK00062, 9,160NE_ODK ,1.88,1.88, 2 -ODK00063, 9,170NE_ODK ,2.00,2.00, 2 -ODK00064, 9,180NE_ODK ,2.12,2.12, 2 -ODK00065, 9,190NE_ODK ,2.24,2.24, 2 -ODK00066, 9,200NE_ODK ,2.35,2.36, 2 -ODK00067, 9,210NE_ODK ,2.47,2.47, 2 -ODK00068, 9,220NE_ODK ,2.59,2.59, 2 -ODK00069, 9,230NE_ODK ,2.71,2.71, 2 -ODK00070, 9,240NE_ODK ,2.83,2.83, 2 -ODK00071, 9,250NE_ODK ,2.94,2.95, 2 -ODK00072, 9,20NW_ODK ,0.24,-0.24, 2 -ODK00073, 9,30NW_ODK ,0.35,-0.35, 2 -ODK00074, 9,40NW_ODK ,0.47,-0.47, 2 -ODK00075, 9,50NW_ODK ,0.59,-0.59, 2 -ODK00076, 9,60NW_ODK ,0.71,-0.71, 2 -ODK00077, 9,70NW_ODK ,0.82,-0.82, 2 -ODK00078, 9,80NW_ODK ,0.94,-0.94, 2 -ODK00079, 9,90NW_ODK ,1.06,-1.06, 2 -ODK00080, 9,100NW_ODK ,1.18,-1.18, 2 -ODK00081, 9,110NW_ODK ,1.30,-1.30, 2 -ODK00082, 9,120NW_ODK ,1.41,-1.41, 2 -ODK00083, 9,130NW_ODK ,1.53,-1.53, 2 -ODK00084, 9,140NW_ODK ,1.65,-1.65, 2 -ODK00085, 9,150NW_ODK ,1.77,-1.77, 2 -ODK00086, 9,160NW_ODK ,1.88,-1.88, 2 -ODK00087, 9,170NW_ODK ,2.00,-2.00, 2 -ODK00088, 9,180NW_ODK ,2.12,-2.12, 2 -ODK00089, 9,190NW_ODK ,2.24,-2.24, 2 -ODK00090, 9,200NW_ODK ,2.35,-2.36, 2 -ODK00091, 9,210NW_ODK ,2.47,-2.47, 2 -ODK00092, 9,220NW_ODK ,2.59,-2.59, 2 -ODK00093, 9,230NW_ODK ,2.71,-2.71, 2 -ODK00094, 9,240NW_ODK ,2.83,-2.83, 2 -ODK00095, 9,250NW_ODK ,2.94,-2.95, 2 -ODK00096, 9,20NNW_ODK ,0.31,-0.13, 2 -ODK00097, 9,30NNW_ODK ,0.46,-0.19, 2 -ODK00098, 9,40NNW_ODK ,0.62,-0.25, 2 -ODK00099, 9,50NNW_ODK ,0.77,-0.32, 2 -ODK00100, 9,60NNW_ODK ,0.92,-0.38, 2 -ODK00101, 9,70NNW_ODK ,1.08,-0.45, 2 -ODK00102, 9,80NNW_ODK ,1.23,-0.51, 2 -ODK00103, 9,90NNW_ODK ,1.38,-0.57, 2 -ODK00104, 9,100NNW_ODK ,1.54,-0.64, 2 -ODK00105, 9,110NNW_ODK ,1.69,-0.70, 2 -ODK00106, 9,120NNW_ODK ,1.85,-0.77, 2 -ODK00107, 9,130NNW_ODK ,2.00,-0.83, 2 -ODK00108, 9,140NNW_ODK ,2.15,-0.89, 2 -ODK00109, 9,150NNW_ODK ,2.31,-0.96, 2 -ODK00110, 9,160NNW_ODK ,2.46,-1.02, 2 -ODK00111, 9,170NNW_ODK ,2.62,-1.08, 2 -ODK00112, 9,180NNW_ODK ,2.77,-1.15, 2 -ODK00113, 9,190NNW_ODK ,2.92,-1.21, 2 -ODK00114, 9,200NNW_ODK ,3.08,-1.28, 2 -ODK00115, 9,210NNW_ODK ,3.23,-1.34, 2 -ODK00116, 9,220NNW_ODK ,3.38,-1.40, 2 -ODK00117, 9,230NNW_ODK ,3.54,-1.47, 2 -ODK00118, 9,240NNW_ODK ,3.69,-1.53, 2 -HOM00000, 9,HOM ,0.00,0.00, 1 -HOM00001, 9,20N_HOM ,0.33,0.00, 2 -HOM00002, 9,30N_HOM ,0.50,0.00, 2 -HOM00003, 9,40N_HOM ,0.67,0.00, 2 -HOM00004, 9,50N_HOM ,0.83,0.00, 2 -HOM00005, 9,60N_HOM ,1.00,0.00, 2 -HOM00006, 9,70N_HOM ,1.17,0.00, 2 -HOM00007, 9,80N_HOM ,1.33,0.00, 2 -HOM00008, 9,90N_HOM ,1.50,0.00, 2 -HOM00009, 9,100N_HOM ,1.67,0.00, 2 -HOM00010, 9,110N_HOM ,1.83,0.00, 2 -HOM00011, 9,120N_HOM ,2.00,0.00, 2 -HOM00012, 9,130N_HOM ,2.17,0.00, 2 -HOM00013, 9,140N_HOM ,2.33,0.00, 2 -HOM00014, 9,150N_HOM ,2.50,0.00, 2 -HOM00015, 9,160N_HOM ,2.66,0.00, 2 -HOM00016, 9,170N_HOM ,2.83,0.00, 2 -HOM00017, 9,180N_HOM ,3.00,0.00, 2 -HOM00018, 9,190N_HOM ,3.16,0.00, 2 -HOM00019, 9,200N_HOM ,3.33,0.00, 2 -HOM00020, 9,210N_HOM ,3.50,0.00, 2 -HOM00021, 9,220N_HOM ,3.66,0.00, 2 -HOM00022, 9,230N_HOM ,3.83,0.00, 2 -HOM00023, 9,240N_HOM ,4.00,0.00, 2 -HOM00024, 9,250N_HOM ,4.16,0.00, 2 -HOM00025, 9,20NNE_HOM ,0.31,0.13, 2 -HOM00026, 9,30NNE_HOM ,0.46,0.19, 2 -HOM00027, 9,40NNE_HOM ,0.62,0.25, 2 -HOM00028, 9,50NNE_HOM ,0.77,0.32, 2 -HOM00029, 9,60NNE_HOM ,0.92,0.38, 2 -HOM00030, 9,70NNE_HOM ,1.08,0.45, 2 -HOM00031, 9,80NNE_HOM ,1.23,0.51, 2 -HOM00032, 9,90NNE_HOM ,1.38,0.57, 2 -HOM00033, 9,100NNE_HOM ,1.54,0.64, 2 -HOM00034, 9,110NNE_HOM ,1.69,0.70, 2 -HOM00035, 9,120NNE_HOM ,1.85,0.77, 2 -HOM00036, 9,130NNE_HOM ,2.00,0.83, 2 -HOM00037, 9,140NNE_HOM ,2.15,0.89, 2 -HOM00038, 9,150NNE_HOM ,2.31,0.96, 2 -HOM00039, 9,160NNE_HOM ,2.46,1.02, 2 -HOM00040, 9,170NNE_HOM ,2.62,1.08, 2 -HOM00041, 9,180NNE_HOM ,2.77,1.15, 2 -HOM00042, 9,190NNE_HOM ,2.92,1.21, 2 -HOM00043, 9,200NNE_HOM ,3.08,1.28, 2 -HOM00044, 9,210NNE_HOM ,3.23,1.34, 2 -HOM00045, 9,220NNE_HOM ,3.38,1.40, 2 -HOM00046, 9,230NNE_HOM ,3.54,1.47, 2 -HOM00047, 9,240NNE_HOM ,3.69,1.53, 2 -HOM00048, 9,20NE_HOM ,0.24,0.24, 2 -HOM00049, 9,30NE_HOM ,0.35,0.35, 2 -HOM00050, 9,40NE_HOM ,0.47,0.47, 2 -HOM00051, 9,50NE_HOM ,0.59,0.59, 2 -HOM00052, 9,60NE_HOM ,0.71,0.71, 2 -HOM00053, 9,70NE_HOM ,0.82,0.82, 2 -HOM00054, 9,80NE_HOM ,0.94,0.94, 2 -HOM00055, 9,90NE_HOM ,1.06,1.06, 2 -HOM00056, 9,100NE_HOM ,1.18,1.18, 2 -HOM00057, 9,110NE_HOM ,1.30,1.30, 2 -HOM00058, 9,120NE_HOM ,1.41,1.41, 2 -HOM00059, 9,130NE_HOM ,1.53,1.53, 2 -HOM00060, 9,140NE_HOM ,1.65,1.65, 2 -HOM00061, 9,150NE_HOM ,1.77,1.77, 2 -HOM00062, 9,160NE_HOM ,1.88,1.88, 2 -HOM00063, 9,170NE_HOM ,2.00,2.00, 2 -HOM00064, 9,180NE_HOM ,2.12,2.12, 2 -HOM00065, 9,190NE_HOM ,2.24,2.24, 2 -HOM00066, 9,200NE_HOM ,2.35,2.36, 2 -HOM00067, 9,210NE_HOM ,2.47,2.47, 2 -HOM00068, 9,220NE_HOM ,2.59,2.59, 2 -HOM00069, 9,230NE_HOM ,2.71,2.71, 2 -HOM00070, 9,240NE_HOM ,2.83,2.83, 2 -HOM00071, 9,250NE_HOM ,2.94,2.95, 2 -HOM00072, 9,20NW_HOM ,0.24,-0.24, 2 -HOM00073, 9,30NW_HOM ,0.35,-0.35, 2 -HOM00074, 9,40NW_HOM ,0.47,-0.47, 2 -HOM00075, 9,50NW_HOM ,0.59,-0.59, 2 -HOM00076, 9,60NW_HOM ,0.71,-0.71, 2 -HOM00077, 9,70NW_HOM ,0.82,-0.82, 2 -HOM00078, 9,80NW_HOM ,0.94,-0.94, 2 -HOM00079, 9,90NW_HOM ,1.06,-1.06, 2 -HOM00080, 9,100NW_HOM ,1.18,-1.18, 2 -HOM00081, 9,110NW_HOM ,1.30,-1.30, 2 -HOM00082, 9,120NW_HOM ,1.41,-1.41, 2 -HOM00083, 9,130NW_HOM ,1.53,-1.53, 2 -HOM00084, 9,140NW_HOM ,1.65,-1.65, 2 -HOM00085, 9,150NW_HOM ,1.77,-1.77, 2 -HOM00086, 9,160NW_HOM ,1.88,-1.88, 2 -HOM00087, 9,170NW_HOM ,2.00,-2.00, 2 -HOM00088, 9,180NW_HOM ,2.12,-2.12, 2 -HOM00089, 9,190NW_HOM ,2.24,-2.24, 2 -HOM00090, 9,200NW_HOM ,2.35,-2.36, 2 -HOM00091, 9,210NW_HOM ,2.47,-2.47, 2 -HOM00092, 9,220NW_HOM ,2.59,-2.59, 2 -HOM00093, 9,230NW_HOM ,2.71,-2.71, 2 -HOM00094, 9,240NW_HOM ,2.83,-2.83, 2 -HOM00095, 9,250NW_HOM ,2.94,-2.95, 2 -HOM00096, 9,20NNW_HOM ,0.31,-0.13, 2 -HOM00097, 9,30NNW_HOM ,0.46,-0.19, 2 -HOM00098, 9,40NNW_HOM ,0.62,-0.25, 2 -HOM00099, 9,50NNW_HOM ,0.77,-0.32, 2 -HOM00100, 9,60NNW_HOM ,0.92,-0.38, 2 -HOM00101, 9,70NNW_HOM ,1.08,-0.45, 2 -HOM00102, 9,80NNW_HOM ,1.23,-0.51, 2 -HOM00103, 9,90NNW_HOM ,1.38,-0.57, 2 -HOM00104, 9,100NNW_HOM ,1.54,-0.64, 2 -HOM00105, 9,110NNW_HOM ,1.69,-0.70, 2 -HOM00106, 9,120NNW_HOM ,1.85,-0.77, 2 -HOM00107, 9,130NNW_HOM ,2.00,-0.83, 2 -HOM00108, 9,140NNW_HOM ,2.15,-0.89, 2 -HOM00109, 9,150NNW_HOM ,2.31,-0.96, 2 -HOM00110, 9,160NNW_HOM ,2.46,-1.02, 2 -HOM00111, 9,170NNW_HOM ,2.62,-1.08, 2 -HOM00112, 9,180NNW_HOM ,2.77,-1.15, 2 -HOM00113, 9,190NNW_HOM ,2.92,-1.21, 2 -HOM00114, 9,200NNW_HOM ,3.08,-1.28, 2 -HOM00115, 9,210NNW_HOM ,3.23,-1.34, 2 -HOM00116, 9,220NNW_HOM ,3.38,-1.40, 2 -HOM00117, 9,230NNW_HOM ,3.54,-1.47, 2 -HOM00118, 9,240NNW_HOM ,3.69,-1.53, 2 -ENA00000, 9,ENA ,0.00,0.00, 1 -ENA00001, 9,20N_ENA ,0.33,0.00, 2 -ENA00002, 9,30N_ENA ,0.50,0.00, 2 -ENA00003, 9,40N_ENA ,0.67,0.00, 2 -ENA00004, 9,50N_ENA ,0.83,0.00, 2 -ENA00005, 9,60N_ENA ,1.00,0.00, 2 -ENA00006, 9,70N_ENA ,1.17,0.00, 2 -ENA00007, 9,80N_ENA ,1.33,0.00, 2 -ENA00008, 9,90N_ENA ,1.50,0.00, 2 -ENA00009, 9,100N_ENA ,1.67,0.00, 2 -ENA00010, 9,110N_ENA ,1.83,0.00, 2 -ENA00011, 9,120N_ENA ,2.00,0.00, 2 -ENA00012, 9,130N_ENA ,2.17,0.00, 2 -ENA00013, 9,140N_ENA ,2.33,0.00, 2 -ENA00014, 9,150N_ENA ,2.50,0.00, 2 -ENA00015, 9,160N_ENA ,2.66,0.00, 2 -ENA00016, 9,170N_ENA ,2.83,0.00, 2 -ENA00017, 9,180N_ENA ,3.00,0.00, 2 -ENA00018, 9,190N_ENA ,3.16,0.00, 2 -ENA00019, 9,200N_ENA ,3.33,0.00, 2 -ENA00020, 9,210N_ENA ,3.50,0.00, 2 -ENA00021, 9,220N_ENA ,3.66,0.00, 2 -ENA00022, 9,230N_ENA ,3.83,0.00, 2 -ENA00023, 9,240N_ENA ,4.00,0.00, 2 -ENA00024, 9,250N_ENA ,4.16,0.00, 2 -ENA00025, 9,20NNE_ENA ,0.31,0.13, 2 -ENA00026, 9,30NNE_ENA ,0.46,0.19, 2 -ENA00027, 9,40NNE_ENA ,0.62,0.25, 2 -ENA00028, 9,50NNE_ENA ,0.77,0.32, 2 -ENA00029, 9,60NNE_ENA ,0.92,0.38, 2 -ENA00030, 9,70NNE_ENA ,1.08,0.45, 2 -ENA00031, 9,80NNE_ENA ,1.23,0.51, 2 -ENA00032, 9,90NNE_ENA ,1.38,0.57, 2 -ENA00033, 9,100NNE_ENA ,1.54,0.64, 2 -ENA00034, 9,110NNE_ENA ,1.69,0.70, 2 -ENA00035, 9,120NNE_ENA ,1.85,0.77, 2 -ENA00036, 9,130NNE_ENA ,2.00,0.83, 2 -ENA00037, 9,140NNE_ENA ,2.15,0.89, 2 -ENA00038, 9,150NNE_ENA ,2.31,0.96, 2 -ENA00039, 9,160NNE_ENA ,2.46,1.02, 2 -ENA00040, 9,170NNE_ENA ,2.62,1.08, 2 -ENA00041, 9,180NNE_ENA ,2.77,1.15, 2 -ENA00042, 9,190NNE_ENA ,2.92,1.21, 2 -ENA00043, 9,200NNE_ENA ,3.08,1.28, 2 -ENA00044, 9,210NNE_ENA ,3.23,1.34, 2 -ENA00045, 9,220NNE_ENA ,3.38,1.40, 2 -ENA00046, 9,230NNE_ENA ,3.54,1.47, 2 -ENA00047, 9,240NNE_ENA ,3.69,1.53, 2 -ENA00048, 9,20NE_ENA ,0.24,0.24, 2 -ENA00049, 9,30NE_ENA ,0.35,0.35, 2 -ENA00050, 9,40NE_ENA ,0.47,0.47, 2 -ENA00051, 9,50NE_ENA ,0.59,0.59, 2 -ENA00052, 9,60NE_ENA ,0.71,0.71, 2 -ENA00053, 9,70NE_ENA ,0.82,0.82, 2 -ENA00054, 9,80NE_ENA ,0.94,0.94, 2 -ENA00055, 9,90NE_ENA ,1.06,1.06, 2 -ENA00056, 9,100NE_ENA ,1.18,1.18, 2 -ENA00057, 9,110NE_ENA ,1.30,1.30, 2 -ENA00058, 9,120NE_ENA ,1.41,1.41, 2 -ENA00059, 9,130NE_ENA ,1.53,1.53, 2 -ENA00060, 9,140NE_ENA ,1.65,1.65, 2 -ENA00061, 9,150NE_ENA ,1.77,1.77, 2 -ENA00062, 9,160NE_ENA ,1.88,1.88, 2 -ENA00063, 9,170NE_ENA ,2.00,2.00, 2 -ENA00064, 9,180NE_ENA ,2.12,2.12, 2 -ENA00065, 9,190NE_ENA ,2.24,2.24, 2 -ENA00066, 9,200NE_ENA ,2.35,2.36, 2 -ENA00067, 9,210NE_ENA ,2.47,2.47, 2 -ENA00068, 9,220NE_ENA ,2.59,2.59, 2 -ENA00069, 9,230NE_ENA ,2.71,2.71, 2 -ENA00070, 9,240NE_ENA ,2.83,2.83, 2 -ENA00071, 9,250NE_ENA ,2.94,2.95, 2 -ENA00072, 9,20NW_ENA ,0.24,-0.24, 2 -ENA00073, 9,30NW_ENA ,0.35,-0.35, 2 -ENA00074, 9,40NW_ENA ,0.47,-0.47, 2 -ENA00075, 9,50NW_ENA ,0.59,-0.59, 2 -ENA00076, 9,60NW_ENA ,0.71,-0.71, 2 -ENA00077, 9,70NW_ENA ,0.82,-0.82, 2 -ENA00078, 9,80NW_ENA ,0.94,-0.94, 2 -ENA00079, 9,90NW_ENA ,1.06,-1.06, 2 -ENA00080, 9,100NW_ENA ,1.18,-1.18, 2 -ENA00081, 9,110NW_ENA ,1.30,-1.30, 2 -ENA00082, 9,120NW_ENA ,1.41,-1.41, 2 -ENA00083, 9,130NW_ENA ,1.53,-1.53, 2 -ENA00084, 9,140NW_ENA ,1.65,-1.65, 2 -ENA00085, 9,150NW_ENA ,1.77,-1.77, 2 -ENA00086, 9,160NW_ENA ,1.88,-1.88, 2 -ENA00087, 9,170NW_ENA ,2.00,-2.00, 2 -ENA00088, 9,180NW_ENA ,2.12,-2.12, 2 -ENA00089, 9,190NW_ENA ,2.24,-2.24, 2 -ENA00090, 9,200NW_ENA ,2.35,-2.36, 2 -ENA00091, 9,210NW_ENA ,2.47,-2.47, 2 -ENA00092, 9,220NW_ENA ,2.59,-2.59, 2 -ENA00093, 9,230NW_ENA ,2.71,-2.71, 2 -ENA00094, 9,240NW_ENA ,2.83,-2.83, 2 -ENA00095, 9,250NW_ENA ,2.94,-2.95, 2 -ENA00096, 9,20NNW_ENA ,0.31,-0.13, 2 -ENA00097, 9,30NNW_ENA ,0.46,-0.19, 2 -ENA00098, 9,40NNW_ENA ,0.62,-0.25, 2 -ENA00099, 9,50NNW_ENA ,0.77,-0.32, 2 -ENA00100, 9,60NNW_ENA ,0.92,-0.38, 2 -ENA00101, 9,70NNW_ENA ,1.08,-0.45, 2 -ENA00102, 9,80NNW_ENA ,1.23,-0.51, 2 -ENA00103, 9,90NNW_ENA ,1.38,-0.57, 2 -ENA00104, 9,100NNW_ENA ,1.54,-0.64, 2 -ENA00105, 9,110NNW_ENA ,1.69,-0.70, 2 -ENA00106, 9,120NNW_ENA ,1.85,-0.77, 2 -ENA00107, 9,130NNW_ENA ,2.00,-0.83, 2 -ENA00108, 9,140NNW_ENA ,2.15,-0.89, 2 -ENA00109, 9,150NNW_ENA ,2.31,-0.96, 2 -ENA00110, 9,160NNW_ENA ,2.46,-1.02, 2 -ENA00111, 9,170NNW_ENA ,2.62,-1.08, 2 -ENA00112, 9,180NNW_ENA ,2.77,-1.15, 2 -ENA00113, 9,190NNW_ENA ,2.92,-1.21, 2 -ENA00114, 9,200NNW_ENA ,3.08,-1.28, 2 -ENA00115, 9,210NNW_ENA ,3.23,-1.34, 2 -ENA00116, 9,220NNW_ENA ,3.38,-1.40, 2 -ENA00117, 9,230NNW_ENA ,3.54,-1.47, 2 -ENA00118, 9,240NNW_ENA ,3.69,-1.53, 2 -ANC00000, 9,ANC ,0.00,0.00, 1 -ANC00001, 9,20N_ANC ,0.33,0.00, 2 -ANC00002, 9,30N_ANC ,0.50,0.00, 2 -ANC00003, 9,40N_ANC ,0.67,0.00, 2 -ANC00004, 9,50N_ANC ,0.83,0.00, 2 -ANC00005, 9,60N_ANC ,1.00,0.00, 2 -ANC00006, 9,70N_ANC ,1.17,0.00, 2 -ANC00007, 9,80N_ANC ,1.33,0.00, 2 -ANC00008, 9,90N_ANC ,1.50,0.00, 2 -ANC00009, 9,100N_ANC ,1.67,0.00, 2 -ANC00010, 9,110N_ANC ,1.83,0.00, 2 -ANC00011, 9,120N_ANC ,2.00,0.00, 2 -ANC00012, 9,130N_ANC ,2.17,0.00, 2 -ANC00013, 9,140N_ANC ,2.33,0.00, 2 -ANC00014, 9,150N_ANC ,2.50,0.00, 2 -ANC00015, 9,160N_ANC ,2.66,0.00, 2 -ANC00016, 9,170N_ANC ,2.83,0.00, 2 -ANC00017, 9,180N_ANC ,3.00,0.00, 2 -ANC00018, 9,190N_ANC ,3.16,0.00, 2 -ANC00019, 9,200N_ANC ,3.33,0.00, 2 -ANC00020, 9,210N_ANC ,3.50,0.00, 2 -ANC00021, 9,220N_ANC ,3.66,0.00, 2 -ANC00022, 9,230N_ANC ,3.83,0.00, 2 -ANC00023, 9,240N_ANC ,4.00,0.00, 2 -ANC00024, 9,250N_ANC ,4.16,0.00, 2 -ANC00025, 9,20NNE_ANC ,0.31,0.13, 2 -ANC00026, 9,30NNE_ANC ,0.46,0.19, 2 -ANC00027, 9,40NNE_ANC ,0.62,0.25, 2 -ANC00028, 9,50NNE_ANC ,0.77,0.32, 2 -ANC00029, 9,60NNE_ANC ,0.92,0.38, 2 -ANC00030, 9,70NNE_ANC ,1.08,0.45, 2 -ANC00031, 9,80NNE_ANC ,1.23,0.51, 2 -ANC00032, 9,90NNE_ANC ,1.38,0.57, 2 -ANC00033, 9,100NNE_ANC ,1.54,0.64, 2 -ANC00034, 9,110NNE_ANC ,1.69,0.70, 2 -ANC00035, 9,120NNE_ANC ,1.85,0.77, 2 -ANC00036, 9,130NNE_ANC ,2.00,0.83, 2 -ANC00037, 9,140NNE_ANC ,2.15,0.89, 2 -ANC00038, 9,150NNE_ANC ,2.31,0.96, 2 -ANC00039, 9,160NNE_ANC ,2.46,1.02, 2 -ANC00040, 9,170NNE_ANC ,2.62,1.08, 2 -ANC00041, 9,180NNE_ANC ,2.77,1.15, 2 -ANC00042, 9,190NNE_ANC ,2.92,1.21, 2 -ANC00043, 9,200NNE_ANC ,3.08,1.28, 2 -ANC00044, 9,210NNE_ANC ,3.23,1.34, 2 -ANC00045, 9,220NNE_ANC ,3.38,1.40, 2 -ANC00046, 9,230NNE_ANC ,3.54,1.47, 2 -ANC00047, 9,240NNE_ANC ,3.69,1.53, 2 -ANC00048, 9,20NE_ANC ,0.24,0.24, 2 -ANC00049, 9,30NE_ANC ,0.35,0.35, 2 -ANC00050, 9,40NE_ANC ,0.47,0.47, 2 -ANC00051, 9,50NE_ANC ,0.59,0.59, 2 -ANC00052, 9,60NE_ANC ,0.71,0.71, 2 -ANC00053, 9,70NE_ANC ,0.82,0.82, 2 -ANC00054, 9,80NE_ANC ,0.94,0.94, 2 -ANC00055, 9,90NE_ANC ,1.06,1.06, 2 -ANC00056, 9,100NE_ANC ,1.18,1.18, 2 -ANC00057, 9,110NE_ANC ,1.30,1.30, 2 -ANC00058, 9,120NE_ANC ,1.41,1.41, 2 -ANC00059, 9,130NE_ANC ,1.53,1.53, 2 -ANC00060, 9,140NE_ANC ,1.65,1.65, 2 -ANC00061, 9,150NE_ANC ,1.77,1.77, 2 -ANC00062, 9,160NE_ANC ,1.88,1.88, 2 -ANC00063, 9,170NE_ANC ,2.00,2.00, 2 -ANC00064, 9,180NE_ANC ,2.12,2.12, 2 -ANC00065, 9,190NE_ANC ,2.24,2.24, 2 -ANC00066, 9,200NE_ANC ,2.35,2.36, 2 -ANC00067, 9,210NE_ANC ,2.47,2.47, 2 -ANC00068, 9,220NE_ANC ,2.59,2.59, 2 -ANC00069, 9,230NE_ANC ,2.71,2.71, 2 -ANC00070, 9,240NE_ANC ,2.83,2.83, 2 -ANC00071, 9,250NE_ANC ,2.94,2.95, 2 -ANC00072, 9,20NW_ANC ,0.24,-0.24, 2 -ANC00073, 9,30NW_ANC ,0.35,-0.35, 2 -ANC00074, 9,40NW_ANC ,0.47,-0.47, 2 -ANC00075, 9,50NW_ANC ,0.59,-0.59, 2 -ANC00076, 9,60NW_ANC ,0.71,-0.71, 2 -ANC00077, 9,70NW_ANC ,0.82,-0.82, 2 -ANC00078, 9,80NW_ANC ,0.94,-0.94, 2 -ANC00079, 9,90NW_ANC ,1.06,-1.06, 2 -ANC00080, 9,100NW_ANC ,1.18,-1.18, 2 -ANC00081, 9,110NW_ANC ,1.30,-1.30, 2 -ANC00082, 9,120NW_ANC ,1.41,-1.41, 2 -ANC00083, 9,130NW_ANC ,1.53,-1.53, 2 -ANC00084, 9,140NW_ANC ,1.65,-1.65, 2 -ANC00085, 9,150NW_ANC ,1.77,-1.77, 2 -ANC00086, 9,160NW_ANC ,1.88,-1.88, 2 -ANC00087, 9,170NW_ANC ,2.00,-2.00, 2 -ANC00088, 9,180NW_ANC ,2.12,-2.12, 2 -ANC00089, 9,190NW_ANC ,2.24,-2.24, 2 -ANC00090, 9,200NW_ANC ,2.35,-2.36, 2 -ANC00091, 9,210NW_ANC ,2.47,-2.47, 2 -ANC00092, 9,220NW_ANC ,2.59,-2.59, 2 -ANC00093, 9,230NW_ANC ,2.71,-2.71, 2 -ANC00094, 9,240NW_ANC ,2.83,-2.83, 2 -ANC00095, 9,250NW_ANC ,2.94,-2.95, 2 -ANC00096, 9,20NNW_ANC ,0.31,-0.13, 2 -ANC00097, 9,30NNW_ANC ,0.46,-0.19, 2 -ANC00098, 9,40NNW_ANC ,0.62,-0.25, 2 -ANC00099, 9,50NNW_ANC ,0.77,-0.32, 2 -ANC00100, 9,60NNW_ANC ,0.92,-0.38, 2 -ANC00101, 9,70NNW_ANC ,1.08,-0.45, 2 -ANC00102, 9,80NNW_ANC ,1.23,-0.51, 2 -ANC00103, 9,90NNW_ANC ,1.38,-0.57, 2 -ANC00104, 9,100NNW_ANC ,1.54,-0.64, 2 -ANC00105, 9,110NNW_ANC ,1.69,-0.70, 2 -ANC00106, 9,120NNW_ANC ,1.85,-0.77, 2 -ANC00107, 9,130NNW_ANC ,2.00,-0.83, 2 -ANC00108, 9,140NNW_ANC ,2.15,-0.89, 2 -ANC00109, 9,150NNW_ANC ,2.31,-0.96, 2 -ANC00110, 9,160NNW_ANC ,2.46,-1.02, 2 -ANC00111, 9,170NNW_ANC ,2.62,-1.08, 2 -ANC00112, 9,180NNW_ANC ,2.77,-1.15, 2 -ANC00113, 9,190NNW_ANC ,2.92,-1.21, 2 -ANC00114, 9,200NNW_ANC ,3.08,-1.28, 2 -ANC00115, 9,210NNW_ANC ,3.23,-1.34, 2 -ANC00116, 9,220NNW_ANC ,3.38,-1.40, 2 -ANC00117, 9,230NNW_ANC ,3.54,-1.47, 2 -ANC00118, 9,240NNW_ANC ,3.69,-1.53, 2 -BGQ00000, 9,BGQ ,0.00,0.00, 1 -BGQ00001, 9,20N_BGQ ,0.33,0.00, 2 -BGQ00002, 9,30N_BGQ ,0.50,0.00, 2 -BGQ00003, 9,40N_BGQ ,0.67,0.00, 2 -BGQ00004, 9,50N_BGQ ,0.83,0.00, 2 -BGQ00005, 9,60N_BGQ ,1.00,0.00, 2 -BGQ00006, 9,70N_BGQ ,1.17,0.00, 2 -BGQ00007, 9,80N_BGQ ,1.33,0.00, 2 -BGQ00008, 9,90N_BGQ ,1.50,0.00, 2 -BGQ00009, 9,100N_BGQ ,1.67,0.00, 2 -BGQ00010, 9,110N_BGQ ,1.83,0.00, 2 -BGQ00011, 9,120N_BGQ ,2.00,0.00, 2 -BGQ00012, 9,130N_BGQ ,2.17,0.00, 2 -BGQ00013, 9,140N_BGQ ,2.33,0.00, 2 -BGQ00014, 9,150N_BGQ ,2.50,0.00, 2 -BGQ00015, 9,160N_BGQ ,2.66,0.00, 2 -BGQ00016, 9,170N_BGQ ,2.83,0.00, 2 -BGQ00017, 9,180N_BGQ ,3.00,0.00, 2 -BGQ00018, 9,190N_BGQ ,3.16,0.00, 2 -BGQ00019, 9,200N_BGQ ,3.33,0.00, 2 -BGQ00020, 9,210N_BGQ ,3.50,0.00, 2 -BGQ00021, 9,220N_BGQ ,3.66,0.00, 2 -BGQ00022, 9,230N_BGQ ,3.83,0.00, 2 -BGQ00023, 9,240N_BGQ ,4.00,0.00, 2 -BGQ00024, 9,250N_BGQ ,4.16,0.00, 2 -BGQ00025, 9,20NNE_BGQ ,0.31,0.13, 2 -BGQ00026, 9,30NNE_BGQ ,0.46,0.19, 2 -BGQ00027, 9,40NNE_BGQ ,0.62,0.25, 2 -BGQ00028, 9,50NNE_BGQ ,0.77,0.32, 2 -BGQ00029, 9,60NNE_BGQ ,0.92,0.38, 2 -BGQ00030, 9,70NNE_BGQ ,1.08,0.45, 2 -BGQ00031, 9,80NNE_BGQ ,1.23,0.51, 2 -BGQ00032, 9,90NNE_BGQ ,1.38,0.57, 2 -BGQ00033, 9,100NNE_BGQ ,1.54,0.64, 2 -BGQ00034, 9,110NNE_BGQ ,1.69,0.70, 2 -BGQ00035, 9,120NNE_BGQ ,1.85,0.77, 2 -BGQ00036, 9,130NNE_BGQ ,2.00,0.83, 2 -BGQ00037, 9,140NNE_BGQ ,2.15,0.89, 2 -BGQ00038, 9,150NNE_BGQ ,2.31,0.96, 2 -BGQ00039, 9,160NNE_BGQ ,2.46,1.02, 2 -BGQ00040, 9,170NNE_BGQ ,2.62,1.08, 2 -BGQ00041, 9,180NNE_BGQ ,2.77,1.15, 2 -BGQ00042, 9,190NNE_BGQ ,2.92,1.21, 2 -BGQ00043, 9,200NNE_BGQ ,3.08,1.28, 2 -BGQ00044, 9,210NNE_BGQ ,3.23,1.34, 2 -BGQ00045, 9,220NNE_BGQ ,3.38,1.40, 2 -BGQ00046, 9,230NNE_BGQ ,3.54,1.47, 2 -BGQ00047, 9,240NNE_BGQ ,3.69,1.53, 2 -BGQ00048, 9,20NE_BGQ ,0.24,0.24, 2 -BGQ00049, 9,30NE_BGQ ,0.35,0.35, 2 -BGQ00050, 9,40NE_BGQ ,0.47,0.47, 2 -BGQ00051, 9,50NE_BGQ ,0.59,0.59, 2 -BGQ00052, 9,60NE_BGQ ,0.71,0.71, 2 -BGQ00053, 9,70NE_BGQ ,0.82,0.82, 2 -BGQ00054, 9,80NE_BGQ ,0.94,0.94, 2 -BGQ00055, 9,90NE_BGQ ,1.06,1.06, 2 -BGQ00056, 9,100NE_BGQ ,1.18,1.18, 2 -BGQ00057, 9,110NE_BGQ ,1.30,1.30, 2 -BGQ00058, 9,120NE_BGQ ,1.41,1.41, 2 -BGQ00059, 9,130NE_BGQ ,1.53,1.53, 2 -BGQ00060, 9,140NE_BGQ ,1.65,1.65, 2 -BGQ00061, 9,150NE_BGQ ,1.77,1.77, 2 -BGQ00062, 9,160NE_BGQ ,1.88,1.88, 2 -BGQ00063, 9,170NE_BGQ ,2.00,2.00, 2 -BGQ00064, 9,180NE_BGQ ,2.12,2.12, 2 -BGQ00065, 9,190NE_BGQ ,2.24,2.24, 2 -BGQ00066, 9,200NE_BGQ ,2.35,2.36, 2 -BGQ00067, 9,210NE_BGQ ,2.47,2.47, 2 -BGQ00068, 9,220NE_BGQ ,2.59,2.59, 2 -BGQ00069, 9,230NE_BGQ ,2.71,2.71, 2 -BGQ00070, 9,240NE_BGQ ,2.83,2.83, 2 -BGQ00071, 9,250NE_BGQ ,2.94,2.95, 2 -BGQ00072, 9,20NW_BGQ ,0.24,-0.24, 2 -BGQ00073, 9,30NW_BGQ ,0.35,-0.35, 2 -BGQ00074, 9,40NW_BGQ ,0.47,-0.47, 2 -BGQ00075, 9,50NW_BGQ ,0.59,-0.59, 2 -BGQ00076, 9,60NW_BGQ ,0.71,-0.71, 2 -BGQ00077, 9,70NW_BGQ ,0.82,-0.82, 2 -BGQ00078, 9,80NW_BGQ ,0.94,-0.94, 2 -BGQ00079, 9,90NW_BGQ ,1.06,-1.06, 2 -BGQ00080, 9,100NW_BGQ ,1.18,-1.18, 2 -BGQ00081, 9,110NW_BGQ ,1.30,-1.30, 2 -BGQ00082, 9,120NW_BGQ ,1.41,-1.41, 2 -BGQ00083, 9,130NW_BGQ ,1.53,-1.53, 2 -BGQ00084, 9,140NW_BGQ ,1.65,-1.65, 2 -BGQ00085, 9,150NW_BGQ ,1.77,-1.77, 2 -BGQ00086, 9,160NW_BGQ ,1.88,-1.88, 2 -BGQ00087, 9,170NW_BGQ ,2.00,-2.00, 2 -BGQ00088, 9,180NW_BGQ ,2.12,-2.12, 2 -BGQ00089, 9,190NW_BGQ ,2.24,-2.24, 2 -BGQ00090, 9,200NW_BGQ ,2.35,-2.36, 2 -BGQ00091, 9,210NW_BGQ ,2.47,-2.47, 2 -BGQ00092, 9,220NW_BGQ ,2.59,-2.59, 2 -BGQ00093, 9,230NW_BGQ ,2.71,-2.71, 2 -BGQ00094, 9,240NW_BGQ ,2.83,-2.83, 2 -BGQ00095, 9,250NW_BGQ ,2.94,-2.95, 2 -BGQ00096, 9,20NNW_BGQ ,0.31,-0.13, 2 -BGQ00097, 9,30NNW_BGQ ,0.46,-0.19, 2 -BGQ00098, 9,40NNW_BGQ ,0.62,-0.25, 2 -BGQ00099, 9,50NNW_BGQ ,0.77,-0.32, 2 -BGQ00100, 9,60NNW_BGQ ,0.92,-0.38, 2 -BGQ00101, 9,70NNW_BGQ ,1.08,-0.45, 2 -BGQ00102, 9,80NNW_BGQ ,1.23,-0.51, 2 -BGQ00103, 9,90NNW_BGQ ,1.38,-0.57, 2 -BGQ00104, 9,100NNW_BGQ ,1.54,-0.64, 2 -BGQ00105, 9,110NNW_BGQ ,1.69,-0.70, 2 -BGQ00106, 9,120NNW_BGQ ,1.85,-0.77, 2 -BGQ00107, 9,130NNW_BGQ ,2.00,-0.83, 2 -BGQ00108, 9,140NNW_BGQ ,2.15,-0.89, 2 -BGQ00109, 9,150NNW_BGQ ,2.31,-0.96, 2 -BGQ00110, 9,160NNW_BGQ ,2.46,-1.02, 2 -BGQ00111, 9,170NNW_BGQ ,2.62,-1.08, 2 -BGQ00112, 9,180NNW_BGQ ,2.77,-1.15, 2 -BGQ00113, 9,190NNW_BGQ ,2.92,-1.21, 2 -BGQ00114, 9,200NNW_BGQ ,3.08,-1.28, 2 -BGQ00115, 9,210NNW_BGQ ,3.23,-1.34, 2 -BGQ00116, 9,220NNW_BGQ ,3.38,-1.40, 2 -BGQ00117, 9,230NNW_BGQ ,3.54,-1.47, 2 -BGQ00118, 9,240NNW_BGQ ,3.69,-1.53, 2 -ORT00000, 9,ORT ,0.00,0.00, 1 -ORT00001, 9,20N_ORT ,0.33,0.00, 2 -ORT00002, 9,30N_ORT ,0.50,0.00, 2 -ORT00003, 9,40N_ORT ,0.67,0.00, 2 -ORT00004, 9,50N_ORT ,0.83,0.00, 2 -ORT00005, 9,60N_ORT ,1.00,0.00, 2 -ORT00006, 9,70N_ORT ,1.17,0.00, 2 -ORT00007, 9,80N_ORT ,1.33,0.00, 2 -ORT00008, 9,90N_ORT ,1.50,0.00, 2 -ORT00009, 9,100N_ORT ,1.67,0.00, 2 -ORT00010, 9,110N_ORT ,1.83,0.00, 2 -ORT00011, 9,120N_ORT ,2.00,0.00, 2 -ORT00012, 9,130N_ORT ,2.17,0.00, 2 -ORT00013, 9,140N_ORT ,2.33,0.00, 2 -ORT00014, 9,150N_ORT ,2.50,0.00, 2 -ORT00015, 9,160N_ORT ,2.66,0.00, 2 -ORT00016, 9,170N_ORT ,2.83,0.00, 2 -ORT00017, 9,180N_ORT ,3.00,0.00, 2 -ORT00018, 9,190N_ORT ,3.16,0.00, 2 -ORT00019, 9,200N_ORT ,3.33,0.00, 2 -ORT00020, 9,210N_ORT ,3.50,0.00, 2 -ORT00021, 9,220N_ORT ,3.66,0.00, 2 -ORT00022, 9,230N_ORT ,3.83,0.00, 2 -ORT00023, 9,240N_ORT ,4.00,0.00, 2 -ORT00024, 9,250N_ORT ,4.16,0.00, 2 -ORT00025, 9,20NNE_ORT ,0.31,0.13, 2 -ORT00026, 9,30NNE_ORT ,0.46,0.19, 2 -ORT00027, 9,40NNE_ORT ,0.62,0.25, 2 -ORT00028, 9,50NNE_ORT ,0.77,0.32, 2 -ORT00029, 9,60NNE_ORT ,0.92,0.38, 2 -ORT00030, 9,70NNE_ORT ,1.08,0.45, 2 -ORT00031, 9,80NNE_ORT ,1.23,0.51, 2 -ORT00032, 9,90NNE_ORT ,1.38,0.57, 2 -ORT00033, 9,100NNE_ORT ,1.54,0.64, 2 -ORT00034, 9,110NNE_ORT ,1.69,0.70, 2 -ORT00035, 9,120NNE_ORT ,1.85,0.77, 2 -ORT00036, 9,130NNE_ORT ,2.00,0.83, 2 -ORT00037, 9,140NNE_ORT ,2.15,0.89, 2 -ORT00038, 9,150NNE_ORT ,2.31,0.96, 2 -ORT00039, 9,160NNE_ORT ,2.46,1.02, 2 -ORT00040, 9,170NNE_ORT ,2.62,1.08, 2 -ORT00041, 9,180NNE_ORT ,2.77,1.15, 2 -ORT00042, 9,190NNE_ORT ,2.92,1.21, 2 -ORT00043, 9,200NNE_ORT ,3.08,1.28, 2 -ORT00044, 9,210NNE_ORT ,3.23,1.34, 2 -ORT00045, 9,220NNE_ORT ,3.38,1.40, 2 -ORT00046, 9,230NNE_ORT ,3.54,1.47, 2 -ORT00047, 9,240NNE_ORT ,3.69,1.53, 2 -ORT00048, 9,20NE_ORT ,0.24,0.24, 2 -ORT00049, 9,30NE_ORT ,0.35,0.35, 2 -ORT00050, 9,40NE_ORT ,0.47,0.47, 2 -ORT00051, 9,50NE_ORT ,0.59,0.59, 2 -ORT00052, 9,60NE_ORT ,0.71,0.71, 2 -ORT00053, 9,70NE_ORT ,0.82,0.82, 2 -ORT00054, 9,80NE_ORT ,0.94,0.94, 2 -ORT00055, 9,90NE_ORT ,1.06,1.06, 2 -ORT00056, 9,100NE_ORT ,1.18,1.18, 2 -ORT00057, 9,110NE_ORT ,1.30,1.30, 2 -ORT00058, 9,120NE_ORT ,1.41,1.41, 2 -ORT00059, 9,130NE_ORT ,1.53,1.53, 2 -ORT00060, 9,140NE_ORT ,1.65,1.65, 2 -ORT00061, 9,150NE_ORT ,1.77,1.77, 2 -ORT00062, 9,160NE_ORT ,1.88,1.88, 2 -ORT00063, 9,170NE_ORT ,2.00,2.00, 2 -ORT00064, 9,180NE_ORT ,2.12,2.12, 2 -ORT00065, 9,190NE_ORT ,2.24,2.24, 2 -ORT00066, 9,200NE_ORT ,2.35,2.36, 2 -ORT00067, 9,210NE_ORT ,2.47,2.47, 2 -ORT00068, 9,220NE_ORT ,2.59,2.59, 2 -ORT00069, 9,230NE_ORT ,2.71,2.71, 2 -ORT00070, 9,240NE_ORT ,2.83,2.83, 2 -ORT00071, 9,250NE_ORT ,2.94,2.95, 2 -ORT00072, 9,20NW_ORT ,0.24,-0.24, 2 -ORT00073, 9,30NW_ORT ,0.35,-0.35, 2 -ORT00074, 9,40NW_ORT ,0.47,-0.47, 2 -ORT00075, 9,50NW_ORT ,0.59,-0.59, 2 -ORT00076, 9,60NW_ORT ,0.71,-0.71, 2 -ORT00077, 9,70NW_ORT ,0.82,-0.82, 2 -ORT00078, 9,80NW_ORT ,0.94,-0.94, 2 -ORT00079, 9,90NW_ORT ,1.06,-1.06, 2 -ORT00080, 9,100NW_ORT ,1.18,-1.18, 2 -ORT00081, 9,110NW_ORT ,1.30,-1.30, 2 -ORT00082, 9,120NW_ORT ,1.41,-1.41, 2 -ORT00083, 9,130NW_ORT ,1.53,-1.53, 2 -ORT00084, 9,140NW_ORT ,1.65,-1.65, 2 -ORT00085, 9,150NW_ORT ,1.77,-1.77, 2 -ORT00086, 9,160NW_ORT ,1.88,-1.88, 2 -ORT00087, 9,170NW_ORT ,2.00,-2.00, 2 -ORT00088, 9,180NW_ORT ,2.12,-2.12, 2 -ORT00089, 9,190NW_ORT ,2.24,-2.24, 2 -ORT00090, 9,200NW_ORT ,2.35,-2.36, 2 -ORT00091, 9,210NW_ORT ,2.47,-2.47, 2 -ORT00092, 9,220NW_ORT ,2.59,-2.59, 2 -ORT00093, 9,230NW_ORT ,2.71,-2.71, 2 -ORT00094, 9,240NW_ORT ,2.83,-2.83, 2 -ORT00095, 9,250NW_ORT ,2.94,-2.95, 2 -ORT00096, 9,20NNW_ORT ,0.31,-0.13, 2 -ORT00097, 9,30NNW_ORT ,0.46,-0.19, 2 -ORT00098, 9,40NNW_ORT ,0.62,-0.25, 2 -ORT00099, 9,50NNW_ORT ,0.77,-0.32, 2 -ORT00100, 9,60NNW_ORT ,0.92,-0.38, 2 -ORT00101, 9,70NNW_ORT ,1.08,-0.45, 2 -ORT00102, 9,80NNW_ORT ,1.23,-0.51, 2 -ORT00103, 9,90NNW_ORT ,1.38,-0.57, 2 -ORT00104, 9,100NNW_ORT ,1.54,-0.64, 2 -ORT00105, 9,110NNW_ORT ,1.69,-0.70, 2 -ORT00106, 9,120NNW_ORT ,1.85,-0.77, 2 -ORT00107, 9,130NNW_ORT ,2.00,-0.83, 2 -ORT00108, 9,140NNW_ORT ,2.15,-0.89, 2 -ORT00109, 9,150NNW_ORT ,2.31,-0.96, 2 -ORT00110, 9,160NNW_ORT ,2.46,-1.02, 2 -ORT00111, 9,170NNW_ORT ,2.62,-1.08, 2 -ORT00112, 9,180NNW_ORT ,2.77,-1.15, 2 -ORT00113, 9,190NNW_ORT ,2.92,-1.21, 2 -ORT00114, 9,200NNW_ORT ,3.08,-1.28, 2 -ORT00115, 9,210NNW_ORT ,3.23,-1.34, 2 -ORT00116, 9,220NNW_ORT ,3.38,-1.40, 2 -ORT00117, 9,230NNW_ORT ,3.54,-1.47, 2 -ORT00118, 9,240NNW_ORT ,3.69,-1.53, 2 -GKN00000, 9,GKN ,0.00,0.00, 1 -GKN00001, 9,20N_GKN ,0.33,0.00, 2 -GKN00002, 9,30N_GKN ,0.50,0.00, 2 -GKN00003, 9,40N_GKN ,0.67,0.00, 2 -GKN00004, 9,50N_GKN ,0.83,0.00, 2 -GKN00005, 9,60N_GKN ,1.00,0.00, 2 -GKN00006, 9,70N_GKN ,1.17,0.00, 2 -GKN00007, 9,80N_GKN ,1.33,0.00, 2 -GKN00008, 9,90N_GKN ,1.50,0.00, 2 -GKN00009, 9,100N_GKN ,1.67,0.00, 2 -GKN00010, 9,110N_GKN ,1.83,0.00, 2 -GKN00011, 9,120N_GKN ,2.00,0.00, 2 -GKN00012, 9,130N_GKN ,2.17,0.00, 2 -GKN00013, 9,140N_GKN ,2.33,0.00, 2 -GKN00014, 9,150N_GKN ,2.50,0.00, 2 -GKN00015, 9,160N_GKN ,2.66,0.00, 2 -GKN00016, 9,170N_GKN ,2.83,0.00, 2 -GKN00017, 9,180N_GKN ,3.00,0.00, 2 -GKN00018, 9,190N_GKN ,3.16,0.00, 2 -GKN00019, 9,200N_GKN ,3.33,0.00, 2 -GKN00020, 9,210N_GKN ,3.50,0.00, 2 -GKN00021, 9,220N_GKN ,3.66,0.00, 2 -GKN00022, 9,230N_GKN ,3.83,0.00, 2 -GKN00023, 9,240N_GKN ,4.00,0.00, 2 -GKN00024, 9,250N_GKN ,4.16,0.00, 2 -GKN00025, 9,20NNE_GKN ,0.31,0.13, 2 -GKN00026, 9,30NNE_GKN ,0.46,0.19, 2 -GKN00027, 9,40NNE_GKN ,0.62,0.25, 2 -GKN00028, 9,50NNE_GKN ,0.77,0.32, 2 -GKN00029, 9,60NNE_GKN ,0.92,0.38, 2 -GKN00030, 9,70NNE_GKN ,1.08,0.45, 2 -GKN00031, 9,80NNE_GKN ,1.23,0.51, 2 -GKN00032, 9,90NNE_GKN ,1.38,0.57, 2 -GKN00033, 9,100NNE_GKN ,1.54,0.64, 2 -GKN00034, 9,110NNE_GKN ,1.69,0.70, 2 -GKN00035, 9,120NNE_GKN ,1.85,0.77, 2 -GKN00036, 9,130NNE_GKN ,2.00,0.83, 2 -GKN00037, 9,140NNE_GKN ,2.15,0.89, 2 -GKN00038, 9,150NNE_GKN ,2.31,0.96, 2 -GKN00039, 9,160NNE_GKN ,2.46,1.02, 2 -GKN00040, 9,170NNE_GKN ,2.62,1.08, 2 -GKN00041, 9,180NNE_GKN ,2.77,1.15, 2 -GKN00042, 9,190NNE_GKN ,2.92,1.21, 2 -GKN00043, 9,200NNE_GKN ,3.08,1.28, 2 -GKN00044, 9,210NNE_GKN ,3.23,1.34, 2 -GKN00045, 9,220NNE_GKN ,3.38,1.40, 2 -GKN00046, 9,230NNE_GKN ,3.54,1.47, 2 -GKN00047, 9,240NNE_GKN ,3.69,1.53, 2 -GKN00048, 9,20NE_GKN ,0.24,0.24, 2 -GKN00049, 9,30NE_GKN ,0.35,0.35, 2 -GKN00050, 9,40NE_GKN ,0.47,0.47, 2 -GKN00051, 9,50NE_GKN ,0.59,0.59, 2 -GKN00052, 9,60NE_GKN ,0.71,0.71, 2 -GKN00053, 9,70NE_GKN ,0.82,0.82, 2 -GKN00054, 9,80NE_GKN ,0.94,0.94, 2 -GKN00055, 9,90NE_GKN ,1.06,1.06, 2 -GKN00056, 9,100NE_GKN ,1.18,1.18, 2 -GKN00057, 9,110NE_GKN ,1.30,1.30, 2 -GKN00058, 9,120NE_GKN ,1.41,1.41, 2 -GKN00059, 9,130NE_GKN ,1.53,1.53, 2 -GKN00060, 9,140NE_GKN ,1.65,1.65, 2 -GKN00061, 9,150NE_GKN ,1.77,1.77, 2 -GKN00062, 9,160NE_GKN ,1.88,1.88, 2 -GKN00063, 9,170NE_GKN ,2.00,2.00, 2 -GKN00064, 9,180NE_GKN ,2.12,2.12, 2 -GKN00065, 9,190NE_GKN ,2.24,2.24, 2 -GKN00066, 9,200NE_GKN ,2.35,2.36, 2 -GKN00067, 9,210NE_GKN ,2.47,2.47, 2 -GKN00068, 9,220NE_GKN ,2.59,2.59, 2 -GKN00069, 9,230NE_GKN ,2.71,2.71, 2 -GKN00070, 9,240NE_GKN ,2.83,2.83, 2 -GKN00071, 9,250NE_GKN ,2.94,2.95, 2 -GKN00072, 9,20NW_GKN ,0.24,-0.24, 2 -GKN00073, 9,30NW_GKN ,0.35,-0.35, 2 -GKN00074, 9,40NW_GKN ,0.47,-0.47, 2 -GKN00075, 9,50NW_GKN ,0.59,-0.59, 2 -GKN00076, 9,60NW_GKN ,0.71,-0.71, 2 -GKN00077, 9,70NW_GKN ,0.82,-0.82, 2 -GKN00078, 9,80NW_GKN ,0.94,-0.94, 2 -GKN00079, 9,90NW_GKN ,1.06,-1.06, 2 -GKN00080, 9,100NW_GKN ,1.18,-1.18, 2 -GKN00081, 9,110NW_GKN ,1.30,-1.30, 2 -GKN00082, 9,120NW_GKN ,1.41,-1.41, 2 -GKN00083, 9,130NW_GKN ,1.53,-1.53, 2 -GKN00084, 9,140NW_GKN ,1.65,-1.65, 2 -GKN00085, 9,150NW_GKN ,1.77,-1.77, 2 -GKN00086, 9,160NW_GKN ,1.88,-1.88, 2 -GKN00087, 9,170NW_GKN ,2.00,-2.00, 2 -GKN00088, 9,180NW_GKN ,2.12,-2.12, 2 -GKN00089, 9,190NW_GKN ,2.24,-2.24, 2 -GKN00090, 9,200NW_GKN ,2.35,-2.36, 2 -GKN00091, 9,210NW_GKN ,2.47,-2.47, 2 -GKN00092, 9,220NW_GKN ,2.59,-2.59, 2 -GKN00093, 9,230NW_GKN ,2.71,-2.71, 2 -GKN00094, 9,240NW_GKN ,2.83,-2.83, 2 -GKN00095, 9,250NW_GKN ,2.94,-2.95, 2 -GKN00096, 9,20NNW_GKN ,0.31,-0.13, 2 -GKN00097, 9,30NNW_GKN ,0.46,-0.19, 2 -GKN00098, 9,40NNW_GKN ,0.62,-0.25, 2 -GKN00099, 9,50NNW_GKN ,0.77,-0.32, 2 -GKN00100, 9,60NNW_GKN ,0.92,-0.38, 2 -GKN00101, 9,70NNW_GKN ,1.08,-0.45, 2 -GKN00102, 9,80NNW_GKN ,1.23,-0.51, 2 -GKN00103, 9,90NNW_GKN ,1.38,-0.57, 2 -GKN00104, 9,100NNW_GKN ,1.54,-0.64, 2 -GKN00105, 9,110NNW_GKN ,1.69,-0.70, 2 -GKN00106, 9,120NNW_GKN ,1.85,-0.77, 2 -GKN00107, 9,130NNW_GKN ,2.00,-0.83, 2 -GKN00108, 9,140NNW_GKN ,2.15,-0.89, 2 -GKN00109, 9,150NNW_GKN ,2.31,-0.96, 2 -GKN00110, 9,160NNW_GKN ,2.46,-1.02, 2 -GKN00111, 9,170NNW_GKN ,2.62,-1.08, 2 -GKN00112, 9,180NNW_GKN ,2.77,-1.15, 2 -GKN00113, 9,190NNW_GKN ,2.92,-1.21, 2 -GKN00114, 9,200NNW_GKN ,3.08,-1.28, 2 -GKN00115, 9,210NNW_GKN ,3.23,-1.34, 2 -GKN00116, 9,220NNW_GKN ,3.38,-1.40, 2 -GKN00117, 9,230NNW_GKN ,3.54,-1.47, 2 -GKN00118, 9,240NNW_GKN ,3.69,-1.53, 2 -TKA00000, 9,TKA ,0.00,0.00, 1 -TKA00001, 9,20N_TKA ,0.33,0.00, 2 -TKA00002, 9,30N_TKA ,0.50,0.00, 2 -TKA00003, 9,40N_TKA ,0.67,0.00, 2 -TKA00004, 9,50N_TKA ,0.83,0.00, 2 -TKA00005, 9,60N_TKA ,1.00,0.00, 2 -TKA00006, 9,70N_TKA ,1.17,0.00, 2 -TKA00007, 9,80N_TKA ,1.33,0.00, 2 -TKA00008, 9,90N_TKA ,1.50,0.00, 2 -TKA00009, 9,100N_TKA ,1.67,0.00, 2 -TKA00010, 9,110N_TKA ,1.83,0.00, 2 -TKA00011, 9,120N_TKA ,2.00,0.00, 2 -TKA00012, 9,130N_TKA ,2.17,0.00, 2 -TKA00013, 9,140N_TKA ,2.33,0.00, 2 -TKA00014, 9,150N_TKA ,2.50,0.00, 2 -TKA00015, 9,160N_TKA ,2.66,0.00, 2 -TKA00016, 9,170N_TKA ,2.83,0.00, 2 -TKA00017, 9,180N_TKA ,3.00,0.00, 2 -TKA00018, 9,190N_TKA ,3.16,0.00, 2 -TKA00019, 9,200N_TKA ,3.33,0.00, 2 -TKA00020, 9,210N_TKA ,3.50,0.00, 2 -TKA00021, 9,220N_TKA ,3.66,0.00, 2 -TKA00022, 9,230N_TKA ,3.83,0.00, 2 -TKA00023, 9,240N_TKA ,4.00,0.00, 2 -TKA00024, 9,250N_TKA ,4.16,0.00, 2 -TKA00025, 9,20NNE_TKA ,0.31,0.13, 2 -TKA00026, 9,30NNE_TKA ,0.46,0.19, 2 -TKA00027, 9,40NNE_TKA ,0.62,0.25, 2 -TKA00028, 9,50NNE_TKA ,0.77,0.32, 2 -TKA00029, 9,60NNE_TKA ,0.92,0.38, 2 -TKA00030, 9,70NNE_TKA ,1.08,0.45, 2 -TKA00031, 9,80NNE_TKA ,1.23,0.51, 2 -TKA00032, 9,90NNE_TKA ,1.38,0.57, 2 -TKA00033, 9,100NNE_TKA ,1.54,0.64, 2 -TKA00034, 9,110NNE_TKA ,1.69,0.70, 2 -TKA00035, 9,120NNE_TKA ,1.85,0.77, 2 -TKA00036, 9,130NNE_TKA ,2.00,0.83, 2 -TKA00037, 9,140NNE_TKA ,2.15,0.89, 2 -TKA00038, 9,150NNE_TKA ,2.31,0.96, 2 -TKA00039, 9,160NNE_TKA ,2.46,1.02, 2 -TKA00040, 9,170NNE_TKA ,2.62,1.08, 2 -TKA00041, 9,180NNE_TKA ,2.77,1.15, 2 -TKA00042, 9,190NNE_TKA ,2.92,1.21, 2 -TKA00043, 9,200NNE_TKA ,3.08,1.28, 2 -TKA00044, 9,210NNE_TKA ,3.23,1.34, 2 -TKA00045, 9,220NNE_TKA ,3.38,1.40, 2 -TKA00046, 9,230NNE_TKA ,3.54,1.47, 2 -TKA00047, 9,240NNE_TKA ,3.69,1.53, 2 -TKA00048, 9,20NE_TKA ,0.24,0.24, 2 -TKA00049, 9,30NE_TKA ,0.35,0.35, 2 -TKA00050, 9,40NE_TKA ,0.47,0.47, 2 -TKA00051, 9,50NE_TKA ,0.59,0.59, 2 -TKA00052, 9,60NE_TKA ,0.71,0.71, 2 -TKA00053, 9,70NE_TKA ,0.82,0.82, 2 -TKA00054, 9,80NE_TKA ,0.94,0.94, 2 -TKA00055, 9,90NE_TKA ,1.06,1.06, 2 -TKA00056, 9,100NE_TKA ,1.18,1.18, 2 -TKA00057, 9,110NE_TKA ,1.30,1.30, 2 -TKA00058, 9,120NE_TKA ,1.41,1.41, 2 -TKA00059, 9,130NE_TKA ,1.53,1.53, 2 -TKA00060, 9,140NE_TKA ,1.65,1.65, 2 -TKA00061, 9,150NE_TKA ,1.77,1.77, 2 -TKA00062, 9,160NE_TKA ,1.88,1.88, 2 -TKA00063, 9,170NE_TKA ,2.00,2.00, 2 -TKA00064, 9,180NE_TKA ,2.12,2.12, 2 -TKA00065, 9,190NE_TKA ,2.24,2.24, 2 -TKA00066, 9,200NE_TKA ,2.35,2.36, 2 -TKA00067, 9,210NE_TKA ,2.47,2.47, 2 -TKA00068, 9,220NE_TKA ,2.59,2.59, 2 -TKA00069, 9,230NE_TKA ,2.71,2.71, 2 -TKA00070, 9,240NE_TKA ,2.83,2.83, 2 -TKA00071, 9,250NE_TKA ,2.94,2.95, 2 -TKA00072, 9,20NW_TKA ,0.24,-0.24, 2 -TKA00073, 9,30NW_TKA ,0.35,-0.35, 2 -TKA00074, 9,40NW_TKA ,0.47,-0.47, 2 -TKA00075, 9,50NW_TKA ,0.59,-0.59, 2 -TKA00076, 9,60NW_TKA ,0.71,-0.71, 2 -TKA00077, 9,70NW_TKA ,0.82,-0.82, 2 -TKA00078, 9,80NW_TKA ,0.94,-0.94, 2 -TKA00079, 9,90NW_TKA ,1.06,-1.06, 2 -TKA00080, 9,100NW_TKA ,1.18,-1.18, 2 -TKA00081, 9,110NW_TKA ,1.30,-1.30, 2 -TKA00082, 9,120NW_TKA ,1.41,-1.41, 2 -TKA00083, 9,130NW_TKA ,1.53,-1.53, 2 -TKA00084, 9,140NW_TKA ,1.65,-1.65, 2 -TKA00085, 9,150NW_TKA ,1.77,-1.77, 2 -TKA00086, 9,160NW_TKA ,1.88,-1.88, 2 -TKA00087, 9,170NW_TKA ,2.00,-2.00, 2 -TKA00088, 9,180NW_TKA ,2.12,-2.12, 2 -TKA00089, 9,190NW_TKA ,2.24,-2.24, 2 -TKA00090, 9,200NW_TKA ,2.35,-2.36, 2 -TKA00091, 9,210NW_TKA ,2.47,-2.47, 2 -TKA00092, 9,220NW_TKA ,2.59,-2.59, 2 -TKA00093, 9,230NW_TKA ,2.71,-2.71, 2 -TKA00094, 9,240NW_TKA ,2.83,-2.83, 2 -TKA00095, 9,250NW_TKA ,2.94,-2.95, 2 -TKA00096, 9,20NNW_TKA ,0.31,-0.13, 2 -TKA00097, 9,30NNW_TKA ,0.46,-0.19, 2 -TKA00098, 9,40NNW_TKA ,0.62,-0.25, 2 -TKA00099, 9,50NNW_TKA ,0.77,-0.32, 2 -TKA00100, 9,60NNW_TKA ,0.92,-0.38, 2 -TKA00101, 9,70NNW_TKA ,1.08,-0.45, 2 -TKA00102, 9,80NNW_TKA ,1.23,-0.51, 2 -TKA00103, 9,90NNW_TKA ,1.38,-0.57, 2 -TKA00104, 9,100NNW_TKA ,1.54,-0.64, 2 -TKA00105, 9,110NNW_TKA ,1.69,-0.70, 2 -TKA00106, 9,120NNW_TKA ,1.85,-0.77, 2 -TKA00107, 9,130NNW_TKA ,2.00,-0.83, 2 -TKA00108, 9,140NNW_TKA ,2.15,-0.89, 2 -TKA00109, 9,150NNW_TKA ,2.31,-0.96, 2 -TKA00110, 9,160NNW_TKA ,2.46,-1.02, 2 -TKA00111, 9,170NNW_TKA ,2.62,-1.08, 2 -TKA00112, 9,180NNW_TKA ,2.77,-1.15, 2 -TKA00113, 9,190NNW_TKA ,2.92,-1.21, 2 -TKA00114, 9,200NNW_TKA ,3.08,-1.28, 2 -TKA00115, 9,210NNW_TKA ,3.23,-1.34, 2 -TKA00116, 9,220NNW_TKA ,3.38,-1.40, 2 -TKA00117, 9,230NNW_TKA ,3.54,-1.47, 2 -TKA00118, 9,240NNW_TKA ,3.69,-1.53, 2 COORD001, 9,50WSW_YXC ,49.27,-116.95, 1 COORD002, 9,50SE_REO ,42.00,-117.08, 1 COORD003, 9,40SE_LKV ,42.02,-119.87, 1 diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml index efa2bd86a0..19b4807c0b 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml @@ -53,6 +53,9 @@ class="com.raytheon.edex.plugin.grib.spatial.GribSpatialCache" factory-method="getInstance" depends-on="gridcoveragelookup"/> + + + @@ -63,6 +66,7 @@ + grid diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/filenameprocessor/NcgribFileNameProcessor.java b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/filenameprocessor/NcgribFileNameProcessor.java index 09e97004a2..ef52528cdb 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/filenameprocessor/NcgribFileNameProcessor.java +++ b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/filenameprocessor/NcgribFileNameProcessor.java @@ -54,11 +54,11 @@ public class NcgribFileNameProcessor implements Processor { // grab global wind and wave ensemble IDs private static final Pattern ENSEMBLE_WAVE_PATTERN = Pattern - .compile("^gep(\\d{0,2}{2})$"); + .compile("^\\d{8}_gep(\\d{0,2}{2})$"); // grab global wind and wave ensemble IDs private static final Pattern ENSEMBLE_NFC_PATTERN = Pattern - .compile("^HTSGW_(\\d{0,2}{2})$"); + .compile("^\\d{8}_HTSGW_(\\d{2})$"); // anything that ends in nest is assumed to be a nested grid identifier // might add alaska fire weather later... private static final Pattern FIREWXNEST_ID_PATTERN = Pattern @@ -73,7 +73,7 @@ public class NcgribFileNameProcessor implements Processor { // This is the least generic pattern ever, are there any constraints on // event names, who knows? private static final Pattern HURRICANE_PATTERN = Pattern - .compile("^([a-z]*)\\d{1,2}[lewcs]$"); + .compile("^\\d{10}_([a-z]*)\\d{1,2}[lewcs]$"); private static NcgribModelNameMap modelMap = null; @@ -85,6 +85,7 @@ public class NcgribFileNameProcessor implements Processor { String secondaryid = null; String ensembleid = null; String[] nameTokens = flName.split("\\."); + for (String token : nameTokens) { if (ENSEMBLE_ID_PATTERN.matcher(token).find()) { ensembleid = token; @@ -112,15 +113,17 @@ public class NcgribFileNameProcessor implements Processor { matcher.find(); secondaryid = matcher.group(1); datasetid = "GHM"; - if (nameTokens[2].equalsIgnoreCase("gribn3")) { + + if (nameTokens[3].equalsIgnoreCase("gribn3")) { datasetid = "GHMNEST"; - } else if (nameTokens[2].equalsIgnoreCase("grib6th")) { + } else if (nameTokens[3].equalsIgnoreCase("grib6th")) { datasetid = "GHM6TH"; - } else if (nameTokens[2].equalsIgnoreCase("hwrfprs_n")) { + } else if (nameTokens[3].equalsIgnoreCase("hwrfprs_n")) { datasetid = "HWRFNEST"; - } else if (nameTokens[2].equalsIgnoreCase("hwrfprs_p")) { + } else if (nameTokens[3].equalsIgnoreCase("hwrfprs_p")) { datasetid = "HWRF"; } + } } @@ -128,6 +131,7 @@ public class NcgribFileNameProcessor implements Processor { modelMap = NcgribModelNameMap.load(); } + // Get model name from grib file template if (datasetid == null) { datasetid = modelMap.getModelName(flName); } diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/ncgrib/ncgribModelNameMap.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/ncgrib/ncgribModelNameMap.xml index 2f4169156c..8eb3e0c393 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/ncgrib/ncgribModelNameMap.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/ncgrib/ncgribModelNameMap.xml @@ -3,219 +3,219 @@ - cmc_geavg.* + gens_cmce.*_cmc_geavg.* cmceDerv - cmc_gespr.* + gens_cmce.*_cmc_gespr.* cmceDerv - gec00.*anl + gens_gefs.*_gec00.*anl gefsAnal - gep[0-9][0-9].*anl + gens_gefs.*_gep[0-9][0-9].*anl gefsAnal - gec00.*bcf.* + gens_gefs.*_gec00.*bcf.* gefsBC - gep[0-9][0-9].*bcf.* + gens_gefs.*_gep[0-9][0-9].*bcf.* gefsBC - geavg.*bcf.* + gens_gefs.*_geavg.*bcf.* gefsBCDerv - gespr.*bcf.* + gens_gefs.*_gespr.*bcf.* gefsBCDerv - geavg.* + gens_gefs.*_geavg.* gefsDerv - gespr.* + gens_gefs.*_gespr.* gefsDerv - HTSGW_mean.* + wave_nfcens.*_HTSGW_mean.* nfcMean - HTSGW_probab.* + wave_nfcens.*_HTSGW_probab.* nfcProb - HTSGW_spread.* + wave_nfcens.*_HTSGW_spread.* nfcSprd - mens.glo_60m.*.grib2 + wave_wave.*_mens.glo_60m.*.grib2 gwwEns - gep[0-9][0-9].glo_60m.*.grib2 + wave_wave.*_gep[0-9][0-9].glo_60m.*.grib2 gwwEns - mean.* + wave_wave.*_mean.* gwwMean - spread.*.grib2 + wave_wave.*_spread.*.grib2 gwwSprd - probab.*.grib2 + wave_wave.*_probab.*.grib2 gwwProb - naefs_geavg.*bcf.* + gens_naefs.*_naefs_geavg.*bcf.* naefsDervBC - naefs_gespr.*bcf.* + gens_naefs.*_naefs_gespr.*bcf.* naefsDervBC - naefs_gemode.*bcf.* + gens_naefs.*_naefs_gemode.*bcf.* naefsModeBC - naefs_ge10pt.*bcf.* + gens_naefs.*_naefs_ge10pt.*bcf.* naefs10ptBC - naefs_ge50pt.*bcf.* + gens_naefs.*_naefs_ge50pt.*bcf.* naefs50ptBC - naefs_ge90pt.*bcf.* + gens_naefs.*_naefs_ge90pt.*bcf.* naefs90ptBC - naefs_geavg.*ndgd_conusf.*grib2 + gens_naefs.*_naefs_geavg.*ndgd_conusf.*grib2 naefsDervUS - naefs_gespr.*ndgd_conusf.*grib2 + gens_naefs.*_naefs_gespr.*ndgd_conusf.*grib2 naefsDervUS - naefs_gemode.*ndgd_conusf.*grib2 + gens_naefs.*_naefs_gemode.*ndgd_conusf.*grib2 naefsModeUS - naefs_ge10pt.*ndgd_conusf.*grib2 + gens_naefs.*_naefs_ge10pt.*ndgd_conusf.*grib2 naefs10ptUS - naefs_ge50pt.*ndgd_conusf.*grib2 + gens_naefs.*_naefs_ge50pt.*ndgd_conusf.*grib2 naefs50ptUS - naefs_ge90pt.*ndgd_conusf.*grib2 + gens_naefs.*_naefs_ge90pt.*ndgd_conusf.*grib2 naefs90ptUS - naefs_geavg.*ndgd_alaskaf.*grib2 + gens_naefs.*_naefs_geavg.*ndgd_alaskaf.*grib2 naefsDervAK - naefs_gespr.*ndgd_alaskaf.*grib2 + gens_naefs.*_naefs_gespr.*ndgd_alaskaf.*grib2 naefsDervAK - naefs_gemode.*ndgd_alaskaf.*grib2 + gens_naefs.*_naefs_gemode.*ndgd_alaskaf.*grib2 naefsModeAK - naefs_ge10pt.*ndgd_alaskaf.*grib2 + gens_naefs.*_naefs_ge10pt.*ndgd_alaskaf.*grib2 naefs10ptAK - naefs_ge50pt.*ndgd_alaskaf.*grib2 + gens_naefs.*_naefs_ge50pt.*ndgd_alaskaf.*grib2 naefs50ptAK - naefs_ge90pt.*ndgd_alaskaf.*grib2 + gens_naefs.*_naefs_ge90pt.*ndgd_alaskaf.*grib2 naefs90ptAK - sref_em.*132.ctl.* + sref_sref.*_sref_em.*132.ctl.* sref16EM - sref_em.*132.[pn][1-3].* + sref_sref.*_sref_em.*132.[pn][1-3].* sref16EM - sref_nmb.*132.ctl.* + sref_sref.*_sref_nmb.*132.ctl.* sref16NMB - sref_nmb.*132.[pn][1-3].* + sref_sref.*_sref_nmb.*132.[pn][1-3].* sref16NMB - sref_nmm.*132.ctl.* + sref_sref.*_sref_nmm.*132.ctl.* sref16NMM - sref_nmm.*132.[pn][1-3].* + sref_sref.*_sref_nmm.*132.[pn][1-3].* sref16NMM - sref.*132.mean.* + sref_sref.*_sref.*132.mean.* sref16Derv - sref.*132.prob.* + sref_sref.*_sref.*132.prob.* sref16Derv - sref.*132.spread.* + sref_sref.*_sref.*132.spread.* sref16Derv - sref_em.*212.ctl.* + sref_sref.*_sref_em.*212.ctl.* sref40EM - sref_em.*212.[pn][1-3].* + sref_sref.*_sref_em.*212.[pn][1-3].* sref40EM - sref_nmb.*212.ctl.* + sref_sref.*_sref_nmb.*212.ctl.* sref40NMB - sref_nmb.*212.[pn][1-3].* + sref_sref.*_sref_nmb.*212.[pn][1-3].* sref40NMB - sref_nmm.*212.ctl.* + sref_sref.*_sref_nmm.*212.ctl.* sref40NMM - sref_nmm.*212.[pn][1-3].* + sref_sref.*_sref_nmm.*212.[pn][1-3].* sref40NMM - sref.*212.mean.* + sref_sref.*_sref.*212.mean.* sref40Derv - sref.*212.prob.* + sref_sref.*_sref.*212.prob.* sref40Derv - sref.*212.spread.* + sref_sref.*_sref.*212.spread.* sref40Derv diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecompressor.java b/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecompressor.java index 24c4b13a74..77f060bd0a 100644 --- a/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecompressor.java +++ b/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecompressor.java @@ -19,11 +19,15 @@ **/ package com.raytheon.edex.plugin.radar; +import java.io.ByteArrayInputStream; +import java.nio.ByteBuffer; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.DataFormatException; import java.util.zip.Inflater; +import org.itadaki.bzip2.BZip2InputStream; + import com.raytheon.edex.esb.Headers; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; @@ -42,6 +46,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority; * Jul 16, 2012 DR 14723 D.Friedman Decompress files atomically * Mar 20, 2013 1804 bsteffen Switch all radar decompressing to be in * memory. + * Aug 20, 2013 16157 wkwock Add bunzip2 cabability. * * * @@ -104,13 +109,27 @@ public class RadarDecompressor { wmoHeaderSize, radarData.length); radarData = radarDataWithHeader; } - } else if (!keepHeader && wmoHeaderSize > 0) { - // strip the header. - radarData = new byte[messageData.length - wmoHeaderSize]; - System.arraycopy(messageData, wmoHeaderSize, radarData, 0, - radarData.length); } else { - radarData = messageData; + radarData = decompressBzip2 (messageData, wmoHeaderSize, headers); + if (radarData !=null) { + if (keepHeader) { + // put the header back on. + byte[] radarDataWithHeader = new byte[radarData.length + + wmoHeaderSize]; + System.arraycopy(messageData, 0, radarDataWithHeader, 0, + wmoHeaderSize); + System.arraycopy(radarData, 0, radarDataWithHeader, + wmoHeaderSize, radarData.length); + radarData = radarDataWithHeader; + } + } else if (!keepHeader && wmoHeaderSize > 0) { + // strip the header. + radarData = new byte[messageData.length - wmoHeaderSize]; + System.arraycopy(messageData, wmoHeaderSize, radarData, 0, + radarData.length); + } else { + radarData = messageData; + } } } catch (Exception e) { theHandler.handle(Priority.ERROR, "Failed decompression on " @@ -152,6 +171,33 @@ public class RadarDecompressor { return false; } + /** + * Checks to see if inBuf has bzip2 compressed block. + * 0-inOff in inBuf is WMO header. + * (inOff+1) - (inOff+120) is nexrad_header(18 bytes) + + * s_product_description_block (102 bytes) + * And inBuf[inOff+121 to inOff+123] is 'BZh' then it most likely is bzip2 + * compressed. + * Also see AWIPS I RadarDecompress.c for more info. + * + * @param inBuf + * the data buffer + * @param inOff + * the offset into the buffer + * @return true if data is bzip2 compressed + */ + private boolean isBzip2Compressed(byte[] inBuf, int inOff) { + if ((inBuf==null) || (inOff < 0) || ((inOff +120) >= inBuf.length)) { + return false; + } + + if (inBuf[inOff+120]== 'B' && inBuf[inOff+121]== 'Z' && inBuf[inOff+122]== 'h') { + return true; + } + + return false; + } + private int findStartRadarData(String headerInfo) { int startOfRadarData = 0; Matcher matcher = WMO_PATTERN.matcher(headerInfo); @@ -222,4 +268,40 @@ public class RadarDecompressor { return outBuf; } + + /** + * Method to handle bzip2 compressed radar data. If data is not compressed it is + * just copied to the output buffer. + * + * @return The decompressed byte array for the radar data + * or null if not decompressed + */ + private byte[] decompressBzip2(byte[] inBuf, int offset, Headers headers) { + byte[] outBuf = null; + + if (isBzip2Compressed(inBuf, offset)) { + byte[] tmpBuf= new byte[inBuf.length-offset-120]; + System.arraycopy(inBuf, offset+120, tmpBuf, 0, tmpBuf.length); + ByteArrayInputStream is = new ByteArrayInputStream(tmpBuf); + BZip2InputStream bis= new BZip2InputStream(is,false); + try { + //use 10x85716 should be safe + byte[] tmpBuf2= new byte[860000]; + int actualByte=bis.read(tmpBuf2); + bis.close(); + outBuf = new byte[actualByte+120]; + //the 120 bytes:description block and symbology block + System.arraycopy(inBuf, offset, outBuf, 0, 8); + byte[] lengthMsg2=ByteBuffer.allocate(4).putInt(outBuf.length).array(); + System.arraycopy(lengthMsg2, 0, outBuf, 8, 4); + System.arraycopy(inBuf, offset+8+4, outBuf, 12, 108); + + System.arraycopy(tmpBuf2, 0, outBuf, 120, actualByte); + } catch (Exception e) { + theHandler.handle(Priority.ERROR, + "Failed to decompress " + headers.get("ingestfilename")); + } + } + return outBuf; + } } diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/SynopticSec2Decoder.java b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/SynopticSec2Decoder.java index aad27be948..1e577dd73b 100644 --- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/SynopticSec2Decoder.java +++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/SynopticSec2Decoder.java @@ -46,6 +46,7 @@ import com.raytheon.uf.edex.decodertools.core.ReportParser; * ------------ ---------- ----------- -------------------------- * 20071010 391 jkorman Initial coding. * 20071109 391 jkorman Added guard for short data. + * 2013/8 757 T. Lee Checked missing wave height from ship report * * * @@ -254,7 +255,7 @@ public class SynopticSec2Decoder extends AbstractSectionDecoder { wavePeriod = null; } } - if(waveHeight != null) { + if((waveHeight != null) && (waveHeight >=0) ) { receiver.setWaveHeight(waveHeight.doubleValue() * 0.5); } if(windWavePeriod != null) { @@ -265,7 +266,7 @@ public class SynopticSec2Decoder extends AbstractSectionDecoder { windWavePeriod = null; } } - if(windWaveHeight != null) { + if((windWaveHeight != null) && (windWaveHeight >=0) ) { receiver.setWindWaveHeight(windWaveHeight.doubleValue() * 0.5); } if ((wavePeriod != null) && (waveHeight != null)) { diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/gpd b/edexOsgi/com.raytheon.uf.tools.cli/impl/gpd new file mode 100644 index 0000000000..1516d0ffed --- /dev/null +++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/gpd @@ -0,0 +1,34 @@ +#!/bin/bash +## +## +############################################################################## +# This script allows users to query point data database from EDEX. +# +# SOFTWARE HISTORY +# +# Date Ticket# Engineer Description +# ------------ ---------- ----------- -------------------------- +# 05/20/2013 Chin Chen Initial Creation. +############################################################################## + +# this allows you to run this script from outside of ./bin +path_to_script=`readlink -f $0` +RUN_FROM_DIR=`dirname $path_to_script` + +BASE_AWIPS_DIR=`dirname $RUN_FROM_DIR` + +# get the base environment +source ${RUN_FROM_DIR}/setup.env + +# setup the environment needed to run the the Python +export LD_LIBRARY_PATH=${BASE_AWIPS_DIR}/src/lib:${PYTHON_INSTALL}/lib +export PYTHONPATH=${RUN_FROM_DIR}/src:$PYTHONPATH + +# execute the ifpInit Python module +_PYTHON="${PYTHON_INSTALL}/bin/python" +_MODULE="${RUN_FROM_DIR}/src/gpd/gpd.py" + +# quoting of '$@' is used to prevent command line interpretation +#$_PYTHON $_MODULE -h ${DEFAULT_HOST} -p ${DEFAULT_PORT} "$@" +$_PYTHON $_MODULE "$@" + diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/GpdCliRequestHandler.py b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/GpdCliRequestHandler.py new file mode 100644 index 0000000000..b1405ef5f8 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/GpdCliRequestHandler.py @@ -0,0 +1,117 @@ +## +# This script is used to send GPD request to EDEX. +# +# Users can override the default EDEX server and port name by specifying them +# in the $DEFAULT_HOST and $DEFAULT_PORT shell environment variables. +# +# 5/22/2013 Chin J. Chen +## +import os +from dynamicserialize.dstypes.gov.noaa.nws.ncep.common.dataplugin.gpd.query import GenericPointDataReqMsg +from ufpy import ThriftClient + + +class GpdCliRequestHandler: + """ Request Activity to EDEX.""" + + def __init__(self): + self.host = os.getenv("DEFAULT_HOST", "localhost") + self.port = os.getenv("DEFAULT_PORT", "9581") + self.client = ThriftClient.ThriftClient(self.host, self.port) + + def getGpdProdInfo(self, prodName, reqType): + req = GenericPointDataReqMsg() + req.setReqType(reqType) + req.setProductName(prodName) + resp = self.client.sendRequest(req) + return resp + + def getGpdProduct(self, refTime,prodName , reqType,querySpecifiedProductVersion=None,versionNum=None ): + req = GenericPointDataReqMsg() + req.setReqType(reqType) + req.setRefTime(refTime) + req.setProductName(prodName) + if (querySpecifiedProductVersion!= None and versionNum !=None): + req.setQuerySpecifiedProductVersion(querySpecifiedProductVersion) + req.setProductVersion(versionNum) + resp = self.client.sendRequest(req) + return resp + + + def getGpdStationProduct(self, stnId, refTime,prodName , reqType,querySpecifiedProductVersion=None,versionNum=None ): + req = GenericPointDataReqMsg() + req.setReqType(reqType) + req.setStnId(stnId) + req.setRefTime(refTime) + req.setProductName(prodName) + if (querySpecifiedProductVersion!= None and versionNum !=None): + req.setQuerySpecifiedProductVersion(querySpecifiedProductVersion) + req.setProductVersion(versionNum) + resp = self.client.sendRequest(req) + return resp + + def getGpdMovingProduct(self, slat, slon, refTime,prodName , reqType,querySpecifiedProductVersion=None,versionNum=None ): + req = GenericPointDataReqMsg() + req.setReqType(reqType) + req.setSlon(slon) + req.setSlat(slat) + req.setRefTime(refTime) + req.setProductName(prodName) + if (querySpecifiedProductVersion!= None and versionNum !=None): + req.setQuerySpecifiedProductVersion(querySpecifiedProductVersion) + req.setProductVersion(versionNum) + resp = self.client.sendRequest(req) + return resp + + def storeGpdGempakProduct(self, gpdGempak, prodName, maxNumLevel,versionNum): + req = GenericPointDataReqMsg() + req.setReqType("STORE_GPD_PRODUCT_FROM_GEMPAK_TBL") + req.setGpdDataString(gpdGempak) + req.setProductName(prodName) + req.setProductVersion(versionNum) + req.setMaxNumLevel(maxNumLevel) + resp = self.client.sendRequest(req) + return resp + + def storeGpdXmlProduct(self, gpdXml): + req = GenericPointDataReqMsg() + req.setReqType("STORE_GPD_PRODUCT_FROM_XML") + req.setGpdDataString(gpdXml) + resp = self.client.sendRequest(req) + return resp + + def storeGpdProductInfo(self, gpdXml): + req = GenericPointDataReqMsg() + req.setReqType("STORE_GPD_PRODUCT_INFO_FROM_XML") + req.setGpdDataString(gpdXml) + resp = self.client.sendRequest(req) + return resp + ''' + def purgeGpdProd(self, prodName, refTime=None, all=None): + req = GenericPointDataReqMsg() + if(all == "yes"): + req.setReqType("PURGE_GPD_PRODUCT_ALLTIME") + else: + req.setReqType("PURGE_GPD_PRODUCT_ONETIME") + if(refTime!=None): + req.setRefTime(refTime) + else: + return "reference time required for purging" + req.setProductName(prodName) + + resp = self.client.sendRequest(req) + return resp + ''' + def purgeGpdExpired(self): + req = GenericPointDataReqMsg() + req.setReqType("PURGE_GPD_EXPIRED_PRODUCT") + resp = self.client.sendRequest(req) + return resp + + def purgeGpdAll(self): + req = GenericPointDataReqMsg() + req.setReqType("PURGE_GPD_ALL_PRODUCTS") + resp = self.client.sendRequest(req) + return resp + + \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/gpd.py b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/gpd.py new file mode 100644 index 0000000000..e0bdc4e7e5 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/gpd.py @@ -0,0 +1,695 @@ +## +# This script is used to query Generic Point Data database from EDEX. +# +# 5/22/2013 Chin J. Chen +## +import io +import logging +import sys +import time +import GpdCliRequestHandler +from ufpy import UsageArgumentParser +from dynamicserialize.dstypes.gov.noaa.nws.ncep.common.dataplugin.gpd.query import GenericPointDataReqMsg +from dynamicserialize.dstypes.java.util import Date + +logger = None +parser = None +USAGE_MESSAGE = \ +""" + + gpd qix --p prodName --f filePath + + gpd qixl --p prodName + + gpd qpx --p prodName --t referenceTime [--f filePath --v versionNum] + + gpd qpxl --p prodName --t referenceTime [--v versionNum] + + gpd qsx --p prodName --t referenceTime --id stationId [--f filePath --v versionNum] + + gpd qsxl --p prodName --t referenceTime --id stationId [--v versionNum] + + gpd qmx --p prodName --t referenceTime --slat latitude --slon longitude [--f filePath --v versionNum] + + gpd qmxl --p prodName --t referenceTime --slat latitude --slon longitude [--v versionNum] + + + gpd spx --f filePath + + gpd spg --f filePath --p prodName [--v versionNum] + + gpd pe + + gpd pa + + gpd u + ####### + NOTE: referenceTime string format yyyy-mm-dd HH:MM:SS, for example "2013-05-21 20:30:00" + filePath - required when saving Gempak table or XML file + filePath - optional when querying, if not provided, result will be saved at current directory + versionNum - optional, if not provided, latest version is returned + ####### +""" +SUBCOMMAND_MESSAGE = \ +""" + qix: To query product information, result saved at optional filePath + qixl: To query and list product information + qpx: To query a product (all stations), result saved at optional filePath + qpxl: To query and list a product (all stations) + qsx: To query a station product, result saved at optional filePath + qsxl: To query and list a station product + qmx: To query a moving product, result saved at optional filePath + qmxl: To query and print a moving product + spx: To store product XML file to EDEX server database + spg: To store product GEMPAk table file to EDEX server database + pe: To purge expired products + pa: To purge all products + u: To print usage +""" +''' + gpd qig --p prodName --f filePath + + gpd qigl --p prodName + + gpd qpg --p prodName --t referenceTime [--f filePath --v versionNum] + + gpd qpgl --p prodName --t referenceTime [--v versionNum] + + gpd qsg --p prodName --t referenceTime --id stationId [--f filePath --v versionNum] + + gpd qsgl --p prodName --t referenceTime --id stationId [--v versionNum] + + gpd qmg --p prodName --t referenceTime --slat latitude --slon longitude [--f filePath --v versionNum] + + gpd qmgl --p prodName --t referenceTime --slat latitude --slon longitude [--v versionNum] + + qig: To query product information, result saved at optional filePath + qigl: To query and list product information + qpg: To query a product (all stations), result saved at optional filePath + qpgl: To query and list a product (all stations) + qsg: To query a station product, result saved at optional filePath + qsgl: To query and list a station product + qmg: To query a moving product, result saved at optional filePath + qmgl: To query and print a moving product +''' +def __initLogger(): + global logger + logger = logging.getLogger("gpd") + logger.setLevel(logging.DEBUG) + ch = logging.StreamHandler() + ch.setLevel(logging.INFO) + # Uncomment line below to enable debug-level logging + ch.setLevel(logging.DEBUG) + formatter = logging.Formatter("\n%(asctime)s %(name)s %(levelname)s: %(message)s", "%H:%M:%S") + ch.setFormatter(formatter) + logger.addHandler(ch) + +def __parseCommandLine(): + global parser + parser = UsageArgumentParser.UsageArgumentParser(prog='gpd',description="Query or store point data database from EDEX.")#, usage=USAGE_MESSAGE) + #parser.add_argument("-u", action="help", + # help="show usage") + + subparsers = parser.add_subparsers(help=USAGE_MESSAGE) + + #to print usage + parser_usage = subparsers.add_parser('u') + parser_usage.set_defaults(func=__printUsage) + + #To update/replace product information + #parser_saveinfo = subparsers.add_parser('si') + #parser_saveinfo.add_argument("--f", dest="filePath", action="store",required=True, + # help=":target file path for return product") + #parser_saveinfo.set_defaults(func=__saveProdInfo) + + #To save a GPD product in XML format + parser_saveprod_xml = subparsers.add_parser('spx') + parser_saveprod_xml.add_argument("--f", dest="filePath", action="store",required=True, + help=":target file path for return product") + parser_saveprod_xml.set_defaults(func=__saveProdXml) + + #To save a GPD product in GEMPAk table format + parser_saveprod_gempak = subparsers.add_parser('spg') + parser_saveprod_gempak.add_argument("--f", dest="filePath", action="store",required=True, + help=":target file path for return product") + parser_saveprod_gempak.add_argument("--p", dest="prodName", action="store",required=True, + help=":name of a Generic Point Data product") + parser_saveprod_gempak.add_argument("--l", dest="maxNumLevel", action="store",required=True, + help=":max number of level for product") + parser_saveprod_gempak.add_argument("--v", dest="versionNum", action="store", + help=":product version") + parser_saveprod_gempak.set_defaults(func=__saveProdGempak) + + #To query product information + parser_infoXml = subparsers.add_parser('qix') + parser_infoXml.add_argument("--p", dest="prodName", action="store",required=True, + help=":name of a Generic Point Data product") + parser_infoXml.add_argument("--f", dest="filePath", action="store", + help=":target file path for return product") + parser_infoXml.set_defaults(func=__getProdInfoXml) + + parser_info_printXml = subparsers.add_parser('qixl') + parser_info_printXml.add_argument("--p", dest="prodName", action="store",required=True, + help=":name of a Generic Point Data product") + #parser_info_printXml.add_argument("--f", dest="filePath", action="store", + # help=":target file path for return product") + parser_info_printXml.set_defaults(func=__getPrintProdInfoXml) + ''' + parser_infoGempak = subparsers.add_parser('qig') + parser_infoGempak.add_argument("--p", dest="prodName", action="store",required=True, + help=":name of a Generic Point Data product") + parser_infoGempak.add_argument("--f", dest="filePath", action="store", + help=":target file path for return product") + parser_infoGempak.set_defaults(func=__getProdInfoGempak) + + parser_info_printGempak = subparsers.add_parser('qigl') + parser_info_printGempak.add_argument("--p", dest="prodName", action="store",required=True, + help=":name of a Generic Point Data product") + parser_info_printGempak.set_defaults(func=__getPrintProdInfoGempak) + ''' + #To query a station product (single station) + parser_stnProdXml = subparsers.add_parser('qsx') + parser_stnProdXml.add_argument("--p", dest="prodName", action="store",required=True, + help=":name of a Generic Point Data product") + parser_stnProdXml.add_argument("--t", dest="refTime", action="store",required=True, + help=":reference time of a product") + parser_stnProdXml.add_argument("--id", dest="stnId", action="store",required=True, + help=":station id of a product") + parser_stnProdXml.add_argument("--f", dest="filePath", action="store", + help=":target file path for return product") + parser_stnProdXml.add_argument("--v", dest="versionNum", action="store", + help=":product version") + parser_stnProdXml.set_defaults(func=__getStnProdXml) + + parser_stnProdXml_print = subparsers.add_parser('qsxl') + parser_stnProdXml_print.add_argument("--p", dest="prodName", action="store",required=True, + help=":name of a Generic Point Data product") + parser_stnProdXml_print.add_argument("--t", dest="refTime", action="store",required=True, + help=":reference time of a product") + parser_stnProdXml_print.add_argument("--id", dest="stnId", action="store",required=True, + help=":station id of a product") + parser_stnProdXml_print.add_argument("--v", dest="versionNum", action="store", + help=":product version") + parser_stnProdXml_print.set_defaults(func=__getPrintStnProdXml) + + ''' + parser_stnProdGempak = subparsers.add_parser('qsg') + parser_stnProdGempak.add_argument("--p", dest="prodName", action="store",required=True, + help=":name of a Generic Point Data product") + parser_stnProdGempak.add_argument("--t", dest="refTime", action="store",required=True, + help=":reference time of a product") + parser_stnProdGempak.add_argument("--id", dest="stnId", action="store",required=True, + help=":station id of a product") + parser_stnProdGempak.add_argument("--f", dest="filePath", action="store", + help=":target file path for return product") + parser_stnProdGempak.add_argument("--v", dest="versionNum", action="store", + help=":product version") + parser_stnProdGempak.set_defaults(func=__getStnProdGempak) + + parser_stnProdGempak_print = subparsers.add_parser('qsgl') + parser_stnProdGempak_print.add_argument("--p", dest="prodName", action="store",required=True, + help=":name of a Generic Point Data product") + parser_stnProdGempak_print.add_argument("--t", dest="refTime", action="store",required=True, + help=":reference time of a product") + parser_stnProdGempak_print.add_argument("--id", dest="stnId", action="store",required=True, + help=":station id of a product") + parser_stnProdGempak_print.add_argument("--v", dest="versionNum", action="store", + help=":product version") + parser_stnProdGempak_print.set_defaults(func=__getPrintStnProdGempak) + ''' + #To query a moving product + parser_movingProdXml = subparsers.add_parser('qmx') + parser_movingProdXml.add_argument("--p", dest="prodName", action="store",required=True, + help=":name of a Generic Point Data product") + parser_movingProdXml.add_argument("--t", dest="refTime", action="store",required=True, + help=":reference time of a product") + parser_movingProdXml.add_argument("--slat", dest="slat", type=float, action="store",required=True, + help=":latitude of a moving product") + parser_movingProdXml.add_argument("--slon", dest="slon", type=float, action="store",required=True, + help=":longitude of a moving product") + parser_movingProdXml.add_argument("--f", dest="filePath", action="store", + help=":target file path for return product") + parser_movingProdXml.add_argument("--v", dest="versionNum", action="store", + help=":product version") + parser_movingProdXml.set_defaults(func=__getMovingProdXml) + + parser_movingProdXml_print = subparsers.add_parser('qmxl') + parser_movingProdXml_print.add_argument("--p", dest="prodName", action="store",required=True, + help=":name of a Generic Point Data product") + parser_movingProdXml_print.add_argument("--t", dest="refTime", action="store",required=True, + help=":reference time of a product") + parser_movingProdXml_print.add_argument("--slat", dest="slat", type=float, action="store",required=True, + help=":latitude of a moving product") + parser_movingProdXml_print.add_argument("--slon", dest="slon", type=float, action="store",required=True, + help=":longitude of a moving product") + parser_movingProdXml_print.add_argument("--v", dest="versionNum", action="store", + help=":product version") + parser_movingProdXml_print.set_defaults(func=__getPrintMovingProdXml) + + ''' + parser_movingProdGempak = subparsers.add_parser('qmg') + parser_movingProdGempak.add_argument("--p", dest="prodName", action="store",required=True, + help=":name of a Generic Point Data product") + parser_movingProdGempak.add_argument("--t", dest="refTime", action="store",required=True, + help=":reference time of a product") + parser_movingProdGempak.add_argument("--slat", dest="slat", type=float, action="store",required=True, + help=":latitude of a moving product") + parser_movingProdGempak.add_argument("--slon", dest="slon", type=float, action="store",required=True, + help=":longitude of a moving product") + parser_movingProdGempak.add_argument("--f", dest="filePath", action="store", + help=":target file path for return product") + parser_movingProdGempak.add_argument("--v", dest="versionNum", action="store", + help=":product version") + parser_movingProdGempak.set_defaults(func=__getMovingProdGempak) + + parser_movingProdGempak_print = subparsers.add_parser('qmgl') + parser_movingProdGempak_print.add_argument("--p", dest="prodName", action="store",required=True, + help=":name of a Generic Point Data product") + parser_movingProdGempak_print.add_argument("--t", dest="refTime", action="store",required=True, + help=":reference time of a product") + parser_movingProdGempak_print.add_argument("--slat", dest="slat", type=float, action="store",required=True, + help=":latitude of a moving product") + parser_movingProdGempak_print.add_argument("--slon", dest="slon", type=float, action="store",required=True, + help=":longitude of a moving product") + parser_movingProdGempak_print.add_argument("--v", dest="versionNum", action="store", + help=":product version") + parser_movingProdGempak_print.set_defaults(func=__getPrintMovingProdGempak) + ''' + + #To query a product + parser_prodXml = subparsers.add_parser('qpx') + parser_prodXml.add_argument("--p", dest="prodName", action="store",required=True, + help=":name of a Generic Point Data product") + parser_prodXml.add_argument("--t", dest="refTime", action="store",required=True, + help=":reference time of a product") + parser_prodXml.add_argument("--f", dest="filePath", action="store", + help=":target file path for return product") + parser_prodXml.add_argument("--v", dest="versionNum", action="store", + help=":product version") + parser_prodXml.set_defaults(func=__getProdXml) + + ''' + parser_prodGempak = subparsers.add_parser('qpg') + parser_prodGempak.add_argument("--p", dest="prodName", action="store",required=True, + help=":name of a Generic Point Data product") + parser_prodGempak.add_argument("--t", dest="refTime", action="store",required=True, + help=":reference time of a product") + parser_prodGempak.add_argument("--f", dest="filePath", action="store", + help=":target file path for return product") + parser_prodGempak.add_argument("--v", dest="versionNum", action="store", + help=":product version") + parser_prodGempak.set_defaults(func=__getProdGempak) + ''' + parser_prodXml_print = subparsers.add_parser('qpxl') + parser_prodXml_print.add_argument("--p", dest="prodName", action="store",required=True, + help=":name of a Generic Point Data product") + parser_prodXml_print.add_argument("--t", dest="refTime", action="store",required=True, + help=":reference time of a product") + parser_prodXml_print.add_argument("--v", dest="versionNum", action="store", + help=":product version") + + parser_prodXml_print.set_defaults(func=__getPrintProdXml) + ''' + parser_prodGempak_print = subparsers.add_parser('qpgl') + parser_prodGempak_print.add_argument("--p", dest="prodName", action="store",required=True, + help=":name of a Generic Point Data product") + parser_prodGempak_print.add_argument("--t", dest="refTime", action="store",required=True, + help=":reference time of a product") + parser_prodGempak_print.add_argument("--v", dest="versionNum", action="store", + help=":product version") + + parser_prodGempak_print.set_defaults(func=__getPrintProdGempak) + ''' + + ''' + #parser_purge_prod = subparsers.add_parser('pp') + #parser_purge_prod.add_argument("--p", dest="prodName", action="store",required=True, + # help=":name of a Generic Point Data product") + #parser_purge_prod.add_argument("--t", dest="refTime", action="store", + # help=":reference time of a product") + #parser_purge_prod.add_argument("--all", dest="all", action="store", + # help=":yes") + #parser_purge_prod.set_defaults(func=__purgeProd) + ''' + + parser_purge_expired = subparsers.add_parser('pe') + parser_purge_expired.set_defaults(func=__purgeExpired) + + parser_purge_all = subparsers.add_parser('pa') + parser_purge_all.set_defaults(func=__purgeAll) + + options = parser.parse_args() + + #logger.debug("Command-line arguments: " + str(options)) + return options + +def __convertTimeToDate(refTime): + struct_time = time.strptime(refTime, "%Y-%m-%d %H:%M:%S") + #print "returned tuple: %s " % struct_time + #print "timeZone " + str(time.timezone) + " altimezone " + str(time.altzone) + milsec = (time.mktime(struct_time)-time.altzone) * 1000 + date= Date() + date.setTime(milsec) + #print "time in msec: %s" % str(date.getTime()) + return date + +def __createFilenameStringXml(name, refTime): + filename = name + '@'+ refTime.replace(" ","@")+".xml" + return filename + +def __createFilenameStringGempak(name, refTime): + filename = name + '@'+ refTime.replace(" ","@")+".gempak" + return filename + +def __getPrintProdInfoXml(options): + req= GpdCliRequestHandler.GpdCliRequestHandler() + prodInfo = req.getGpdProdInfo(options.prodName, "GET_GPD_PRODUCT_INFO_XML") + if(prodInfo != None): + print(prodInfo) + else: + print("Query failed!") + +def __getProdInfoXml(options): + #if options.prodName == None: + # parser.print_help() + # return None + req= GpdCliRequestHandler.GpdCliRequestHandler() + prodInfo = req.getGpdProdInfo(options.prodName,"GET_GPD_PRODUCT_INFO_XML") + if(prodInfo != None): + if(options.filePath == None): + f = open(options.prodName+"Info.xml",'w') + else: + f = open(options.filePath,'w') + f.write(prodInfo) + return prodInfo + else: + print("Query failed!") + return None + +def __getPrintProdInfoGempak(options): + req= GpdCliRequestHandler.GpdCliRequestHandler() + prodInfo = req.getGpdProdInfo(options.prodName, "GET_GPD_PRODUCT_INFO_GEMPAK_TBL") + if(prodInfo != None): + print(prodInfo) + else: + print("Query failed!") + +def __getProdInfoGempak(options): + #if options.prodName == None: + # parser.print_help() + # return None + req= GpdCliRequestHandler.GpdCliRequestHandler() + prodInfo = req.getGpdProdInfo(options.prodName,"GET_GPD_PRODUCT_INFO_GEMPAK_TBL") + if(prodInfo != None): + if(options.filePath == None): + f = open(options.prodName+"Info.gempak",'w') + else: + f = open(options.filePath,'w') + f.write(prodInfo) + return prodInfo + else: + print("Query failed!") + return None + + #=========================================================================== + # print ("GPD Report::::::::::::::") + # print str("Report Name: "+ prodInfo.getName()) + # print str("Master Level Name = " + prodInfo.getMasterLevel().getName()) + # print str("Master Level Description = " + prodInfo.getMasterLevel().getDescription()) + # print str("Master Level Type = " + prodInfo.getMasterLevel().getType()) + # print str("Master Level Unit String = " + prodInfo.getMasterLevel().getUnitString()) + # print ("Max NUmber of Level = " + str(prodInfo.getMaxNumberOfLevel())) + # print ("Parameters:") + # parmLst =prodInfo.getParameterLst() + # i = 1 + # for parm in parmLst: + # print ("Parameter "+ str(i)+ ": Abbreviation="+ str(parm.getAbbreviation())+ " Unit="+str(parm.getUnitString())+ " Name =" + str(parm.getName())) + # i=i+1 + #=========================================================================== + +def __getStnProdXml(options): + #if options.prodName == None or options.refTime == None or options.stnId == None: + # parser.print_help() + # return None + date = __convertTimeToDate(options.refTime) + req= GpdCliRequestHandler.GpdCliRequestHandler() + + if(options.versionNum == None): + stnProd = req.getGpdStationProduct(options.stnId, date,options.prodName,"GET_GPD_STATION_PRODUCT_XML") + else: + stnProd = req.getGpdStationProduct(options.stnId, date,options.prodName, "GET_GPD_STATION_PRODUCT_XML", True, int(options.versionNum)) + if(stnProd!=None): + if(options.filePath == None): + filename = __createFilenameStringXml((options.prodName+'@'+options.stnId),options.refTime) + else: + filename = options.filePath + f = open(filename,'w') + f.write(stnProd) + return stnProd + else: + print("Query failed!") + return None +def __getPrintStnProdXml(options): + date = __convertTimeToDate(options.refTime) + req= GpdCliRequestHandler.GpdCliRequestHandler() + + if(options.versionNum == None): + stnProd = req.getGpdStationProduct(options.stnId, date,options.prodName,"GET_GPD_STATION_PRODUCT_XML") + else: + stnProd = req.getGpdStationProduct(options.stnId, date,options.prodName, "GET_GPD_STATION_PRODUCT_XML",True, int(options.versionNum)) + if(stnProd != None): + print(stnProd) + else: + print("Query failed!") + +def __getStnProdGempak(options): + #if options.prodName == None or options.refTime == None or options.stnId == None: + # parser.print_help() + # return None + date = __convertTimeToDate(options.refTime) + req= GpdCliRequestHandler.GpdCliRequestHandler() + + if(options.versionNum == None): + stnProd = req.getGpdStationProduct(options.stnId, date,options.prodName,"GET_GPD_STATION_PRODUCT_GEMPAK_TBL") + else: + stnProd = req.getGpdStationProduct(options.stnId, date,options.prodName, "GET_GPD_STATION_PRODUCT_GEMPAK_TBL", True, int(options.versionNum)) + if(stnProd!=None): + if(options.filePath == None): + filename = __createFilenameStringGempak((options.prodName+'@'+options.stnId),options.refTime) + else: + filename = options.filePath + f = open(filename,'w') + f.write(stnProd) + return stnProd + else: + print("Query failed!") + return None +def __getPrintStnProdGempak(options): + date = __convertTimeToDate(options.refTime) + req= GpdCliRequestHandler.GpdCliRequestHandler() + + if(options.versionNum == None): + stnProd = req.getGpdStationProduct(options.stnId, date,options.prodName,"GET_GPD_STATION_PRODUCT_GEMPAK_TBL") + else: + stnProd = req.getGpdStationProduct(options.stnId, date,options.prodName, "GET_GPD_STATION_PRODUCT_GEMPAK_TBL",True, int(options.versionNum)) + if(stnProd != None): + print(stnProd) + else: + print("Query failed!") + +def __getMovingProdXml(options): + #if options.prodName == None or options.refTime == None or options.slat == None or options.slon == None: + # parser.print_help() + # return None + date = __convertTimeToDate(options.refTime) + req= GpdCliRequestHandler.GpdCliRequestHandler() + if(options.versionNum == None): + stnProd = req.getGpdMovingProduct(options.slat, options.slon, date,options.prodName,"GET_GPD_MOVING_PRODUCT_XML") + else: + stnProd = req.getGpdMovingProduct(options.slat, options.slon, date,options.prodName, "GET_GPD_MOVING_PRODUCT_XML",True, int(options.versionNum)) + if(stnProd!=None): + if(options.filePath == None): + filename = __createFilenameStringXml((options.prodName+'@'+str(options.slat)+'#'+str(options.slon)),options.refTime) + else: + filename = options.filePath + f = open(filename,'w') + f.write(stnProd) + return stnProd + else: + print("Query failed!") + return None +def __getPrintMovingProdXml(options): + date = __convertTimeToDate(options.refTime) + req= GpdCliRequestHandler.GpdCliRequestHandler() + if(options.versionNum == None): + stnProd = req.getGpdMovingProduct(options.slat, options.slon, date,options.prodName,"GET_GPD_MOVING_PRODUCT_XML") + else: + stnProd = req.getGpdMovingProduct(options.slat, options.slon, date,options.prodName, "GET_GPD_MOVING_PRODUCT_XML", True, int(options.versionNum)) + if(stnProd != None): + print(stnProd) + else: + print("Query failed!") + +def __getMovingProdGempak(options): + #if options.prodName == None or options.refTime == None or options.slat == None or options.slon == None: + # parser.print_help() + # return None + date = __convertTimeToDate(options.refTime) + req= GpdCliRequestHandler.GpdCliRequestHandler() + if(options.versionNum == None): + stnProd = req.getGpdMovingProduct(options.slat, options.slon, date,options.prodName,"GET_GPD_MOVING_PRODUCT_GEMPAK_TBL") + else: + stnProd = req.getGpdMovingProduct(options.slat, options.slon, date,options.prodName, "GET_GPD_MOVING_PRODUCT_GEMPAK_TBL",True, int(options.versionNum)) + if(stnProd!=None): + if(options.filePath == None): + filename = __createFilenameStringGempak((options.prodName+'@'+str(options.slat)+'#'+str(options.slon)),options.refTime) + else: + filename = options.filePath + f = open(filename,'w') + f.write(stnProd) + return stnProd + else: + print("Query failed!") + return None +def __getPrintMovingProdGempak(options): + date = __convertTimeToDate(options.refTime) + req= GpdCliRequestHandler.GpdCliRequestHandler() + if(options.versionNum == None): + stnProd = req.getGpdMovingProduct(options.slat, options.slon, date,options.prodName,"GET_GPD_MOVING_PRODUCT_GEMPAK_TBL") + else: + stnProd = req.getGpdMovingProduct(options.slat, options.slon, date,options.prodName, "GET_GPD_MOVING_PRODUCT_GEMPAK_TBL", True, int(options.versionNum)) + if(stnProd != None): + print(stnProd) + else: + print("Query failed!") + +def __getProdXml(options): + #if options.prodName == None or options.refTime == None: + # parser.print_help() + # return None + date = __convertTimeToDate(options.refTime) + req= GpdCliRequestHandler.GpdCliRequestHandler() + if(options.versionNum == None): + prod = req.getGpdProduct( date,options.prodName,"GET_GPD_PRODUCT_XML") + else: + prod = req.getGpdProduct( date,options.prodName,"GET_GPD_PRODUCT_XML", True, int(options.versionNum)) + if(prod != None): + if(options.filePath == None): + filename = __createFilenameStringXml(options.prodName,options.refTime) + else: + filename = options.filePath + f = open(filename,'w') + f.write(prod) + return prod + else: + print("Query failed!") + return None + +def __getPrintProdXml(options): + date = __convertTimeToDate(options.refTime) + req= GpdCliRequestHandler.GpdCliRequestHandler() + if(options.versionNum == None): + prod = req.getGpdProduct( date,options.prodName,"GET_GPD_PRODUCT_XML") + else: + prod = req.getGpdProduct( date,options.prodName,"GET_GPD_PRODUCT_XML", True, int(options.versionNum)) + if(prod != None): + print(prod) + else: + print("Query failed!") + +def __getProdGempak(options): + #if options.prodName == None or options.refTime == None: + # parser.print_help() + # return None + date = __convertTimeToDate(options.refTime) + req= GpdCliRequestHandler.GpdCliRequestHandler() + if(options.versionNum == None): + prod = req.getGpdProduct( date,options.prodName,"GET_GPD_PRODUCT_GEMPAK_TBL") + else: + prod = req.getGpdProduct( date,options.prodName,"GET_GPD_PRODUCT_GEMPAK_TBL", True, int(options.versionNum)) + if(prod != None): + if(options.filePath == None): + filename = __createFilenameStringGempak(options.prodName,options.refTime) + else: + filename = options.filePath + f = open(filename,'w') + f.write(prod) + return prod + else: + print("Query failed!") + return None + +def __getPrintProdGempak(options): + date = __convertTimeToDate(options.refTime) + req= GpdCliRequestHandler.GpdCliRequestHandler() + if(options.versionNum == None): + prod = req.getGpdProduct( date,options.prodName,"GET_GPD_PRODUCT_GEMPAK_TBL") + else: + prod = req.getGpdProduct( date,options.prodName,"GET_GPD_PRODUCT_GEMPAK_TBL", True, int(options.versionNum)) + if(prod != None): + print(prod) + else: + print("Query failed!") + +#def __purgeProd(options): +# req= GpdCliRequestHandler.GpdCliRequestHandler() +# req.purgeGpdProd(options.prodName,options.refTime, option.all) + +def __purgeExpired(options): + req= GpdCliRequestHandler.GpdCliRequestHandler() + req.purgeGpdExpired() + +def __purgeAll(options): + req= GpdCliRequestHandler.GpdCliRequestHandler() + req.purgeGpdAll() + +def __printUsage(options): + print(USAGE_MESSAGE) + + +def __saveProdXml(options): + # read in XML from input file + xmlfile = io.open(options.filePath, 'rb') + gpdXML = xmlfile.read() + xmlfile.close() + + # Store GPD report to EDEX + req= GpdCliRequestHandler.GpdCliRequestHandler() + result = req.storeGpdXmlProduct(gpdXML) + if result==None: + print("Store action failed!") + else: + print(result) + +def __saveProdGempak(options): + # read in XML from input file + gpkfile = io.open(options.filePath, 'rb') + gpdGempak = gpkfile.read() + gpkfile.close() + + # Store GPD report to EDEX + req= GpdCliRequestHandler.GpdCliRequestHandler() + maxNumLevel = options.maxNumLevel + + if(options.versionNum == None): + result = req.storeGpdGempakProduct(gpdGempak,options.prodName,int(maxNumLevel),0) + else: + result = req.storeGpdGempakProduct(gpdGempak,options.prodName,int(maxNumLevel),int(options.versionNum)) + + if result==None: + print("Store action failed!") + else: + print(result) + +def main(): + __initLogger() + #logger.info("Starting Query report.") + options = __parseCommandLine() + #vars(options) + options.func(options) + #logger.info("queried report name: " + options.prodName) + + return 0 + +if __name__ == '__main__': + main() diff --git a/ncep/com.raytheon.uf.edex.ncep.feature/feature.xml b/ncep/com.raytheon.uf.edex.ncep.feature/feature.xml index 781094c8f2..c290defa19 100644 --- a/ncep/com.raytheon.uf.edex.ncep.feature/feature.xml +++ b/ncep/com.raytheon.uf.edex.ncep.feature/feature.xml @@ -486,4 +486,19 @@ version="0.0.0" unpack="false"/> + + + + + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.aww/src/gov/noaa/nws/ncep/common/dataplugin/aww/AwwRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.aww/src/gov/noaa/nws/ncep/common/dataplugin/aww/AwwRecord.java index cf3741cef5..5d99f7939a 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.aww/src/gov/noaa/nws/ncep/common/dataplugin/aww/AwwRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.aww/src/gov/noaa/nws/ncep/common/dataplugin/aww/AwwRecord.java @@ -27,12 +27,12 @@ * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * May 07, 2013 1869 bsteffen Remove dataURI column from * PluginDataObject. + * July 29, 2013 1028 ghull add AwwReportType enum * * * * This code has been developed by the SIB for use in the AWIPS2 system. */ - package gov.noaa.nws.ncep.common.dataplugin.aww; import java.util.Calendar; @@ -112,6 +112,69 @@ public class AwwRecord extends PluginDataObject{ * 30. HYDROLOGIC STATEMENT * 31. URGENT WEATHER MESSAGE */ + public static enum AwwReportType { + SEVERE_THUNDERSTORM_WARNING, + SEVERE_THUNDERSTORM_WATCH, + TORNADO_WARNING, + TORNADO_WATCH, + SEVERE_THUNDERSTORM_OUTLINE_UPDATE, + TORNADO_WATCH_OUTLINE_UPDATE, + FLASH_FLOOD_WARNING, + FLASH_FLOOD_WATCH, + FLOOD_WARNING, + FLOOD_WATCH, + FLOOD_STATEMENT, + // WINTER STORM. something is getting decoded as WINTER STORM + WINTER_STORM_WARNING, + WINTER_STORM_WATCH, + WATCH_COUNTY_NOTIFICATION, + SEVERE_WEATHER_STATEMENT, + WIND_ADVISORY, // ?WIND CHILL ADVISORY? + // WIND CHILL ADVISORYs getting decoded as "ADVISORY" + FOG_ADVISORY, + HEAT_ADVISORY, + FROST_ADVISORY, + SMOKE_ADVISORY, + WEATHER_ADVISORY, + WINTER_WEATHER_ADVISORY, + SIGNIGICANT_WEATHER_ADVISORY, + SPECIAL_WEATHER_STATEMENT, + RED_FLAG_WARNING, + TORNADO_REPORT, + HIGH_WIND_WARNING, + FREEZE_WARNING, + ADVERTENCIA_DE_INUNDACIONES, + HYDROLOGIC_STATEMENT, + URGENT_WEATHER_MESSAGE, + UNKNOWN_AWW_REPORT_TYPE, + // DON"T know what this is but WTCH is looking for it (isSevereWeatherStatusNotification)? + STATUS_REPORT; + + public static AwwReportType getReportType( String rtStr ) { + rtStr = rtStr.trim().replace(" ", "_" ); + for( AwwReportType rt : values() ) { + if( rt.toString().equals( rtStr ) ) { + return rt; + } + } + // WTCH is looking for + if( rtStr.equals("THUNDERSTORM_REPORT" ) ) { + return SEVERE_THUNDERSTORM_WATCH; + } + if( rtStr.endsWith( "STATUS REPORT" ) ) { +// ??? return AwwReportType.SEVERE_WEATHER_STATUS_NOTIFICATION + } + // WSTM is looking for + if( rtStr.equals( "WINTER_STORM" ) ) { + // ??? + } + if( rtStr.equals( "ADVISORY" ) ) { + // ???? WIND CHILL ADVISORY is getting decoded as "ADVISORY"??? + } + return UNKNOWN_AWW_REPORT_TYPE; + } + } + @Column(length=40) @DataURI(position=1) @DynamicSerializeElement diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.aww/src/gov/noaa/nws/ncep/common/dataplugin/aww/UGCHeaderUtil.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.aww/src/gov/noaa/nws/ncep/common/dataplugin/aww/UGCHeaderUtil.java new file mode 100644 index 0000000000..ddad936797 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.aww/src/gov/noaa/nws/ncep/common/dataplugin/aww/UGCHeaderUtil.java @@ -0,0 +1,74 @@ +package gov.noaa.nws.ncep.common.dataplugin.aww; + +import java.util.ArrayList; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +// *** Copied from raytheon's class in com.raytheon.edex.warning. +// TODO : get this moved to a common plugin. + +public class UGCHeaderUtil { + + /** Another RE to Catch the Date portion of the UGC Header */ + private static final String DATESTR = "[0-9]{6}\\-"; + + /** Parses a single county from a UGC Header, can be repeated */ + private static final String SINGLECOUNTY = "(?:([A-Z]{3}[0-9]{3})([\\-\\>]))|(?:([0-9]{3})[\\-\\>])"; + + /** + * Private utility method which will return an ArrayList of each zone + * formatted from a UGC Header. + * + * @param fips + * @return + */ + public static ArrayList getUGCZones(String fips) { + ArrayList rval = new ArrayList(); + String matchStr = ""; + + Pattern pattern = Pattern.compile(DATESTR); + Matcher matcher = pattern.matcher(fips); + if (matcher.find()) { + matchStr = fips.substring(0, fips.length() - 7); + } else { + matchStr = fips; + } + if (!matchStr.endsWith("-")) { + matchStr += "-"; + } + + String currentState = ""; + String startOfSeries = ""; + pattern = Pattern.compile(SINGLECOUNTY); + matcher = pattern.matcher(matchStr); + while (matcher.find()) { + if (matcher.group(1) != null && matcher.group(1).length() == 6) { + currentState = matcher.group(1).substring(0, 3); + rval.add(matcher.group(1)); + if (matcher.group(2).equals(">")) { + startOfSeries = matcher.group(1).substring(3, 6); + } + } else { + rval.add(currentState + matcher.group(3)); + if (!startOfSeries.equals("")) { + int start = Integer.parseInt(startOfSeries); + int end = Integer.parseInt(matcher.group(3)); + for (int i = start + 1; i < end; i++) { + String str = String.valueOf(i); + while (str.length() < 3) { + str = "0" + str; + } + rval.add(currentState + str); + } + startOfSeries = ""; + } + if (matcher.group(2) != null && matcher.group(2).equals(">")) { + startOfSeries = matcher.group(1).substring(3, 6); + } + } + } + return rval; + } + +} + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject index 442c1b0cb9..475d3540f3 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject @@ -1,3 +1,4 @@ gov.noaa.nws.ncep.common.dataplugin.geomag.GeoMagRecord -gov.noaa.nws.ncep.common.dataplugin.geomag.fixed.GeoMagSource -gov.noaa.nws.ncep.common.dataplugin.geomag.fixed.GeoMagSourcePreference \ No newline at end of file +gov.noaa.nws.ncep.common.dataplugin.geomag.GeoMagAvg +gov.noaa.nws.ncep.common.dataplugin.geomag.GeoMagK1min +gov.noaa.nws.ncep.common.dataplugin.geomag.GeoMagK3hr \ No newline at end of file diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/build.properties b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/build.properties index 5791d48d5f..34d2e4d2da 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/build.properties +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/build.properties @@ -1,5 +1,4 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ - .,\ - res/ + . diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/res/scripts/geomagSourcePreferences.sql b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/res/scripts/geomagSourcePreferences.sql deleted file mode 100644 index 76ec6e30c1..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/res/scripts/geomagSourcePreferences.sql +++ /dev/null @@ -1,3 +0,0 @@ -INSERT INTO awips.geomag_source_preferences VALUES (201, 'Primary', 1); -INSERT INTO awips.geomag_source_preferences VALUES (202, 'Secondary', 2); -INSERT INTO awips.geomag_source_preferences VALUES (203, 'Tertiary', 3); \ No newline at end of file diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/res/scripts/geomagSources.sql b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/res/scripts/geomagSources.sql deleted file mode 100644 index 6d856706e8..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/res/scripts/geomagSources.sql +++ /dev/null @@ -1,3 +0,0 @@ -INSERT INTO awips.geomag_sources VALUES (101, 201, 'Data transmitted directly via the Magworm protocol from the Table Mountain Observatory (TMO).', 'direct'); -INSERT INTO awips.geomag_sources VALUES (102, 202, 'Data transmitted directly via the Magworm protocol from USGS Golden, CO.', 'magworm'); -INSERT INTO awips.geomag_sources VALUES (103, 203, 'Data originally transmitted via GOES and then through the Magworm protocol from USGS Golden, CO.', 'domsat'); diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagAvg.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagAvg.java new file mode 100644 index 0000000000..ee02e937f6 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagAvg.java @@ -0,0 +1,173 @@ +package gov.noaa.nws.ncep.common.dataplugin.geomag; + +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +//import javax.persistence.UniqueConstraint; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; + +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; + +import com.raytheon.uf.common.dataplugin.PluginDataObject; +import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject; +import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; +import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; + +/** + * Record implementation for geomag avg. + * + * 
+ * SOFTWARE HISTORY
+ * Date         Ticket#    Engineer           Description
+ * ------------ ---------- ----------------   --------------------------
+ * 08/14/2013   T989       qzhou              Initial creation.
+ *
+ * + * @author qzhou + * @version 1.0 + */ + +@Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "geomagseq") +@Table(name = "geomag_houravg") +@Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) +@XmlAccessorType(XmlAccessType.NONE) +@DynamicSerialize +public class GeoMagAvg extends PersistableDataObject { + + + /** + * + */ + private static final long serialVersionUID = 1L; + public static final String ID_GEN = "idgen"; + + /** The id */ + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = ID_GEN) + private Integer id; + + /** + * station code + */ + @Column + @XmlAttribute + @DynamicSerializeElement + private String stationCode; + + /** + * time tag + */ + @Column + @XmlAttribute + @DynamicSerializeElement + private Date avgTime; + + /** + * insert time tag + */ + @Column + @XmlAttribute + @DynamicSerializeElement + private Date insertTime; + + /** + * H data Hour Average + */ + @Column(length=16) + @DynamicSerializeElement + private float hHrAvg; + + /** + * D data Hour Average + */ + @Column(length=16) + @DynamicSerializeElement + private float dHrAvg; + + + public GeoMagAvg() { + + } + + public void generateId() { + this.id = hashCode(); + } + + /** + * @return the hHrAvg + */ + public float getHHrAvg() { + return hHrAvg; + } + + public void setHHrAvg(float hHrAvg) { + this.hHrAvg = hHrAvg; + } + + /** + * @return the dHrAvg + */ + public float getDHrAvg() { + return dHrAvg; + } + + public void setDHrAvg(float dHrAvg) { + this.dHrAvg = dHrAvg; + } + + /** + * @return The id + */ + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + /** + * @return the timeTag + */ + public Date getAvgTime() { + return avgTime; + } + + public void setAvgTime(Date avgTime) { + this.avgTime = avgTime; + } + + /** + * @return the timeTag + */ + public Date getInsertTime() { + return insertTime; + } + + public void setInsertTime(Date insertTime) { + this.insertTime = insertTime; + } + + /** + * @return the stationCode + */ + public String getStationCode() { + return stationCode; + } + + public void setStationCode(String stationCode) { + this.stationCode = stationCode; + } +} + + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagK1min.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagK1min.java new file mode 100644 index 0000000000..7cb7e1b6ce --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagK1min.java @@ -0,0 +1,365 @@ +package gov.noaa.nws.ncep.common.dataplugin.geomag; + +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; + +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; + +import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject; +import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; +import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; + +/** + * Record implementation for geomag k 1 min. + * + * 
+ * SOFTWARE HISTORY
+ * Date         Ticket#    Engineer           Description
+ * ------------ ---------- ----------------   --------------------------
+ * 08/14/2013   T989       qzhou              Initial creation.
+ *
+ * + * @author qzhou + * @version 1.0 + */ + +@Entity +@Table(name = "geomag_k1min") +@Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) +@XmlAccessorType(XmlAccessType.NONE) +@DynamicSerialize +public class GeoMagK1min extends PersistableDataObject { + + /** + * + */ + private static final long serialVersionUID = 1L; + + + /** The id */ + @Id + @DynamicSerializeElement + private Integer id; + + /** + * station code + */ + @Column + @XmlAttribute + @DynamicSerializeElement + private String stationCode; + + /** + * time tag + */ + @Column + @XmlAttribute + @DynamicSerializeElement + private Date refTime; + + /** + * insert time tag + */ + @Column + @XmlAttribute + @DynamicSerializeElement + private Date lastUpdate; + + /** + * H data Hour Average + */ + @Column(length=16) + @DynamicSerializeElement + private int kestIndex; + + /** + * D data Hour Average + */ + @Column(length=16) + @DynamicSerializeElement + private float kestReal; + + /** + * D data Hour Average + */ + @Column(length=16) + @DynamicSerializeElement + private float kestGamma; + + /** + * H data Hour Average + */ + @Column(length=16) + @DynamicSerializeElement + private int hkIndex; + + /** + * D data Hour Average + */ + @Column(length=16) + @DynamicSerializeElement + private float hkReal; + + /** + * D data Hour Average + */ + @Column(length=16) + @DynamicSerializeElement + private float hkGamma; + + /** + * H data Hour Average + */ + @Column(length=16) + @DynamicSerializeElement + private int dkIndex; + + /** + * D data Hour Average + */ + @Column(length=16) + @DynamicSerializeElement + private float dkReal; + + /** + * D data Hour Average + */ + @Column(length=16) + @DynamicSerializeElement + private float dkGamma; + + /** + * D data Hour Average + */ + @Column(length=16) + @DynamicSerializeElement + private int hCount; + + /** + * D data Hour Average + */ + @Column(length=16) + @DynamicSerializeElement + private int dCount; + + /** + * D data Hour Average + */ + @Column(length=16) + @DynamicSerializeElement + private int aest; + + /** + * D data Hour Average + */ + @Column(length=16) + @DynamicSerializeElement + private float ks; + + + + public GeoMagK1min() { + + } + + public void generateId() { + this.id = hashCode(); + } + + /** + * @return the hHrAvg + */ + public int getKestIndex() { + return kestIndex; + } + + public void setKestIndex(int kestIndex) { + this.kestIndex = kestIndex; + } + + /** + * @return the dHrAvg + */ + public float getKestReal() { + return kestReal; + } + + public void setKestReal(float kestReal) { + this.kestReal = kestReal; + } + + /** + * @return the hHrAvg + */ + public float getKestGamma() { + return kestGamma; + } + + public void setKestGamma(float kestGamma) { + this.kestGamma = kestGamma; + } + + /** + * @return the hHrAvg + */ + public int getHkIndex() { + return hkIndex; + } + + public void setHKIndex(int hkIndex) { + this.hkIndex = hkIndex; + } + + /** + * @return the dHrAvg + */ + public float getHKReal() { + return hkReal; + } + + public void setHKReal(float hkReal) { + this.hkReal = hkReal; + } + + /** + * @return the hHrAvg + */ + public float getHKGamma() { + return hkGamma; + } + + public void setHKGamma(float hkGamma) { + this.hkGamma = hkGamma; + } + + /** + * @return the hHrAvg + */ + public int getDKIndex() { + return dkIndex; + } + + public void setDKIndex(int dkIndex) { + this.dkIndex = dkIndex; + } + + /** + * @return the dHrAvg + */ + public float getDKReal() { + return dkReal; + } + + public void setDKReal(float dkReal) { + this.dkReal = dkReal; + } + + /** + * @return the hHrAvg + */ + public float getDKGamma() { + return dkGamma; + } + + public void setDKGamma(float dkGamma) { + this.dkGamma = dkGamma; + } + + /** + * @return the dHrAvg + */ + public float getHCount() { + return hCount; + } + + public void setHCount(int hCount) { + this.hCount = hCount; + } + + /** + * @return the dHrAvg + */ + public int getDCount() { + return dCount; + } + + public void setDCount(int dCount) { + this.dCount = dCount; + } + + /** + * @return the dHrAvg + */ + public int getAest() { + return aest; + } + + public void setAest(int aest) { + this.aest = aest; + } + + /** + * @return the dHrAvg + */ + public float getKs() { + return ks; + } + + public void setKs(float ks) { + this.ks = ks; + } + + /** + * @return The id + */ + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + /** + * @return the timeTag + */ + public Date getRefTime() { + return refTime; + } + + public void setRefTime(Date refTime) { + this.refTime = refTime; + } + + /** + * @return the timeTag + */ + public Date getLastUpdate() { + return lastUpdate; + } + + public void setLastUpdate(Date lastUpdate) { + this.lastUpdate = lastUpdate; + } + + /** + * @return the stationCode + */ + public String getStationCode() { + return stationCode; + } + + public void setStationCode(String stationCode) { + this.stationCode = stationCode; + } +} + + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagK3hr.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagK3hr.java new file mode 100644 index 0000000000..d11bde7cee --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagK3hr.java @@ -0,0 +1,203 @@ +package gov.noaa.nws.ncep.common.dataplugin.geomag; + +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; + +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; + +import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject; +import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; +import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; + +/** + * Record implementation for geomag k 3 hr. + * + * 
+ * SOFTWARE HISTORY
+ * Date         Ticket#    Engineer           Description
+ * ------------ ---------- ----------------   --------------------------
+ * 08/14/2013   T989       qzhou              Initial creation.
+ *
+ * + * @author qzhou + * @version 1.0 + */ + +@Entity +@Table(name = "geomag_k3hr") +@Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) +@XmlAccessorType(XmlAccessType.NONE) +@DynamicSerialize +public class GeoMagK3hr extends PersistableDataObject { + + + /** + * + */ + private static final long serialVersionUID = 1L; + + + /** The id */ + @Id + @DynamicSerializeElement + private Integer id; + + /** + * station code + */ + @Column + @XmlAttribute + @DynamicSerializeElement + private String stationCode; + + /** + * time tag + */ + @Column + @XmlAttribute + @DynamicSerializeElement + private Date refTime; + + /** + * insert time tag + */ + @Column + @XmlAttribute + @DynamicSerializeElement + private Date lastUpdate; + + /** + * H data Hour Average + */ + @Column(length=16) + @DynamicSerializeElement + private int kIndex; + + /** + * D data Hour Average + */ + @Column(length=16) + @DynamicSerializeElement + private float kReal; + + /** + * D data Hour Average + */ + @Column(length=16) + @DynamicSerializeElement + private float kGamma; + + /** + * D data Hour Average + */ + @Column(length=16) + @DynamicSerializeElement + private float aFinalRunning; + + + + public GeoMagK3hr() { + + } + + public void generateId() { + this.id = hashCode(); + } + + /** + * @return the hHrAvg + */ + public int getKIndex() { + return kIndex; + } + + public void setKIndex(int kIndex) { + this.kIndex = kIndex; + } + + /** + * @return the dHrAvg + */ + public float getKReal() { + return kReal; + } + + public void setKReal(float kReal) { + this.kReal = kReal; + } + + /** + * @return the hHrAvg + */ + public float getKGamma() { + return kGamma; + } + + public void setKGamma(float kGamma) { + this.kGamma = kGamma; + } + + /** + * @return the dHrAvg + */ + public float getAFinalRunning() { + return aFinalRunning; + } + + public void setAFinalRunning(float aFinalRunning) { + this.aFinalRunning = aFinalRunning; + } + + /** + * @return The id + */ + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + /** + * @return the timeTag + */ + public Date getRefTime() { + return refTime; + } + + public void setRefTime(Date refTime) { + this.refTime = refTime; + } + + /** + * @return the timeTag + */ + public Date getLastUpdate() { + return lastUpdate; + } + + public void setLastUpdate(Date lastUpdate) { + this.lastUpdate = lastUpdate; + } + + /** + * @return the stationCode + */ + public String getStationCode() { + return stationCode; + } + + public void setStationCode(String stationCode) { + this.stationCode = stationCode; + } +} + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagPathProvider.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagPathProvider.java new file mode 100644 index 0000000000..d43f9fe9e1 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagPathProvider.java @@ -0,0 +1,54 @@ +package gov.noaa.nws.ncep.common.dataplugin.geomag; + +import java.util.Date; + +import com.raytheon.uf.common.dataplugin.persist.DefaultPathProvider; +import com.raytheon.uf.common.dataplugin.persist.IPersistable; + +public class GeoMagPathProvider extends DefaultPathProvider { + private static GeoMagPathProvider instance = new GeoMagPathProvider(); + + public static GeoMagPathProvider getInstance() { + return instance; + } + + protected GeoMagPathProvider() { + + } + + @Override + public String getHDFFileName(String pluginName, IPersistable persistable) { + if (persistable == null) { + throw new IllegalArgumentException( + "Expected argument persistable is null"); + } + + if (!(persistable instanceof GeoMagRecord)) { + throw new IllegalArgumentException( + "Argument persistable is of wrong type. Expected " + + GeoMagRecord.class + " but got " + + persistable.getClass()); + } + + if (pluginName == null) { + throw new IllegalArgumentException( + "Expected argument pluginName not set on object " + + persistable.toString()); + } + + GeoMagRecord pdo = (GeoMagRecord) persistable; + StringBuffer sb = new StringBuffer(64); + sb.append(pluginName); + + if (pdo.getDataTime() != null ) { + Date time = (Date) pdo.getDataTime().getRefTime().clone(); + time.setHours(0); + + // //System.out.println("***Path "+pdo.getDataTime().getRefTime() +" "+ fileNameFormat.get().format(pdo.getDataTime().getRefTime())); + sb.append(fileNameFormat.get().format(time)); + sb.append(".h5"); + } + return sb.toString(); + } +} + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagRecord.java index 631085f11a..b850dc8cb3 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagRecord.java @@ -16,24 +16,20 @@ import javax.xml.bind.annotation.XmlRootElement; import com.raytheon.uf.common.dataplugin.IDecoderGettable; import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataplugin.annotations.DataURI; +import com.raytheon.uf.common.dataplugin.persist.IHDFFilePathProvider; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; -import com.raytheon.uf.common.datastorage.IDataStore; -import com.raytheon.uf.common.datastorage.records.FloatDataRecord; -import com.raytheon.uf.common.datastorage.records.IDataRecord; -import com.raytheon.uf.common.datastorage.records.LongDataRecord; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; - /** - * Record implementation for geomag plugin. + * Record implementation for geomag plugin. * * 
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer           Description
  * ------------ ---------- ----------------   --------------------------
  * 03/27/2013   975        sgurung            Initial creation.
- * 05/26/2013              bhebbard           Added SequenceGenerator annotation.
- * 07/22/2013   1977       rjpeter            Added getDataURI and annotations.
+ * 05/26/2013              bhebbard           Added SequenceGenerator annotation. 
+ * 06/26/2013   989        qzhou              Added lots of fields.
  *
* * @author sgurung @@ -50,16 +46,49 @@ public class GeoMagRecord extends PersistablePluginDataObject { private static final long serialVersionUID = 1L; - public static final String OBS_TIME = "OBS_TIME"; - - public static final String component1 = "component1"; - - public static final String component2 = "component2"; - - public static final String component3 = "component3"; - - public static final String component4 = "component4"; + public static final String OBS_TIME = "Obs_Time";//h5 + public static final String Comp_Insert_Time = "Comp_Insert_Time"; + public static final String component1 = "Component1"; + public static final String component2 = "Component2"; + public static final String component3 = "Component3"; + public static final String component4 = "Component4"; + public static final String H_HR_AVG = "Hr_Avg_H"; + public static final String D_HR_AVG = "Hr_Avg_D"; + + public static final String K_Index = "P3h_K_Index"; + public static final String K_Real = "P3h_K_Real"; + public static final String K_Gamma = "P3h_Gamma"; + public static final String Kest_Index = "P3h_Kest_Index"; + public static final String Kest_Real = "P3h_Kest_Real"; + public static final String Kest_Gamma = "P3h_Kest_Gamma"; + public static final String KH_Real = "P3h_Hk_Real"; + public static final String KH_Gamma = "P3h_H_Gamma"; + public static final String KD_Real = "P3h_Dk_Real"; + public static final String KD_Gamma = "P3h_D_Gamma"; + public static final String A_Running = "P3h_A_Running"; + public static final String A_Final_Running = "P3h_A_Final_Running"; + public static final String KH_Int = "P3h_Hk_Int"; + public static final String KD_Int = "P3h_Dk_Int"; + public static final String Last_Update = "P3h_Last_Update"; + + public static final String Kest_Index_1m = "P1m_Kest_Index"; + public static final String Kest_Real_1m = "P1m_Kest_Real"; + public static final String Kest_Gamma_1m = "P1m_Kest_Gamma"; + public static final String KH_Real_1m = "P1m_Hk_Real"; + public static final String KH_Gamma_1m = "P1m_H_Gamma"; + public static final String KH_Index_1m = "P1m_Hk_Index"; + public static final String KD_Real_1m = "P1m_Dk_Real"; + public static final String KD_Gamma_1m = "P1m_D_Gamma"; + public static final String KD_Index_1m = "P1m_Dk_Index"; + public static final String KH_Count = "P1m_H_Count"; + public static final String KD_Count = "P1m_D_Count"; + public static final String KH_Dev = "P1m_H_Dev"; + public static final String KD_Dev = "P1m_D_Dev"; + public static final String A_est = "P1m_A_est"; + public static final String K_s = "P1m_K_s"; + public static final String Last_Update_1m = "P1m_Last_Update"; + /** * station code */ @@ -82,52 +111,160 @@ public class GeoMagRecord extends PersistablePluginDataObject { * report type */ @DataURI(position = 3) - @Column + @Column @DynamicSerializeElement @XmlAttribute private String reportType; - + +// /** +// * index for data in hdf5, 0-1439 +// */ +// @Column +// @DynamicSerializeElement +// @XmlAttribute +// private int idx; + /** * flag to indicate bad data point */ - /* - * @Column - * - * @DynamicSerializeElement - * - * @XmlAttribute private String badDataPoint; + @Column + @DynamicSerializeElement + @XmlAttribute + private String badDataPoint; + + /** + * H or X values */ - + @Column + @DynamicSerializeElement + @XmlAttribute + private float component_1; + + /** + * D or Y values + */ + @Column + @DynamicSerializeElement + @XmlAttribute + private float component_2; + + /** + * Z values + */ + @Column + @DynamicSerializeElement + @XmlAttribute + private float component_3; + + /** + * F values + */ + @Column + @DynamicSerializeElement + @XmlAttribute + private float component_4; + /** * Observation Date and Time for the minute values */ @Transient private long[] obs_times; - + /** * H or X values */ @Transient private float[] comp1_data; - + /** * D or Y values */ @Transient private float[] comp2_data; - + /** * Z values */ @Transient private float[] comp3_data; - + /** * F values */ @Transient private float[] comp4_data; + /** + * Following for HrAvg values + */ + @Transient + private float[] hrAvgH; + + @Transient + private float[] hrAvgD; + + @Transient + private long[] comp_InsertTime; + + /** + * Following for K values + */ + // 3hr + @Transient + private int[] kK_Index; + @Transient + private float[] kK_Real; + @Transient + private float[] kK_Gamma; + @Transient + private int[] kest_Index; + @Transient + private float[] kest_Real; + @Transient + private float[] kest_Gamma; + @Transient + private float[] hK_Real; + @Transient + private float[] hK_Gamma; + @Transient + private float[] dK_Real; + @Transient + private float[] dK_Gamma; + + // 1 min + @Transient + private int[] h_Count; + @Transient + private int[] d_Count; + @Transient + private int[] kest_Index_1m; + @Transient + private float[] kest_Real_1m; + @Transient + private float[] kest_Gamma_1m; + @Transient + private float[] hK_Real_1m; + @Transient + private float[] hK_Gamma_1m; + @Transient + private float[] dK_Real_1m; + @Transient + private float[] dK_Gamma_1m; + @Transient + private int[] hK_Index_1m; + @Transient + private int[] dK_Index_1m; + @Transient + private float[] h_Dev; + @Transient + private float[] d_Dev; + @Transient + private float[] Ks; + @Transient + private int[] a_est; + @Transient + private float[] update_1m; + /** * No-arg Constructor */ @@ -159,7 +296,7 @@ public class GeoMagRecord extends PersistablePluginDataObject { public void setStationCode(String stationCode) { this.stationCode = stationCode; } - + /** * @return the sourceId */ @@ -174,7 +311,21 @@ public class GeoMagRecord extends PersistablePluginDataObject { public void setSourceId(int sourceId) { this.sourceId = sourceId; } + + /** + * @return the badDataPoint + */ + public String getBadDataPoint() { + return badDataPoint; + } + /** + * @param the badDataPoint to set + */ + public void setBadDataPoint(String badDataPoint) { + this.badDataPoint = badDataPoint; + } + /** * @return the reportType */ @@ -191,50 +342,37 @@ public class GeoMagRecord extends PersistablePluginDataObject { } /** - * @return the min_data + * @return the obs_times array */ public long[] getObsTimes() { return obs_times; } - - /** - * @param comp1_data - * the comp1_data to set - */ public void setObsTimes(long[] obs_times) { this.obs_times = obs_times; } - + /** - * @return the comp1_data + * @return the comp1_data array */ public float[] getComp1Data() { return comp1_data; } - /** - * @param comp1_data - * the comp1_data to set - */ public void setComp1Data(float[] h_data) { this.comp1_data = h_data; } - + /** - * @return the comp2_data + * @return the comp2_data array */ public float[] getComp2Data() { return comp2_data; } - /** - * @param comp2_data - * the comp2_data to set - */ public void setComp2Data(float[] d_data) { this.comp2_data = d_data; } - + /** * @return the comp3_data */ @@ -242,65 +380,357 @@ public class GeoMagRecord extends PersistablePluginDataObject { return comp3_data; } - /** - * @param comp3_data - * the comp3_data to set - */ public void setComp3Data(float[] z_data) { this.comp3_data = z_data; } - + /** * @return the comp4_data */ public float[] getComp4Data() { return comp4_data; } - - /** - * @param comp4_data - * the comp4_data to set - */ + public void setComp4Data(float[] f_data) { this.comp4_data = f_data; } + + /** + * @return the component_1 + */ + public float getComponent_1() { + return component_1; + } + public void setComponent_1(float component_1) { + this.component_1 = component_1; + } + + /** + * @return the component_2 + */ + public float getComponent_2() { + return component_2; + } + + public void setComponent_2(float component_2) { + this.component_2 = component_2; + } + + /** + * @return the component_3 + */ + public float getComponent_3() { + return component_3; + } + + public void setComponent_3(float component_3) { + this.component_3 = component_3; + } + + /** + * @return the component_4 + */ + public float getComponent_4() { + return component_4; + } + + public void setComponent_4(float component_4) { + this.component_4 = component_4; + } + + /** + * @return the h_HrAvg + */ + public float[] getHrAvgH() { + return hrAvgH; + } + + /** + * @param h_HrAvg + */ + public void setHrAvgH(float[] hrAvgH) { + this.hrAvgH = hrAvgH; + } + + /** + * @return the d_HrAvg + */ + public float[] getHrAvgD() { + return hrAvgD; + } + + /** + * @param d_HrAvg + */ + public void setHrAvgD(float[] hrAvgD) { + this.hrAvgD = hrAvgD; + } + + public long[] getCompInsertTime() { + return comp_InsertTime; + } + + public void setCompInsertTime(long[] comp_InsertTime) { + this.comp_InsertTime = comp_InsertTime; + } + + /* + * @param k index related + */ + // 3hr + public int[] getKKIndex() { + return kK_Index; + } + + public void setKKIndex(int[] kK_Index) { + this.kK_Index = kK_Index; + } + + public float[] getKKReal() { + return kK_Real; + } + + public void setKKReal(float[] kK_Real) { + this.kK_Real = kK_Real; + } + + public float[] getKKGamma() { + return kK_Gamma; + } + + public void setKKGamma(float[] kK_Gamma) { + this.kK_Gamma = kK_Gamma; + } + + + public float[] getHKReal() { + return hK_Real; + } + + public void setHKReal(float[] hK_Real) { + this.hK_Real = hK_Real; + } + + public float[] getDKReal() { + return dK_Real; + } + + public void setDKReal(float[] dK_Real) { + this.dK_Real = dK_Real; + } + + public int[] getKestIndex() { + return kest_Index; + } + + public void setKestIndex(int[] kest_Index) { + this.kest_Index = kest_Index; + } + + public float[] getKestReal() { + return kest_Real; + } + + public void setKestReal(float[] kest_Real) { + this.kest_Real = kest_Real; + } + + public float[] getKestGamma() { + return kest_Gamma; + } + + public void setKestGamma(float[] kest_Gamma) { + this.kest_Gamma = kest_Gamma; + } + + public float[] getHKGamma() { + return hK_Gamma; + } + + public void setHKGamma(float[] hK_Gamma) { + this.hK_Gamma = hK_Gamma; + } + + public float[] getDKGamma() { + return dK_Gamma; + } + + public void setDKGamma(float[] dK_Gamma) { + this.dK_Gamma = dK_Gamma; + } + + // 1min + public float[] getHKReal1m() { + return hK_Real_1m; + } + + public void setHKReal1m(float[] hK_Real_1m) { + this.hK_Real_1m = hK_Real_1m; + } + + public float[] getDKReal1m() { + return dK_Real_1m; + } + + public void setDKReal1m(float[] dK_Real_1m) { + this.dK_Real_1m = dK_Real_1m; + } + + public int[] getKestIndex1m() { + return kest_Index_1m; + } + + public void setKestIndex1m(int[] kest_Index_1m) { + this.kest_Index_1m = kest_Index_1m; + } + + public float[] getKestReal1m() { + return kest_Real_1m; + } + + public void setKestReal1m(float[] kest_Real_1m) { + this.kest_Real_1m = kest_Real_1m; + } + + public float[] getKestGamma1m() { + return kest_Gamma_1m; + } + + public void setKestGamma1m(float[] kest_Gamma_1m) { + this.kest_Gamma_1m = kest_Gamma_1m; + } + + public float[] getHKGamma1m() { + return hK_Gamma_1m; + } + + public void setHKGamma1m(float[] hK_Gamma_1m) { + this.hK_Gamma_1m = hK_Gamma_1m; + } + + public float[] getDKGamma1m() { + return dK_Gamma_1m; + } + + public void setDKGamma1m(float[] dK_Gamma_1m) { + this.dK_Gamma_1m = dK_Gamma_1m; + } + + public int[] getHKIndex1m() { + return hK_Index_1m; + } + + public void setHKIndex1m(int[] hK_Index_1m) { + this.hK_Index_1m = hK_Index_1m; + } + + public int[] getDKIndex1m() { + return dK_Index_1m; + } + + public void setDKIndex1m(int[] dK_Index_1m) { + this.dK_Index_1m = dK_Index_1m; + } + + public int[] getHCount() { + return h_Count; + } + + public void setHCount(int[] h_Count) { + this.h_Count = h_Count; + } + + public int[] getDCount() { + return d_Count; + } + + public void setDCount(int[] d_Count) { + this.d_Count = d_Count; + } + + public float[] getHDev() { + return h_Dev; + } + + public void setHDev(float[] h_Dev) { + this.h_Dev = h_Dev; + } + + public float[] getDDev() { + return d_Dev; + } + + public void setDDev(float[] d_Dev) { + this.d_Dev = d_Dev; + } + + public float[] getKs() { + return Ks; + } + + public void setKs(float[] Ks) { + this.Ks = Ks; + } + + public int[] getAest() { + return a_est; + } + + public void setAest(int[] a_est) { + this.a_est = a_est; + } + + public float[] getLastUpdate() { + return update_1m; + } + + public void setLastUpdate(float[] update_1m) { + this.update_1m = update_1m; + } + @Override public IDecoderGettable getDecoderGettable() { return null; } - public void retrieveFromDataStore(IDataStore dataStore) { - - try { - IDataRecord[] dataRec = dataStore.retrieve(getDataURI()); - for (IDataRecord element : dataRec) { - if (element.getName().equals(GeoMagRecord.component1)) { - obs_times = (((LongDataRecord) element).getLongData()); - } - if (element.getName().equals(GeoMagRecord.component1)) { - comp1_data = (((FloatDataRecord) element).getFloatData()); - } - if (element.getName().equals(GeoMagRecord.component2)) { - comp2_data = (((FloatDataRecord) element).getFloatData()); - } - if (element.getName().equals(GeoMagRecord.component3)) { - comp3_data = (((FloatDataRecord) element).getFloatData()); - } - if (element.getName().equals(GeoMagRecord.component4)) { - comp4_data = (((FloatDataRecord) element).getFloatData()); - } - } - - } catch (Exception se) { - se.printStackTrace(); - } - } - +// public void retrieveFromDataStore(IDataStore dataStore) { +// +// try { +// IDataRecord[] dataRec = dataStore.retrieve(getDataURI()); +// for (int i = 0; i < dataRec.length; i++) { +// if (dataRec[i].getName().equals(GeoMagRecord.OBS_TIME)) { +// obs_times = (((LongDataRecord) dataRec[i]).getLongData()); +// } +// if (dataRec[i].getName().equals(GeoMagRecord.component1)) { +// comp1_data = (((FloatDataRecord) dataRec[i]).getFloatData()); +// } +// if (dataRec[i].getName().equals(GeoMagRecord.component2)) { +// comp2_data = (((FloatDataRecord) dataRec[i]).getFloatData()); +// } +// if (dataRec[i].getName().equals(GeoMagRecord.component3)) { +// comp3_data = (((FloatDataRecord) dataRec[i]).getFloatData()); +// } +// if (dataRec[i].getName().equals(GeoMagRecord.component4)) { +// comp4_data = (((FloatDataRecord) dataRec[i]).getFloatData()); +// } +// } +// +// } catch (Exception se) { +// se.printStackTrace(); +// } +// } + @Override @Column @Access(AccessType.PROPERTY) public String getDataURI() { return super.getDataURI(); } + + @Override + public IHDFFilePathProvider getHDFPathProvider() { + return GeoMagPathProvider.getInstance(); + } } + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagAvgDao.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagAvgDao.java new file mode 100644 index 0000000000..bfa572f0f0 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagAvgDao.java @@ -0,0 +1,94 @@ +package gov.noaa.nws.ncep.common.dataplugin.geomag.dao; + +import java.util.Date; +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Session; +import org.hibernate.criterion.Criterion; +import org.hibernate.criterion.Restrictions; +import org.springframework.orm.hibernate3.HibernateTemplate; +import org.springframework.transaction.TransactionStatus; +import org.springframework.transaction.support.TransactionCallback; + +import gov.noaa.nws.ncep.common.dataplugin.geomag.GeoMagAvg; + +import com.raytheon.uf.edex.database.dao.CoreDao; +import com.raytheon.uf.edex.database.dao.DaoConfig; + +/** + * Record implementation for geomag avgDao. + * + * 
+ * SOFTWARE HISTORY
+ * Date         Ticket#    Engineer           Description
+ * ------------ ---------- ----------------   --------------------------
+ * 08/14/2013   T989       qzhou              Initial creation.
+ *
+ * + * @author qzhou + * @version 1.0 + */ + +public class GeoMagAvgDao extends CoreDao { + /** + * Creates a new GribModelDao + */ + public GeoMagAvgDao() { + super(DaoConfig.forClass(GeoMagAvg.class)); + } + + /** + * Retrieves a GeoMagAvgId based on the given id + * + * @param id + * The given ID number + * @return The GeoMagAvgId + */ + public GeoMagAvg queryById(int id) { + return (GeoMagAvg) super.queryById(id); + } + + public int getAreaId (int id){ + return queryById(id).getId(); + } + + + @SuppressWarnings("unchecked") + public List getAvgForStation(final String stationCode, final Date start, final Date end) { + return (List) txTemplate.execute(new TransactionCallback() { + @Override + public Object doInTransaction(TransactionStatus status) { + HibernateTemplate ht = getHibernateTemplate(); + Session sess = ht.getSessionFactory().getCurrentSession(); + Criteria crit = sess.createCriteria(GeoMagAvg.class); + Criterion where1 = Restrictions.eq("stationCode", stationCode); + crit.add(where1); +// Criterion where2 = Restrictions.gt("avgTime", start); +// crit.add(where2); +// Criterion where3 = Restrictions.le("avgTime", end); +// crit.add(where3); + Criterion where2 = Restrictions.between("avgTime", start, end);//include bounds, but don't need bounds + crit.add(where2); + return crit.list(); + } + }); + } + + @SuppressWarnings("unchecked") + public List getSingleAvg(final String stationCode, final Date date) { + return (List) txTemplate.execute(new TransactionCallback() { + @Override + public Object doInTransaction(TransactionStatus status) { + HibernateTemplate ht = getHibernateTemplate(); + Session sess = ht.getSessionFactory().getCurrentSession(); + Criteria crit = sess.createCriteria(GeoMagAvg.class); + Criterion where1 = Restrictions.eq("stationCode", stationCode); + crit.add(where1); + Criterion where2 = Restrictions.eq("avgTime", date); + crit.add(where2); + return crit.list(); + } + }); + } +} diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagDao.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagDao.java index 843d262e0e..bbd07ebac4 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagDao.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagDao.java @@ -1,18 +1,22 @@ package gov.noaa.nws.ncep.common.dataplugin.geomag.dao; +import java.util.Date; +import java.util.List; + import com.raytheon.uf.common.dataplugin.PluginException; import com.raytheon.uf.common.dataplugin.persist.IPersistable; import com.raytheon.uf.common.datastorage.IDataStore; import com.raytheon.uf.common.datastorage.StorageException; import com.raytheon.uf.common.datastorage.records.AbstractStorageRecord; import com.raytheon.uf.common.datastorage.records.FloatDataRecord; -import com.raytheon.uf.common.datastorage.records.LongDataRecord; +import com.raytheon.uf.common.datastorage.records.IntegerDataRecord; import com.raytheon.uf.edex.database.DataAccessLayerException; import com.raytheon.uf.edex.database.plugin.PluginDao; +import gov.noaa.nws.ncep.common.dataplugin.geomag.GeoMagAvg; +import gov.noaa.nws.ncep.common.dataplugin.geomag.GeoMagK1min; +import gov.noaa.nws.ncep.common.dataplugin.geomag.GeoMagK3hr; import gov.noaa.nws.ncep.common.dataplugin.geomag.GeoMagRecord; -import gov.noaa.nws.ncep.common.dataplugin.geomag.fixed.GeoMagSource; -import gov.noaa.nws.ncep.common.dataplugin.geomag.fixed.GeoMagSourcePreference; /** * This is a Data Access Object (DAO) driver to interact with geomag database table and HDF5 data store. @@ -23,7 +27,7 @@ import gov.noaa.nws.ncep.common.dataplugin.geomag.fixed.GeoMagSourcePreference; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * 04/2013 975 S. Gurung Initial Creation - * + * 07/16/2013 975 Q. Zhou Added fields. * * * @author sgurung @@ -32,30 +36,183 @@ import gov.noaa.nws.ncep.common.dataplugin.geomag.fixed.GeoMagSourcePreference; public class GeoMagDao extends PluginDao { /** The source data access object */ - private GeoMagSourceDao sourceDao = new GeoMagSourceDao(); - - /** The source preference data access object */ - private GeoMagSourcePreferenceDao sourcePrefDao = new GeoMagSourcePreferenceDao(); + private GeoMagAvgDao avgDao = new GeoMagAvgDao(); + private GeoMagK3hrDao k3hrDao = new GeoMagK3hrDao(); + private GeoMagK1minDao k1minDao = new GeoMagK1minDao(); public GeoMagDao(String pluginName) throws PluginException { super(pluginName); } +// @Override +// public StorageStatus persistToHDF5(PluginDataObject... records) +// throws PluginException { +// long t0 = System.currentTimeMillis(); +// +// // NOTE: currently making the assumption that models aren't +// // mixed in the records aggregate. If this isn't true, +// // some pre-processing will be needed. +// Map> containerMap = new HashMap>( +// records.length); +// Map fileMap = new HashMap(); +// +// for (PluginDataObject p : records) { +// if (p instanceof IPointData) { +// PointDataView pdv = ((IPointData) p).getPointDataView(); +// List views = containerMap +// .get(pdv.getContainer()); +// if (views == null) { +// views = new ArrayList(); +// containerMap.put(pdv.getContainer(), views); +// } +// views.add(pdv); +// File file = fileMap.get(pdv.getContainer()); +// if (file == null) { +// file = getFullFilePath(p); +// System.out.println("***file " +file.toString()); +// fileMap.put(pdv.getContainer(), file); +// } +// +// }DataTime +// } +// +// List ssList = new ArrayList(); +// try { +// for (PointDataContainer container : containerMap.keySet()) { +// IDataStore ds = DataStoreFactory.getDataStore(fileMap +// .get(container)); +// StorageProperties sp = new StorageProperties(); +// String compression = PluginRegistry.getInstance() +// .getRegisteredObject(pluginName).getCompression(); +// if (compression != null) { +// sp.setCompression(StorageProperties.Compression +// .valueOf(compression)); +// } +// +// Set params = container.getParameters(); +// for (String param : params) { +// try { +// IDataRecord idr = container.getParameterRecord(param); +// ds.addDataRecord(idr, sp); +// } catch (StorageException e) { +// throw new PluginException("Error adding record", e); +// } +// } +// +// try { +// StorageStatus ss = ds.store(StoreOp.APPEND); +// if (ss.getOperationPerformed() == StoreOp.APPEND) { +// // increment the indices +// List views = containerMap.get(container); +// int idx = (int) ss.getIndexOfAppend()[0]; +// container.incrementIds(idx, views); +// } +// ssList.add(ss); +// } catch (StorageException e) { +// throw new PluginException("Error updating point file", e); +// } +// } +// // Aggregate the storage status errors +// StorageStatus aggregatedStatus = new StorageStatus(); +// List se = new ArrayList(); +// for (StorageStatus ss : ssList) { +// StorageException[] seArr = ss.getExceptions(); +// if (seArr != null) { +// se.addAll(Arrays.asList(seArr)); +// } +// } +// +// aggregatedStatus.setExceptions(se.toArray(new StorageException[se +// .size()])); +// return aggregatedStatus; +// } +// +// finally { +// System.out.println("Time spent in persist: " +// + (System.currentTimeMillis() - t0)); +// } +// } +// +// public File getFullFilePath(PluginDataObject p) { +// File file; +// String directory = p.getPluginName() + File.separator +// + pathProvider.getHDFPath(p.getPluginName(), (IPersistable) p); +// file = new File(directory +// + File.separator +// + pathProvider.getHDFFileName(p.getPluginName(), +// (IPersistable) p)); +// return file; +// } + + /** + * Retrieves an geomag report using the datauri . + * + * @param dataURI + * The dataURI to match against. + * @return The report record if it exists. + */ + public GeoMagRecord queryByDataURI(String dataURI) { + GeoMagRecord report = null; + List obs = null; + try { + obs = queryBySingleCriteria("dataURI", dataURI); + } catch (DataAccessLayerException e) { + e.printStackTrace(); + } + if ((obs != null) && (obs.size() > 0)) { + report = (GeoMagRecord) obs.get(0); + } + return report; + } + + /** + * Queries for to determine if a given data uri exists on the sfcobs table. + * + * @param dataUri + * The DataURI to find. + * @return An array of objects. If not null, there should only be a single + * element. + */ + public Object[] queryDataUriColumn(final String dataUri) { + + String sql = "select datauri from awips.geomag where datauri='" + + dataUri + "';"; + + Object[] results = executeSQLQuery(sql); + + return results; + } + @Override - protected IDataStore populateDataStore(IDataStore dataStore, IPersistable record) + public IDataStore populateDataStore(IDataStore dataStore, IPersistable record) throws StorageException { + //return null; GeoMagRecord magRecord = (GeoMagRecord) record; + // change to 00:00:00.0. "/geomag/2013-04-01_00:00:00.0/BOU/102/GEOMAG"; +// String headUri = magRecord.getDataURI(); +// headUri = headUri.substring(0, 18) +"_00:00:00.0/" + headUri.substring(30); + /* * Write observation times to HDF5. */ - if (magRecord.getObsTimes() != null ) { - AbstractStorageRecord storageRecord = new LongDataRecord(GeoMagRecord.OBS_TIME, - magRecord.getDataURI(), (long[]) magRecord.getObsTimes(), 1, - new long[] {magRecord.getObsTimes().length}); - storageRecord.setCorrelationObject(magRecord); - dataStore.addDataRecord(storageRecord); - } +// if (magRecord.getObsTimes() != null ) { +// AbstractStorageRecord storageRecord = new LongDataRecord(GeoMagRecord.OBS_TIME, +// headUri, (long[]) magRecord.getObsTimes(), 1, +// new long[] {magRecord.getObsTimes().length}); +// storageRecord.setCorrelationObject(magRecord); +// dataStore.addDataRecord(storageRecord); +// +// } + +// if (magRecord.getCompIdx() != null) { +// AbstractStorageRecord storageRecord = new IntegerDataRecord(GeoMagRecord.CompIdx, +// magRecord.getDataURI(), (int[]) magRecord.getCompIdx(), 1, +// new long[] {magRecord.getCompIdx().length}); +// +// storageRecord.setCorrelationObject(record); +// dataStore.addDataRecord(storageRecord); +// } /* * Write component1 data to HDF5. @@ -66,6 +223,7 @@ public class GeoMagDao extends PluginDao { new long[] {magRecord.getComp1Data().length}); storageRecord.setCorrelationObject(magRecord); dataStore.addDataRecord(storageRecord); + //StorageStatus ss = dataStore.store(StoreOp.APPEND); } /* @@ -77,67 +235,377 @@ public class GeoMagDao extends PluginDao { new long[] {magRecord.getComp2Data().length}); storageRecord.setCorrelationObject(magRecord); dataStore.addDataRecord(storageRecord); + + } + +// /* +// * Write component3 data to HDF5. +// */ +// if ( magRecord.getComp3Data() != null ) { +// AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.component3, +// magRecord.getDataURI(), (float[]) magRecord.getComp3Data(), 1, +// new long[] {magRecord.getComp3Data().length}); +// storageRecord.setCorrelationObject(magRecord); +// dataStore.addDataRecord(storageRecord); +// +// } +// +// /* +// * Write component4 data to HDF5. +// */ +// if ( magRecord.getComp4Data() != null ) { +// AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.component4, +// magRecord.getDataURI(), (float[]) magRecord.getComp4Data(), 1, +// new long[] {magRecord.getComp4Data().length}); +// storageRecord.setCorrelationObject(magRecord); +// dataStore.addDataRecord(storageRecord); +// +// } + +// if (magRecord.getHrAvgIdx() != null) { +// AbstractStorageRecord storageRecord = new IntegerDataRecord(GeoMagRecord.HrAvgIdx, +// magRecord.getDataURI(), (int[]) magRecord.getHrAvgIdx(), 1, +// new long[] {magRecord.getHrAvgIdx().length}); +// +// storageRecord.setCorrelationObject(record); +// dataStore.addDataRecord(storageRecord); +// } + + /* + * Write H_HR_AVG data to HDF5. + */ + if ( magRecord.getHrAvgH() != null ) { + AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.H_HR_AVG, + magRecord.getDataURI(), (float[]) magRecord.getHrAvgH(), 1, + new long[] {magRecord.getHrAvgH().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + } /* - * Write component3 data to HDF5. + * Write D_HR_AVG data to HDF5. */ - if ( magRecord.getComp3Data() != null ) { - AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.component3, - magRecord.getDataURI(), (float[]) magRecord.getComp3Data(), 1, - new long[] {magRecord.getComp3Data().length}); + if ( magRecord.getHrAvgD() != null ) { + AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.D_HR_AVG, + magRecord.getDataURI(), (float[]) magRecord.getHrAvgD(), 1, + new long[] {magRecord.getHrAvgD().length}); storageRecord.setCorrelationObject(magRecord); dataStore.addDataRecord(storageRecord); + } +// /* +// * Write insertTime data to HDF5. +// */ +// if ( magRecord.getCompInsertTime() != null ) { +// AbstractStorageRecord storageRecord = new LongDataRecord(GeoMagRecord.Comp_Insert_Time, +// magRecord.getDataURI(), (long[]) magRecord.getCompInsertTime(), 1, +// new long[] {magRecord.getCompInsertTime().length}); +// storageRecord.setCorrelationObject(magRecord); +// dataStore.addDataRecord(storageRecord); +// +// } /* - * Write component4 data to HDF5. + * Write K_Index data to HDF5. */ - if ( magRecord.getComp4Data() != null ) { - AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.component4, - magRecord.getDataURI(), (float[]) magRecord.getComp4Data(), 1, - new long[] {magRecord.getComp4Data().length}); + // 3hr + if ( magRecord.getKKIndex() != null ) { + AbstractStorageRecord storageRecord = new IntegerDataRecord(GeoMagRecord.K_Index, + magRecord.getDataURI(), (int[]) magRecord.getKKIndex(), 1, + new long[] {magRecord.getKKIndex().length}); storageRecord.setCorrelationObject(magRecord); - dataStore.addDataRecord(storageRecord); + dataStore.addDataRecord(storageRecord); + } + if ( magRecord.getKKGamma() != null ) { + AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.K_Gamma, + magRecord.getDataURI(), (float[]) magRecord.getKKGamma(), 1, + new long[] {magRecord.getKKGamma().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + + } + + if ( magRecord.getKKReal() != null ) { + AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.K_Real, + magRecord.getDataURI(), (float[]) magRecord.getKKReal(), 1, + new long[] {magRecord.getKKReal().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + + } + + if ( magRecord.getKestIndex() != null ) { + AbstractStorageRecord storageRecord = new IntegerDataRecord(GeoMagRecord.Kest_Index, + magRecord.getDataURI(), (int[]) magRecord.getKestIndex(), 1, + new long[] {magRecord.getKestIndex().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + + } + + if ( magRecord.getKestGamma() != null ) { + AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.Kest_Gamma, + magRecord.getDataURI(), (float[]) magRecord.getKestGamma(), 1, + new long[] {magRecord.getKestGamma().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + + } + + if ( magRecord.getKestReal() != null ) { + AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.Kest_Real, + magRecord.getDataURI(), (float[]) magRecord.getKestReal(), 1, + new long[] {magRecord.getKestReal().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + + } + + if ( magRecord.getHKGamma() != null ) { + AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.KH_Gamma, + magRecord.getDataURI(), (float[]) magRecord.getHKGamma(), 1, + new long[] {magRecord.getHKGamma().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + + } + + if ( magRecord.getHKReal() != null ) { + AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.KH_Real, + magRecord.getDataURI(), (float[]) magRecord.getHKReal(), 1, + new long[] {magRecord.getHKReal().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + + } + + if ( magRecord.getDKGamma() != null ) { + AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.KD_Gamma, + magRecord.getDataURI(), (float[]) magRecord.getDKGamma(), 1, + new long[] {magRecord.getDKGamma().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + + } + + if ( magRecord.getDKReal() != null ) { + AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.KD_Real, + magRecord.getDataURI(), (float[]) magRecord.getDKReal(), 1, + new long[] {magRecord.getDKReal().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + + } + + + + // 1 min +// if (magRecord.getKIdx() != null) { +// AbstractStorageRecord storageRecord = new IntegerDataRecord(GeoMagRecord.KIdx, +// magRecord.getDataURI(), (int[]) magRecord.getKIdx(), 1, +// new long[] {magRecord.getKIdx().length}); +// +// storageRecord.setCorrelationObject(record); +// dataStore.addDataRecord(storageRecord); +// } + + if ( magRecord.getKestIndex1m() != null ) { + AbstractStorageRecord storageRecord = new IntegerDataRecord(GeoMagRecord.Kest_Index_1m, + magRecord.getDataURI(), (int[]) magRecord.getKestIndex1m(), 1, + new long[] {magRecord.getKestIndex1m().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + + } + + if ( magRecord.getKestGamma1m() != null ) { + AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.Kest_Gamma_1m, + magRecord.getDataURI(), (float[]) magRecord.getKestGamma1m(), 1, + new long[] {magRecord.getKestGamma1m().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + + } + + if ( magRecord.getKestReal1m() != null ) { + AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.Kest_Real_1m, + magRecord.getDataURI(), (float[]) magRecord.getKestReal1m(), 1, + new long[] {magRecord.getKestReal1m().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + + } + + if ( magRecord.getHKGamma1m() != null ) { + AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.KH_Gamma_1m, + magRecord.getDataURI(), (float[]) magRecord.getHKGamma1m(), 1, + new long[] {magRecord.getHKGamma1m().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + + } + + if ( magRecord.getHKReal1m() != null ) { + AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.KH_Real_1m, + magRecord.getDataURI(), (float[]) magRecord.getHKReal1m(), 1, + new long[] {magRecord.getHKReal1m().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + + } + + if ( magRecord.getDKGamma1m() != null ) { + AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.KD_Gamma_1m, + magRecord.getDataURI(), (float[]) magRecord.getDKGamma1m(), 1, + new long[] {magRecord.getDKGamma1m().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + + } + + if ( magRecord.getDKReal1m() != null ) { + AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.KD_Real_1m, + magRecord.getDataURI(), (float[]) magRecord.getDKReal1m(), 1, + new long[] {magRecord.getDKReal1m().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + + } + if ( magRecord.getHKIndex1m() != null ) { + AbstractStorageRecord storageRecord = new IntegerDataRecord(GeoMagRecord.KH_Index_1m, + magRecord.getDataURI(), (int[]) magRecord.getHKIndex1m(), 1, + new long[] {magRecord.getHKIndex1m().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + + } + + if ( magRecord.getDKIndex1m() != null ) { + AbstractStorageRecord storageRecord = new IntegerDataRecord(GeoMagRecord.KD_Index_1m, + magRecord.getDataURI(), (int[]) magRecord.getDKIndex1m(), 1, + new long[] {magRecord.getDKIndex1m().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + + } + + if ( magRecord.getHCount() != null ) { + AbstractStorageRecord storageRecord = new IntegerDataRecord(GeoMagRecord.KH_Count, + magRecord.getDataURI(), (int[]) magRecord.getHCount(), 1, + new long[] {magRecord.getHCount().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + + } + + if ( magRecord.getDCount() != null ) { + AbstractStorageRecord storageRecord = new IntegerDataRecord(GeoMagRecord.KD_Count, + magRecord.getDataURI(), (int[]) magRecord.getDCount(), 1, + new long[] {magRecord.getDCount().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + + } + + if ( magRecord.getHDev() != null ) { + AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.KH_Dev, + magRecord.getDataURI(), (float[]) magRecord.getHDev(), 1, + new long[] {magRecord.getHDev().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + + } + + if ( magRecord.getDDev() != null ) { + AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.KD_Dev, + magRecord.getDataURI(), (float[]) magRecord.getDDev(), 1, + new long[] {magRecord.getDDev().length}); + storageRecord.setCorrelationObject(magRecord); + dataStore.addDataRecord(storageRecord); + + } + + if (magRecord.getKs() != null) { + AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.K_s, + magRecord.getDataURI(), (float[]) magRecord.getKs(), 1, + new long[] {magRecord.getKs().length}); + storageRecord.setCorrelationObject(record); + dataStore.addDataRecord(storageRecord); + + } + + if (magRecord.getAest() != null) { + AbstractStorageRecord storageRecord = new IntegerDataRecord(GeoMagRecord.A_est, + magRecord.getDataURI(), (int[]) magRecord.getAest(), 1, + new long[] {magRecord.getAest().length}); + storageRecord.setCorrelationObject(record); + dataStore.addDataRecord(storageRecord); + + } + + if (magRecord.getLastUpdate() != null) { + AbstractStorageRecord storageRecord = new FloatDataRecord(GeoMagRecord.Last_Update_1m, + magRecord.getDataURI(), (float[]) magRecord.getLastUpdate(), 1, + new long[] {magRecord.getLastUpdate().length}); + storageRecord.setCorrelationObject(record); + dataStore.addDataRecord(storageRecord); + + } return dataStore; } /* - * Get GeoMagSource from source ID + * Get GeoMagAvg from ID */ - public GeoMagSource getGeoMagSource(int sourceId) { - return sourceDao.queryById(sourceId); + public GeoMagAvg getGeoMagAvg(Date avgTime) { + return (GeoMagAvg) avgDao.queryById(avgTime); } - public Integer getGeoMagSourceId(String sourceName) throws DataAccessLayerException { - return sourceDao.getSourceId(sourceName); - } +// public Integer getGeoMagSourceId(String sourceName) throws DataAccessLayerException { +// return avgDao.getSourceId(sourceName); +// } - public GeoMagSourceDao getGeoMagSource() { - return sourceDao; + public GeoMagAvgDao getGeoMagAvgDao() { + return avgDao; } - public void setGeoMagSourceDao( - GeoMagSourceDao sourceDao) { - this.sourceDao = sourceDao; + public void setGeoMagAvgDao( + GeoMagAvgDao avgDao) { + this.avgDao = avgDao; } /* - * Get GeoMagSourcePreference from source preference ID + * Get GeoMagK1min from ID */ - public GeoMagSourcePreference getGeoMagSourcePreference(int prefId) { - return sourcePrefDao.queryById(prefId); + public GeoMagK1min getGeoMagDateK1min(int id) { + return k1minDao.queryById(id); } - public GeoMagSourcePreferenceDao getGeoMagSourcePreference() { - return sourcePrefDao; + public GeoMagK1minDao getGeoMagK1minDao() { + return k1minDao; + } + + public void setGeoMagK1minDao( + GeoMagK1minDao k1minDao) { + this.k1minDao = k1minDao; } - public void setGeoMagSourcePreference( - GeoMagSourcePreferenceDao sourcePrefDao) { - this.sourcePrefDao = sourcePrefDao; + /* + * Get GeoMagK1min from ID + */ + public GeoMagK3hr getGeoMagDateK3hr(int id) { + return k3hrDao.queryById(id); } + public GeoMagK3hrDao getGeoMagK3hrDao() { + return k3hrDao; + } + + public void setGeoMagK3hrDao( + GeoMagK3hrDao k3hrDao) { + this.k3hrDao = k3hrDao; + } } \ No newline at end of file diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagK1minDao.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagK1minDao.java new file mode 100644 index 0000000000..7f27e61ff2 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagK1minDao.java @@ -0,0 +1,45 @@ +package gov.noaa.nws.ncep.common.dataplugin.geomag.dao; + +import gov.noaa.nws.ncep.common.dataplugin.geomag.GeoMagK1min; + +import com.raytheon.uf.edex.database.dao.CoreDao; +import com.raytheon.uf.edex.database.dao.DaoConfig; + +/** + * Record implementation for geomag k1minDao. + * + * 
+ * SOFTWARE HISTORY
+ * Date         Ticket#    Engineer           Description
+ * ------------ ---------- ----------------   --------------------------
+ * 08/14/2013   T989       qzhou              Initial creation.
+ *
+ * + * @author qzhou + * @version 1.0 + */ + +public class GeoMagK1minDao extends CoreDao { + /** + * Creates a new GribModelDao + */ + public GeoMagK1minDao() { + super(DaoConfig.forClass(GeoMagK1min.class)); + } + + /** + * Retrieves a GeoMagAvgId based on the given id + * + * @param id + * The given ID number + * @return The GeoMagAvgId + */ + public GeoMagK1min queryById(int id) { + return (GeoMagK1min) super.queryById(id); + } + + public int getAreaId (int id){ + return queryById(id).getId(); + } +} + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagK3hrDao.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagK3hrDao.java new file mode 100644 index 0000000000..9443f3fee3 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagK3hrDao.java @@ -0,0 +1,75 @@ +package gov.noaa.nws.ncep.common.dataplugin.geomag.dao; + + +import java.util.Date; +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Session; +import org.hibernate.criterion.Criterion; +import org.hibernate.criterion.Restrictions; +import org.springframework.orm.hibernate3.HibernateTemplate; +import org.springframework.transaction.TransactionStatus; +import org.springframework.transaction.support.TransactionCallback; + +import gov.noaa.nws.ncep.common.dataplugin.geomag.GeoMagK3hr; + +import com.raytheon.uf.edex.database.dao.CoreDao; +import com.raytheon.uf.edex.database.dao.DaoConfig; + +/** + * Record implementation for geomag k3hrDao. + * + * 
+ * SOFTWARE HISTORY
+ * Date         Ticket#    Engineer           Description
+ * ------------ ---------- ----------------   --------------------------
+ * 08/14/2013   T989       qzhou              Initial creation.
+ *
+ * + * @author qzhou + * @version 1.0 + */ + +public class GeoMagK3hrDao extends CoreDao { + /** + * Creates a new GribModelDao + */ + public GeoMagK3hrDao() { + super(DaoConfig.forClass(GeoMagK3hr.class)); + } + + /** + * Retrieves a GeoMagAvgId based on the given id + * + * @param id + * The given ID number + * @return The GeoMagAvgId + */ + public GeoMagK3hr queryById(int id) { + return (GeoMagK3hr) super.queryById(id); + } + + public int getId (int id){ + return queryById(id).getId(); + } + + @SuppressWarnings("unchecked") + public List getK3hrForStation(final String stationCode, final Date time) { + return (List) txTemplate.execute(new TransactionCallback() { + @Override + public Object doInTransaction(TransactionStatus status) { + HibernateTemplate ht = getHibernateTemplate(); + Session sess = ht.getSessionFactory().getCurrentSession(); + Criteria crit = sess.createCriteria(GeoMagK3hr.class); + Criterion where1 = Restrictions.eq("stationCode", stationCode); + crit.add(where1); + Criterion where2 = Restrictions.ge("k3hrTime", time); + crit.add(where2); + return crit.list(); + } + }); + } +} + + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagSourceDao.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagSourceDao.java deleted file mode 100644 index 69b8729778..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagSourceDao.java +++ /dev/null @@ -1,85 +0,0 @@ -package gov.noaa.nws.ncep.common.dataplugin.geomag.dao; - -/** - * This Data Access Object is used to interact with the database to get geomag source - * ID numbers and source names for a geomag data. - * - * 
- * SOFTWARE HISTORY
- * 
- * Date         Ticket#    	Engineer    Description
- * ------------ ---------- 	----------- --------------------------
- * 04/2013		975			S. Gurung	Initial Creation
- *
- * - * @author sgurung - * @version 1.0 - */ - -import java.util.List; - -import com.raytheon.uf.edex.database.DataAccessLayerException; -import com.raytheon.uf.edex.database.dao.CoreDao; -import com.raytheon.uf.edex.database.dao.DaoConfig; -import com.raytheon.uf.edex.database.query.DatabaseQuery; - -import gov.noaa.nws.ncep.common.dataplugin.geomag.fixed.GeoMagSource; - -public class GeoMagSourceDao extends CoreDao { - - /** - * Constructs a new GeoMagSourceDao - */ - public GeoMagSourceDao() { - super(DaoConfig.forClass(GeoMagSource.class)); - } - - /** - * Retrieves a GeoMagSource based on the given source id - * - * @param sourceId - * The source ID number - * @return The GeoMagSource with the given ID - */ - public GeoMagSource queryById(int sourceId) { - return (GeoMagSource) super.queryById(sourceId); - } - - /** - * Gets the source name given the id - * - * @param sourceId - * The source id - * @return The source name - * @throws DataAccessLayerException - * If errors occur during query - */ - @SuppressWarnings("unchecked") - public String getSourceName (int sourceId){ - return queryById(sourceId).getSourceName(); - } - - /** - * Gets the source id given the name - * - * @param sourceName - * The source name - * @return The source id corresponding to the given name - * @throws DataAccessLayerException - * If errors occur during query - */ - @SuppressWarnings("unchecked") - public Integer getSourceId(String sourceName) - throws DataAccessLayerException { - DatabaseQuery query = new DatabaseQuery(daoClass.getName()); - query.addReturnedField("sourceId"); - query.addQueryParam("sourceName", sourceName); - List sources = (List) this.queryByCriteria(query); - if (sources.isEmpty()) { - return null; - } else { - return sources.get(0); - } - } - -} \ No newline at end of file diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagSourcePreferenceDao.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagSourcePreferenceDao.java deleted file mode 100644 index 1da9ba44de..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagSourcePreferenceDao.java +++ /dev/null @@ -1,49 +0,0 @@ -package gov.noaa.nws.ncep.common.dataplugin.geomag.dao; - -/** - * This Data Access Object is used to interact with the database to get geomag source preference - * ID numbers and source preference order for a geomag data. - * - * 
- * SOFTWARE HISTORY
- * 
- * Date         Ticket#    	Engineer    Description
- * ------------ ---------- 	----------- --------------------------
- * 04/2013		975			S. Gurung	Initial Creation
- *
- * - * @author sgurung - * @version 1.0 - */ - -import com.raytheon.uf.edex.database.dao.CoreDao; -import com.raytheon.uf.edex.database.dao.DaoConfig; - -import gov.noaa.nws.ncep.common.dataplugin.geomag.fixed.GeoMagSourcePreference; - -public class GeoMagSourcePreferenceDao extends CoreDao { - - /** - * Constructs a new GeoMagSourcePreferenceDao - */ - public GeoMagSourcePreferenceDao() { - super(DaoConfig.forClass(GeoMagSourcePreference.class)); - } - - /** - * Retrieves a GeoMag source preference based on the given source preference id - * - * @param preferenceId - * The source preference ID number - * @return The GeoMagSource - */ - public GeoMagSourcePreference queryById(int preferenceId) { - return (GeoMagSourcePreference) super.queryById(preferenceId); - } - - public String getSourcePreferenceDesc (int preferenceId){ - return queryById(preferenceId).getDescription(); - } - - -} \ No newline at end of file diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/fixed/GeoMagSource.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/fixed/GeoMagSource.java deleted file mode 100644 index ec02f78f17..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/fixed/GeoMagSource.java +++ /dev/null @@ -1,112 +0,0 @@ -package gov.noaa.nws.ncep.common.dataplugin.geomag.fixed; - -import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; -import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject; -import com.raytheon.uf.common.serialization.ISerializableObject; -/** - * This java class is to create GEOMAG sources. - * - * 
- * SOFTWARE HISTORY
- * 
- * Date         Ticket#    	Engineer    Description
- * ------------ ---------- 	----------- --------------------------
- * 04/2013		975			S. Gurung	Initial Creation
- * 
- *
- * - * @author sgurung - * @version 1.0 - */ - -@Entity -@Table(name = "geomag_sources", uniqueConstraints=@javax.persistence.UniqueConstraint(columnNames="sourceName")) - -public class GeoMagSource extends PersistableDataObject implements - Serializable, ISerializableObject { - - private static final long serialVersionUID = 1L; - - /** The source id number */ - @Id - private int sourceId; - - /** The source preference id number */ - @Column(length = 16) - private int preferenceId; - - /** The source description */ - @Column(length = 128) - private String sourceDesc; - - /** The source name */ - @Column(length = 64) - private String sourceName; - - /** - * Constructs and empty GeoMagSource - */ - public GeoMagSource() { - } - - /** - * Constructs a new GeoMagSource - * - * @param sourceId - * The source ID number - * @param sourceName - * The source name - * @param preferenceId - * The preference ID number - * @param sourceDesc - * The source description - */ - public GeoMagSource (int sourceId, int preferenceId, String sourceName, String sourceDesc) { - this.sourceId = sourceId; - this.preferenceId = preferenceId; - this.sourceName = sourceName; - this.sourceDesc = sourceDesc; - } - - public int getSourceId() { - return sourceId; - } - - public void setSourceId(int sourceId) { - this.sourceId = sourceId; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public int getPreferenceId() { - return preferenceId; - } - - public void setPreferenceId(int preferenceId) { - this.preferenceId = preferenceId; - } - - public String getSourceDesc() { - return sourceDesc; - } - - public void setSourceDesc(String sourceDesc) { - this.sourceDesc = sourceDesc; - } - - public String toString() { - return sourceName; - } -} diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/fixed/GeoMagSourcePreference.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/fixed/GeoMagSourcePreference.java deleted file mode 100644 index 60837409f3..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/fixed/GeoMagSourcePreference.java +++ /dev/null @@ -1,94 +0,0 @@ -package gov.noaa.nws.ncep.common.dataplugin.geomag.fixed; - -import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; -import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject; -import com.raytheon.uf.common.serialization.ISerializableObject; -/** - * This java class is to create GEOMAG source preferences. - * - * 
- * SOFTWARE HISTORY
- * 
- * Date         Ticket#    	Engineer    Description
- * ------------ ---------- 	----------- --------------------------
- * 04/2013		975			S. Gurung	Initial Creation
- * 
- *
- * - * @author sgurung - * @version 1.0 - */ - -@Entity -@Table(name = "geomag_source_preferences") - -public class GeoMagSourcePreference extends PersistableDataObject implements - Serializable, ISerializableObject { - - private static final long serialVersionUID = 1L; - - /** The source id number */ - @Id - private int preferenceId; - - /** The source name */ - @Column(length = 128) - private String description; - - /** The preference order number */ - @Column(length = 128) - private int preferenceOrder; - - /** - * Constructs and empty GeoMagSourcePreference - */ - public GeoMagSourcePreference() { - } - - /** - * Constructs a new GeoMagSourcePreference - * - * @param preferenceId - * The area file ID number - * @param description - * The area name - */ - public GeoMagSourcePreference (int sourceId, String sourceName) { - this.preferenceId = sourceId; - this.description = sourceName; - } - - public int getSourceId() { - return preferenceId; - } - - public void setSourceId(int sourceId) { - this.preferenceId = sourceId; - } - - public String getDescription() { - return description; - } - - public void setDescription(String desc) { - this.description = desc; - } - public int getPreferenceOrder() { - return preferenceOrder; - } - - public void setPreferenceOrder(int preferenceOrder) { - this.preferenceOrder = preferenceOrder; - } - - public String toString() { - return description; - } - -} diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/GeoMagSource.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/GeoMagSource.java new file mode 100644 index 0000000000..e17e293c61 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/GeoMagSource.java @@ -0,0 +1,51 @@ +package gov.noaa.nws.ncep.common.dataplugin.geomag.table; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +/** + * Defines a magnetometer station. + * + *
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer     Description
+ * ------------ ---------- ----------- --------------------------
+ * 07/17/2013   975        qzhou       Initiate for reading source attributes
+ *
+ * + * @author qzhou + * @version 1 + */ +@XmlRootElement(name = "source") +@XmlAccessorType(XmlAccessType.NONE) +@XmlType(name = "") +public class GeoMagSource { + + @XmlAttribute + private String name; + + @XmlAttribute + private int priority; + + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getPriority() { + return priority; + } + + public void setPriority(int priority) { + this.priority = priority; + } + +} + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/GeoMagStation.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/GeoMagStation.java index 434fb649c1..20853c8ebb 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/GeoMagStation.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/GeoMagStation.java @@ -4,9 +4,7 @@ import java.util.ArrayList; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; @@ -21,6 +19,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * 03/29/2013 975 sgurung Initial Creation + * 07/17/2013 975 qzhou Changed source type for reading source attributes * * * @author sgurung @@ -48,8 +47,7 @@ public class GeoMagStation { * Data sources for the station */ @XmlElement - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - protected String[] source; + protected ArrayList source; /** * Indicates whether the station should be included @@ -65,6 +63,13 @@ public class GeoMagStation { @XmlElement protected Boolean kpStation; + /** + * Indicates whether the station has a header. + * Same station data may have or have no header. + */ + @XmlElement + protected String hasHeader; + /** * Data order (e.g. HDZF or XYZF) */ @@ -84,8 +89,10 @@ public class GeoMagStation { @XmlElement protected RawDataFormat rawDataFormat; - public GeoMagStation() { + + public GeoMagStation() { + source = new ArrayList(); } /** @@ -124,7 +131,7 @@ public class GeoMagStation { * Gets the stationCode of this station * @return the stationCode */ - public String[] getSource() { + public ArrayList getSource() { return source; } @@ -132,7 +139,7 @@ public class GeoMagStation { * Sets the source of this station * @param source the source to set */ - public void setSource(String[] source) { + public void setSource(ArrayList source) { this.source = source; } @@ -170,6 +177,22 @@ public class GeoMagStation { this.kpStation = kpStation; } + /** + * Gets the header true or false + * @return the hasHeader + */ + public String getHasHeader() { + return hasHeader; + } + + /** + * Sets the hasHeader value of this station + * @param hasHeader the hasHeader to set + */ + public void setHasHeader(String hasHeader) { + this.hasHeader = hasHeader; + } + /** * Gets the dataOrder of this station * @return the dataOrder @@ -217,4 +240,5 @@ public class GeoMagStation { public void setRawDataFormat(RawDataFormat rawDataFormat) { this.rawDataFormat = rawDataFormat; } + } diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/KFitTime.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/KFitTime.java new file mode 100644 index 0000000000..6e282e2c75 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/KFitTime.java @@ -0,0 +1,74 @@ +package gov.noaa.nws.ncep.common.dataplugin.geomag.table; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +/* + * The FitTime. + * + * 
+ * SOFTWARE HISTORY
+ *                   
+ * ate          Ticket#     Engineer   Description
+ * -----------  ----------  ---------- --------------------------
+ * 05/14/2013   #989        qzhou      Initial Creation
+ *
+ * + * @author qzhou + * @version 1 + */ + +@XmlRootElement(name = "fitTime") +@XmlAccessorType(XmlAccessType.NONE) +@XmlType(name = "") +public class KFitTime { + + @XmlAttribute + private String key; + + @XmlAttribute + private float coeffA; + + @XmlAttribute + private float coeffB; + + @XmlAttribute + private float coeffW; + + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public float getCoeffA() { + return coeffA; + } + + public void setCoeffA(float coeffA) { + this.coeffA = coeffA; + } + + public float getCoeffB() { + return coeffB; + } + + public void setCoeffB(float coeffB) { + this.coeffB = coeffB; + } + + public float getCoeffW() { + return coeffW; + } + + public void setCoeffW(float coeffW) { + this.coeffW = coeffW; + } + +} diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/KStationCoeffTableReader.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/KStationCoeffTableReader.java new file mode 100644 index 0000000000..80cdd4886b --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/KStationCoeffTableReader.java @@ -0,0 +1,61 @@ +package gov.noaa.nws.ncep.common.dataplugin.geomag.table; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.util.List; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Unmarshaller; +/* + * The KStationCoeffTable Reader. + * + * 
+ * SOFTWARE HISTORY
+ *                   
+ * ate          Ticket#     Engineer   Description
+ * -----------  ----------  ---------- --------------------------
+ * 05/14/2013   #989        qzhou      Initial Creation
+ *
+ * + * @author qzhou + * @version 1 + */ +public class KStationCoeffTableReader { + + private String xmlFile = null; + + public KStationCoeffTableReader(String file) { + xmlFile = file; + } + + public List getStationList() throws JAXBException{ + + JAXBContext context = JAXBContext.newInstance(KStationCoefficients.class); + //PACKAGE); + Unmarshaller unmarshaller = context.createUnmarshaller(); + KStationCoefficients sfstnlist = null; + + File file = new File(xmlFile); + + try { + if (file.exists()) { + sfstnlist = (KStationCoefficients)unmarshaller.unmarshal( + new FileReader(xmlFile)); + List listOfItems = sfstnlist.getKStationCoefficients(); + + return listOfItems; + } + } catch (FileNotFoundException e) { + + e.printStackTrace(); + } + + return null; + + + } +} + + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/KStationCoefficient.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/KStationCoefficient.java new file mode 100644 index 0000000000..084497f17c --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/KStationCoefficient.java @@ -0,0 +1,151 @@ +package gov.noaa.nws.ncep.common.dataplugin.geomag.table; + +import java.util.ArrayList; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +/* + * The KStationCoefficient. + * + * 
+ * SOFTWARE HISTORY
+ *                   
+ * ate          Ticket#     Engineer   Description
+ * -----------  ----------  ---------- --------------------------
+ * 05/14/2013   #989        qzhou      Initial Creation
+ *
+ * + * @author qzhou + * @version 1 + */ + +@XmlRootElement(name = "kStationCoefficient") +@XmlAccessorType(XmlAccessType.NONE) +//@XmlType(name = "") +public class KStationCoefficient { + + /** + * Station Code + */ + @XmlElement + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + private String stationCode; + /** + * provider + */ + @XmlElement + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + private String provider; + /** + * k9Limit + */ + @XmlElement + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + private String k9Limit; + /** + * longitude + */ + @XmlElement + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + private String longitude; + /** + * fitTime + */ + @XmlElement + protected ArrayList fitTime; + /** + * @XmlElement + */ + @XmlElement + protected ArrayList ksThree; + + /** + * Default constructor. + */ + public KStationCoefficient() { + fitTime = new ArrayList(); + ksThree = new ArrayList(); + } + + /** + * @return the stationCode + */ + public String getStationCode() { + return stationCode; + } + + /** + * @param stationCode: the stationCode to set + */ + public void setStationCode(String stationCode) { + this.stationCode = stationCode; + } + + /** + * @return the provider + */ + public String getProvider() { + return provider; + } + + /** + * @param provider: the provider to set + */ + public void setProvider(String provider) { + this.provider = provider; + } + + /** + * @return the k9Limit + */ + public String getK9Limit() { + return k9Limit; + } + + /** + * @param k9Limit: the k9Limit to set + */ + public void setK9Limit(String k9Limit) { + this.k9Limit = k9Limit; + } + + /** + * @return the longitude + */ + public String getLongitude() { + return longitude; + } + + /** + * @param longitude: the longitude to set + */ + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + /** + * @return the fitTime + */ + + public ArrayList getKFitTime() { + return fitTime; + } + + /** + * @return the fitTime + */ + + public ArrayList getKsThree() { + return ksThree; + } + public void setKsThree(ArrayList ksThree) { + this.ksThree = ksThree; + } +} + + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/KStationCoefficients.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/KStationCoefficients.java new file mode 100644 index 0000000000..dbee87ee0d --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/KStationCoefficients.java @@ -0,0 +1,98 @@ +package gov.noaa.nws.ncep.common.dataplugin.geomag.table; + +import java.io.File; +import java.io.InputStream; +import java.util.ArrayList; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Unmarshaller; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +import com.raytheon.uf.common.serialization.ISerializableObject; + +/* + * The KStationCoefficients. + * + * 
+ * SOFTWARE HISTORY
+ *                   
+ * ate          Ticket#     Engineer   Description
+ * -----------  ----------  ---------- --------------------------
+ * 05/14/2013   #989        qzhou      Initial Creation
+ *
+ * + * @author qzhou + * @version 1 + */ + +@XmlRootElement(name = "kStationCoefficients") +@XmlAccessorType(XmlAccessType.NONE) +public class KStationCoefficients implements ISerializableObject{ + + /** + * A list of the available KStationCoefficients + */ + @XmlElement(name="kStationCoefficient") + private ArrayList stationList; + + /** + * Default constructor. + */ + public KStationCoefficients() { + stationList = new ArrayList(); + } + + /** + * Gets the list of KStationCoefficients + * @return the stationList + */ + public ArrayList getKStationCoefficients() { + return stationList; + } + + /** + * + * @param file + * @return + * @throws JAXBException + */ + public static KStationCoefficients fromFile(File file) throws JAXBException { + KStationCoefficients gml = null; + + JAXBContext ctx = JAXBContext.newInstance(KStationCoefficients.class); + if (ctx != null) { + Unmarshaller um = ctx.createUnmarshaller(); + if (um != null) { + gml = (KStationCoefficients) um.unmarshal(file); + } + } + //System.out.println("*****fromFile"+gml.getK9Limit()); + return gml; + } + + /** + * + * @param is + * @return + * @throws JAXBException + */ + public static KStationCoefficients fromStream(InputStream is) + throws JAXBException { + KStationCoefficients gml = null; + + JAXBContext ctx = JAXBContext.newInstance(KStationCoefficients.class); + if (ctx != null) { + Unmarshaller um = ctx.createUnmarshaller(); + if (um != null) { + gml = (KStationCoefficients) um.unmarshal(is); + } + } + + return gml; + } +} + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/KsThree.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/KsThree.java new file mode 100644 index 0000000000..0545ab14ff --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/table/KsThree.java @@ -0,0 +1,148 @@ +package gov.noaa.nws.ncep.common.dataplugin.geomag.table; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +/* + * The KStationCoeffTable Reader. + * + * 
+ * SOFTWARE HISTORY
+ *                   
+ * ate          Ticket#     Engineer   Description
+ * -----------  ----------  ---------- --------------------------
+ * 05/14/2013   #989        qzhou      Initial Creation
+ *
+ * + * @author qzhou + * @version 1 + */ +@XmlRootElement(name = "ksThree") +@XmlAccessorType(XmlAccessType.NONE) +@XmlType(name = "") +public class KsThree { + + @XmlAttribute + private String period; + + @XmlAttribute + private String season; + + @XmlAttribute + private int k0; + + @XmlAttribute + private int k1; + + @XmlAttribute + private int k2; + + @XmlAttribute + private int k3; + + @XmlAttribute + private int k4; + + @XmlAttribute + private int k5; + + @XmlAttribute + private int k6; + + @XmlAttribute + private int k7; + + @XmlAttribute + private int k8; + + @XmlAttribute + private int k9; + + + public String getSeason() { + return season; + } + public void setSeason(String season) { + this.season = season; + } + + public String getPeriod() { + return period; + } + public void setPeriod(String period) { + this.period = period; + } + + public int getK0() { + return k0; + } + public void setK0(int k0) { + this.k0 = k0; + } + + public int getK1() { + return k1; + } + public void setK1(int k1) { + this.k1 = k1; + } + + public int getK2() { + return k2; + } + public void setK2(int k2) { + this.k2 = k2; + } + + public int getK3() { + return k3; + } + public void setK3(int k3) { + this.k3 = k3; + } + + public int getK4() { + return k4; + } + public void setK4(int k4) { + this.k4 = k4; + } + + public int getK5() { + return k5; + } + public void setK5(int k5) { + this.k5 = k5; + } + + public int getK6() { + return k6; + } + public void setK6(int k6) { + this.k6 = k6; + } + + public int getK7() { + return k7; + } + public void setK7(int k7) { + this.k7 = k7; + } + + public int getK8() { + return k8; + } + public void setK8(int k8) { + this.k8 = k8; + } + + public int getK9() { + return k9; + } + public void setK9(int k9) { + this.k9 = k9; + } +} + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/util/GeoMagStationLookup.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/util/GeoMagStationLookup.java index 6209922124..3539a8f8a1 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/util/GeoMagStationLookup.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/util/GeoMagStationLookup.java @@ -27,7 +27,7 @@ import com.raytheon.uf.common.localization.PathManagerFactory; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * 04/2013 975 sgurung Initial creation - * + * 07/2013 975 qzhou Change Map stnsByCode to * * * @author sgurung @@ -43,11 +43,10 @@ public class GeoMagStationLookup { private static GeoMagStationLookup instance; /** A map of the stations. The key is the station code of the station */ - private Map stnsByCode; + private Map> stnsByCode; public static synchronized GeoMagStationLookup getInstance() { if (instance == null) { - // System.out.println("in reloading geoMagStations.xml ...."); instance = new GeoMagStationLookup(); } return instance; @@ -64,7 +63,7 @@ public class GeoMagStationLookup { } private GeoMagStationLookup() { - stnsByCode = new HashMap(); + stnsByCode = new HashMap>(); try { initStationList(); } catch (GeoMagException e) { @@ -72,11 +71,26 @@ public class GeoMagStationLookup { } } - public GeoMagStation getStationByCode(String stnCode) { - return stnsByCode.get(stnCode); + public GeoMagStation getStationByCode(String stnCode, boolean hasHeader) { + ArrayList stationList = null; + + stationList = stnsByCode.get(stnCode); + + int i = 0; + for (i = 0; i getStationsByCodeMap() { + return stationList.get(i); + } + + public Map> getStationsByCodeMap() { return stnsByCode; } @@ -110,15 +124,28 @@ public class GeoMagStationLookup { if (stnsFile.exists()) { geoMagStationsTbl = new GeoMagStationTableReader(stnsFile.getPath()); } + // if site version exists, use it instead /*if (siteStnsFile.exists()) { geoMagStationsTbl = new GeoMagStationTableReader(stnsFile.getPath()); }*/ List list = (geoMagStationsTbl!=null)?geoMagStationsTbl.getStationList():new ArrayList(); - + //System.out.println("**list "+list.size()); for(GeoMagStation station : list){ - stnsByCode.put(station.getStationCode(), station); + ArrayList stationList = null; + if (stnsByCode.containsKey(station.getStationCode())) { + stationList = stnsByCode.get(station.getStationCode()); + if(stationList==null) + stationList=new ArrayList(); + + stationList.add(station); + + }else{ + stationList=new ArrayList(); + stationList.add(station); + } + stnsByCode.put(station.getStationCode(), stationList);//station); } } catch (Exception e) { throw new GeoMagException("Unable to unmarshal ncep geomag stations file"); diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/util/KStationCoefficientLookup.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/util/KStationCoefficientLookup.java new file mode 100644 index 0000000000..9f73fc4024 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/util/KStationCoefficientLookup.java @@ -0,0 +1,132 @@ +package gov.noaa.nws.ncep.common.dataplugin.geomag.util; + +import gov.noaa.nws.ncep.common.dataplugin.geomag.exception.GeoMagException; +import gov.noaa.nws.ncep.common.dataplugin.geomag.table.KStationCoeffTableReader; +import gov.noaa.nws.ncep.common.dataplugin.geomag.table.KStationCoefficient; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.xml.bind.JAXBException; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import com.raytheon.uf.common.localization.IPathManager; +import com.raytheon.uf.common.localization.LocalizationContext; +import com.raytheon.uf.common.localization.PathManagerFactory; + +/* + * The KStationCoefficient table Lookup. + * + * 
+ * SOFTWARE HISTORY
+ *                   
+ * ate          Ticket#     Engineer   Description
+ * -----------  ----------  ---------- --------------------------
+ * 05/14/2013   #989        qzhou      Initial Creation
+ *
+ * + * @author qzhou + * @version 1 + */ + +public class KStationCoefficientLookup { + + /** The logger */ + protected transient Log logger = LogFactory.getLog(getClass()); + + /** The singleton instance of GeoMagStationLookup **/ + private static KStationCoefficientLookup instance; + + /** A map of the stations. The key is the station code of the station */ + private Map coeff; + + public static synchronized KStationCoefficientLookup getInstance() { + if (instance == null) { + + try { + instance = new KStationCoefficientLookup(); + } catch (JAXBException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + return instance; + } + + /** + * If file has been modified, then reload it again + * + * @return + * @return + */ + public static void ReloadInstance() { + instance = null; + } + + private KStationCoefficientLookup() throws JAXBException { + coeff = new HashMap(); + try { + initStationList(); + } catch (GeoMagException e) { + logger.error("Unable to initialize K stations list!", e); + } + } + + public KStationCoefficient getStationByCode(String stnCode) { + return coeff.get(stnCode); + } + + public Map getStationsByCodeMap() { + return coeff; + } + + private void initStationList() throws GeoMagException, JAXBException { + IPathManager pathMgr = PathManagerFactory.getPathManager(); + + LocalizationContext commonStaticBase = pathMgr.getContext( + LocalizationContext.LocalizationType.COMMON_STATIC, + LocalizationContext.LocalizationLevel.BASE); + + /*LocalizationContext commonStaticSite = pathMgr.getContext( + LocalizationContext.LocalizationType.COMMON_STATIC, + LocalizationContext.LocalizationLevel.SITE);*/ + + String path = ""; + //String sitePath = ""; + try { + path = pathMgr.getFile(commonStaticBase, + "ncep" + File.separator + "geomag" + File.separator + "kStandardLookup.xml") + .getCanonicalPath(); + //sitePath = pathMgr.getFile(commonStaticSite, NcPathConstants.GEOMAG_STNS_TBL).getCanonicalPath(); + } catch (IOException e) { + logger.error("Error reading K stations coefficient table. ", e); + } + + File stnsFile = new File(path); + + //File siteStnsFile = new File(sitePath); + KStationCoeffTableReader kStationCoeffTbl = null; + + if (stnsFile.exists()) { + kStationCoeffTbl = new KStationCoeffTableReader(stnsFile.getPath()); + } + // if site version exists, use it instead + /*if (siteStnsFile.exists()) { + geoMagStationsTbl = new GeoMagStationTableReader(stnsFile.getPath()); + }*/ + + List list = (kStationCoeffTbl!=null)? kStationCoeffTbl.getStationList() : new ArrayList(); + + for(KStationCoefficient station : list){ + coeff.put(station.getStationCode(), station); + //System.out.println("****look2 "+station.getStationCode()); + } + } +} + diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.ffa/.classpath b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/.classpath similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.rsc.ffa/.classpath rename to ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/.classpath diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.wcn/.project b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/.project similarity index 74% rename from ncep/gov.noaa.nws.ncep.viz.rsc.wcn/.project rename to ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/.project index 64b48636e0..530b44f0b5 100644 --- a/ncep/gov.noaa.nws.ncep.viz.rsc.wcn/.project +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/.project @@ -1,10 +1,15 @@ - gov.noaa.nws.ncep.viz.rsc.wcn + gov.noaa.nws.ncep.common.dataplugin.gpd + + org.python.pydev.PyDevBuilder + + + org.eclipse.jdt.core.javabuilder @@ -24,5 +29,6 @@ org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + org.python.pydev.pythonNature diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/.pydevproject b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/.pydevproject new file mode 100644 index 0000000000..a9cca037b3 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/.pydevproject @@ -0,0 +1,7 @@ + + + + +Default +python 2.7 + diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.wtch/.settings/org.eclipse.jdt.core.prefs b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/.settings/org.eclipse.jdt.core.prefs similarity index 92% rename from ncep/gov.noaa.nws.ncep.viz.rsc.wtch/.settings/org.eclipse.jdt.core.prefs rename to ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/.settings/org.eclipse.jdt.core.prefs index 08350b0fab..392c5c4b2d 100644 --- a/ncep/gov.noaa.nws.ncep.viz.rsc.wtch/.settings/org.eclipse.jdt.core.prefs +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Thu Oct 13 13:59:08 EDT 2011 +#Fri Mar 29 15:10:04 EDT 2013 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..a47e6be5ba --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/META-INF/MANIFEST.MF @@ -0,0 +1,22 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Gpd Plug-in +Bundle-SymbolicName: gov.noaa.nws.ncep.common.dataplugin.gpd +Bundle-Version: 1.0.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174", + javax.persistence;bundle-version="1.0.0", + com.raytheon.uf.common.pointdata;bundle-version="1.12.1174", + com.raytheon.uf.common.parameter;bundle-version="1.0.0", + com.raytheon.uf.common.dataplugin.level;bundle-version="1.12.1174", + com.raytheon.uf.common.status;bundle-version="1.12.1174" +Import-Package: com.raytheon.edex.uengine.tasks.query, + com.raytheon.uf.common.pointdata, + com.raytheon.uf.common.serialization.comm, + com.raytheon.uf.edex.pointdata, + org.apache.commons.logging +Export-Package: gov.noaa.nws.ncep.common.dataplugin.gpd, + gov.noaa.nws.ncep.common.dataplugin.gpd.dao, + gov.noaa.nws.ncep.common.dataplugin.gpd.product, + gov.noaa.nws.ncep.common.dataplugin.gpd.query +Bundle-Vendor: SIB diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject new file mode 100644 index 0000000000..c0342e1758 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject @@ -0,0 +1,8 @@ +gov.noaa.nws.ncep.common.dataplugin.gpd.GenericPointDataRecord +gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataProductInfo +gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataLevel +gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataParameter +gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataProductContainer +gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataStationProduct +gov.noaa.nws.ncep.common.dataplugin.gpd.query.GenericPointDataReqMsg + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObjectForPy b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObjectForPy new file mode 100644 index 0000000000..e2eebe4004 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObjectForPy @@ -0,0 +1,7 @@ +gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataProductInfo +gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataLevel +gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataParameter +gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataProductContainer +gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataStationProduct +gov.noaa.nws.ncep.common.dataplugin.gpd.query.GenericPointDataReqMsg + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/GenericPointDataLevel.py b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/GenericPointDataLevel.py new file mode 100644 index 0000000000..7bc23f3ee7 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/GenericPointDataLevel.py @@ -0,0 +1,21 @@ + +# File auto-generated against equivalent DynamicSerialize Java class + +class GenericPointDataLevel(object): + + def __init__(self): + self.levelValue = None + self.gpdParameters = None + + def getLevelValue(self): + return self.levelValue + + def setLevelValue(self, levelValue): + self.levelValue = levelValue + + def getGpdParameters(self): + return self.gpdParameters + + def setGpdParameters(self, gpdParameters): + self.gpdParameters = gpdParameters + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/GenericPointDataParameter.py b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/GenericPointDataParameter.py new file mode 100644 index 0000000000..9e34d074fe --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/GenericPointDataParameter.py @@ -0,0 +1,21 @@ + +# File auto-generated against equivalent DynamicSerialize Java class + +class GenericPointDataParameter(object): + + def __init__(self): + self.name = None + self.value = None + + def getName(self): + return self.name + + def setName(self, name): + self.name = name + + def getValue(self): + return self.value + + def setValue(self, value): + self.value = value + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/GenericPointDataProductContainer.py b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/GenericPointDataProductContainer.py new file mode 100644 index 0000000000..12b3651a6f --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/GenericPointDataProductContainer.py @@ -0,0 +1,35 @@ + +# File auto-generated against equivalent DynamicSerialize Java class + +class GenericPointDataProductContainer(object): + + def __init__(self): + self.refTime = None + self.productInfo = None + self.stnProdLst = None + self.productCorrectionVersion = None + + def getRefTime(self): + return self.refTime + + def setRefTime(self, refTime): + self.refTime = refTime + + def getProductInfo(self): + return self.productInfo + + def setProductInfo(self, productInfo): + self.productInfo = productInfo + + def getStnProdLst(self): + return self.stnProdLst + + def setStnProdLst(self, stnProdLst): + self.stnProdLst = stnProdLst + + def getProductCorrectionVersion(self): + return self.productCorrectionVersion + + def setProductCorrectionVersion(self, productCorrectionVersion): + self.productCorrectionVersion = productCorrectionVersion + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/GenericPointDataProductInfo.py b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/GenericPointDataProductInfo.py new file mode 100644 index 0000000000..4112ac16cb --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/GenericPointDataProductInfo.py @@ -0,0 +1,42 @@ + +# File auto-generated against equivalent DynamicSerialize Java class + +class GenericPointDataProductInfo(object): + + def __init__(self): + self.name = None + self.maxNumberOfLevel = None + self.masterLevel = None + self.parameterLst = None + self.identifier = None + + def getName(self): + return self.name + + def setName(self, name): + self.name = name + + def getMaxNumberOfLevel(self): + return self.maxNumberOfLevel + + def setMaxNumberOfLevel(self, maxNumberOfLevel): + self.maxNumberOfLevel = maxNumberOfLevel + + def getMasterLevel(self): + return self.masterLevel + + def setMasterLevel(self, masterLevel): + self.masterLevel = masterLevel + + def getParameterLst(self): + return self.parameterLst + + def setParameterLst(self, parameterLst): + self.parameterLst = parameterLst + + def getIdentifier(self): + return self.identifier + + def setIdentifier(self, identifier): + self.identifier = identifier + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/GenericPointDataStationProduct.py b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/GenericPointDataStationProduct.py new file mode 100644 index 0000000000..869711a87b --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/GenericPointDataStationProduct.py @@ -0,0 +1,63 @@ + +# File auto-generated against equivalent DynamicSerialize Java class + +class GenericPointDataStationProduct(object): + + def __init__(self): + self.location = None + self.slat = None + self.slon = None + self.numLevel = None + self.productVersion = None + self.productName = None + self.refTime = None + self.levelLst = None + + def getLocation(self): + return self.location + + def setLocation(self, location): + self.location = location + + def getSlat(self): + return self.slat + + def setSlat(self, slat): + self.slat = slat + + def getSlon(self): + return self.slon + + def setSlon(self, slon): + self.slon = slon + + def getNumLevel(self): + return self.numLevel + + def setNumLevel(self, numLevel): + self.numLevel = numLevel + + def getProductVersion(self): + return self.productVersion + + def setProductVersion(self, productVersion): + self.productVersion = productVersion + + def getProductName(self): + return self.productName + + def setProductName(self, productName): + self.productName = productName + + def getRefTime(self): + return self.refTime + + def setRefTime(self, refTime): + self.refTime = refTime + + def getLevelLst(self): + return self.levelLst + + def setLevelLst(self, levelLst): + self.levelLst = levelLst + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/NY20130704190000.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/NY20130704190000.xml new file mode 100644 index 0000000000..0af98347c9 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/NY20130704190000.xml @@ -0,0 +1,246 @@ + + + 2013-07-20T01:50:00Z + + + + EARTHQUAKE0 + wave speed 0 + Knot + + + EARTHQUAKE4 + wave speed 1 + Knot + + + EARTHQUAKE2 + wave speed 2 + Knot + + + EARTHQUAKE3 + wave speed 3 + Knot + + + TSUNAMI3 + wave speed 4 + Knot + + + TSUNAMI4 + wave speed 5 + Knot + + + TSUNAMI5 + wave speed 6 + Knot + + + TSUNAMI6 + wave speed 7 + Knot + + + TSUNAMI8 + wave speed 8 + Knot + + + EARTHQUAKE1 + wave speed 9 + Knot + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/__init__.py b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/__init__.py new file mode 100644 index 0000000000..64dc1c5759 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/__init__.py @@ -0,0 +1,17 @@ + +# File auto-generated by PythonFileGenerator + +__all__ = [ + 'GenericPointDataLevel', + 'GenericPointDataParameter', + 'GenericPointDataProductContainer', + 'GenericPointDataProductInfo', + 'GenericPointDataStationProduct' + ] + +from GenericPointDataLevel import GenericPointDataLevel +from GenericPointDataParameter import GenericPointDataParameter +from GenericPointDataProductContainer import GenericPointDataProductContainer +from GenericPointDataStationProduct import GenericPointDataStationProduct +from GenericPointDataProductInfo import GenericPointDataProductInfo + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/productExample.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/productExample.xml new file mode 100644 index 0000000000..e7bcb3bdb4 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/productExample.xml @@ -0,0 +1,309 @@ + + + 2013-07-25T05:50:00Z + + + + EARTHQUAKE0 + wave speed 0 + Knot + + + EARTHQUAKE4 + wave speed 1 + Knot + + + EARTHQUAKE2 + wave speed 2 + Knot + + + EARTHQUAKE3 + wave speed 3 + Knot + + + TSUNAMI3 + wave speed 4 + Knot + + + TSUNAMI4 + wave speed 5 + Knot + + + TSUNAMI5 + wave speed 6 + Knot + + + TSUNAMI6 + wave speed 7 + Knot + + + TSUNAMI8 + wave speed 8 + Knot + + + EARTHQUAKE1 + wave speed 9 + Knot + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/sfc_all_parms_single_station_00-12z.sfc b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/sfc_all_parms_single_station_00-12z.sfc new file mode 100644 index 0000000000..0c99ae7f89 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/sfc_all_parms_single_station_00-12z.sfc @@ -0,0 +1,76 @@ + PARM = PMSL;ALTI;TMPC;DWPC;SKNT;DRCT;GUST;WNUM;CHC1;CHC2;CHC3;VSBY;P03D;P03I; + MSUN;SNOW;WEQS;P24I;TDXC;TDNC;P03C;CTYL;CTYM;CTYH;P06I;T6XC;T6NC;CEIL; + P01I;SNEW + + STN YYMMDD/HHMM PMSL ALTI TMPC DWPC SKNT DRCT + GUST WNUM CHC1 CHC2 CHC3 VSBY + P03D P03I MSUN SNOW WEQS P24I + TDXC TDNC P03C CTYL CTYM CTYH + P06I T6XC T6NC CEIL P01I SNEW + DCA 130724/0000 1005.00 29.68 29.40 17.80 8.00 330.00 + -9999.00 -9999.00 556.00 2502.00 -9999.00 10.00 + 3002.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.20 -9999.00 -9999.00 -9999.00 + -9999.00 31.70 29.40 -9999.00 -9999.00 -9999.00 + DCA 130724/0100 1005.40 29.69 28.90 17.80 6.00 330.00 + -9999.00 -9999.00 1506.00 2502.00 -9999.00 10.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + DCA 130724/0200 1005.60 29.70 28.30 18.30 4.00 240.00 + -9999.00 -9999.00 1502.00 2503.00 -9999.00 10.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 250.00 -9999.00 -9999.00 + DCA 130724/0300 1005.60 29.70 27.80 18.30 5.00 230.00 + -9999.00 -9999.00 606.00 1502.00 2503.00 10.00 + 1006.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.60 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 250.00 -9999.00 -9999.00 + DCA 130724/0400 1006.20 29.72 26.70 18.90 6.00 210.00 + -9999.00 -9999.00 1506.00 2503.00 -9999.00 10.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 250.00 -9999.00 -9999.00 + DCA 130724/0500 1006.40 29.72 25.60 19.40 6.00 200.00 + -9999.00 -9999.00 1506.00 2502.00 -9999.00 10.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 31.70 24.40 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + DCA 130724/0600 1005.40 29.69 25.60 19.40 3.00 220.00 + -9999.00 -9999.00 1506.00 2502.00 -9999.00 10.00 + 8002.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -0.20 -9999.00 -9999.00 -9999.00 + -9999.00 29.40 25.00 -9999.00 -9999.00 -9999.00 + DCA 130724/0700 1005.70 29.70 26.70 19.40 7.00 270.00 + -9999.00 -9999.00 1502.00 2503.00 -9999.00 10.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 250.00 -9999.00 -9999.00 + DCA 130724/0800 1005.60 29.70 25.60 19.40 0.00 0.00 + -9999.00 -9999.00 1502.00 2503.00 -9999.00 10.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 250.00 -9999.00 -9999.00 + DCA 130724/0900 1005.70 29.70 25.60 18.30 0.00 0.00 + -9999.00 -9999.00 806.00 2503.00 -9999.00 10.00 + 1003.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.30 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 250.00 -9999.00 -9999.00 + DCA 130724/1000 1005.90 29.71 24.40 18.30 8.00 350.00 + -9999.00 -9999.00 806.00 1502.00 2502.00 10.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + DCA 130724/1100 1006.90 29.74 25.60 17.80 8.00 330.00 + 14.00 -9999.00 1502.00 2503.00 -9999.00 10.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 250.00 -9999.00 -9999.00 + DCA 130724/1200 -9999.00 29.75 -9999.00 -9999.00 14.00 330.00 + -9999.00 -9999.00 1006.00 1703.00 2303.00 10.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 170.00 -9999.00 -9999.00 + + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/sfc_selected_parms_multi_stations_12z.sfc b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/sfc_selected_parms_multi_stations_12z.sfc new file mode 100644 index 0000000000..ec5df410a8 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/sfc_selected_parms_multi_stations_12z.sfc @@ -0,0 +1,9 @@ + PARM = ALTI;TMPK;RELH;UKNT;VKNT;SMSL + + STN YYMMDD/HHMM ALTI TMPK RELH UKNT VKNT SMSL + IAD 130724/1200 29.77 297.05 66.13 3.50 -6.06 076 + DCA 130724/1200 29.75 -9999.00 -9999.00 7.00 -12.12 + BWI 130724/1200 29.74 297.55 66.65 8.46 -3.08 070 + ADW 130724/1200 29.75 298.15 65.53 5.00 -8.66 078 + + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/ship20130731191010.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/ship20130731191010.xml new file mode 100644 index 0000000000..209839cc5c --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/ship20130731191010.xml @@ -0,0 +1,246 @@ + + + 2013-07-31T19:10:10Z + + + + WINDSP0 + wind speed 0 + Knot + + + WINDSP1 + wind speed 1 + Knot + + + WINDSP2 + wind speed 2 + Knot + + + WINDSP3 + wind speed 3 + Knot + + + WINDSP4 + wind speed 4 + Knot + + + WINDSP5 + wind speed 5 + Knot + + + WINDSP6 + wind speed 6 + Knot + + + WINDSP7 + wind speed 7 + Knot + + + WINDSP8 + wind speed 8 + Knot + + + WINDSP9 + wind speed 9 + Knot + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/ship_multi_stations_12z.shp b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/ship_multi_stations_12z.shp new file mode 100644 index 0000000000..5f07e8072b --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/ship_multi_stations_12z.shp @@ -0,0 +1,2903 @@ + PARM = SLAT;SLON;PMSL;PRES;P03D;TMPC;DWPC;TMWC;SPED;DRCT;VSBK;WWMO;PWWM;CFRT; + CFRL;CTYL;CLHL;SSTC;WPER;WHGT;PWHR;PWMN;PWDR;PWSP;TOST;CBAS;POWW;HOWW; + DOSW;POSW;HOSW;DOS2;POS2;HOS2;IDTH;ROIA;GUST;ALTI;SHPD;SHPK;PKWD;PKWS; + PKWT;PMN1 + + STN YYMMDD/HHMM SLAT SLON PMSL PRES P03D TMPC + DWPC TMWC SPED DRCT VSBK WWMO + PWWM CFRT CFRL CTYL CLHL SSTC + WPER WHGT PWHR PWMN PWDR PWSP + TOST CBAS POWW HOWW DOSW POSW + HOSW DOS2 POS2 HOS2 IDTH ROIA + GUST ALTI SHPD SHPK PKWD PKWS + PKWT PMN1 + WDF7019 130724/1200 44.50 -83.00 1015.90 -9999.00 3010.00 27.70 + -9999.00 -9999.00 5.10 350.00 10.00 -9999.00 + -9999.00 2.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 2.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + KCDK 130724/1200 34.60 -75.40 1007.00 -9999.00 2002.00 26.10 + 23.00 23.90 6.70 180.00 20.00 -9999.00 + 0.00 2.00 1.00 1.00 74.00 -9999.00 + -9999.00 1.10 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 8.00 2.00 0.50 190.00 6.00 + 1.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + KCDK 130724/1200 34.60 -75.40 1007.00 -9999.00 2002.00 26.10 + 23.00 23.90 6.70 180.00 20.00 -9999.00 + 0.00 2.00 1.00 1.00 74.00 -9999.00 + -9999.00 1.10 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 8.00 2.00 0.50 190.00 6.00 + 1.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDF7019 130724/1200 44.50 -83.00 1015.90 -9999.00 3010.00 27.70 + -9999.00 -9999.00 5.10 350.00 10.00 -9999.00 + -9999.00 2.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 2.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD2876 130724/1200 43.40 -86.90 1017.20 -9999.00 -9999.00 16.60 + -9999.00 -9999.00 5.10 60.00 50.00 3.00 + 0.00 2.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 1.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDH 130724/1200 39.79 -71.09 1009.40 -9999.00 -9999.00 25.60 + 23.20 -9999.00 6.20 260.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 25.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD2876 130724/1200 43.40 -86.90 1017.20 -9999.00 -9999.00 16.60 + -9999.00 -9999.00 5.10 60.00 50.00 3.00 + 0.00 2.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 1.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WZP8164 130724/1200 47.50 -88.59 1017.60 -9999.00 4000.00 7.70 + -9999.00 -9999.00 2.60 240.00 20.00 -9999.00 + 1.00 3.00 0.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 2.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WZD2465 130724/1200 45.79 -84.90 1017.60 -9999.00 -9999.00 13.80 + -9999.00 -9999.00 3.60 280.00 10.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 13.80 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCE5063 130724/1200 30.20 -88.90 1014.10 -9999.00 -9999.00 32.60 + 29.50 -9999.00 11.80 270.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 31.30 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDC6055 130724/1200 44.90 -87.09 1016.70 -9999.00 -9999.00 16.20 + -9999.00 -9999.00 3.10 30.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 18.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WZP8164 130724/1200 47.50 -88.59 1017.60 -9999.00 4000.00 7.70 + -9999.00 -9999.00 2.60 240.00 20.00 -9999.00 + 1.00 3.00 0.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 2.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WZD2465 130724/1200 45.79 -84.90 1017.60 -9999.00 -9999.00 13.80 + -9999.00 -9999.00 3.60 280.00 10.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 13.80 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDC6055 130724/1200 44.90 -87.09 1016.70 -9999.00 -9999.00 16.20 + -9999.00 -9999.00 3.10 30.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 18.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCE5063 130724/1200 30.20 -88.90 1014.10 -9999.00 -9999.00 32.60 + 29.50 -9999.00 11.80 270.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 31.30 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDH 130724/1200 39.79 -71.09 1009.40 -9999.00 -9999.00 25.60 + 23.20 -9999.00 6.20 260.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 25.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDC6055 130724/1200 44.90 -87.09 1016.70 -9999.00 -9999.00 16.20 + -9999.00 -9999.00 3.10 30.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 18.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WZD2465 130724/1200 45.79 -84.90 1017.60 -9999.00 -9999.00 13.80 + -9999.00 -9999.00 3.60 280.00 10.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 13.80 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WZP8164 130724/1200 47.50 -88.59 1017.60 -9999.00 4000.00 7.70 + -9999.00 -9999.00 2.60 240.00 20.00 -9999.00 + 1.00 3.00 0.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 2.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCE5063 130724/1200 30.20 -88.90 1014.10 -9999.00 -9999.00 32.60 + 29.50 -9999.00 11.80 270.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 31.30 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDH 130724/1200 39.79 -71.09 1009.40 -9999.00 -9999.00 25.60 + 23.20 -9999.00 6.20 260.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 25.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDC6055 130724/1200 44.90 -87.09 1016.70 -9999.00 -9999.00 16.20 + -9999.00 -9999.00 3.10 30.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 18.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WZD2465 130724/1200 45.79 -84.90 1017.60 -9999.00 -9999.00 13.80 + -9999.00 -9999.00 3.60 280.00 10.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 13.80 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WZP8164 130724/1200 47.50 -88.59 1017.60 -9999.00 4000.00 7.70 + -9999.00 -9999.00 2.60 240.00 20.00 -9999.00 + 1.00 3.00 0.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 2.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + VCRG 130724/1200 47.20 -61.60 998.90 -9999.00 8017.00 19.30 + 19.20 -9999.00 10.80 180.00 4.00 60.00 + 6.00 8.00 8.00 -9999.00 -9999.00 17.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 3.00 2.00 2.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 47.20 -61.60 998.90 -9999.00 8017.00 19.30 + 19.20 -9999.00 10.80 180.00 4.00 60.00 + 6.00 8.00 8.00 -9999.00 -9999.00 17.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 3.00 2.00 2.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTEO 130724/1200 36.79 -76.30 1007.60 -9999.00 -9999.00 25.10 + 22.00 22.90 4.60 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 28.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDL 130724/1200 31.00 -79.90 1010.50 -9999.00 -9999.00 25.80 + 23.00 23.80 12.40 250.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 47.50 -85.20 1016.50 -9999.00 3005.00 13.10 + 8.90 -9999.00 7.20 220.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 15.10 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.60 -63.50 1004.20 -9999.00 2.00 17.50 + 17.90 -9999.00 7.70 220.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 13.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.70 -63.60 1004.40 -9999.00 3016.00 17.40 + 18.80 -9999.00 2.10 160.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 999.70 -9999.00 3012.00 20.20 + 16.90 -9999.00 4.10 240.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 43.70 -65.30 1004.10 -9999.00 2014.00 17.30 + 17.20 -9999.00 3.10 180.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 49.50 -65.40 999.90 -9999.00 1014.00 12.00 + 12.10 -9999.00 4.10 110.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 999.60 -9999.00 1013.00 20.80 + 17.90 -9999.00 4.10 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 999.60 -9999.00 1014.00 20.70 + 18.20 -9999.00 3.60 360.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 43.20 -79.20 1011.80 -9999.00 2030.00 16.90 + 10.50 -9999.00 5.70 350.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 21.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.70 -63.60 1004.50 -9999.00 3015.00 17.90 + 17.90 -9999.00 2.60 170.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 41.70 -83.40 1014.40 -9999.00 1018.00 16.80 + 11.30 -9999.00 10.30 10.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 25.70 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 48.29 -64.70 999.20 -9999.00 3027.00 19.80 + 17.40 -9999.00 0.50 310.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.29 -75.90 1008.90 -9999.00 1031.00 13.10 + 7.70 -9999.00 4.60 320.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 24.10 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 47.60 -70.09 998.20 -9999.00 3003.00 16.10 + 17.60 -9999.00 2.60 290.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + KCGH 130724/1200 28.30 -78.40 1009.00 -9999.00 -9999.00 29.40 + 23.30 25.00 6.70 220.00 -9999.00 -9999.00 + -9999.00 7.00 6.00 2.00 26.00 26.70 + -9999.00 1.40 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 3.00 1.00 120.00 4.00 + 1.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDH 130724/1200 39.79 -71.09 1004.80 -9999.00 2080.00 26.00 + 24.60 25.00 6.20 260.00 10.00 2.00 + 0.00 1.00 1.00 -9999.00 -9999.00 26.10 + -9999.00 1.10 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 7.00 1.00 0.50 200.00 6.00 + 1.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + KCEJ 130724/1200 41.50 -70.70 1003.80 -9999.00 -9999.00 23.40 + 21.40 -9999.00 3.60 270.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 23.50 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDH 130724/1200 39.79 -71.09 1004.80 -9999.00 2080.00 26.00 + 24.60 25.00 6.20 260.00 10.00 2.00 + 0.00 1.00 1.00 -9999.00 -9999.00 26.10 + -9999.00 1.10 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 7.00 1.00 0.50 200.00 6.00 + 1.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 47.20 -61.60 998.90 -9999.00 8017.00 19.30 + 19.20 -9999.00 10.80 180.00 4.00 60.00 + 6.00 8.00 8.00 -9999.00 -9999.00 17.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 3.00 2.00 2.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + VCRG 130724/1200 47.20 -61.60 998.90 -9999.00 8017.00 19.30 + 19.20 -9999.00 10.80 180.00 4.00 60.00 + 6.00 8.00 8.00 -9999.00 -9999.00 17.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 3.00 2.00 2.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDL 130724/1200 31.00 -79.90 1010.50 -9999.00 -9999.00 25.80 + 23.00 23.80 12.40 250.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTEO 130724/1200 36.79 -76.30 1007.60 -9999.00 -9999.00 25.10 + 22.00 22.90 4.60 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 28.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.70 -63.60 1004.40 -9999.00 3016.00 17.40 + 18.80 -9999.00 2.10 160.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 48.29 -64.70 999.20 -9999.00 3027.00 19.80 + 17.40 -9999.00 0.50 310.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 999.70 -9999.00 3012.00 20.20 + 16.90 -9999.00 4.10 240.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.70 -63.60 1004.50 -9999.00 3015.00 17.90 + 17.90 -9999.00 2.60 170.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDH 130724/1200 39.79 -71.09 1004.80 -9999.00 2080.00 26.00 + 24.60 25.00 6.20 260.00 10.00 2.00 + 0.00 1.00 1.00 -9999.00 -9999.00 26.10 + -9999.00 1.10 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 7.00 1.00 0.50 200.00 6.00 + 1.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + KCGH 130724/1200 28.30 -78.40 1009.00 -9999.00 -9999.00 29.40 + 23.30 25.00 6.70 220.00 -9999.00 -9999.00 + -9999.00 7.00 6.00 2.00 26.00 26.70 + -9999.00 1.40 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 3.00 1.00 120.00 4.00 + 1.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 999.60 -9999.00 1014.00 20.70 + 18.20 -9999.00 3.60 360.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 43.70 -65.30 1004.10 -9999.00 2014.00 17.30 + 17.20 -9999.00 3.10 180.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 999.60 -9999.00 1013.00 20.80 + 17.90 -9999.00 4.10 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 47.60 -70.09 998.20 -9999.00 3003.00 16.10 + 17.60 -9999.00 2.60 290.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 49.50 -65.40 999.90 -9999.00 1014.00 12.00 + 12.10 -9999.00 4.10 110.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.60 -63.50 1004.20 -9999.00 2.00 17.50 + 17.90 -9999.00 7.70 220.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 13.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDH 130724/1200 39.79 -71.09 1004.80 -9999.00 2080.00 26.00 + 24.60 25.00 6.20 260.00 10.00 2.00 + 0.00 1.00 1.00 -9999.00 -9999.00 26.10 + -9999.00 1.10 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 7.00 1.00 0.50 200.00 6.00 + 1.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + KCGH 130724/1200 28.30 -78.40 1009.00 -9999.00 -9999.00 29.40 + 23.30 25.00 6.70 220.00 -9999.00 -9999.00 + -9999.00 7.00 6.00 2.00 26.00 26.70 + -9999.00 1.40 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 3.00 1.00 120.00 4.00 + 1.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 999.60 -9999.00 1014.00 20.70 + 18.20 -9999.00 3.60 360.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 47.20 -61.60 998.90 -9999.00 8017.00 19.30 + 19.20 -9999.00 10.80 180.00 4.00 60.00 + 6.00 8.00 8.00 -9999.00 -9999.00 17.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 3.00 2.00 2.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + VCRG 130724/1200 47.20 -61.60 998.90 -9999.00 8017.00 19.30 + 19.20 -9999.00 10.80 180.00 4.00 60.00 + 6.00 8.00 8.00 -9999.00 -9999.00 17.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 3.00 2.00 2.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDL 130724/1200 31.00 -79.90 1010.50 -9999.00 -9999.00 25.80 + 23.00 23.80 12.40 250.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTEO 130724/1200 36.79 -76.30 1007.60 -9999.00 -9999.00 25.10 + 22.00 22.90 4.60 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 28.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.70 -63.60 1004.40 -9999.00 3016.00 17.40 + 18.80 -9999.00 2.10 160.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 48.29 -64.70 999.20 -9999.00 3027.00 19.80 + 17.40 -9999.00 0.50 310.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 999.70 -9999.00 3012.00 20.20 + 16.90 -9999.00 4.10 240.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.70 -63.60 1004.50 -9999.00 3015.00 17.90 + 17.90 -9999.00 2.60 170.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 47.50 -85.20 1016.50 -9999.00 3005.00 13.10 + 8.90 -9999.00 7.20 220.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 15.10 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 41.70 -83.40 1014.40 -9999.00 1018.00 16.80 + 11.30 -9999.00 10.30 10.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 25.70 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.29 -75.90 1008.90 -9999.00 1031.00 13.10 + 7.70 -9999.00 4.60 320.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 24.10 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 43.20 -79.20 1011.80 -9999.00 2030.00 16.90 + 10.50 -9999.00 5.70 350.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 21.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 43.70 -65.30 1004.10 -9999.00 2014.00 17.30 + 17.20 -9999.00 3.10 180.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 999.60 -9999.00 1013.00 20.80 + 17.90 -9999.00 4.10 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 47.60 -70.09 998.20 -9999.00 3003.00 16.10 + 17.60 -9999.00 2.60 290.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 49.50 -65.40 999.90 -9999.00 1014.00 12.00 + 12.10 -9999.00 4.10 110.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.60 -63.50 1004.20 -9999.00 2.00 17.50 + 17.90 -9999.00 7.70 220.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 13.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 47.50 -85.20 1016.50 -9999.00 3005.00 13.10 + 8.90 -9999.00 7.20 220.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 15.10 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 41.70 -83.40 1014.40 -9999.00 1018.00 16.80 + 11.30 -9999.00 10.30 10.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 25.70 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.29 -75.90 1008.90 -9999.00 1031.00 13.10 + 7.70 -9999.00 4.60 320.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 24.10 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 43.20 -79.20 1011.80 -9999.00 2030.00 16.90 + 10.50 -9999.00 5.70 350.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 21.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3972 130724/1200 45.70 -86.00 1017.10 -9999.00 -9999.00 14.70 + -9999.00 -9999.00 2.10 200.00 20.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 17.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WHED 130724/1200 31.50 -78.59 1014.00 -9999.00 1020.00 27.20 + 24.20 25.00 9.30 240.00 20.00 60.00 + 5.00 4.00 3.00 2.00 57.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 7.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WHED 130724/1200 31.50 -78.59 1014.00 -9999.00 1020.00 27.20 + 24.20 25.00 9.30 240.00 20.00 60.00 + 5.00 4.00 3.00 2.00 57.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 7.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD3825 130724/1200 37.90 -66.59 1009.50 -9999.00 -9999.00 27.50 + 25.00 25.50 11.30 230.00 20.00 3.00 + 6.00 8.00 7.00 6.00 26.00 29.00 + -9999.00 2.10 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 5.00 1.50 -9999.00 5.00 + 1.50 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WHED 130724/1200 31.50 -78.59 1014.00 -9999.00 1020.00 27.20 + 24.20 25.00 9.30 240.00 20.00 60.00 + 5.00 4.00 3.00 2.00 57.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 7.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3972 130724/1200 45.70 -86.00 1017.10 -9999.00 -9999.00 14.70 + -9999.00 -9999.00 2.10 200.00 20.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 17.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + KCEJ 130724/1200 41.50 -70.70 1003.80 -9999.00 -9999.00 23.40 + 21.40 -9999.00 3.60 270.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 23.50 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3972 130724/1200 45.70 -86.00 1017.10 -9999.00 -9999.00 14.70 + -9999.00 -9999.00 2.10 200.00 20.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 17.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WHED 130724/1200 31.50 -78.59 1014.00 -9999.00 1020.00 27.20 + 24.20 25.00 9.30 240.00 20.00 60.00 + 5.00 4.00 3.00 2.00 57.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 7.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + KCEJ 130724/1200 41.50 -70.70 1003.80 -9999.00 -9999.00 23.40 + 21.40 -9999.00 3.60 270.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 23.50 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3972 130724/1200 45.70 -86.00 1017.10 -9999.00 -9999.00 14.70 + -9999.00 -9999.00 2.10 200.00 20.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 17.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD3825 130724/1200 37.90 -66.59 1009.50 -9999.00 -9999.00 27.50 + 25.00 25.50 11.30 230.00 20.00 3.00 + 6.00 8.00 7.00 6.00 26.00 29.00 + -9999.00 2.10 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 5.00 1.50 -9999.00 5.00 + 1.50 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WZC7602 130724/1200 45.29 -83.40 1014.80 -9999.00 -9999.00 14.90 + -9999.00 -9999.00 6.20 340.00 50.00 2.00 + 0.00 1.00 -9999.00 -9999.00 -9999.00 21.10 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 2.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD3825 130724/1200 37.90 -66.59 1009.50 -9999.00 -9999.00 27.50 + 25.00 25.50 11.30 230.00 20.00 3.00 + 6.00 8.00 7.00 6.00 26.00 29.00 + -9999.00 2.10 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 5.00 1.50 -9999.00 5.00 + 1.50 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD3825 130724/1200 37.90 -66.59 1009.50 -9999.00 -9999.00 27.50 + 25.00 25.50 11.30 230.00 20.00 3.00 + 6.00 8.00 7.00 6.00 26.00 29.00 + -9999.00 2.10 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 5.00 1.50 -9999.00 5.00 + 1.50 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WZC7602 130724/1200 45.29 -83.40 1014.80 -9999.00 -9999.00 14.90 + -9999.00 -9999.00 6.20 340.00 50.00 2.00 + 0.00 1.00 -9999.00 -9999.00 -9999.00 21.10 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 2.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + V7HP2 130724/1200 33.40 -71.40 1015.00 -9999.00 4000.00 26.00 + 24.60 25.00 15.40 220.00 10.00 81.00 + 8.00 8.00 8.00 7.00 26.00 25.00 + -9999.00 4.20 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 2.00 3.00 220.00 2.00 + 3.00 220.00 2.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WZC7602 130724/1200 45.29 -83.40 1014.80 -9999.00 -9999.00 14.90 + -9999.00 -9999.00 6.20 340.00 50.00 2.00 + 0.00 1.00 -9999.00 -9999.00 -9999.00 21.10 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 2.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + V7HP2 130724/1200 33.40 -71.40 1015.00 -9999.00 4000.00 26.00 + 24.60 25.00 15.40 220.00 10.00 81.00 + 8.00 8.00 8.00 7.00 26.00 25.00 + -9999.00 4.20 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 2.00 3.00 220.00 2.00 + 3.00 220.00 2.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WZC7602 130724/1200 45.29 -83.40 1014.80 -9999.00 -9999.00 14.90 + -9999.00 -9999.00 6.20 340.00 50.00 2.00 + 0.00 1.00 -9999.00 -9999.00 -9999.00 21.10 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 2.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WYR4481 130724/1200 47.50 -88.90 1017.30 -9999.00 -9999.00 8.90 + -9999.00 -9999.00 4.10 220.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 8.30 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD6126 130724/1200 33.00 -77.50 1009.50 -9999.00 4000.00 26.00 + 24.20 24.70 2.60 230.00 20.00 1.00 + 2.00 5.00 4.00 2.00 15.00 26.30 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 4.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + V7HP2 130724/1200 33.40 -71.40 1015.00 -9999.00 4000.00 26.00 + 24.60 25.00 15.40 220.00 10.00 81.00 + 8.00 8.00 8.00 7.00 26.00 25.00 + -9999.00 4.20 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 2.00 3.00 220.00 2.00 + 3.00 220.00 2.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD6126 130724/1200 33.00 -77.50 1009.50 -9999.00 4000.00 26.00 + 24.20 24.70 2.60 230.00 20.00 1.00 + 2.00 5.00 4.00 2.00 15.00 26.30 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 4.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + V7HP2 130724/1200 33.40 -71.40 1015.00 -9999.00 4000.00 26.00 + 24.60 25.00 15.40 220.00 10.00 81.00 + 8.00 8.00 8.00 7.00 26.00 25.00 + -9999.00 4.20 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 2.00 3.00 220.00 2.00 + 3.00 220.00 2.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WYR4481 130724/1200 47.50 -88.90 1017.30 -9999.00 -9999.00 8.90 + -9999.00 -9999.00 4.10 220.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 8.30 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + KIRH 130724/1200 34.79 -73.59 1008.40 -9999.00 6027.00 26.70 + 23.50 24.40 10.30 220.00 20.00 29.00 + 9.00 6.00 5.00 3.00 8.00 25.00 + -9999.00 4.30 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 3.00 4.00 2.50 250.00 8.00 + 3.50 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD6126 130724/1200 33.00 -77.50 1009.50 -9999.00 4000.00 26.00 + 24.20 24.70 2.60 230.00 20.00 1.00 + 2.00 5.00 4.00 2.00 15.00 26.30 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 4.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WYR4481 130724/1200 47.50 -88.90 1017.30 -9999.00 -9999.00 8.90 + -9999.00 -9999.00 4.10 220.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 8.30 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD6126 130724/1200 33.00 -77.50 1009.50 -9999.00 4000.00 26.00 + 24.20 24.70 2.60 230.00 20.00 1.00 + 2.00 5.00 4.00 2.00 15.00 26.30 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 4.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WYR4481 130724/1200 47.50 -88.90 1017.30 -9999.00 -9999.00 8.90 + -9999.00 -9999.00 4.10 220.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 8.30 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + KIRH 130724/1200 34.79 -73.59 1008.40 -9999.00 6027.00 26.70 + 23.50 24.40 10.30 220.00 20.00 29.00 + 9.00 6.00 5.00 3.00 8.00 25.00 + -9999.00 4.30 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 3.00 4.00 2.50 250.00 8.00 + 3.50 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + C6FT7 130724/1200 34.70 -65.59 1016.00 -9999.00 -9999.00 30.90 + -9999.00 -9999.00 9.80 190.00 -9999.00 -9999.00 + 1.00 6.00 6.00 2.00 57.00 29.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 7.00 -9999.00 2.00 300.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD2876 130724/1200 43.60 -86.80 1017.20 -9999.00 -9999.00 14.90 + -9999.00 -9999.00 6.20 40.00 50.00 2.00 + 0.00 2.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 1.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCF3012 130724/1200 45.70 -83.70 1016.40 -9999.00 -9999.00 14.40 + -9999.00 -9999.00 6.70 310.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDH 130724/1200 39.79 -71.09 1010.20 -9999.00 -9999.00 25.70 + 23.30 -9999.00 7.20 260.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 26.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD2876 130724/1200 43.60 -86.80 1017.20 -9999.00 -9999.00 14.90 + -9999.00 -9999.00 6.20 40.00 50.00 2.00 + 0.00 2.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 1.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + C6FT7 130724/1200 34.70 -65.59 1016.00 -9999.00 -9999.00 30.90 + -9999.00 -9999.00 9.80 190.00 -9999.00 -9999.00 + 1.00 6.00 6.00 2.00 57.00 29.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 7.00 -9999.00 2.00 300.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + KIRH 130724/1200 34.79 -73.59 1008.40 -9999.00 6027.00 26.70 + 23.50 24.40 10.30 220.00 20.00 29.00 + 9.00 6.00 5.00 3.00 8.00 25.00 + -9999.00 4.30 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 3.00 4.00 2.50 250.00 8.00 + 3.50 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCF3012 130724/1200 45.70 -83.70 1016.40 -9999.00 -9999.00 14.40 + -9999.00 -9999.00 6.70 310.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + C6FT7 130724/1200 34.70 -65.59 1016.00 -9999.00 -9999.00 30.90 + -9999.00 -9999.00 9.80 190.00 -9999.00 -9999.00 + 1.00 6.00 6.00 2.00 57.00 29.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 7.00 -9999.00 2.00 300.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + KIRH 130724/1200 34.79 -73.59 1008.40 -9999.00 6027.00 26.70 + 23.50 24.40 10.30 220.00 20.00 29.00 + 9.00 6.00 5.00 3.00 8.00 25.00 + -9999.00 4.30 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 3.00 4.00 2.50 250.00 8.00 + 3.50 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCF3012 130724/1200 45.70 -83.70 1016.40 -9999.00 -9999.00 14.40 + -9999.00 -9999.00 6.70 310.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCF3012 130724/1200 45.70 -83.70 1016.40 -9999.00 -9999.00 14.40 + -9999.00 -9999.00 6.70 310.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + C6FT7 130724/1200 34.70 -65.59 1016.00 -9999.00 -9999.00 30.90 + -9999.00 -9999.00 9.80 190.00 -9999.00 -9999.00 + 1.00 6.00 6.00 2.00 57.00 29.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 7.00 -9999.00 2.00 300.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WJBJ 130724/1200 28.30 -78.00 1013.00 -9999.00 2010.00 27.50 + 23.30 24.50 6.20 200.00 20.00 0.00 + 2.00 6.00 1.00 4.00 41.00 28.00 + -9999.00 2.20 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 6.00 4.00 1.00 190.00 5.00 + 2.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 315.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WZP8164 130724/1200 47.50 -88.59 1017.60 -9999.00 4000.00 8.30 + -9999.00 -9999.00 4.60 260.00 20.00 2.00 + 1.00 4.00 1.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 2.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDC6055 130724/1200 45.00 -87.00 1017.40 -9999.00 -9999.00 16.20 + -9999.00 -9999.00 2.10 350.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 18.50 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WJBJ 130724/1200 28.30 -78.00 1013.00 -9999.00 2010.00 27.50 + 23.30 24.50 6.20 200.00 20.00 0.00 + 2.00 6.00 1.00 4.00 41.00 28.00 + -9999.00 2.20 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 6.00 4.00 1.00 190.00 5.00 + 2.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 315.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDH 130724/1200 39.79 -71.09 1010.20 -9999.00 -9999.00 25.70 + 23.30 -9999.00 7.20 260.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 26.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDH 130724/1200 39.79 -71.09 1010.20 -9999.00 -9999.00 25.70 + 23.30 -9999.00 7.20 260.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 26.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WJBJ 130724/1200 28.30 -78.00 1013.00 -9999.00 2010.00 27.50 + 23.30 24.50 6.20 200.00 20.00 0.00 + 2.00 6.00 1.00 4.00 41.00 28.00 + -9999.00 2.20 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 6.00 4.00 1.00 190.00 5.00 + 2.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 315.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDC6055 130724/1200 45.00 -87.00 1017.40 -9999.00 -9999.00 16.20 + -9999.00 -9999.00 2.10 350.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 18.50 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WZP8164 130724/1200 47.50 -88.59 1017.60 -9999.00 4000.00 8.30 + -9999.00 -9999.00 4.60 260.00 20.00 2.00 + 1.00 4.00 1.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 2.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WJBJ 130724/1200 28.30 -78.00 1013.00 -9999.00 2010.00 27.50 + 23.30 24.50 6.20 200.00 20.00 0.00 + 2.00 6.00 1.00 4.00 41.00 28.00 + -9999.00 2.20 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 6.00 4.00 1.00 190.00 5.00 + 2.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 315.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDC6055 130724/1200 45.00 -87.00 1017.40 -9999.00 -9999.00 16.20 + -9999.00 -9999.00 2.10 350.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 18.50 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WZP8164 130724/1200 47.50 -88.59 1017.60 -9999.00 4000.00 8.30 + -9999.00 -9999.00 4.60 260.00 20.00 2.00 + 1.00 4.00 1.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 2.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDC6055 130724/1200 45.00 -87.00 1017.40 -9999.00 -9999.00 16.20 + -9999.00 -9999.00 2.10 350.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 18.50 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WZP8164 130724/1200 47.50 -88.59 1017.60 -9999.00 4000.00 8.30 + -9999.00 -9999.00 4.60 260.00 20.00 2.00 + 1.00 4.00 1.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 2.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 1000.40 -9999.00 1023.00 20.70 + 16.60 -9999.00 5.10 360.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 1000.60 -9999.00 1023.00 20.30 + 15.80 -9999.00 5.70 250.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.50 -75.80 -9999.00 -9999.00 -9999.00 13.10 + 7.60 -9999.00 7.20 310.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 23.40 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 1000.40 -9999.00 1022.00 20.90 + 16.90 -9999.00 5.70 190.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.70 -63.60 1005.30 -9999.00 1013.00 17.80 + 17.80 -9999.00 4.60 190.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 49.40 -65.90 999.70 -9999.00 1009.00 12.80 + 13.00 -9999.00 9.30 90.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 41.70 -83.40 1015.30 -9999.00 1022.00 16.50 + 10.30 -9999.00 7.70 10.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.90 -61.70 1000.70 -9999.00 3007.00 20.00 + 19.50 -9999.00 9.80 170.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 17.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 43.20 -79.20 1011.30 -9999.00 16.00 18.50 + 10.90 -9999.00 3.60 320.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 24.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.60 -63.60 1005.30 -9999.00 3008.00 18.40 + 18.80 -9999.00 2.60 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 12.50 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 47.79 -69.80 998.90 -9999.00 1015.00 15.00 + 16.40 -9999.00 4.10 340.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.70 -63.60 1005.30 -9999.00 1015.00 17.70 + 19.00 -9999.00 5.10 190.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDL 130724/1200 30.89 -79.90 1010.60 -9999.00 -9999.00 26.00 + 23.20 24.00 8.20 240.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTEO 130724/1200 36.79 -76.30 1007.80 -9999.00 -9999.00 25.90 + 22.10 23.20 6.70 190.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 28.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 48.29 -64.70 999.90 -9999.00 2016.00 16.70 + 16.20 -9999.00 5.10 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + MHNO6 130724/1200 40.60 -65.40 1009.60 -9999.00 6023.00 24.50 + 23.00 23.50 5.10 20.00 10.00 2.00 + 0.00 5.00 4.00 6.00 2.00 24.30 + -9999.00 5.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 1.00 6.00 4.00 220.00 5.00 + 3.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCF3012 130724/1200 45.90 -83.90 1017.40 -9999.00 -9999.00 14.50 + -9999.00 -9999.00 5.10 340.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCF3012 130724/1200 45.90 -83.90 1017.40 -9999.00 -9999.00 14.50 + -9999.00 -9999.00 5.10 340.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + KCEJ 130724/1200 41.50 -70.70 1004.20 -9999.00 -9999.00 23.90 + 21.20 -9999.00 1.50 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 23.50 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCF3012 130724/1200 45.90 -83.90 1017.40 -9999.00 -9999.00 14.50 + -9999.00 -9999.00 5.10 340.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 41.70 -83.40 1015.30 -9999.00 1022.00 16.50 + 10.30 -9999.00 7.70 10.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.50 -75.80 -9999.00 -9999.00 -9999.00 13.10 + 7.60 -9999.00 7.20 310.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 23.40 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 43.20 -79.20 1011.30 -9999.00 16.00 18.50 + 10.90 -9999.00 3.60 320.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 24.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + MHNO6 130724/1200 40.60 -65.40 1009.60 -9999.00 6023.00 24.50 + 23.00 23.50 5.10 20.00 10.00 2.00 + 0.00 5.00 4.00 6.00 2.00 24.30 + -9999.00 5.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 1.00 6.00 4.00 220.00 5.00 + 3.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + MHNO6 130724/1200 40.60 -65.40 1009.60 -9999.00 6023.00 24.50 + 23.00 23.50 5.10 20.00 10.00 2.00 + 0.00 5.00 4.00 6.00 2.00 24.30 + -9999.00 5.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 1.00 6.00 4.00 220.00 5.00 + 3.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 48.29 -64.70 999.90 -9999.00 2016.00 16.70 + 16.20 -9999.00 5.10 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDL 130724/1200 30.89 -79.90 1010.60 -9999.00 -9999.00 26.00 + 23.20 24.00 8.20 240.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTEO 130724/1200 36.79 -76.30 1007.80 -9999.00 -9999.00 25.90 + 22.10 23.20 6.70 190.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 28.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.70 -63.60 1005.30 -9999.00 1015.00 17.70 + 19.00 -9999.00 5.10 190.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 47.79 -69.80 998.90 -9999.00 1015.00 15.00 + 16.40 -9999.00 4.10 340.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.70 -63.60 1005.30 -9999.00 1013.00 17.80 + 17.80 -9999.00 4.60 190.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.60 -63.60 1005.30 -9999.00 3008.00 18.40 + 18.80 -9999.00 2.60 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 12.50 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.90 -61.70 1000.70 -9999.00 3007.00 20.00 + 19.50 -9999.00 9.80 170.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 17.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 1000.40 -9999.00 1022.00 20.90 + 16.90 -9999.00 5.70 190.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 49.40 -65.90 999.70 -9999.00 1009.00 12.80 + 13.00 -9999.00 9.30 90.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 1000.40 -9999.00 1023.00 20.70 + 16.60 -9999.00 5.10 360.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 1000.60 -9999.00 1023.00 20.30 + 15.80 -9999.00 5.70 250.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 48.29 -64.70 999.90 -9999.00 2016.00 16.70 + 16.20 -9999.00 5.10 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDL 130724/1200 30.89 -79.90 1010.60 -9999.00 -9999.00 26.00 + 23.20 24.00 8.20 240.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTEO 130724/1200 36.79 -76.30 1007.80 -9999.00 -9999.00 25.90 + 22.10 23.20 6.70 190.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 28.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.70 -63.60 1005.30 -9999.00 1015.00 17.70 + 19.00 -9999.00 5.10 190.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 47.79 -69.80 998.90 -9999.00 1015.00 15.00 + 16.40 -9999.00 4.10 340.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.70 -63.60 1005.30 -9999.00 1013.00 17.80 + 17.80 -9999.00 4.60 190.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.60 -63.60 1005.30 -9999.00 3008.00 18.40 + 18.80 -9999.00 2.60 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 12.50 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.90 -61.70 1000.70 -9999.00 3007.00 20.00 + 19.50 -9999.00 9.80 170.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 17.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 1000.40 -9999.00 1022.00 20.90 + 16.90 -9999.00 5.70 190.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 49.40 -65.90 999.70 -9999.00 1009.00 12.80 + 13.00 -9999.00 9.30 90.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 1000.40 -9999.00 1023.00 20.70 + 16.60 -9999.00 5.10 360.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 1000.60 -9999.00 1023.00 20.30 + 15.80 -9999.00 5.70 250.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCF3012 130724/1200 45.90 -83.90 1017.40 -9999.00 -9999.00 14.50 + -9999.00 -9999.00 5.10 340.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 41.70 -83.40 1015.30 -9999.00 1022.00 16.50 + 10.30 -9999.00 7.70 10.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.50 -75.80 -9999.00 -9999.00 -9999.00 13.10 + 7.60 -9999.00 7.20 310.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 23.40 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 43.20 -79.20 1011.30 -9999.00 16.00 18.50 + 10.90 -9999.00 3.60 320.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 24.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + KCEJ 130724/1200 41.50 -70.70 1004.20 -9999.00 -9999.00 23.90 + 21.20 -9999.00 1.50 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 23.50 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + KCEJ 130724/1200 41.50 -70.70 1004.20 -9999.00 -9999.00 23.90 + 21.20 -9999.00 1.50 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 23.50 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3108 130724/1200 43.00 -87.59 1017.70 -9999.00 -9999.00 17.40 + -9999.00 -9999.00 5.70 20.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WYR4481 130724/1200 47.60 -88.59 1017.90 -9999.00 -9999.00 7.10 + -9999.00 -9999.00 3.60 210.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 5.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3108 130724/1200 42.79 -87.50 1017.70 -9999.00 -9999.00 17.60 + -9999.00 -9999.00 5.70 60.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCE5063 130724/1200 30.20 -89.00 1014.50 -9999.00 -9999.00 32.40 + 29.60 -9999.00 9.30 290.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 31.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3108 130724/1200 43.00 -87.59 1017.70 -9999.00 -9999.00 17.40 + -9999.00 -9999.00 5.70 20.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3108 130724/1200 42.79 -87.50 1017.70 -9999.00 -9999.00 17.60 + -9999.00 -9999.00 5.70 60.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WYR4481 130724/1200 47.60 -88.59 1017.90 -9999.00 -9999.00 7.10 + -9999.00 -9999.00 3.60 210.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 5.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD3825 130724/1200 38.00 -66.09 1010.50 -9999.00 -9999.00 26.00 + 23.00 24.00 10.30 180.00 20.00 81.00 + 6.00 7.00 7.00 4.00 26.00 28.40 + -9999.00 2.10 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 5.00 1.50 -9999.00 5.00 + 1.50 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD3825 130724/1200 38.00 -66.09 1010.50 -9999.00 -9999.00 26.00 + 23.00 24.00 10.30 180.00 20.00 81.00 + 6.00 7.00 7.00 4.00 26.00 28.40 + -9999.00 2.10 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 5.00 1.50 -9999.00 5.00 + 1.50 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3108 130724/1200 43.00 -87.59 1017.70 -9999.00 -9999.00 17.40 + -9999.00 -9999.00 5.70 20.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3108 130724/1200 43.00 -87.59 1017.70 -9999.00 -9999.00 17.40 + -9999.00 -9999.00 5.70 20.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD3825 130724/1200 38.00 -66.09 1010.50 -9999.00 -9999.00 26.00 + 23.00 24.00 10.30 180.00 20.00 81.00 + 6.00 7.00 7.00 4.00 26.00 28.40 + -9999.00 2.10 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 5.00 1.50 -9999.00 5.00 + 1.50 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCE5063 130724/1200 30.20 -89.00 1014.50 -9999.00 -9999.00 32.40 + 29.60 -9999.00 9.30 290.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 31.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCE5063 130724/1200 30.20 -89.00 1014.50 -9999.00 -9999.00 32.40 + 29.60 -9999.00 9.30 290.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 31.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3108 130724/1200 42.79 -87.50 1017.70 -9999.00 -9999.00 17.60 + -9999.00 -9999.00 5.70 60.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WYR4481 130724/1200 47.60 -88.59 1017.90 -9999.00 -9999.00 7.10 + -9999.00 -9999.00 3.60 210.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 5.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3108 130724/1200 42.79 -87.50 1017.70 -9999.00 -9999.00 17.60 + -9999.00 -9999.00 5.70 60.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WYR4481 130724/1200 47.60 -88.59 1017.90 -9999.00 -9999.00 7.10 + -9999.00 -9999.00 3.60 210.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 5.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD3825 130724/1200 38.00 -66.09 1010.50 -9999.00 -9999.00 26.00 + 23.00 24.00 10.30 180.00 20.00 81.00 + 6.00 7.00 7.00 4.00 26.00 28.40 + -9999.00 2.10 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 5.00 1.50 -9999.00 5.00 + 1.50 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WBD4889 130724/1200 43.90 -86.50 1017.90 -9999.00 3000.00 15.50 + -9999.00 -9999.00 5.10 10.00 20.00 2.00 + 0.00 6.00 5.00 1.00 15.00 18.80 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 4.00 8.00 1.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD2876 130724/1200 43.70 -86.70 1017.20 -9999.00 -9999.00 14.90 + -9999.00 -9999.00 5.70 90.00 50.00 2.00 + 0.00 2.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 1.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD2876 130724/1200 43.70 -86.70 1017.20 -9999.00 -9999.00 14.90 + -9999.00 -9999.00 5.70 90.00 50.00 2.00 + 0.00 2.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 1.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WBD4889 130724/1200 43.90 -86.50 1017.90 -9999.00 3000.00 15.50 + -9999.00 -9999.00 5.10 10.00 20.00 2.00 + 0.00 6.00 5.00 1.00 15.00 18.80 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 4.00 8.00 1.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDH 130724/1200 39.79 -71.09 1010.80 -9999.00 -9999.00 25.60 + 23.10 -9999.00 6.70 260.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 26.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + ZCEI6 130724/1200 29.39 -69.59 1018.00 -9999.00 4000.00 28.00 + 23.20 24.50 3.60 140.00 20.00 2.00 + 2.00 8.00 7.00 7.00 5.00 -9999.00 + -9999.00 0.70 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 2.00 5.00 0.50 140.00 5.00 + 0.50 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDC6055 130724/1200 45.10 -86.90 1017.70 -9999.00 -9999.00 16.10 + -9999.00 -9999.00 0.50 20.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 19.10 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + C6FT7 130724/1200 35.00 -65.80 1015.90 -9999.00 -9999.00 30.90 + -9999.00 -9999.00 12.90 210.00 20.00 16.00 + 2.00 6.00 6.00 4.00 8.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 3.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + ZCEI6 130724/1200 29.39 -69.59 1018.00 -9999.00 4000.00 28.00 + 23.20 24.50 3.60 140.00 20.00 2.00 + 2.00 8.00 7.00 7.00 5.00 -9999.00 + -9999.00 0.70 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 2.00 5.00 0.50 140.00 5.00 + 0.50 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDH 130724/1200 39.79 -71.09 1010.80 -9999.00 -9999.00 25.60 + 23.10 -9999.00 6.70 260.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 26.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDC6055 130724/1200 45.10 -86.90 1017.70 -9999.00 -9999.00 16.10 + -9999.00 -9999.00 0.50 20.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 19.10 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + ZCEI6 130724/1200 29.39 -69.59 1018.00 -9999.00 4000.00 28.00 + 23.20 24.50 3.60 140.00 20.00 2.00 + 2.00 8.00 7.00 7.00 5.00 -9999.00 + -9999.00 0.70 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 2.00 5.00 0.50 140.00 5.00 + 0.50 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDH 130724/1200 39.79 -71.09 1010.80 -9999.00 -9999.00 25.60 + 23.10 -9999.00 6.70 260.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 26.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDC6055 130724/1200 45.10 -86.90 1017.70 -9999.00 -9999.00 16.10 + -9999.00 -9999.00 0.50 20.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 19.10 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCE5063 130724/1200 30.30 -89.09 1014.50 -9999.00 -9999.00 31.90 + 29.20 -9999.00 9.30 290.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 31.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + C6FT7 130724/1200 35.00 -65.80 1015.90 -9999.00 -9999.00 30.90 + -9999.00 -9999.00 12.90 210.00 20.00 16.00 + 2.00 6.00 6.00 4.00 8.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 3.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDC6055 130724/1200 45.10 -86.90 1017.70 -9999.00 -9999.00 16.10 + -9999.00 -9999.00 0.50 20.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 19.10 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDF7020 130724/1200 41.90 -82.70 1014.20 -9999.00 3000.00 15.50 + -9999.00 -9999.00 9.30 10.00 50.00 2.00 + 2.00 7.00 7.00 4.00 26.00 22.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 2.00 1.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3108 130724/1200 42.60 -87.50 1018.10 -9999.00 -9999.00 17.60 + -9999.00 -9999.00 5.10 30.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.70 -61.79 1002.10 -9999.00 3019.00 20.30 + 19.20 -9999.00 10.30 170.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 18.50 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.60 -63.60 1006.00 -9999.00 1017.00 19.70 + 20.10 -9999.00 1.50 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 11.50 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 43.20 -79.20 1011.30 -9999.00 3.00 16.70 + 10.60 -9999.00 5.10 350.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 24.80 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.60 -75.70 -9999.00 -9999.00 -9999.00 13.50 + 7.00 -9999.00 6.20 310.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 23.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 41.79 -83.30 1015.10 -9999.00 3014.00 16.70 + 10.50 -9999.00 8.20 20.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 25.70 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.70 -63.60 1005.60 -9999.00 1014.00 18.10 + 19.30 -9999.00 4.60 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 1001.70 -9999.00 1030.00 19.60 + 15.10 -9999.00 7.20 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 1001.90 -9999.00 1031.00 19.00 + 14.20 -9999.00 7.20 230.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 1001.70 -9999.00 1031.00 19.50 + 14.70 -9999.00 7.20 360.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 48.29 -64.70 1000.50 -9999.00 1014.00 17.00 + 16.50 -9999.00 6.20 190.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.70 -63.60 1005.80 -9999.00 1015.00 18.30 + 18.20 -9999.00 5.70 190.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 48.10 -69.50 1000.30 -9999.00 1032.00 11.40 + 12.50 -9999.00 15.40 300.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTEO 130724/1200 36.79 -76.30 1008.30 -9999.00 -9999.00 27.10 + 22.40 23.80 4.60 290.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 28.50 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDL 130724/1200 31.00 -79.90 1010.90 -9999.00 -9999.00 25.20 + 22.50 23.30 10.80 270.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 49.40 -66.40 999.80 -9999.00 1003.00 12.40 + 12.60 -9999.00 6.20 90.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD3825 130724/1200 38.00 -65.70 1010.50 -9999.00 -9999.00 27.00 + 24.00 25.00 11.30 200.00 20.00 2.00 + 2.00 7.00 7.00 4.00 26.00 28.80 + -9999.00 2.10 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 5.00 1.50 -9999.00 5.00 + 1.50 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + V7HP2 130724/1200 33.29 -71.50 1015.00 -9999.00 4000.00 26.00 + 24.60 25.00 12.40 220.00 10.00 80.00 + 8.00 8.00 8.00 7.00 26.00 25.00 + -9999.00 4.20 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 2.00 3.00 220.00 2.00 + 3.00 220.00 2.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCF3012 130724/1200 46.10 -84.00 1017.70 -9999.00 -9999.00 15.40 + -9999.00 -9999.00 4.60 320.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WYR4481 130724/1200 47.60 -88.30 1017.90 -9999.00 -9999.00 9.30 + -9999.00 -9999.00 5.10 230.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 5.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDF7020 130724/1200 41.90 -82.70 1014.20 -9999.00 3000.00 15.50 + -9999.00 -9999.00 9.30 10.00 50.00 2.00 + 2.00 7.00 7.00 4.00 26.00 22.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 2.00 1.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + KCEJ 130724/1200 41.50 -70.70 1004.80 -9999.00 -9999.00 23.70 + 21.30 -9999.00 2.10 250.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 23.70 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD3825 130724/1200 38.00 -65.70 1010.50 -9999.00 -9999.00 27.00 + 24.00 25.00 11.30 200.00 20.00 2.00 + 2.00 7.00 7.00 4.00 26.00 28.80 + -9999.00 2.10 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 5.00 1.50 -9999.00 5.00 + 1.50 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3108 130724/1200 42.60 -87.50 1018.10 -9999.00 -9999.00 17.60 + -9999.00 -9999.00 5.10 30.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + V7HP2 130724/1200 33.29 -71.50 1015.00 -9999.00 4000.00 26.00 + 24.60 25.00 12.40 220.00 10.00 80.00 + 8.00 8.00 8.00 7.00 26.00 25.00 + -9999.00 4.20 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 2.00 3.00 220.00 2.00 + 3.00 220.00 2.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD3825 130724/1200 38.00 -65.70 1010.50 -9999.00 -9999.00 27.00 + 24.00 25.00 11.30 200.00 20.00 2.00 + 2.00 7.00 7.00 4.00 26.00 28.80 + -9999.00 2.10 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 5.00 1.50 -9999.00 5.00 + 1.50 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 49.40 -66.40 999.80 -9999.00 1003.00 12.40 + 12.60 -9999.00 6.20 90.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDL 130724/1200 31.00 -79.90 1010.90 -9999.00 -9999.00 25.20 + 22.50 23.30 10.80 270.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTEO 130724/1200 36.79 -76.30 1008.30 -9999.00 -9999.00 27.10 + 22.40 23.80 4.60 290.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 28.50 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.70 -63.60 1005.80 -9999.00 1015.00 18.30 + 18.20 -9999.00 5.70 190.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 1001.70 -9999.00 1031.00 19.50 + 14.70 -9999.00 7.20 360.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 48.10 -69.50 1000.30 -9999.00 1032.00 11.40 + 12.50 -9999.00 15.40 300.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 48.29 -64.70 1000.50 -9999.00 1014.00 17.00 + 16.50 -9999.00 6.20 190.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + V7HP2 130724/1200 33.29 -71.50 1015.00 -9999.00 4000.00 26.00 + 24.60 25.00 12.40 220.00 10.00 80.00 + 8.00 8.00 8.00 7.00 26.00 25.00 + -9999.00 4.20 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 2.00 3.00 220.00 2.00 + 3.00 220.00 2.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + C6FT7 130724/1200 35.00 -65.80 1015.90 -9999.00 -9999.00 30.90 + -9999.00 -9999.00 12.90 210.00 20.00 16.00 + 2.00 6.00 6.00 4.00 8.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 3.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD3825 130724/1200 38.00 -65.70 1010.50 -9999.00 -9999.00 27.00 + 24.00 25.00 11.30 200.00 20.00 2.00 + 2.00 7.00 7.00 4.00 26.00 28.80 + -9999.00 2.10 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 5.00 1.50 -9999.00 5.00 + 1.50 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 1001.90 -9999.00 1031.00 19.00 + 14.20 -9999.00 7.20 230.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 1001.70 -9999.00 1030.00 19.60 + 15.10 -9999.00 7.20 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.70 -63.60 1005.60 -9999.00 1014.00 18.10 + 19.30 -9999.00 4.60 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.60 -63.60 1006.00 -9999.00 1017.00 19.70 + 20.10 -9999.00 1.50 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 11.50 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.70 -61.79 1002.10 -9999.00 3019.00 20.30 + 19.20 -9999.00 10.30 170.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 18.50 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + C6FT7 130724/1200 35.00 -65.80 1015.90 -9999.00 -9999.00 30.90 + -9999.00 -9999.00 12.90 210.00 20.00 16.00 + 2.00 6.00 6.00 4.00 8.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 3.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + V7HP2 130724/1200 33.29 -71.50 1015.00 -9999.00 4000.00 26.00 + 24.60 25.00 12.40 220.00 10.00 80.00 + 8.00 8.00 8.00 7.00 26.00 25.00 + -9999.00 4.20 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 2.00 3.00 220.00 2.00 + 3.00 220.00 2.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 1001.90 -9999.00 1031.00 19.00 + 14.20 -9999.00 7.20 230.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 1001.70 -9999.00 1030.00 19.60 + 15.10 -9999.00 7.20 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.70 -63.60 1005.60 -9999.00 1014.00 18.10 + 19.30 -9999.00 4.60 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.60 -63.60 1006.00 -9999.00 1017.00 19.70 + 20.10 -9999.00 1.50 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 11.50 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.70 -61.79 1002.10 -9999.00 3019.00 20.30 + 19.20 -9999.00 10.30 170.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 18.50 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCE5063 130724/1200 30.30 -89.09 1014.50 -9999.00 -9999.00 31.90 + 29.20 -9999.00 9.30 290.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 31.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 41.79 -83.30 1015.10 -9999.00 3014.00 16.70 + 10.50 -9999.00 8.20 20.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 25.70 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.60 -75.70 -9999.00 -9999.00 -9999.00 13.50 + 7.00 -9999.00 6.20 310.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 23.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 43.20 -79.20 1011.30 -9999.00 3.00 16.70 + 10.60 -9999.00 5.10 350.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 24.80 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3108 130724/1200 42.60 -87.50 1018.10 -9999.00 -9999.00 17.60 + -9999.00 -9999.00 5.10 30.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDF7020 130724/1200 41.90 -82.70 1014.20 -9999.00 3000.00 15.50 + -9999.00 -9999.00 9.30 10.00 50.00 2.00 + 2.00 7.00 7.00 4.00 26.00 22.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 2.00 1.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 49.40 -66.40 999.80 -9999.00 1003.00 12.40 + 12.60 -9999.00 6.20 90.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDL 130724/1200 31.00 -79.90 1010.90 -9999.00 -9999.00 25.20 + 22.50 23.30 10.80 270.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTEO 130724/1200 36.79 -76.30 1008.30 -9999.00 -9999.00 27.10 + 22.40 23.80 4.60 290.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 28.50 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.70 -63.60 1005.80 -9999.00 1015.00 18.30 + 18.20 -9999.00 5.70 190.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 1001.70 -9999.00 1031.00 19.50 + 14.70 -9999.00 7.20 360.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 48.10 -69.50 1000.30 -9999.00 1032.00 11.40 + 12.50 -9999.00 15.40 300.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 48.29 -64.70 1000.50 -9999.00 1014.00 17.00 + 16.50 -9999.00 6.20 190.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCE5063 130724/1200 30.30 -89.09 1014.50 -9999.00 -9999.00 31.90 + 29.20 -9999.00 9.30 290.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 31.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 41.79 -83.30 1015.10 -9999.00 3014.00 16.70 + 10.50 -9999.00 8.20 20.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 25.70 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.60 -75.70 -9999.00 -9999.00 -9999.00 13.50 + 7.00 -9999.00 6.20 310.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 23.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 43.20 -79.20 1011.30 -9999.00 3.00 16.70 + 10.60 -9999.00 5.10 350.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 24.80 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3108 130724/1200 42.60 -87.50 1018.10 -9999.00 -9999.00 17.60 + -9999.00 -9999.00 5.10 30.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDF7020 130724/1200 41.90 -82.70 1014.20 -9999.00 3000.00 15.50 + -9999.00 -9999.00 9.30 10.00 50.00 2.00 + 2.00 7.00 7.00 4.00 26.00 22.20 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 5.00 2.00 1.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCF3012 130724/1200 46.10 -84.00 1017.70 -9999.00 -9999.00 15.40 + -9999.00 -9999.00 4.60 320.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WYR4481 130724/1200 47.60 -88.30 1017.90 -9999.00 -9999.00 9.30 + -9999.00 -9999.00 5.10 230.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 5.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3972 130724/1200 45.50 -86.50 1017.70 -9999.00 -9999.00 14.80 + -9999.00 -9999.00 2.10 220.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 18.40 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3972 130724/1200 45.60 -86.20 1017.40 -9999.00 -9999.00 15.40 + -9999.00 -9999.00 3.10 190.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 18.30 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3972 130724/1200 45.50 -86.50 1017.70 -9999.00 -9999.00 14.80 + -9999.00 -9999.00 2.10 220.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 18.40 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3972 130724/1200 45.60 -86.20 1017.40 -9999.00 -9999.00 15.40 + -9999.00 -9999.00 3.10 190.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 18.30 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3972 130724/1200 45.60 -86.20 1017.40 -9999.00 -9999.00 15.40 + -9999.00 -9999.00 3.10 190.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 18.30 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + KCEJ 130724/1200 41.50 -70.70 1004.80 -9999.00 -9999.00 23.70 + 21.30 -9999.00 2.10 250.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 23.70 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + KCEJ 130724/1200 41.50 -70.70 1004.80 -9999.00 -9999.00 23.70 + 21.30 -9999.00 2.10 250.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 23.70 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3972 130724/1200 45.50 -86.50 1017.70 -9999.00 -9999.00 14.80 + -9999.00 -9999.00 2.10 220.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 18.40 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCF3012 130724/1200 46.10 -84.00 1017.70 -9999.00 -9999.00 15.40 + -9999.00 -9999.00 4.60 320.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WYR4481 130724/1200 47.60 -88.30 1017.90 -9999.00 -9999.00 9.30 + -9999.00 -9999.00 5.10 230.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 5.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3972 130724/1200 45.50 -86.50 1017.70 -9999.00 -9999.00 14.80 + -9999.00 -9999.00 2.10 220.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 18.40 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCF3012 130724/1200 46.10 -84.00 1017.70 -9999.00 -9999.00 15.40 + -9999.00 -9999.00 4.60 320.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WYR4481 130724/1200 47.60 -88.30 1017.90 -9999.00 -9999.00 9.30 + -9999.00 -9999.00 5.10 230.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 5.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 135.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3972 130724/1200 45.60 -86.20 1017.40 -9999.00 -9999.00 15.40 + -9999.00 -9999.00 3.10 190.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 18.30 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + VGPY 130724/1200 43.70 -77.50 1008.00 -9999.00 3020.00 17.00 + -9999.00 -9999.00 8.20 310.00 20.00 2.00 + 2.00 7.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 3.00 1.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + VGPY 130724/1200 43.70 -77.50 1008.00 -9999.00 3020.00 17.00 + -9999.00 -9999.00 8.20 310.00 20.00 2.00 + 2.00 7.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 3.00 1.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + VGPY 130724/1200 43.70 -77.50 1008.00 -9999.00 3020.00 17.00 + -9999.00 -9999.00 8.20 310.00 20.00 2.00 + 2.00 7.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 3.00 1.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + VGPY 130724/1200 43.70 -77.50 1008.00 -9999.00 3020.00 17.00 + -9999.00 -9999.00 8.20 310.00 20.00 2.00 + 2.00 7.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 3.00 1.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD2876 130724/1200 43.90 -86.70 1017.90 -9999.00 -9999.00 16.10 + -9999.00 -9999.00 4.60 80.00 50.00 2.00 + 0.00 2.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD2876 130724/1200 43.90 -86.70 1017.90 -9999.00 -9999.00 16.10 + -9999.00 -9999.00 4.60 80.00 50.00 2.00 + 0.00 2.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WZP8164 130724/1200 47.60 -87.70 1017.90 -9999.00 4000.00 10.50 + -9999.00 -9999.00 5.10 290.00 20.00 3.00 + 1.00 5.00 2.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 1.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WZP8164 130724/1200 47.60 -87.70 1017.90 -9999.00 4000.00 10.50 + -9999.00 -9999.00 5.10 290.00 20.00 3.00 + 1.00 5.00 2.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 1.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDH 130724/1200 39.79 -71.09 1011.60 -9999.00 -9999.00 25.80 + 23.10 -9999.00 5.70 250.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 26.10 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + VCPX 130724/1200 43.29 -79.70 1014.00 -9999.00 3030.00 16.00 + -9999.00 -9999.00 10.30 10.00 20.00 2.00 + 2.00 4.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 1.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + VCPX 130724/1200 43.29 -79.70 1014.00 -9999.00 3030.00 16.00 + -9999.00 -9999.00 10.30 10.00 20.00 2.00 + 2.00 4.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 1.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WZE4928 130724/1200 45.79 -84.80 1017.90 -9999.00 -9999.00 16.10 + -9999.00 -9999.00 2.60 270.00 20.00 2.00 + 0.00 1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 5.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3108 130724/1200 42.40 -87.50 1018.40 -9999.00 -9999.00 17.90 + -9999.00 -9999.00 6.20 40.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 43.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3108 130724/1200 42.40 -87.50 1018.40 -9999.00 -9999.00 17.90 + -9999.00 -9999.00 6.20 40.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 43.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCE5063 130724/1200 30.39 -89.09 1014.70 -9999.00 -9999.00 32.70 + 29.20 -9999.00 6.20 280.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 31.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WZE4928 130724/1200 45.79 -84.80 1017.90 -9999.00 -9999.00 16.10 + -9999.00 -9999.00 2.60 270.00 20.00 2.00 + 0.00 1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 5.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDH 130724/1200 39.79 -71.09 1011.60 -9999.00 -9999.00 25.80 + 23.10 -9999.00 5.70 250.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 26.10 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WZE4928 130724/1200 45.79 -84.80 1017.90 -9999.00 -9999.00 16.10 + -9999.00 -9999.00 2.60 270.00 20.00 2.00 + 0.00 1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 5.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + VCPX 130724/1200 43.29 -79.70 1014.00 -9999.00 3030.00 16.00 + -9999.00 -9999.00 10.30 10.00 20.00 2.00 + 2.00 4.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 1.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WCE5063 130724/1200 30.39 -89.09 1014.70 -9999.00 -9999.00 32.70 + 29.20 -9999.00 6.20 280.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 31.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WL3108 130724/1200 42.40 -87.50 1018.40 -9999.00 -9999.00 17.90 + -9999.00 -9999.00 6.20 40.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 42.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 43.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WZE4928 130724/1200 45.79 -84.80 1017.90 -9999.00 -9999.00 16.10 + -9999.00 -9999.00 2.60 270.00 20.00 2.00 + 0.00 1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 5.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + VCPX 130724/1200 43.29 -79.70 1014.00 -9999.00 3030.00 16.00 + -9999.00 -9999.00 10.30 10.00 20.00 2.00 + 2.00 4.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 1.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDH 130724/1200 39.79 -71.09 1011.60 -9999.00 -9999.00 25.80 + 23.10 -9999.00 5.70 250.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 26.10 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.40 -61.90 1003.10 -9999.00 3042.00 20.70 + 19.00 -9999.00 9.30 190.00 10.00 1.00 + 6.00 7.00 7.00 -9999.00 -9999.00 19.10 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 4.00 2.00 1.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + VCRG 130724/1200 46.40 -61.90 1003.10 -9999.00 3042.00 20.70 + 19.00 -9999.00 9.30 190.00 10.00 1.00 + 6.00 7.00 7.00 -9999.00 -9999.00 19.10 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 4.00 2.00 1.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDC6055 130724/1200 45.29 -86.90 1017.70 -9999.00 -9999.00 16.90 + -9999.00 -9999.00 0.50 60.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 18.10 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 41.79 -83.09 1015.60 -9999.00 3012.00 16.70 + 10.50 -9999.00 7.70 20.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 25.60 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 270.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 43.20 -79.20 1010.90 -9999.00 6009.00 17.80 + 10.20 -9999.00 4.60 360.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 24.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.70 -63.60 1006.20 -9999.00 3018.00 17.90 + 19.20 -9999.00 4.10 210.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.70 -63.60 1006.20 -9999.00 3017.00 18.50 + 18.40 -9999.00 3.10 210.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 1003.10 -9999.00 1035.00 18.30 + 13.20 -9999.00 11.30 340.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 44.70 -75.50 1002.40 -9999.00 -9999.00 13.90 + 6.70 -9999.00 6.20 310.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 23.80 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WHED 130724/1200 32.00 -77.90 1014.00 -9999.00 -9999.00 29.40 + 25.80 26.70 4.10 230.00 20.00 61.00 + 2.00 8.00 8.00 2.00 74.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 8.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTDL 130724/1200 30.89 -80.00 1011.30 -9999.00 -9999.00 25.10 + 22.00 22.90 11.30 260.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WTEO 130724/1200 36.79 -76.30 1008.40 -9999.00 -9999.00 28.90 + 23.00 24.60 4.60 270.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 28.80 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WE4805 130724/1200 47.20 -91.00 1019.20 -9999.00 3001.00 15.50 + -9999.00 -9999.00 3.10 230.00 20.00 3.00 + 0.00 7.00 -9999.00 -9999.00 -9999.00 12.70 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 4.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 225.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 49.29 -66.90 1000.40 -9999.00 3005.00 11.50 + 11.60 -9999.00 1.00 30.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 90.00 18.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 47.79 -85.30 1017.30 -9999.00 8.00 13.30 + 10.50 -9999.00 2.10 280.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 14.90 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 8.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 46.79 -71.20 1003.40 -9999.00 1037.00 18.10 + 12.50 -9999.00 7.20 240.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + SHIP 130724/1200 48.29 -64.70 1001.00 -9999.00 3018.00 16.70 + 16.60 -9999.00 9.30 200.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 0.00 -1.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 0.00 -9999.00 -9999.00 + -9999.00 -9999.00 + + diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/snd_multi_levels_station_BAD.snd b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/snd_multi_levels_station_BAD.snd new file mode 100644 index 0000000000..4846a963c4 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/snd_multi_levels_station_BAD.snd @@ -0,0 +1,50 @@ + + SNPARM = PRES;THTA;MIXR;DRCT;SPED;TVRK;HGHT + STNPRM = KINX;SWET;LIFT + + STID = STNM = 72403 TIME = 130724/0000 + SLAT = ****** SLON = -77.46 SELV = 93.0 + STIM = 0 + + KINX = 21.00 SWET = 240.60 LIFT = -0.82 + + PRES THTA MIXR DRCT SPED TVRK HGHT + 995.00 302.78 14.28 300.00 2.06 304.94 93.00 + 1000.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 41.00 + 925.00 303.03 11.88 310.00 7.21 298.46 730.00 + 850.00 303.94 11.42 295.00 12.87 292.14 1460.00 + 700.00 311.75 2.87 305.00 13.38 282.04 3089.00 + 500.00 323.59 0.37 265.00 15.96 265.51 5790.00 + 400.00 330.60 0.06 270.00 16.99 254.46 7490.00 + 300.00 338.32 0.05 255.00 23.17 239.86 9580.00 + 250.00 341.85 0.04 250.00 26.77 230.06 10830.00 + 200.00 348.84 0.04 255.00 22.14 220.26 12300.00 + 150.00 368.75 0.01 285.00 15.44 214.45 14130.00 + 100.00 406.70 0.00 265.00 7.21 210.65 16630.00 + + STID = FFC STNM = 72215 TIME = 130731/1200 + SLAT = 33.36 SLON = -84.57 SELV = 245.0 + STIM = 1200 + + LIFT = -1.56 SHOW = 0.38 KINX = 36.10 + + STID = IAD STNM = 72403 TIME = 130724/1200 + SLAT = 38.98 SLON = -77.46 SELV = 93.0 + STIM = 1200 + + KINX = 30.40 SWET = 210.38 LIFT = 2.80 + + PRES THTA MIXR DRCT SPED TVRK HGHT + 997.00 296.20 13.11 335.00 1.54 298.28 93.00 + 1000.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 62.00 + 925.00 299.75 10.98 315.00 7.72 295.08 741.00 + 850.00 302.89 10.97 295.00 6.69 291.06 1465.00 + 700.00 309.98 5.83 265.00 9.78 280.94 3090.00 + 500.00 323.59 2.08 270.00 16.47 265.79 5780.00 + 400.00 330.60 1.76 250.00 18.53 254.72 7480.00 + 300.00 336.91 0.42 245.00 29.86 238.91 9560.00 + 250.00 340.66 0.14 240.00 26.25 229.27 10810.00 + 200.00 348.84 0.01 265.00 27.28 220.25 12270.00 + 150.00 363.93 0.00 245.00 16.99 211.65 14100.00 + 100.00 405.54 0.00 210.00 7.21 210.05 16600.00 + \ No newline at end of file diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/snd_multi_levels_stations_00_12z.snd b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/snd_multi_levels_stations_00_12z.snd new file mode 100644 index 0000000000..91a91f0069 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/snd_multi_levels_stations_00_12z.snd @@ -0,0 +1,83 @@ + + SNPARM = PRES;THTA;MIXR;DRCT;SPED;TVRK;HGHT + STNPRM = KINX;SWET;LIFT + + STID = IAD STNM = 72403 TIME = 130724/0000 + SLAT = 38.98 SLON = -77.46 SELV = 93.0 + STIM = 0 + + KINX = 21.00 SWET = 240.60 LIFT = -0.82 + + PRES THTA MIXR DRCT SPED TVRK HGHT + 995.00 302.78 14.28 300.00 2.06 304.94 93.00 + 1000.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 41.00 + 925.00 303.03 11.88 310.00 7.21 298.46 730.00 + 850.00 303.94 11.42 295.00 12.87 292.14 1460.00 + 700.00 311.75 2.87 305.00 13.38 282.04 3089.00 + 500.00 323.59 0.37 265.00 15.96 265.51 5790.00 + 400.00 330.60 0.06 270.00 16.99 254.46 7490.00 + 300.00 338.32 0.05 255.00 23.17 239.86 9580.00 + 250.00 341.85 0.04 250.00 26.77 230.06 10830.00 + 200.00 348.84 0.04 255.00 22.14 220.26 12300.00 + 150.00 368.75 0.01 285.00 15.44 214.45 14130.00 + 100.00 406.70 0.00 265.00 7.21 210.65 16630.00 + + STID = ALB STNM = 72518 TIME = 130724/0000 + SLAT = 42.69 SLON = -73.83 SELV = 95.0 + STIM = 0 + + KINX = 32.10 SWET = 201.39 LIFT = -0.72 + + PRES THTA MIXR DRCT SPED TVRK HGHT + 991.00 302.73 13.98 0.00 2.57 304.48 95.00 + 1000.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 12.00 + 925.00 301.18 13.35 315.00 4.63 296.91 696.00 + 850.00 303.10 10.97 305.00 6.69 291.26 1424.00 + 700.00 309.98 6.59 275.00 5.15 281.06 3048.00 + 500.00 323.83 0.61 240.00 11.84 265.75 5740.00 + 400.00 329.30 0.34 240.00 19.56 253.50 7430.00 + 300.00 337.76 0.14 235.00 18.53 239.47 9510.00 + 250.00 341.85 0.09 230.00 14.41 230.06 10770.00 + 200.00 347.25 0.04 245.00 21.11 219.25 12230.00 + 150.00 370.12 0.03 250.00 19.56 215.25 14060.00 + 100.00 416.35 0.04 240.00 9.78 215.66 16590.00 + + STID = IAD STNM = 72403 TIME = 130724/1200 + SLAT = 38.98 SLON = -77.46 SELV = 93.0 + STIM = 1200 + + KINX = 30.40 SWET = 210.38 LIFT = 2.80 + + PRES THTA MIXR DRCT SPED TVRK HGHT + 997.00 296.20 13.11 335.00 1.54 298.28 93.00 + 1000.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 62.00 + 925.00 299.75 10.98 315.00 7.72 295.08 741.00 + 850.00 302.89 10.97 295.00 6.69 291.06 1465.00 + 700.00 309.98 5.83 265.00 9.78 280.94 3090.00 + 500.00 323.59 2.08 270.00 16.47 265.79 5780.00 + 400.00 330.60 1.76 250.00 18.53 254.72 7480.00 + 300.00 336.91 0.42 245.00 29.86 238.91 9560.00 + 250.00 340.66 0.14 240.00 26.25 229.27 10810.00 + 200.00 348.84 0.01 265.00 27.28 220.25 12270.00 + 150.00 363.93 0.00 245.00 16.99 211.65 14100.00 + 100.00 405.54 0.00 210.00 7.21 210.05 16600.00 + + STID = ALB STNM = 72518 TIME = 130724/1200 + SLAT = 42.69 SLON = -73.83 SELV = 95.0 + STIM = 1200 + + KINX = 32.70 SWET = 211.61 LIFT = 4.80 + + PRES THTA MIXR DRCT SPED TVRK HGHT + 995.00 294.77 11.03 340.00 2.06 296.30 95.00 + 1000.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 47.00 + 925.00 294.03 10.14 295.00 12.87 289.30 716.00 + 850.00 301.22 9.66 270.00 11.33 289.22 1431.00 + 700.00 307.10 6.36 265.00 278.41 3042.00 + 500.00 321.15 0.22 250.00 19.56 263.49 5710.00 + 400.00 326.70 0.20 245.00 21.11 251.48 7400.00 + 300.00 335.50 0.09 235.00 38.10 237.86 9470.00 + 250.00 338.58 0.05 230.00 33.46 227.86 10710.00 + 200.00 352.95 0.04 250.00 31.92 222.86 12170.00 + 150.00 373.91 0.03 235.00 26.77 217.45 14030.00 + 100.00 411.72 0.03 245.00 15.96 213.25 16570.00 diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/snd_wrap_around.snd b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/snd_wrap_around.snd new file mode 100644 index 0000000000..6bf7fbdfa5 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/TEMP/snd_wrap_around.snd @@ -0,0 +1,465 @@ + + SNPARM = PRES;TMPC;DWPT;HGHT;DRCT;SKNT;TMPK;RELH;MIXR;UKNT;VKNT;THTA;THTE + STNPRM = LIFT;SHOW;KINX + + STID = FFC STNM = 72215 TIME = 130731/1200 + SLAT = 33.36 SLON = -84.57 SELV = 245.0 + STIM = 1200 + + LIFT = -1.56 SHOW = 0.38 KINX = 36.10 + + PRES TMPC DWPT HGHT DRCT SKNT TMPK RELH + MIXR UKNT VKNT THTA THTE + 992.00 21.80 21.00 245.00 0.00 0.00 294.95 95.21 + 16.06 0.00 0.00 295.63 341.92 + 1000.00 -9999.00 -9999.00 170.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 925.00 22.00 18.40 851.00 210.00 10.99 295.15 80.03 + 14.62 5.50 9.52 301.80 345.11 + 850.00 17.00 13.90 1581.00 230.00 16.01 290.15 81.96 + 11.88 12.26 10.29 303.94 339.55 + 700.00 5.80 4.30 3209.00 225.00 27.00 278.95 90.08 + 7.49 19.09 19.09 308.88 332.09 + 500.00 -6.70 -7.60 5900.00 10.00 6.99 266.45 93.30 + 4.34 -1.21 -6.89 324.81 339.47 + 400.00 -16.10 -18.70 7630.00 245.00 8.00 257.05 80.35 + 2.20 7.25 3.38 333.98 341.92 + 300.00 -31.70 -36.70 9730.00 275.00 21.00 241.45 61.19 + 0.55 20.92 -1.83 340.58 342.79 + 250.00 -42.90 -51.90 10980.00 315.00 27.99 230.25 36.51 + 0.13 19.79 -19.79 342.15 342.70 + 200.00 -54.10 -62.10 12450.00 310.00 42.00 219.05 36.72 + 0.04 32.17 -27.00 346.94 347.14 + 150.00 -65.70 -74.70 14250.00 310.00 35.99 207.45 27.52 + 0.01 27.57 -23.14 356.71 356.76 + 100.00 -70.70 -78.70 16650.00 305.00 17.00 202.45 29.86 + 0.01 13.92 -9.75 390.87 390.92 + + STID = BMX STNM = 72230 TIME = 130731/1200 + SLAT = 33.16 SLON = -86.76 SELV = 178.0 + STIM = 1200 + + LIFT = -7.20 SHOW = -4.07 KINX = 34.50 + + PRES TMPC DWPT HGHT DRCT SKNT TMPK RELH + MIXR UKNT VKNT THTA THTE + 998.00 24.40 22.80 178.00 0.00 0.00 297.55 90.80 + 17.87 0.00 0.00 297.72 349.73 + 1000.00 -9999.00 -9999.00 158.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 925.00 23.20 22.30 844.00 250.00 18.01 296.35 94.68 + 18.72 16.92 6.16 303.03 358.79 + 850.00 17.80 16.80 1578.00 260.00 16.01 290.95 93.87 + 14.37 15.76 2.78 304.78 347.88 + 700.00 7.20 -0.80 3212.00 275.00 19.00 280.35 56.80 + 5.18 18.93 -1.66 310.43 326.85 + 500.00 -7.90 -12.20 5910.00 295.00 17.00 265.25 71.21 + 3.02 15.40 -7.18 323.34 333.66 + 400.00 -19.30 -31.30 7610.00 315.00 23.00 253.85 33.78 + 0.70 16.26 -16.26 329.82 332.49 + 300.00 -31.50 -49.50 9710.00 315.00 39.01 241.65 15.21 + 0.14 27.58 -27.58 340.86 341.47 + 250.00 -41.90 -55.90 10970.00 320.00 46.00 231.25 20.34 + 0.08 29.57 -35.24 343.64 343.99 + 200.00 -53.50 -65.50 12440.00 325.00 46.00 219.65 21.73 + 0.03 26.38 -37.68 347.89 348.02 + 150.00 -66.30 -76.30 14240.00 320.00 48.00 206.85 23.40 + 0.01 30.85 -36.77 355.68 355.72 + 100.00 -72.50 -81.50 16630.00 175.00 6.99 200.65 24.71 + 0.01 -0.61 6.97 387.39 387.42 + + STID = MHX STNM = 72305 TIME = 130731/1200 + SLAT = 34.78 SLON = -76.88 SELV = 11.0 + STIM = 1200 + + LIFT = 1.14 SHOW = 6.24 KINX = 0.70 + + PRES TMPC DWPT HGHT DRCT SKNT TMPK RELH + MIXR UKNT VKNT THTA THTE + 1019.00 22.80 22.50 11.00 0.00 0.00 295.95 98.19 + 17.17 0.00 0.00 294.36 343.58 + 1000.00 23.80 19.90 176.00 75.00 10.99 296.95 78.79 + 14.86 -10.62 -2.85 296.95 340.06 + 925.00 20.40 13.40 855.00 45.00 6.99 293.55 64.13 + 10.55 -4.94 -4.94 300.16 331.38 + 850.00 15.40 5.40 1579.00 10.00 8.00 288.55 51.29 + 6.66 -1.39 -7.88 302.26 322.46 + 700.00 7.00 -22.00 3196.00 290.00 16.01 280.15 10.55 + 0.94 15.04 -5.47 310.20 313.49 + 500.00 -8.90 -12.40 5880.00 265.00 19.00 264.25 75.75 + 2.97 18.93 1.66 322.12 332.23 + 400.00 -17.90 -20.70 7590.00 245.00 27.00 255.25 78.69 + 1.85 24.47 11.41 331.64 338.33 + 300.00 -33.50 -37.80 9680.00 255.00 19.00 239.65 65.16 + 0.49 18.35 4.92 338.04 340.01 + 250.00 -44.30 -53.30 10930.00 265.00 21.00 228.85 35.99 + 0.11 20.92 1.83 340.07 340.54 + 200.00 -56.10 -67.10 12380.00 295.00 39.01 217.05 23.89 + 0.02 35.35 -16.48 343.77 343.88 + 150.00 -65.30 -82.30 14170.00 300.00 25.00 207.85 7.84 + 0.00 21.65 -12.50 357.40 357.41 + 100.00 -65.70 -88.70 16600.00 295.00 17.00 207.45 2.74 + 0.00 15.40 -7.18 400.52 400.53 + + STID = GSO STNM = 72317 TIME = 130731/1200 + SLAT = 36.08 SLON = -79.95 SELV = 270.0 + STIM = 1200 + + LIFT = -0.43 SHOW = 4.89 KINX = 28.70 + + PRES TMPC DWPT HGHT DRCT SKNT TMPK RELH + MIXR UKNT VKNT THTA THTE + 989.00 22.00 19.00 270.00 0.00 0.00 295.15 83.09 + 14.19 0.00 0.00 296.08 337.11 + 1000.00 -9999.00 -9999.00 177.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 925.00 19.60 16.40 856.00 285.00 6.99 292.75 81.76 + 12.84 6.75 -1.81 299.34 337.06 + 850.00 15.00 8.00 1579.00 310.00 14.01 288.15 62.92 + 7.98 10.73 -9.00 301.85 325.82 + 700.00 5.40 2.60 3196.00 235.00 12.00 278.55 82.15 + 6.64 9.83 6.89 308.43 329.06 + 500.00 -8.50 -9.40 5860.00 280.00 22.01 264.65 93.20 + 3.77 21.67 -3.82 322.61 335.32 + 400.00 -18.10 -22.40 7560.00 270.00 27.00 255.05 68.99 + 1.59 27.00 0.00 331.38 337.19 + 300.00 -34.30 -43.30 9650.00 270.00 29.00 238.85 39.67 + 0.28 29.00 0.00 336.91 338.05 + 250.00 -44.90 -53.90 10890.00 270.00 31.00 228.25 35.76 + 0.10 31.00 0.00 339.18 339.62 + 200.00 -54.10 -64.10 12350.00 280.00 50.99 219.05 28.19 + 0.03 50.22 -8.85 346.94 347.10 + 150.00 -63.90 -72.90 14160.00 310.00 31.99 209.25 28.26 + 0.01 24.51 -20.56 359.81 359.87 + 100.00 -64.30 -73.30 16600.00 295.00 17.00 208.85 28.09 + 0.02 15.40 -7.18 403.23 403.33 + + STID = RNK STNM = 72318 TIME = 130731/1200 + SLAT = 37.20 SLON = -80.41 SELV = 654.0 + STIM = 1200 + + LIFT = 2.82 SHOW = 2.78 KINX = 33.10 + + PRES TMPC DWPT HGHT DRCT SKNT TMPK RELH + MIXR UKNT VKNT THTA THTE + 948.00 17.60 17.60 654.00 280.00 2.00 290.75 100.00 + 13.54 1.97 -0.35 295.22 334.23 + 1000.00 -9999.00 -9999.00 180.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 925.00 17.60 13.30 854.00 295.00 8.00 290.75 75.89 + 10.48 7.25 -3.38 297.30 327.93 + 850.00 15.20 9.20 1575.00 260.00 14.01 288.35 67.37 + 8.66 13.79 2.43 302.05 328.04 + 700.00 3.40 2.60 3189.00 235.00 23.00 276.55 94.49 + 6.64 18.84 13.19 306.22 326.65 + 500.00 -9.50 -10.80 5860.00 255.00 24.01 263.65 90.24 + 3.37 23.19 6.21 321.39 332.78 + 400.00 -18.90 -21.50 7550.00 280.00 25.00 254.25 79.90 + 1.73 24.62 -4.34 330.34 336.58 + 300.00 -35.10 -42.10 9630.00 270.00 25.99 238.05 48.79 + 0.32 25.99 0.00 335.79 337.07 + 250.00 -45.90 -54.90 10870.00 265.00 33.00 227.25 35.38 + 0.09 32.88 2.88 337.69 338.08 + 200.00 -53.30 -65.30 12330.00 285.00 46.00 219.85 21.80 + 0.03 44.43 -11.91 348.20 348.34 + 150.00 -62.30 -74.30 14140.00 285.00 25.99 210.85 18.56 + 0.01 25.11 -6.73 362.56 362.61 + 100.00 -63.30 -76.30 16600.00 300.00 18.01 209.85 15.62 + 0.01 15.59 -9.00 405.16 405.23 + + STID = BNA STNM = 72327 TIME = 130731/1200 + SLAT = 36.25 SLON = -86.56 SELV = 210.0 + STIM = 1200 + + LIFT = 1.12 SHOW = -0.30 KINX = 37.30 + + PRES TMPC DWPT HGHT DRCT SKNT TMPK RELH + MIXR UKNT VKNT THTA THTE + 997.00 19.80 19.00 210.00 0.00 0.00 292.95 95.14 + 14.07 0.00 0.00 293.20 333.38 + 1000.00 -9999.00 -9999.00 152.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 925.00 20.40 16.80 825.00 210.00 22.01 293.55 79.81 + 13.18 11.00 19.06 300.16 338.99 + 850.00 15.20 15.10 1551.00 250.00 25.99 288.35 99.36 + 12.86 24.42 8.89 302.05 340.23 + 700.00 7.20 7.10 3183.00 305.00 27.00 280.35 99.32 + 9.12 22.12 -15.49 310.43 338.67 + 500.00 -7.10 -14.10 5890.00 275.00 20.01 266.05 57.39 + 2.58 19.93 -1.74 324.32 333.26 + 400.00 -19.10 -35.10 7590.00 295.00 19.00 254.05 22.94 + 0.49 17.22 -8.03 330.08 331.97 + 300.00 -34.30 -9999.00 9670.00 300.00 29.00 238.85 -9999.00 + -9999.00 25.12 -14.50 336.91 -9999.00 + 250.00 -43.10 -9999.00 10920.00 295.00 48.00 230.05 -9999.00 + -9999.00 43.50 -20.29 341.85 -9999.00 + 200.00 -52.90 -9999.00 12390.00 290.00 44.00 220.25 -9999.00 + -9999.00 41.34 -15.05 348.84 -9999.00 + 150.00 -64.90 -9999.00 14200.00 305.00 63.00 208.25 -9999.00 + -9999.00 51.60 -36.13 358.09 -9999.00 + 100.00 -65.70 -9999.00 16630.00 330.00 25.00 207.45 -9999.00 + -9999.00 12.50 -21.65 400.52 -9999.00 + + STID = WAL STNM = 72402 TIME = 130731/1200 + SLAT = 37.93 SLON = -75.47 SELV = 12.0 + STIM = 1200 + + LIFT = 4.85 SHOW = 6.63 KINX = -8.60 + + PRES TMPC DWPT HGHT DRCT SKNT TMPK RELH + MIXR UKNT VKNT THTA THTE + 1020.00 19.00 15.90 12.00 340.00 2.99 292.15 82.21 + 11.26 1.02 -2.81 290.50 322.40 + 1000.00 23.40 13.40 185.00 345.00 2.99 296.55 53.39 + 9.75 0.77 -2.89 296.55 325.03 + 925.00 17.80 10.80 859.00 335.00 4.00 290.95 63.56 + 8.86 1.69 -3.63 297.50 323.58 + 850.00 11.80 7.50 1575.00 310.00 8.00 284.95 74.92 + 7.71 6.13 -5.14 298.49 321.36 + 700.00 7.80 -29.20 3179.00 320.00 6.00 280.95 5.20 + 0.49 3.86 -4.60 311.09 312.87 + 500.00 -9.10 -12.70 5870.00 240.00 15.00 264.05 75.10 + 2.90 12.99 7.50 321.88 331.75 + 400.00 -19.10 -27.10 7560.00 240.00 22.01 254.05 49.22 + 1.04 19.06 11.00 330.08 333.96 + 300.00 -34.90 -40.90 9630.00 260.00 25.00 238.25 54.29 + 0.36 24.62 4.34 336.07 337.51 + 250.00 -45.50 -50.50 10880.00 275.00 37.00 227.65 56.95 + 0.15 36.86 -3.23 338.29 338.92 + 200.00 -57.90 -62.90 12320.00 280.00 39.01 215.25 52.63 + 0.04 38.41 -6.77 340.92 341.10 + 150.00 -62.90 -77.90 14110.00 275.00 33.99 210.25 11.56 + 0.01 33.86 -2.96 361.53 361.56 + 100.00 -63.10 -85.10 16590.00 260.00 17.00 210.05 3.64 + 0.00 16.74 2.95 405.54 405.56 + + STID = IAD STNM = 72403 TIME = 130731/1200 + SLAT = 38.98 SLON = -77.46 SELV = 93.0 + STIM = 1200 + + LIFT = 3.77 SHOW = 5.07 KINX = 11.60 + + PRES TMPC DWPT HGHT DRCT SKNT TMPK RELH + MIXR UKNT VKNT THTA THTE + 1011.00 18.80 17.80 93.00 0.00 0.00 291.95 93.92 + 12.85 0.00 0.00 291.04 327.42 + 1000.00 20.00 16.20 180.00 200.00 4.99 293.15 78.75 + 11.71 1.71 4.69 293.15 326.70 + 925.00 18.40 12.40 854.00 225.00 10.00 291.55 68.03 + 9.87 7.07 7.07 298.12 327.12 + 850.00 12.80 9.10 1573.00 235.00 8.99 285.95 78.20 + 8.60 7.37 5.16 299.54 325.07 + 700.00 5.20 -13.80 3176.00 275.00 14.01 278.35 23.91 + 1.89 13.95 -1.22 308.21 314.48 + 500.00 -8.70 -16.70 5860.00 255.00 12.00 264.45 52.39 + 2.08 11.60 3.11 322.37 329.61 + 400.00 -19.50 -28.50 7560.00 230.00 17.00 253.65 44.75 + 0.92 13.02 10.93 329.56 332.98 + 300.00 -35.50 -43.50 9620.00 270.00 24.01 237.65 43.72 + 0.27 24.01 0.00 335.22 336.33 + 250.00 -46.90 -53.90 10860.00 270.00 37.00 226.25 44.57 + 0.10 37.00 0.00 336.21 336.64 + 200.00 -56.50 -79.50 12300.00 285.00 42.00 216.65 3.97 + 0.00 40.57 -10.87 343.13 343.15 + 150.00 -62.10 -89.10 14100.00 295.00 33.99 211.05 1.58 + 0.00 30.81 -14.37 362.90 362.91 + 100.00 -62.30 -92.30 16590.00 275.00 18.01 210.85 0.90 + 0.00 17.94 -1.57 407.09 407.09 + + STID = ILN STNM = 72426 TIME = 130731/1200 + SLAT = 39.41 SLON = -83.81 SELV = 317.0 + STIM = 1200 + + LIFT = 2.51 SHOW = 1.66 KINX = 33.50 + + PRES TMPC DWPT HGHT DRCT SKNT TMPK RELH + MIXR UKNT VKNT THTA THTE + 982.00 18.20 17.80 317.00 185.00 6.00 291.35 97.51 + 13.23 0.52 5.98 292.87 330.62 + 1000.00 -9999.00 -9999.00 162.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 925.00 15.60 15.60 831.00 210.00 19.00 288.75 100.00 + 12.19 9.50 16.45 295.25 330.44 + 850.00 12.80 12.80 1548.00 170.00 14.01 285.95 100.00 + 11.04 -2.43 13.79 299.54 332.07 + 700.00 4.80 4.00 3158.00 170.00 4.00 277.95 94.55 + 7.33 -0.69 3.94 307.77 330.41 + 500.00 -8.70 -12.90 5840.00 280.00 22.01 264.45 71.62 + 2.85 21.67 -3.82 322.37 332.10 + 400.00 -19.70 -40.70 7530.00 275.00 24.01 253.45 13.66 + 0.27 23.92 -2.09 329.30 330.40 + 300.00 -35.90 -73.90 9600.00 295.00 27.00 237.25 0.96 + 0.01 24.47 -11.41 334.66 334.69 + 250.00 -46.10 -65.10 10830.00 310.00 35.99 227.05 9.81 + 0.02 27.57 -23.14 337.39 337.51 + 200.00 -56.70 -70.70 12280.00 305.00 44.00 216.45 15.47 + 0.01 36.04 -25.24 342.82 342.88 + 150.00 -58.10 -72.10 14090.00 310.00 31.99 215.05 15.02 + 0.02 24.51 -20.56 369.78 369.86 + 100.00 -62.90 -75.90 16600.00 295.00 20.01 210.25 15.76 + 0.01 18.13 -8.46 405.93 406.00 + + STID = ALB STNM = 72518 TIME = 130731/1200 + SLAT = 42.69 SLON = -73.83 SELV = 95.0 + STIM = 1200 + + LIFT = 9.13 SHOW = 9.40 KINX = 3.30 + + PRES TMPC DWPT HGHT DRCT SKNT TMPK RELH + MIXR UKNT VKNT THTA THTE + 1011.00 16.20 12.90 95.00 205.00 2.99 289.35 80.80 + 9.33 1.26 2.71 288.45 314.77 + 1000.00 15.40 11.60 186.00 270.00 2.99 288.55 78.07 + 8.65 2.99 0.00 288.55 313.03 + 925.00 14.40 9.60 848.00 10.00 8.00 287.55 72.88 + 8.17 -1.39 -7.88 294.03 317.77 + 850.00 9.00 5.80 1557.00 335.00 8.00 282.15 80.35 + 6.85 3.38 -7.25 295.56 315.71 + 700.00 4.80 -16.20 3152.00 295.00 19.00 277.95 20.17 + 1.55 17.22 -8.03 307.77 312.96 + 500.00 -9.50 -56.50 5810.00 300.00 37.00 263.65 0.98 + 0.04 32.05 -18.50 321.39 321.55 + 400.00 -22.10 -51.10 7490.00 295.00 43.01 251.05 5.34 + 0.09 38.98 -18.18 326.18 326.55 + 300.00 -39.30 -52.30 9530.00 305.00 52.00 233.85 23.87 + 0.10 42.60 -29.83 329.86 330.29 + 250.00 -49.70 -58.70 10750.00 305.00 58.00 223.45 33.92 + 0.06 47.51 -33.27 332.05 332.29 + 200.00 -60.70 -68.70 12170.00 290.00 66.01 212.45 34.05 + 0.02 62.03 -22.58 336.48 336.57 + 150.00 -54.90 -64.90 13990.00 270.00 39.01 218.25 27.88 + 0.04 39.01 0.00 375.28 375.49 + 100.00 -58.50 -69.50 16560.00 290.00 17.00 214.65 22.99 + 0.03 15.97 -5.81 414.42 414.61 + + STID = PIT STNM = 72520 TIME = 130731/1200 + SLAT = 40.53 SLON = -80.22 SELV = 360.0 + STIM = 1200 + + LIFT = 4.03 SHOW = 5.46 KINX = -17.40 + + PRES TMPC DWPT HGHT DRCT SKNT TMPK RELH + MIXR UKNT VKNT THTA THTE + 979.00 16.00 15.40 360.00 0.00 0.00 289.15 96.23 + 11.36 0.00 0.00 290.91 323.13 + 1000.00 -9999.00 -9999.00 175.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 925.00 17.60 12.60 846.00 215.00 8.99 290.75 72.49 + 10.00 5.16 7.37 297.30 326.58 + 850.00 11.40 8.70 1562.00 255.00 6.99 284.55 83.47 + 8.37 6.75 1.81 298.07 322.78 + 700.00 6.20 -40.80 3165.00 300.00 4.99 279.35 1.84 + 0.16 4.32 -2.50 309.32 309.92 + 500.00 -9.50 -18.50 5850.00 265.00 13.00 263.65 47.93 + 1.79 12.95 1.13 321.39 327.64 + 400.00 -21.90 -30.90 7540.00 210.00 16.01 251.25 43.96 + 0.73 8.00 13.86 326.44 329.18 + 300.00 -36.70 -42.70 9590.00 245.00 18.01 236.45 53.70 + 0.30 16.32 7.61 333.53 334.73 + 250.00 -47.70 -56.70 10820.00 240.00 23.00 225.45 34.69 + 0.07 19.92 11.50 335.02 335.33 + 200.00 -54.90 -63.90 12260.00 260.00 35.99 218.25 31.88 + 0.04 35.45 6.25 345.67 345.83 + 150.00 -59.90 -70.90 14070.00 290.00 37.00 213.25 22.46 + 0.02 34.77 -12.66 366.68 366.78 + 100.00 -60.30 -73.30 16600.00 290.00 16.01 212.85 16.63 + 0.02 15.04 -5.47 410.95 411.06 + + STID = BUF STNM = 72528 TIME = 130731/1200 + SLAT = 42.93 SLON = -78.73 SELV = 215.0 + STIM = 1200 + + LIFT = 8.19 SHOW = 9.56 KINX = 3.60 + + PRES TMPC DWPT HGHT DRCT SKNT TMPK RELH + MIXR UKNT VKNT THTA THTE + 995.00 14.40 12.30 215.00 160.00 4.00 287.55 87.20 + 9.11 -1.37 3.76 287.96 313.63 + 1000.00 -9999.00 -9999.00 174.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 925.00 16.20 8.20 840.00 265.00 2.00 289.35 59.06 + 7.43 1.99 0.17 295.87 317.70 + 850.00 10.40 5.70 1551.00 190.00 2.00 283.55 72.64 + 6.80 0.35 1.97 297.03 317.17 + 700.00 5.80 -15.20 3153.00 245.00 12.00 278.95 20.44 + 1.68 10.88 5.07 308.88 314.51 + 500.00 -8.50 -33.50 5820.00 275.00 27.99 264.65 11.31 + 0.46 27.88 -2.44 322.61 324.34 + 400.00 -21.50 -41.50 7510.00 255.00 29.00 251.65 14.68 + 0.25 28.01 7.51 326.96 327.97 + 300.00 -39.10 -45.10 9560.00 265.00 29.99 234.05 52.91 + 0.23 29.88 2.61 330.14 331.07 + 250.00 -49.50 -55.50 10780.00 270.00 37.00 223.65 49.27 + 0.08 37.00 0.00 332.34 332.70 + 200.00 -59.70 -65.70 12200.00 280.00 38.00 213.45 45.39 + 0.03 37.42 -6.60 338.07 338.19 + 150.00 -55.90 -62.90 14020.00 275.00 25.99 217.25 41.11 + 0.05 25.89 -2.27 373.56 373.83 + 100.00 -59.10 -67.10 16580.00 295.00 20.01 214.05 34.71 + 0.05 18.13 -8.46 413.27 413.53 + + STID = DTX STNM = 72632 TIME = 130731/1200 + SLAT = 42.70 SLON = -83.46 SELV = 329.0 + STIM = 1200 + + LIFT = 3.50 SHOW = 4.92 KINX = 30.20 + + PRES TMPC DWPT HGHT DRCT SKNT TMPK RELH + MIXR UKNT VKNT THTA THTE + 980.00 17.40 16.30 329.00 25.00 2.99 290.55 93.26 + 12.03 -1.26 -2.71 292.23 326.53 + 1000.00 -9999.00 -9999.00 159.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 925.00 17.40 12.40 831.00 180.00 10.00 290.55 72.45 + 9.87 0.00 10.00 297.09 325.97 + 850.00 12.00 8.90 1547.00 195.00 10.00 285.15 81.32 + 8.49 2.59 9.66 298.70 323.81 + 700.00 4.80 4.60 3153.00 255.00 14.01 277.95 98.61 + 7.65 13.53 3.62 307.77 331.35 + 500.00 -9.50 -28.50 5830.00 285.00 18.01 263.65 19.69 + 0.73 17.39 -4.66 321.39 324.09 + 400.00 -21.90 -36.90 7510.00 255.00 27.00 251.25 24.42 + 0.41 26.08 6.99 326.44 328.01 + 300.00 -38.70 -44.70 9550.00 260.00 27.00 234.45 53.04 + 0.24 26.59 4.69 330.71 331.67 + 250.00 -48.50 -55.50 10780.00 280.00 35.00 224.65 43.97 + 0.08 34.47 -6.08 333.83 334.19 + 200.00 -57.90 -64.90 12210.00 285.00 31.99 215.25 40.31 + 0.03 30.90 -8.28 340.92 341.06 + 150.00 -55.10 -84.10 14040.00 300.00 29.99 218.05 1.57 + 0.00 25.97 -15.00 374.94 374.95 + 100.00 -58.30 -88.30 16600.00 295.00 13.00 214.85 1.12 + 0.00 11.78 -5.49 414.81 414.82 + + STID = APG STNM = 74002 TIME = 130731/1200 + SLAT = 39.47 SLON = -76.07 SELV = 5.0 + STIM = 1200 + + LIFT = 4.18 SHOW = 8.17 KINX = 8.50 + + PRES TMPC DWPT HGHT DRCT SKNT TMPK RELH + MIXR UKNT VKNT THTA THTE + 1021.00 22.00 18.90 5.00 45.00 2.99 295.15 82.58 + 13.65 -2.12 -2.12 293.40 332.43 + 1000.00 21.20 17.10 183.00 260.00 4.99 294.35 77.43 + 12.42 4.92 0.87 294.35 330.06 + 925.00 17.20 12.50 857.00 265.00 4.99 290.35 73.86 + 9.94 4.97 0.44 296.89 325.93 + 850.00 11.40 6.40 1571.00 310.00 8.00 284.55 71.34 + 7.14 6.13 -5.14 298.07 319.28 + 700.00 5.00 -13.00 3171.00 285.00 17.00 278.15 25.87 + 2.02 16.42 -4.40 307.99 314.65 + 500.00 -8.70 -28.70 5860.00 280.00 16.01 264.45 18.16 + 0.72 15.76 -2.78 322.37 325.03 + 400.00 -20.50 -49.50 7550.00 240.00 14.01 252.65 5.59 + 0.10 12.13 7.00 328.26 328.70 + 300.00 -36.90 -41.20 9610.00 235.00 16.01 236.25 64.23 + 0.35 13.11 9.18 333.25 334.64 + 250.00 -47.10 -50.00 10840.00 265.00 31.99 226.05 72.01 + 0.16 31.87 2.79 335.91 336.58 + 200.00 -56.70 -67.70 12280.00 275.00 48.00 216.45 23.66 + 0.02 47.82 -4.18 342.82 342.92 + 150.00 -60.70 -81.70 14080.00 290.00 33.99 212.45 4.71 + 0.00 31.94 -11.63 365.31 365.33 + 100.00 -61.90 -87.90 16580.00 290.00 19.00 211.25 1.91 + 0.00 17.85 -6.50 407.86 407.87 diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/build.properties b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/build.properties new file mode 100644 index 0000000000..34d2e4d2da --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/component-deploy.xml new file mode 100644 index 0000000000..ef703691f3 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/component-deploy.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.ffa/gov.noaa.nws.ncep.viz.rsc.ffa.ecl b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/gov.noaa.nws.ncep.common.dataplugin.gpd.ecl similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.rsc.ffa/gov.noaa.nws.ncep.viz.rsc.ffa.ecl rename to ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/gov.noaa.nws.ncep.common.dataplugin.gpd.ecl diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/GenericPointDataConstants.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/GenericPointDataConstants.java new file mode 100644 index 0000000000..3c1450f789 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/GenericPointDataConstants.java @@ -0,0 +1,69 @@ +/** + * + * + * This code has been developed by the NCEP-SIB for use in the AWIPS2 system. + * + * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    	Engineer    Description
+ * -------		------- 	-------- 	-----------
+ * 05/30/2013				Chin J. Chen	Initial coding
+ *
+ *
+ * + * @author Chin J. Chen + * @version 1.0 + */ +package gov.noaa.nws.ncep.common.dataplugin.gpd; + +public class GenericPointDataConstants { + public static final String HDF5_NUM_LEVEL = "NumProfileLevel"; + public static final String HDF5_STN_ID = "StationId"; + public static final String HDF5_LEVEL_VALUE = "LevelValue"; + public static final String HDF5_PDV_CURIDX="pointDataView.curIdx"; + public static final String HDF5_PDV_ID="id"; + public static final String MAX_LEVELS = "maxLevels"; + + public static final int MANDATORY_DATASET_NUM = 3; + public static final int MAX_STNID_STRING_SIZE = 16; + // db filed defined in GenericPointDataRecord + public static final String DB_PROD_NAME= "productInfo.name"; + public static final String DB_MASTER_LEVEL_NAME= "productInfo.masterLevel.name"; + public static final String DB_REFTIME_NAME= "dataTime.refTime"; + public static final String DB_PRODUCT_VERSION = "productVersion"; + public static final String DB_STN_CATALOGTYPE = "location.catalogType"; + public static final String DB_SLAT = "slat"; + public static final String DB_SLON = "slon"; + + // GEMPAK sounding data table definition names string + public static final String SND_PARM = "SNPARM"; //unique string in sounding data table, used as table type identifier + public static final int SND_PARM_PER_LINE = 8; // defined bases on Gempak Fortran coding + public static final String SND_STN_PARM = "STNPRM"; + public static final String SND_STN_ID = "STID"; + public static final String SND_STN_NUM = "STNM"; + public static final String SND_STN_LAT = "SLAT"; + public static final String SND_STN_LON = "SLON"; + public static final String SND_STN_ELEVATION= "SELV"; + public static final String SND_STN_IM= "STIM"; + public static final String SND_REFTIME= "TIME"; // time format like this, 130724/0000 + public static final int SND_HDR_PARM_PER_LINE = 13; //based on Gempak definition + // GEMPAK surface data table definition names string + public static final String SFC_PARM = "PARM"; + public static final int SFC_PARM_PER_LINE = 6; // defined bases on Gempak Fortran coding + public static final String SFC_STN = "STN"; + public static final String SFC_REFTIME = "YYMMDD/HHMM";//unique string in surface data table, used as table type identifier + public static final String SFC_LAT = "SLAT"; + public static final String SFC_LON = "SLON"; + public static final int SFC_HDR_PARM_PER_LINE = 14; //based on Gempak definition + + public static final float GPD_INVALID_FLOAT_VALUE = -9999.0f; + + public static final String GEMPAK_TEMP = "TMPC"; + public static final String GEMPAK_DEWPT = "DWPT"; + public static final String GEMPAK_HEIGHT = "HGHT"; + public static final String GEMPAK_WIND_DIR = "DRCT"; + public static final String GEMPAK_WIND_SPEED = "SKNT"; //in knot + public static final String GEMPAK_PRESSURE = "PRES"; //in millibars + public static final String GEMPAK_OMEGA = ""; +} diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/GenericPointDataRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/GenericPointDataRecord.java new file mode 100644 index 0000000000..04fa3abd8f --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/GenericPointDataRecord.java @@ -0,0 +1,312 @@ +/** + * + * + * This code has been developed by the NCEP-SIB for use in the AWIPS2 system. + * + * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    	Engineer    Description
+ * -------		------- 	-------- 	-----------
+ * 05/30/2013				Chin J. Chen	Initial coding
+ *
+ *
+ * + * @author Chin J. Chen + * @version 1.0 + */ +package gov.noaa.nws.ncep.common.dataplugin.gpd; + +import gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataProductInfo; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import javax.persistence.Column; +import javax.persistence.Embedded; +import javax.persistence.Entity; +import javax.persistence.ManyToOne; +import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Transient; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +import com.raytheon.uf.common.dataplugin.IDecoderGettable; +import com.raytheon.uf.common.dataplugin.PluginDataObject; +import com.raytheon.uf.common.dataplugin.persist.IPersistable; +import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; +import com.raytheon.uf.common.pointdata.IPointData; +import com.raytheon.uf.common.pointdata.PointDataView; +import com.raytheon.uf.common.pointdata.spatial.ObStation; +import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; +import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; +import com.raytheon.uf.common.time.DataTime; + +@Entity +//@Table(name = "gpd", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "gpdseq") +@Table(name = "gpd") +@DynamicSerialize +@XmlAccessorType(XmlAccessType.NONE) +@XmlRootElement +public class GenericPointDataRecord extends PersistablePluginDataObject implements +/*ISpatialEnabled,*/ IDecoderGettable, IPointData, IPersistable { + + private static final long serialVersionUID = 1L; + @ManyToOne + @PrimaryKeyJoinColumn + //@DataURI(position = 1, embedded = true) + @DynamicSerializeElement + @XmlElement + private GenericPointDataProductInfo productInfo; + + @ManyToOne + @PrimaryKeyJoinColumn + @DynamicSerializeElement + @XmlElement + private ObStation location; + + @Column + @DynamicSerializeElement + @XmlAttribute + private float slat; + + @Column + @DynamicSerializeElement + @XmlAttribute + private float slon; + + @Embedded + @DynamicSerializeElement + private PointDataView pointDataView; + + /* TBM - chin...delete these later..not used? + @Column + @DynamicSerializeElement + @XmlAttribute + private int numLevel; + */ + + @Column + @DynamicSerializeElement + @XmlAttribute + //@DataURI(position = 2) + //product release version for product correction used only. + private int productVersion=0; + + + //list of master level values + @Transient + @XmlElement + private List levelValueLst = new ArrayList(); + + //one level of parameters value map. Key (String) = parameter name, value (double) = parameter value + //@Transient + //private HashMap Map_ParmToValue = new HashMap(); + + //Map of all levels of parameters value maps. Key (integer) = level value in levelValueLst, value = + // one level of parameter values = a Map_ParmToValue map). + //@Transient + //private HashMap> Map_LevelToParmValueMap = new HashMap >(); + + public GenericPointDataRecord() { + super(); + //System.out.println("GenericPointDataRecord() entered"); + + } + + public GenericPointDataRecord(String uri) { + super(uri); + //System.out.println("GenericPointDataRecord(String uri) entered"); + } + + public GenericPointDataRecord(String uri, GenericPointDataProductInfo productInfo, + ObStation location, + float slat, float slon, PointDataView pointDataView) { + super(uri); + this.productInfo = productInfo; + this.location = location; + this.slat = slat; + this.slon = slon; + this.pointDataView = pointDataView; + this.pluginName ="gpd"; + //System.out.println("GenericPointDataRecord(3) entered"); + } + public GenericPointDataRecord(GenericPointDataProductInfo productInfo, + ObStation location, + float slat, float slon, PointDataView pointDataView, DataTime dataTime, + int productVersion) { + this.productInfo = productInfo; + this.location = location; + this.slat = slat; + this.slon = slon; + this.pointDataView = pointDataView; + this.dataTime = dataTime; + this.productVersion = productVersion; + this.pluginName ="gpd"; + //System.out.println("GenericPointDataRecord(4) entered"); + } + + /* TBM - chin...delete it later..not used? + public void constructTransientListAndMap(GenericPointDataStationProduct stnPd){ + setNumLevel(stnPd.getNumLevel()); + for(int i=0; i getValues(String paramName) { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getString(String paramName) { + // TODO Auto-generated method stub + return null; + } + + @Override + public String[] getStrings(String paramName) { + // TODO Auto-generated method stub + return null; + } + + + /*TBM - chin...delete these later..not used? + @Override + public void constructDataURI() throws PluginException { + // TODO Auto-generated method stub + super.constructDataURI(); + // ObStation class does not define dataUri component. Therefore, + // add stationId/longitude/latitude here to end of dataUri + if(this.location!=null){ + if(this.location.getStationId()!=null){ + this.dataURI = this.dataURI+DataURI.SEPARATOR+this.location.getStationId(); + } + else { + this.dataURI = this.dataURI+DataURI.SEPARATOR+"null"; + } + if(this.location.getStationGeom()!=null){ + this.dataURI = this.dataURI+DataURI.SEPARATOR+ + this.location.getStationGeom().getX()+ DataURI.SEPARATOR+ + this.location.getStationGeom().getY(); + } + else { + this.dataURI = this.dataURI+DataURI.SEPARATOR+"null"+DataURI.SEPARATOR+"null"; + } + } + }*/ + + public ObStation getLocation() { + return location; + } + + public void setLocation(ObStation location) { + this.location = location; + } + + /* TBM - chin...delete these later..not used? + public int getNumLevel() { + return numLevel; + } + + public void setNumLevel(int numLevel) { + this.numLevel = numLevel; + } */ + + public List getLevelValueLst() { + return levelValueLst; + } + + public void setLevelValueLst(List levelValueLst) { + this.levelValueLst = levelValueLst; + } + + /* TBM - chin...delete these later..not used? + public HashMap getMap_ParmToValue() { + return Map_ParmToValue; + } + + public void setMap_ParmToValue(HashMap map_ParmToValue) { + Map_ParmToValue = map_ParmToValue; + } + + public HashMap> getMap_LevelToParmValueMap() { + return Map_LevelToParmValueMap; + } + + public void setMap_LevelToParmValueMap( + HashMap> map_LevelToParmValueMap) { + Map_LevelToParmValueMap = map_LevelToParmValueMap; + }*/ + + public int getProductVersion() { + return productVersion; + } + + public void setProductVersion(int productVersion) { + this.productVersion = productVersion; + } + +} diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/dao/GenericPointDataDao.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/dao/GenericPointDataDao.java new file mode 100644 index 0000000000..db62fc8130 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/dao/GenericPointDataDao.java @@ -0,0 +1,1295 @@ +/** + * + * + * This code has been developed by the NCEP-SIB for use in the AWIPS2 system. + * + * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    	Engineer    Description
+ * -------		------- 	-------- 	-----------
+ * 05/30/2013				Chin J. Chen	Initial coding
+ *
+ *
+ * + * @author Chin J. Chen + * @version 1.0 + */ +package gov.noaa.nws.ncep.common.dataplugin.gpd.dao; + +import gov.noaa.nws.ncep.common.dataplugin.gpd.GenericPointDataConstants; +import gov.noaa.nws.ncep.common.dataplugin.gpd.GenericPointDataRecord; +import gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataLevel; +import gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataParameter; +import gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataProductContainer; +import gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataProductInfo; +import gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataStationProduct; +import gov.noaa.nws.ncep.common.dataplugin.gpd.query.GenericPointDataQuery; +import gov.noaa.nws.ncep.common.dataplugin.gpd.query.GenericPointDataReqMsg.GenericPointDataQueryKey; + +import java.io.File; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.xml.bind.JAXBException; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.Criteria; +import org.hibernate.Session; +import org.hibernate.Transaction; +import org.hibernate.criterion.Criterion; +import org.hibernate.criterion.Restrictions; + +import com.raytheon.uf.common.dataplugin.PluginDataObject; +import com.raytheon.uf.common.dataplugin.PluginException; +import com.raytheon.uf.common.dataplugin.level.MasterLevel; +import com.raytheon.uf.common.parameter.Parameter; +import com.raytheon.uf.common.pointdata.PointDataContainer; +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.edex.database.DataAccessLayerException; +import com.raytheon.uf.edex.database.purge.PurgeLogger; +import com.raytheon.uf.edex.database.query.DatabaseQuery; +import com.raytheon.uf.edex.pointdata.PointDataPluginDao; + + +public class GenericPointDataDao extends PointDataPluginDao { + + private Log logger = LogFactory.getLog(getClass()); + private PointDataDescription pdd; + private SimpleDateFormat hdfFileDateFormat, dbRefTimeFormat; + + public GenericPointDataDao(String pluginName) throws PluginException { + super(pluginName); + hdfFileDateFormat = new SimpleDateFormat("-yyyy-MM-dd-HH-mm"); + dbRefTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + } + + @Override + public String[] getKeysRequiredForFileName() { + return new String[] { GenericPointDataConstants.DB_REFTIME_NAME , GenericPointDataConstants.DB_PROD_NAME, GenericPointDataConstants.DB_MASTER_LEVEL_NAME}; + } + + + + @Override + public GenericPointDataRecord newObject() { + return new GenericPointDataRecord(); + } + + + /* + * (non-Javadoc) + * @see com.raytheon.uf.edex.pointdata.PointDataPluginDao#getPointDataFileName(com.raytheon.uf.common.dataplugin.PluginDataObject) + * Chin: in GPD implementation this is only called from Purge + * + */ + @Override + public String getPointDataFileName(GenericPointDataRecord p) { + Date refTime = (p.getDataTime().getRefTime()); + String dateStr = hdfFileDateFormat.format(refTime); + //System.out.println("gpd getPointDataFileName1 called and return: "+"gpd-"+p.getProductInfo().getName()+dateStr+/*"-"+p.getReportType().getMasterLevel().getName()+*/".h5"); + return "gpd-"+p.getProductInfo().getName()+dateStr+".h5"; + } + + /* + * (non-Javadoc) + * @see com.raytheon.uf.edex.pointdata.PointDataPluginDao#getPointDataFileName(java.util.Map) + * return a full HDF5 point data file name (including path) + * Chin:::This is called when requesting data + * Currently one report is defined with only one master level, therefore file path will be like this. + * /awips2/edex/data/hdf5/gpd/productName/gpd-productName-yyyy-mm-dd-HH-MM.h5 + * E.g. /awips2/edex/data/hdf5/gpd/sib1/gpd-sib1-2013-05-08-19-00.h5 + * Note:::future ??? + * If, we want to defined more than one master level for one report type, then file path will like this, + * /awips2/edex/data/hdf5/gpd/reportName/masterLevelName/gpd-reportName-masterLevelName-yyyy-mm-dd-HH-MM.h5 + * E.g. /awips2/edex/data/hdf5/gpd/sib1/MB/gpd-sib1-MB-2013-05-08-19-00.h5 + * + */ + @Override + public String getPointDataFileName(Map dbResults) { + String reportname = (String)dbResults.get(GenericPointDataConstants.DB_PROD_NAME); + //String lmName= (String)dbResults.get(GenericPointDataConstants.DB_MASTER_LEVEL_NAME); + String dateStr = hdfFileDateFormat.format(dbResults.get(GenericPointDataConstants.DB_REFTIME_NAME)); + String filename = + PLUGIN_HDF5_DIR + + reportname + File.separator + //+ lmName + File.separator + +this.pluginName+"-"+reportname+/*"-"+lmName+*/dateStr+".h5"; + //System.out.println("GenericPointDataDao getPointDataFileName2 called and return: "+ filename); + + return filename; + } + /* + * (non-Javadoc) + * @see com.raytheon.uf.edex.pointdata.PointDataPluginDao#getFullFilePath(com.raytheon.uf.common.dataplugin.PluginDataObject) + * return a full HDF5 point data file name (including path) + * This is called when decoding data + */ + @Override + public File getFullFilePath(PluginDataObject persistable) { + File file; + GenericPointDataRecord rec = (GenericPointDataRecord)persistable; + String directory = PLUGIN_HDF5_DIR /*+ File.separator + persistable.getPluginName() + + File.separator*/ + + rec.getProductInfo().getName(); + + Date refTime = ((PluginDataObject) persistable).getDataTime().getRefTime(); + String dateStr = hdfFileDateFormat.format(refTime); + String fileName = persistable.getPluginName()+ "-"+rec.getProductInfo().getName()+/*"-"+rec.getReportType().getMasterLevel().getName()+*/dateStr+".h5"; + file = new File(directory + + File.separator + + fileName); + //System.out.println("GenericPointDataDao getFullFilePath return "+ file.getPath()+" "+ file.getName()); + return file; + } + /* + * This function is for development testing.. not used in production code + */ + public PointDataDescription getPointDataDescription() throws JAXBException { + if (pdd == null) { + pdd = PointDataDescription.fromStream(this.getClass() + .getResourceAsStream("/res/pointdata/gpd.xml")); + } + return pdd; + } + + //look up target location in gpd_location table. If not present and if createLocation = TRUE, insert it to table. + public boolean lookupGpdLocation(ObStation location, boolean createLocation) { + boolean status= true; + Session sess = null; + Transaction trans = null; + try { + sess = getSessionFactory().openSession(); + trans = sess.beginTransaction(); + + Criteria crit = sess.createCriteria(ObStation.class); + + Criterion nameCrit = Restrictions.eq("stationId", location.getStationId()); + crit.add(nameCrit); + Criterion nameCrit1 = Restrictions.eq("catalogType", location.getCatalogType()); + crit.add(nameCrit1); + //querying... + List vals = crit.list(); + + if (vals.size() <= 0) { + //not in database + if (createLocation) { + sess.saveOrUpdate(location); + trans.commit(); + } else { + status = false; + } + } + + } catch (Exception e) { + logger.error( + "lookupGpdLocation:Error occurred looking up [" + location.getStationId() + + "]", e); + status = false; + if (trans != null) { + try { + trans.rollback(); + } catch (Exception e1) { + logger.error("lookupGpdLocation: Error occurred rolling back transaction", e); + } + } + } finally { + if (sess != null) { + try { + sess.close(); + } catch (Exception e) { + logger.error("lookupGpdLocation: Error occurred closing session", e); + } + } + } + + return status; + } + //look up target parm in parameter table. If not present and if createParm = TRUE, insert it to table. + public boolean lookupParameter(Parameter parm, boolean createParm) { + boolean status= true; + Session sess = null; + Transaction trans = null; + try { + sess = getSessionFactory().openSession(); + trans = sess.beginTransaction(); + + Criteria crit = sess.createCriteria(Parameter.class); + + Criterion nameCrit = Restrictions.eq("abbreviation", parm.getAbbreviation()); + crit.add(nameCrit); + //querying... + List vals = crit.list(); + if (vals.size() <= 0 ){ + if(createParm) { + sess.saveOrUpdate(parm); + trans.commit(); + } + else { + status = false; + } + } + + } catch (Exception e) { + logger.error( + "lookupParameter: Error occurred looking up parm[" + parm.getAbbreviation() + + "]", e); + status = false; + if (trans != null) { + try { + trans.rollback(); + } catch (Exception e1) { + logger.error("lookupParameter: Error occurred rolling back transaction", e); + } + } + } finally { + if (sess != null) { + try { + sess.close(); + } catch (Exception e) { + logger.error("lookupParameter: Error occurred closing session", e); + } + } + } + + return status; + } + //look up target masterLvl in level_master table. If not present and if createMl = TRUE, insert it to table. + public boolean lookupMasterlevel(MasterLevel masterLvl, boolean createMl) { + boolean status= true; + Session sess = null; + Transaction trans = null; + try { + sess = getSessionFactory().openSession(); + trans = sess.beginTransaction(); + + Criteria crit = sess.createCriteria(Parameter.class); + + Criterion nameCrit = Restrictions.eq("name", masterLvl.getName()); + crit.add(nameCrit); + //querying... + List vals = crit.list(); + if (vals.size() <= 0 ){ + if(createMl) { + sess.saveOrUpdate(masterLvl); + trans.commit(); + } + else { + status = false; + } + } + + } catch (Exception e) { + logger.error( + "lookupMasterlevel: Error occurred looking up parm[" + masterLvl.getName() + + "]", e); + status = false; + if (trans != null) { + try { + trans.rollback(); + } catch (Exception e1) { + logger.error("lookupMasterlevel: Error occurred rolling back transaction", e); + } + } + } finally { + if (sess != null) { + try { + sess.close(); + } catch (Exception e) { + logger.error("lookupMasterlevel: Error occurred closing session", e); + } + } + } + + return status; + } + + + private boolean mergeProductInfoParameterList(GenericPointDataProductInfo targetProdInfo, GenericPointDataProductInfo sourceProdInfo){ + List srcParmList = sourceProdInfo.getParameterLst(); + List tarParmList = targetProdInfo.getParameterLst(); + boolean merged = false; + /*for(Parameter p: srcParmList){ + System.out.println("srcA p="+p.getAbbreviation()); + } + for(Parameter p: tarParmList){ + System.out.println("tarA p="+p.getAbbreviation()); + }*/ + for (int index = srcParmList.size()-1; index >=0 ; index--){ + Parameter pm = srcParmList.get(index); + boolean found = false; + for(Parameter p: tarParmList){ + if(p.getAbbreviation().equals(pm.getAbbreviation())){ + found = true; + break; + } + } + if(found == false){ + Parameter newPm = srcParmList.remove(index); + tarParmList.add(newPm); + merged = true; + //System.out.println("not found add newPM="+ newPm.getAbbreviation()); + } + /*else { + System.out.println("found srcP="+pm.getAbbreviation()); + }*/ + } + //System.out.println("merged = "+ merged); + /*for(Parameter p: srcParmList){ + System.out.println("srcB p="+p.getAbbreviation()); + } + for(Parameter p: tarParmList){ + System.out.println("tarB p="+p.getAbbreviation()); + }*/ + return merged; + } + // 1. look up target product in gpd_productinfo table. If not present and if createReport = TRUE, insert it to table. + // 2. A complete product is returned using the contents found in DB, as user may just use product name in input XML file for + // decoding request, when a same product information had been already saved in DB earlier. + // 3. If prodInfo contains new parameters, if version number is 0, than update DB, otherwise, reject the update + // 4. copy input prod's "number of level" to return prodInfo + public GenericPointDataProductInfo lookupUpdateGpdProdInfo(GenericPointDataProductInfo prod, boolean createProd, int prodVersion) { + GenericPointDataProductInfo returnProdInfo = null; + boolean status= true; + Session sess = null; + Transaction trans = null; + int maxnumLvl = prod.getMaxNumberOfLevel(); + try { + sess = getSessionFactory().openSession(); + trans = sess.beginTransaction(); + + Criteria crit = sess.createCriteria(GenericPointDataProductInfo.class); + + Criterion nameCrit = Restrictions.eq("name", prod.getName()); + crit.add(nameCrit); + List vals = crit.list(); + if (vals.size() > 0) { + // the product is already in DB + GenericPointDataProductInfo dbProdInfo = (GenericPointDataProductInfo) vals.get(0); + //check to see if there are new parameters, and merge then to parameter list in dbProdInfo + boolean merged = mergeProductInfoParameterList(dbProdInfo,prod); + if(merged == true ){ + //if there are new parameters and product version number is 0, then update product to DB + if( prodVersion == 0){ + for (Parameter pm: dbProdInfo.getParameterLst()){ + if(lookupParameter( pm, true) == false){ + break; + } + } + sess.saveOrUpdate(dbProdInfo); + trans.commit(); + //TBD...do we need clone it? + returnProdInfo = dbProdInfo;//.clone(); + } + //prod version > 0, disallow update prod info + } + else{ + //TBD...do we need clone it? + returnProdInfo = dbProdInfo;//.clone(); + } + + } else if (createProd) { + for (Parameter pm: prod.getParameterLst()){ + if(lookupParameter( pm, true) == false){ + status = false; + break; + } + } + if(status== true && lookupMasterlevel(prod.getMasterLevel(), true) == false){ + status = false; + } + if(status){ + sess.saveOrUpdate(prod); + returnProdInfo = prod; + trans.commit(); + } + } else + status = false; + } catch (Exception e) { + logger.error( + "lookupGpdReportType: Error occurred looking up GenericPointDataReporttype[" + prod.getName() + + "]", e); + status = false; + if (trans != null) { + try { + trans.rollback(); + } catch (Exception e1) { + logger.error("lookupGpdReportType: Error occurred rolling back transaction", e); + } + } + } finally { + if (sess != null) { + try { + sess.close(); + } catch (Exception e) { + logger.error("lookupGpdReportType: Error occurred closing session", e); + } + } + } + returnProdInfo.setMaxNumberOfLevel(maxnumLvl); + return returnProdInfo; + } + /* + * To create or update product meta data information + */ + public GenericPointDataProductInfo updateProductInfo(GenericPointDataProductInfo prod){ + Session sess = null; + boolean status=true; + Transaction trans = null; + GenericPointDataProductInfo rval=null; + try { + sess = getSessionFactory().openSession(); + trans = sess.beginTransaction(); + + + for (Parameter pm: prod.getParameterLst()){ + if(lookupParameter( pm, true) == false){ + status = false; + break; + } + } + if(status== true && lookupMasterlevel(prod.getMasterLevel(), true) == false){ + status = false; + } + if(status){ + sess.saveOrUpdate(prod); + + Criteria crit = sess.createCriteria(GenericPointDataProductInfo.class); + + Criterion nameCrit = Restrictions.eq("name", prod.getName()); + crit.add(nameCrit); + List vals = crit.list(); + if (vals.size() > 0) { + rval = ((GenericPointDataProductInfo) vals.get(0)).clone(); + System.out.println("updateProductInfo: new parameter array size="+rval.getParameterLst().size()); + } + + trans.commit(); + } + + } catch (Exception e) { + logger.error( + "updateProductInfo: Error occurred looking up product [" + prod.getName() + + "]", e); + + if (trans != null) { + try { + trans.rollback(); + } catch (Exception e1) { + logger.error("updateProductInfo: Error occurred rolling back transaction", e); + } + } + } finally { + if (sess != null) { + try { + sess.close(); + } catch (Exception e) { + logger.error("updateProductInfo: Error occurred closing session", e); + } + } + } + return rval; + + } + + /* TBM...Chin delet this leter...not used + public boolean lookupGpdDataUri(String dataUri) { + boolean status= true; + Session sess = null; + Transaction trans = null; + try { + sess = getSessionFactory().openSession(); + trans = sess.beginTransaction(); + + Criteria crit = sess.createCriteria(GenericPointDataRecord.class); + + Criterion nameCrit = Restrictions.eq("dataURI", dataUri); + crit.add(nameCrit); + //querying... + List vals = crit.list(); + + if (vals.size() <= 0) { + status = false; + } + } catch (Exception e) { + logger.error( + "lookupGpdLocation:Error occurred looking up lookupGpdDataUri[" + dataUri + + "]", e); + status = false; + if (trans != null) { + try { + trans.rollback(); + } catch (Exception e1) { + logger.error("lookupGpdDataUri: Error occurred rolling back transaction", e); + } + } + } finally { + if (sess != null) { + try { + sess.close(); + } catch (Exception e) { + logger.error("lookupGpdDataUri: Error occurred closing session", e); + } + } + } + + return status; + } + */ + public GenericPointDataProductInfo getGpdProdInfo(String prodName){ + GenericPointDataProductInfo rval=null; + if(prodName!= null){ + Session sess = null; + sess = getSessionFactory().openSession(); + sess.beginTransaction(); + + Criteria crit = sess.createCriteria(GenericPointDataProductInfo.class); + + Criterion nameCrit = Restrictions.eq("name", prodName); + crit.add(nameCrit); + List vals = crit.list(); + if (vals.size() > 0) { + try { + //to avoid LazyInitializationException, we have to take care of Collection before + // closing session. Therefore, clone() it. + rval = ((GenericPointDataProductInfo) vals.get(0)).clone(); + } catch (CloneNotSupportedException e) { + e.printStackTrace(); + } + } + if (sess != null) { + try { + sess.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + return rval; + } + /* + * Chin:::: + * Get point data container for one or multiple stations. + * Based on queryKey. + * If BY_STN_ID, then stnId required, and is querying one station + * If BY_SLAT_SLON, then slat/slon required, and is querying one station + * If BY_REPORT_NAME, then both not required, and is querying all stations that meet prodInfo and refTime query constraints + */ + private PointDataContainer getPointDataContainer(Date refTime, GenericPointDataQueryKey quertKey, String stnId, float slat, float slon, GenericPointDataProductInfo prodInfo, int productVersion) throws Exception{ + String prodName = prodInfo.getName(); + + PointDataContainer pdc=null; + + GenericPointDataQuery pdq = new GenericPointDataQuery("gpd"); + StringBuilder returnParametersString = new StringBuilder(); + /* + * add return fields for both DB and HDF5 + */ + //1st:: add return fields from HDF5. They are the parameter list defined in a GPD report + for ( Parameter parm: prodInfo.getParameterLst()) { + String parameter= parm.getAbbreviation(); + if (returnParametersString.length() > 0) { + returnParametersString.append(","); + } + returnParametersString.append(parameter); + } + //also add the 3 HDF5 mandatory datasets + returnParametersString.append(","+GenericPointDataConstants.HDF5_LEVEL_VALUE); + returnParametersString.append(","+GenericPointDataConstants.HDF5_NUM_LEVEL); + returnParametersString.append(","+GenericPointDataConstants.HDF5_STN_ID); + System.out.println("gpd dao hdf5 parameterlist="+returnParametersString.toString()); + + //2nd:: add return fields form DB. the parameter name need to be defined in + //gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpddb.xmlquertKey + // for example:: + returnParametersString.append(","+GenericPointDataConstants.DB_STN_CATALOGTYPE); + returnParametersString.append(","+GenericPointDataConstants.DB_SLAT); + returnParametersString.append(","+GenericPointDataConstants.DB_SLON); + + // parameters defined in /gov.noaa.nws.ncep.edex.plugin.gpd/utility/common_static/base/path/gpdPathKeys.xml + // AND those returned by dao.getKeysRequiredForFileName() + // will be added automatically when calling PointDataQuery.execute() + + //PointDataQuery.setParameters() is to set return fields from both DB and HDF5 + pdq.setParameters(returnParametersString.toString()); + + //PointDataQuery.addParameter() is to add DB query constraints + pdq.addParameter("productInfo.name",prodName,"="); + if(quertKey == GenericPointDataQueryKey.BY_STN_ID) + pdq.addParameter("location.stationId",stnId,"="); + else if(quertKey == GenericPointDataQueryKey.BY_SLAT_SLON){ + pdq.addParameter("slat",Float.toString(slat+0.001f),"<"); + pdq.addParameter("slon",Float.toString(slon+0.001f),"<"); + pdq.addParameter("slat",Float.toString(slat-0.001f),">"); + pdq.addParameter("slon",Float.toString(slon-0.001f),">"); + } + + String dateStr = dbRefTimeFormat.format(refTime); + pdq.addParameter("dataTime.refTime",dateStr,"="); + pdq.addParameter("productVersion", Integer.toString(productVersion), "="); + System.out.println("requestig refTime = "+ dateStr); + pdq.requestAllLevels(); + pdc = pdq.execute(); + + return pdc; + } + + /* TBM...Chin delet this leter...not used + public GenericPointDataProductContainer getGpdProduct(Date refTime, String prodName,boolean useSpecifiedProductVersion, int productVersion)throws Exception{ + GenericPointDataProductInfo prodInfo = getGpdProdInfo( prodName); + if (prodInfo == null) { + System.out.println("report is not in DB"); + return null; + } + if(useSpecifiedProductVersion== false){ + //find the latest version if there is one. Otherwise, use user specified version number + productVersion = getGpdProductLatestVersion( refTime, prodName); + } + PointDataContainer pdc = getPointDataContainer( refTime,GenericPointDataQueryKey.BY_REPORT_NAME, null,0,0, prodInfo, productVersion); + if (pdc == null) { + System.out.println("pdc is null"); + return null; + } + System.out.println("pdc CurrentSz()="+pdc.getCurrentSz()); + GenericPointDataProductContainer prodCon = new GenericPointDataProductContainer(); + prodCon.setProductInfo(prodInfo); + prodCon.setRefTime(refTime); + prodCon.setProductCorrectionVersion(productVersion); + for (int i = 0; i < pdc.getCurrentSz(); i++) { + PointDataView pdv =pdc.readRandom(i); + System.out.println("pdv#"+i+" *********************************************"); + Set parameters = new HashSet(pdv.getContainer().getParameters()); + for(String parm: parameters){ + System.out.println("parm ="+parm); + } + String stnId= null; + if (parameters.contains(GenericPointDataConstants.HDF5_STN_ID)){ + stnId = pdv.getString(GenericPointDataConstants.HDF5_STN_ID); + System.out.println("stnid= "+ stnId); + //stnId value is retrieved already, so drop it here + parameters.remove(GenericPointDataConstants.HDF5_STN_ID); + } + else + continue; //stnId not available, no need to continue on this PDV. + int numLevel=0; + if (parameters.contains(GenericPointDataConstants.HDF5_NUM_LEVEL)){ + numLevel = pdv.getInt(GenericPointDataConstants.HDF5_NUM_LEVEL); + System.out.println("numLevel= "+ numLevel); + //numLevel value is retrieved already, so drop it here + parameters.remove(GenericPointDataConstants.HDF5_NUM_LEVEL); + } + else + continue; //level number is 0, no need to continue on this PDV. + + List levelList; + if (parameters.contains(GenericPointDataConstants.HDF5_LEVEL_VALUE)){ + levelList = new ArrayList(numLevel); + Number[] num = pdv.getNumberAllLevels(GenericPointDataConstants.HDF5_LEVEL_VALUE);//pdv.getNumberAllLevels(parm,numLevel); + for(Number n: num){ + System.out.println("level value="+n.floatValue()); + if(n.floatValue() == GenericPointDataConstants.GPD_INVALID_FLOAT_VALUE) + //Not a valid level, skip it + continue; + GenericPointDataLevel gpdLevel = new GenericPointDataLevel(); + gpdLevel.setLevelValue(n.floatValue()); + levelList.add(gpdLevel); + } + //level value is retrieved already, so drop it here + parameters.remove(GenericPointDataConstants.HDF5_LEVEL_VALUE); + } + else + continue; //no level value, no need to continue on this PDV. + + int stnCatalogType=ObStation.CAT_TYPE_MESONET; + if (parameters.contains(GenericPointDataConstants.DB_STN_CATALOGTYPE)){ + stnCatalogType = pdv.getInt(GenericPointDataConstants.DB_STN_CATALOGTYPE); + System.out.println("stnCatalogType= "+ stnCatalogType); + //DB_STN_CATALOGTYPE value is retrieved already, so drop it here + parameters.remove(GenericPointDataConstants.DB_STN_CATALOGTYPE); + } + float slat = -9999; + if (parameters.contains(GenericPointDataConstants.DB_SLAT)){ + slat = pdv.getFloat(GenericPointDataConstants.DB_SLAT); + System.out.println("slat= "+ slat); + //slat value is retrieved already, so drop it here + parameters.remove(GenericPointDataConstants.DB_SLAT); + } + float slon = -9999; + if (parameters.contains(GenericPointDataConstants.DB_SLON)){ + slon = pdv.getFloat(GenericPointDataConstants.DB_SLON); + System.out.println("slon= "+ slon); + //slon value is retrieved already, so drop it here + parameters.remove(GenericPointDataConstants.DB_SLON); + } + //PDV id is not returned back to user, so drop it here + parameters.remove(GenericPointDataConstants.HDF5_PDV_ID); + + GenericPointDataStationProduct stnPd= new GenericPointDataStationProduct(); + stnPd.setProductName(prodName); + stnPd.setRefTime(refTime); + stnPd.setLevelLst(levelList); + stnPd.setProductVersion(productVersion); + stnPd.getLocation().setStationId(stnId); + stnPd.getLocation().setCatalogType(stnCatalogType); + stnPd.setNumLevel(numLevel); + stnPd.setSlat(slat); + stnPd.setSlon(slon); + for(String parm: parameters){ + //these parameters are data parameters and should be 2 dimensional float value per design + //If a new "meta" data is queried, then we should take care of that data specifically before here. + Number[] num = pdv.getNumberAllLevels(parm);//,numLevel); + System.out.println("parm ="+parm); + for(int j=0; j< numLevel ; j++){ + Number n = num[j]; + System.out.println(" value="+n.floatValue()); + GenericPointDataParameter gpdParm = new GenericPointDataParameter(parm,n.floatValue()); + levelList.get(j).getGpdParameters().add(gpdParm); + } + } + prodCon.getStnProdLst().add(stnPd); + } + return prodCon; + } + */ + public GenericPointDataProductContainer getGpdProduct(Date refTime, GenericPointDataQueryKey key, String stnId, float slat, float slon, String prodName,boolean useSpecifiedProductVersion, int productVersion)throws Exception{ + GenericPointDataProductInfo prodInfo = getGpdProdInfo( prodName); + if (prodInfo == null) { + System.out.println("report is not in DB"); + return null; + } + if(useSpecifiedProductVersion== false){ + //find the latest version if there is one. Otherwise, use user specified version number + productVersion = getGpdProductLatestVersion( refTime, prodName); + if(productVersion <0) + return null; + } + PointDataContainer pdc = getPointDataContainer( refTime, key, stnId, slat, slon, prodInfo, productVersion); + if (pdc == null) { + System.out.println("pdc is null"); + return null; + } + System.out.println("pdc CurrentSz()="+pdc.getCurrentSz()); + GenericPointDataProductContainer prodCon = new GenericPointDataProductContainer(); + prodCon.setProductInfo(prodInfo); + prodCon.setRefTime(refTime); + prodCon.setProductCorrectionVersion(productVersion); + for (int i = 0; i < pdc.getCurrentSz(); i++) { + PointDataView pdv =pdc.readRandom(i); + //System.out.println("pdv#"+i+" *********************************************"); + Set parameters = new HashSet(pdv.getContainer().getParameters()); + /*for(String parm: parameters){ + System.out.println("parm ="+parm); + }*/ + int numLevel=0; + if (parameters.contains(GenericPointDataConstants.HDF5_NUM_LEVEL)){ + numLevel = pdv.getInt(GenericPointDataConstants.HDF5_NUM_LEVEL); + //System.out.println("numLevel= "+ numLevel); + //numLevel value is retrieved already, so drop it here + parameters.remove(GenericPointDataConstants.HDF5_NUM_LEVEL); + } + else + continue; //level number is 0, no need to continue on this PDV. + + List levelList; + if (parameters.contains(GenericPointDataConstants.HDF5_LEVEL_VALUE)){ + levelList = new ArrayList(numLevel); + if(numLevel >1){ + Number[] num = pdv.getNumberAllLevels(GenericPointDataConstants.HDF5_LEVEL_VALUE);//pdv.getNumberAllLevels(parm,numLevel); + int count=0; + for(Number n: num){ + count++; + if(count > numLevel) + break; + //System.out.println("Level " +count+ " value="+n.floatValue()); + GenericPointDataLevel gpdLevel = new GenericPointDataLevel(); + gpdLevel.setLevelValue(n.floatValue()); + levelList.add(gpdLevel); + } + } + else{ + GenericPointDataLevel gpdLevel = new GenericPointDataLevel(); + gpdLevel.setLevelValue(pdv.getFloat(GenericPointDataConstants.HDF5_LEVEL_VALUE)); + levelList.add(gpdLevel); + } + //level value is retrieved already, so drop it here + parameters.remove(GenericPointDataConstants.HDF5_LEVEL_VALUE); + } + else + continue; //no level value, no need to continue on this PDV. + + int stnCatalogType=ObStation.CAT_TYPE_MESONET; + if (parameters.contains(GenericPointDataConstants.DB_STN_CATALOGTYPE)){ + stnCatalogType = pdv.getInt(GenericPointDataConstants.DB_STN_CATALOGTYPE); + //System.out.println("stnCatalogType= "+ stnCatalogType); + //DB_STN_CATALOGTYPE value is retrieved already, so drop it here + parameters.remove(GenericPointDataConstants.DB_STN_CATALOGTYPE); + } + String rtnstnId = stnId; + if (parameters.contains(GenericPointDataConstants.HDF5_STN_ID)){ + rtnstnId = pdv.getString(GenericPointDataConstants.HDF5_STN_ID); + //System.out.println("stnId= "+ rtnstnId); + //stnId is input parameter, can drop it here. + parameters.remove(GenericPointDataConstants.HDF5_STN_ID); + } + float rtnslat = slat; + if (parameters.contains(GenericPointDataConstants.DB_SLAT)){ + rtnslat = pdv.getFloat(GenericPointDataConstants.DB_SLAT); + //System.out.println("slat= "+ rtnslat); + //slat value is retrieved already, so drop it here + parameters.remove(GenericPointDataConstants.DB_SLAT); + } + float rtnslon = slon; + if (parameters.contains(GenericPointDataConstants.DB_SLON)){ + rtnslon = pdv.getFloat(GenericPointDataConstants.DB_SLON); + //System.out.println("slon= "+ rtnslon); + //slon value is retrieved already, so drop it here + parameters.remove(GenericPointDataConstants.DB_SLON); + } + //PDV id is not returned back to user, so drop it here + parameters.remove(GenericPointDataConstants.HDF5_PDV_ID); + + GenericPointDataStationProduct stnPd= new GenericPointDataStationProduct(); + stnPd.setProductName(prodName); + stnPd.setRefTime(refTime); + stnPd.setLevelLst(levelList); + stnPd.setProductVersion(productVersion); + stnPd.getLocation().setStationId(rtnstnId); + stnPd.getLocation().setCatalogType(stnCatalogType); + stnPd.setNumLevel(numLevel); + stnPd.setSlat(rtnslat); + stnPd.setSlon(rtnslon); + for(String parm: parameters){ + if(numLevel>1){ + //these parameters are data parameters and should be 2 dimensional float value per design + //If a new "meta" data is queried, then we should take care of that data specifically before here. + Number[] num = pdv.getNumberAllLevels(parm);//,numLevel); + //System.out.println("parm ="+parm); + for(int j=0; j< numLevel ; j++){ + Number n = num[j]; + //System.out.println(" value="+n.floatValue()); + GenericPointDataParameter gpdParm = new GenericPointDataParameter(parm,n.floatValue()); + levelList.get(j).getGpdParameters().add(gpdParm); + } + } + else { + GenericPointDataParameter gpdParm = new GenericPointDataParameter(parm,pdv.getFloat(parm)); + levelList.get(0).getGpdParameters().add(gpdParm); + } + } + prodCon.getStnProdLst().add(stnPd); + } + return prodCon; + } + /* + * + */ + public List getGpdStationProduct(List refTimeList, GenericPointDataQueryKey key, String stnId, float slat, float slon, String prodName)throws Exception{ + GenericPointDataProductInfo prodInfo = getGpdProdInfo( prodName); + if (prodInfo == null) { + System.out.println("product is not in DB"); + return null; + } + List stnProdList = new ArrayList(); + for(Date refTime: refTimeList){ + int productVersion = getGpdProductLatestVersion( refTime, prodName); + if(productVersion <0) + continue; + PointDataContainer pdc = getPointDataContainer( refTime, key, stnId, slat, slon, prodInfo, productVersion); + if (pdc == null) { + System.out.println("pdc is null"); + continue; + } + System.out.println(refTime.toString() +" pdc CurrentSz()="+pdc.getCurrentSz()); + + for (int i = 0; i < pdc.getCurrentSz(); i++) { + PointDataView pdv =pdc.readRandom(i); + //System.out.println("pdv#"+i+" *********************************************"); + Set parameters = new HashSet(pdv.getContainer().getParameters()); + int numLevel=0; + if (parameters.contains(GenericPointDataConstants.HDF5_NUM_LEVEL)){ + numLevel = pdv.getInt(GenericPointDataConstants.HDF5_NUM_LEVEL); + //System.out.println("numLevel= "+ numLevel); + //numLevel value is retrieved already, so drop it here + parameters.remove(GenericPointDataConstants.HDF5_NUM_LEVEL); + } + else + continue; //level number is 0, no need to continue on this PDV. + + List levelList; + if (parameters.contains(GenericPointDataConstants.HDF5_LEVEL_VALUE)){ + levelList = new ArrayList(numLevel); + if(numLevel >1){ + Number[] num = pdv.getNumberAllLevels(GenericPointDataConstants.HDF5_LEVEL_VALUE);//pdv.getNumberAllLevels(parm,numLevel); + int count=0; + for(Number n: num){ + count++; + if(count > numLevel) + break; + //System.out.println("Level " +count+ " value="+n.floatValue()); + GenericPointDataLevel gpdLevel = new GenericPointDataLevel(); + gpdLevel.setLevelValue(n.floatValue()); + levelList.add(gpdLevel); + } + } + else{ + GenericPointDataLevel gpdLevel = new GenericPointDataLevel(); + gpdLevel.setLevelValue(pdv.getFloat(GenericPointDataConstants.HDF5_LEVEL_VALUE)); + levelList.add(gpdLevel); + } + //level value is retrieved already, so drop it here + parameters.remove(GenericPointDataConstants.HDF5_LEVEL_VALUE); + } + else + continue; //no level value, no need to continue on this PDV. + + int stnCatalogType=ObStation.CAT_TYPE_MESONET; + if (parameters.contains(GenericPointDataConstants.DB_STN_CATALOGTYPE)){ + stnCatalogType = pdv.getInt(GenericPointDataConstants.DB_STN_CATALOGTYPE); + //System.out.println("stnCatalogType= "+ stnCatalogType); + //DB_STN_CATALOGTYPE value is retrieved already, so drop it here + parameters.remove(GenericPointDataConstants.DB_STN_CATALOGTYPE); + } + String rtnstnId = stnId; + if (parameters.contains(GenericPointDataConstants.HDF5_STN_ID)){ + rtnstnId = pdv.getString(GenericPointDataConstants.HDF5_STN_ID); + //System.out.println("stnId= "+ rtnstnId); + //stnId is input parameter, can drop it here. + parameters.remove(GenericPointDataConstants.HDF5_STN_ID); + } + float rtnslat = slat; + if (parameters.contains(GenericPointDataConstants.DB_SLAT)){ + rtnslat = pdv.getFloat(GenericPointDataConstants.DB_SLAT); + //System.out.println("slat= "+ rtnslat); + //slat value is retrieved already, so drop it here + parameters.remove(GenericPointDataConstants.DB_SLAT); + } + float rtnslon = slon; + if (parameters.contains(GenericPointDataConstants.DB_SLON)){ + rtnslon = pdv.getFloat(GenericPointDataConstants.DB_SLON); + //System.out.println("slon= "+ rtnslon); + //slon value is retrieved already, so drop it here + parameters.remove(GenericPointDataConstants.DB_SLON); + } + //PDV id is not returned back to user, so drop it here + parameters.remove(GenericPointDataConstants.HDF5_PDV_ID); + + GenericPointDataStationProduct stnPd= new GenericPointDataStationProduct(); + stnPd.setProductName(prodName); + stnPd.setRefTime(refTime); + stnPd.setLevelLst(levelList); + stnPd.setProductVersion(productVersion); + stnPd.getLocation().setStationId(rtnstnId); + stnPd.getLocation().setCatalogType(stnCatalogType); + stnPd.setNumLevel(numLevel); + stnPd.setSlat(rtnslat); + stnPd.setSlon(rtnslon); + for(String parm: parameters){ + if(numLevel>1){ + //these parameters are data parameters and should be 2 dimensional float value per design + //If a new "meta" data is queried, then we should take care of that data specifically before here. + Number[] num = pdv.getNumberAllLevels(parm);//,numLevel); + //System.out.println("parm ="+parm); + for(int j=0; j< numLevel ; j++){ + Number n = num[j]; + //System.out.println(" value="+n.floatValue()); + GenericPointDataParameter gpdParm = new GenericPointDataParameter(parm,n.floatValue()); + levelList.get(j).getGpdParameters().add(gpdParm); + } + } + else { + GenericPointDataParameter gpdParm = new GenericPointDataParameter(parm,pdv.getFloat(parm)); + levelList.get(0).getGpdParameters().add(gpdParm); + } + } + stnProdList.add(stnPd); + } + } + return stnProdList; + } + + /* TBM...Chin delet this leter...not used + public GenericPointDataStationProduct getGpdStationProduct(Date refTime, GenericPointDataQueryKey key, String stnId, double slat, double slon, String reportName,boolean useSpecifiedProductVersion, int productVersion)throws Exception{ + GenericPointDataProductInfo report = getGpdProdInfo( reportName); + if (report == null) { + System.out.println("report is not in DB"); + return null; + } + if(useSpecifiedProductVersion== false){ + //find the latest version if there is one. Otherwise, use user specified version number + productVersion = getGpdProductLatestVersion( refTime, reportName); + } + PointDataContainer pdc; + pdc = getPointDataContainer( refTime, key, stnId, slat, slon, report, productVersion); + + if (pdc == null) { + System.out.println("pdc is null"); + return null; + } + //for a single station product query, the pdc.getCurrentSz() should always be 1 + System.out.println("pdc CurrentSz()="+pdc.getCurrentSz()); + GenericPointDataStationProduct stnPd= null; + for (int i = 0; i < pdc.getCurrentSz(); i++) { + PointDataView pdv =pdc.readRandom(i); + Set parameters = pdv.getContainer().getParameters(); + for(String parm: parameters){ + System.out.println("parm ="+parm); + } + int numLevel=0; + if (parameters.contains(GenericPointDataConstants.HDF5_NUM_LEVEL)){ + numLevel = pdv.getInt(GenericPointDataConstants.HDF5_NUM_LEVEL); + System.out.println("numLevel= "+ numLevel); + //numLevel value is retrieved already, so drop it here + parameters.remove(GenericPointDataConstants.HDF5_NUM_LEVEL); + } + else + continue; //level number is 0, no need to continue on this PDV. + + List levelList; + if (parameters.contains(GenericPointDataConstants.HDF5_LEVEL_VALUE)){ + levelList = new ArrayList(numLevel); + Number[] num = pdv.getNumberAllLevels(GenericPointDataConstants.HDF5_LEVEL_VALUE);//pdv.getNumberAllLevels(parm,numLevel); + for(Number n: num){ + System.out.println("level value="+n.floatValue()); + if(n.floatValue() == GenericPointDataConstants.GPD_INVALID_FLOAT_VALUE) + //Not a valid level, skip it + continue; + GenericPointDataLevel gpdLevel = new GenericPointDataLevel(); + gpdLevel.setLevelValue(n.floatValue()); + levelList.add(gpdLevel); + } + //level value is retrieved already, so drop it here + parameters.remove(GenericPointDataConstants.HDF5_LEVEL_VALUE); + } + else + continue; //no level value, no need to continue on this PDV. + + int stnCatalogType=ObStation.CAT_TYPE_MESONET; + if (parameters.contains(GenericPointDataConstants.DB_STN_CATALOGTYPE)){ + stnCatalogType = pdv.getInt(GenericPointDataConstants.DB_STN_CATALOGTYPE); + System.out.println("stnCatalogType= "+ stnCatalogType); + //DB_STN_CATALOGTYPE value is retrieved already, so drop it here + parameters.remove(GenericPointDataConstants.DB_STN_CATALOGTYPE); + } + String rtnstnId = stnId; + if (parameters.contains(GenericPointDataConstants.HDF5_STN_ID)){ + rtnstnId = pdv.getString(GenericPointDataConstants.HDF5_STN_ID); + System.out.println("stnId= "+ rtnstnId); + //stnId is input parameter, can drop it here. + parameters.remove(GenericPointDataConstants.HDF5_STN_ID); + } + double rtnslat = slat; + if (parameters.contains(GenericPointDataConstants.DB_SLAT)){ + rtnslat = pdv.getFloat(GenericPointDataConstants.DB_SLAT); + System.out.println("slat= "+ rtnslat); + //slat value is retrieved already, so drop it here + parameters.remove(GenericPointDataConstants.DB_SLAT); + } + double rtnslon = slon; + if (parameters.contains(GenericPointDataConstants.DB_SLON)){ + rtnslon = pdv.getFloat(GenericPointDataConstants.DB_SLON); + System.out.println("slon= "+ rtnslon); + //slon value is retrieved already, so drop it here + parameters.remove(GenericPointDataConstants.DB_SLON); + } + //PDV_id is not returned back to user, so drop it here + parameters.remove(GenericPointDataConstants.HDF5_PDV_ID); + + + stnPd= new GenericPointDataStationProduct(); + stnPd.setProductName(reportName); + stnPd.setRefTime(refTime); + stnPd.setLevelLst(levelList); + stnPd.setProductVersion(productVersion); + stnPd.setSlat(rtnslat); + stnPd.setSlon(rtnslon); + stnPd.getLocation().setStationId(rtnstnId); + stnPd.getLocation().setCatalogType(stnCatalogType); + stnPd.setNumLevel(numLevel); + for(String parm: parameters){ + //these parameters are data parameters and should be 2 dimensional float value per design + //If a new "meta" data is queried, then we should take care of that data specifically before here. + Number[] num = pdv.getNumberAllLevels(parm);//,numLevel); + System.out.println("parm ="+parm); + for(int j=0; j< numLevel ; j++){ + Number n = num[j]; + System.out.println(" value="+n.floatValue()); + GenericPointDataParameter gpdParm = new GenericPointDataParameter(parm,n.floatValue()); + levelList.get(j).getGpdParameters().add(gpdParm); + } + } + } + return stnPd; + } + */ + public int getGpdProductLatestVersion( Date refTime, String prodName){ + int latestProdVer=-1; + Session sess = null; + sess = getSessionFactory().openSession(); + sess.beginTransaction(); + + Criteria crit = sess.createCriteria(GenericPointDataRecord.class); + //System.out.println("getGpdProductLatestVersion input reportName="+ prodName); + Criterion rptnameCrit = Restrictions.eq("productInfo.name", prodName); + crit.add(rptnameCrit); + Criterion reftimeCrit = Restrictions.eq("dataTime.refTime", refTime); + crit.add(reftimeCrit); + List vals = crit.list(); + if(vals.size() > 0) { + for(int i=0; i < vals.size() ; i++){ + //to avoid LazyInitializationException, we have to take care of Collection before + // closing session. + GenericPointDataRecord rec = (GenericPointDataRecord) vals.get(i); + int version = rec.getProductVersion(); + if(version > latestProdVer) + latestProdVer = version; + //System.out.println("latestProdVer= "+ latestProdVer); + + } + } + if (sess != null) { + try { + sess.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + return latestProdVer; + } + + /** + * Chin note: copy from PluginDao, modified code to get GPD HDF5 file path correctly. + * + * Purges data from the database for this plugin with the given reference + * time matching the given productKeys. If refTime is null, will purge all + * data associated with the productKeys. Hdf5 must be purged separately as + * most hdf5 files can't be purged with a single reference time. Use the + * passed map to track what needs to be done with hdf5. + * + * @param refTime + * The reftime to delete data for. A null will purge all data for + * the productKeys. + * @param productKeys + * The product key/values to use as a constraint for deletions. + * Should be in key value pairs. + * @param trackHdf5 + * If true will use trackToUri to populate hdf5FileToUriPurged + * map. + * @param trackToUri + * If true will track each URI that needs to be deleted from + * HDF5, if false will only track the hdf5 files that need to be + * deleted. + * @param hdf5FileToUriPurged + * Map to be populated by purgeDataByRefTime of all the hdf5 + * files that need to be updated. If trackToUri is true, each + * file will have the exact data URI's to be removed from each + * file. If trackToUri is false, the map will have a null entry + * for the list and only track the files. + * @return Number of rows deleted from database. + * @throws DataAccessLayerException + */ + @Override + @SuppressWarnings("unchecked") + public int purgeDataByRefTime(Date refTime, + Map productKeys, boolean trackHdf5, + boolean trackToUri, Map> hdf5FileToUriPurged) + throws DataAccessLayerException { + + int results = 0; + PurgeLogger.logInfo("Enter purgeDataByRefTime refTime=" + refTime +" trackHdf5="+trackHdf5+ " trackToUri="+trackToUri, pluginName); + DatabaseQuery dataQuery = new DatabaseQuery(this.daoClass); + if((hdf5FileToUriPurged != null)){ + for (String key: hdf5FileToUriPurged.keySet()) + { + List pairLst = hdf5FileToUriPurged.get(key); + PurgeLogger.logInfo("starting purgeDataByRefTime hdf5FileToUriPurged map key=" + key, pluginName); + if(pairLst!=null){ + for(String val: pairLst){ + PurgeLogger.logInfo("starting purgeDataByRefTime hdf5FileToUriPurged map val=" + val, pluginName); + } + } + } + } + if (refTime != null) { + dataQuery.addQueryParam(PURGE_VERSION_FIELD, refTime); + } + + if ((productKeys != null) && (productKeys.size() > 0)) { + for (Map.Entry pair : productKeys.entrySet()) { + dataQuery.addQueryParam(pair.getKey(), pair.getValue()); + PurgeLogger.logInfo(" purgeDataByRefTime product map key=" + pair.getKey()+" value="+ pair.getValue(), pluginName); + } + } + + List pdos = null; + + dataQuery.setMaxResults(500); + + // fields for hdf5 purge + String previousFile = null; + StringBuilder pathBuilder = new StringBuilder(); + + int loopCount=0; + do { + pdos = (List) this.queryByCriteria(dataQuery); + if ((pdos != null) && !pdos.isEmpty()) { + this.delete(pdos); + + if (trackHdf5 && (hdf5FileToUriPurged != null)) { + for (PluginDataObject pdo : pdos) { + pathBuilder.setLength(0); + GenericPointDataRecord rec = (GenericPointDataRecord)pdo; + String directory = PLUGIN_HDF5_DIR + rec.getProductInfo().getName(); + + String dateStr = hdfFileDateFormat.format(refTime); + String fileName = this.pluginName+ "-"+rec.getProductInfo().getName()+dateStr+".h5"; + String file = directory+ File.separator+ fileName; + PurgeLogger.logInfo(++loopCount+" purgeDataByRefTime file=" + file, pluginName); + if (trackToUri) { + List uriList = hdf5FileToUriPurged + .get(file); + if (uriList == null) { + // sizing to 50 as most data types have numerous + // entries in a file + uriList = new ArrayList(50); + hdf5FileToUriPurged.put(file, uriList); + } + uriList.add(file); + } else { + // only need to track file, tracking last file + // instead of constantly indexing hashMap + if (!file.equals(previousFile)) { + hdf5FileToUriPurged.put(file, null); + previousFile = file; + } + } + } + } + + results += pdos.size(); + } + + } while ((pdos != null) && !pdos.isEmpty()); + if((hdf5FileToUriPurged != null)){ + for (String key: hdf5FileToUriPurged.keySet()) + { + List pairLst = hdf5FileToUriPurged.get(key); + PurgeLogger.logInfo("leaving purgeDataByRefTime hdf5FileToUriPurged map key=" + key, pluginName); + if(pairLst!=null){ + for(String val: pairLst){ + PurgeLogger.logInfo("leaving purgeDataByRefTime hdf5FileToUriPurged map val=" + val, pluginName); + } + } + } + } + return results; + } + +} diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/product/GenericPointDataLevel.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/product/GenericPointDataLevel.java new file mode 100644 index 0000000000..7e3b4efef1 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/product/GenericPointDataLevel.java @@ -0,0 +1,79 @@ +/** + * + * + * This code has been developed by the NCEP-SIB for use in the AWIPS2 system. + * + * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    	Engineer    Description
+ * -------		------- 	-------- 	-----------
+ * 05/30/2013				Chin J. Chen	Initial coding
+ *
+ *
+ * + * @author Chin J. Chen + * @version 1.0 + */ +package gov.noaa.nws.ncep.common.dataplugin.gpd.product; + +import java.util.ArrayList; +import java.util.List; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; + +import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; +import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; + +@DynamicSerialize +@XmlAccessorType(XmlAccessType.NONE) +public class GenericPointDataLevel { + @DynamicSerializeElement + @XmlAttribute + private float levelValue; + + @DynamicSerializeElement + @XmlElement(name = "GPD-Parameter") + private List gpdParameters = new ArrayList(); + + + + public GenericPointDataLevel() { + super(); + // TODO Auto-generated constructor stub + } + + public GenericPointDataLevel(float levelValue, + List gpdParameters) { + super(); + this.levelValue = levelValue; + this.gpdParameters = gpdParameters; + } + + + + public GenericPointDataLevel(float levelValue) { + super(); + this.levelValue = levelValue; + } + + public float getLevelValue() { + return levelValue; + } + + public void setLevelValue(float levelValue) { + this.levelValue = levelValue; + } + + public List getGpdParameters() { + return gpdParameters; + } + + public void setGpdParameters(List gpdParameters) { + this.gpdParameters = gpdParameters; + } + +} diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/product/GenericPointDataParameter.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/product/GenericPointDataParameter.java new file mode 100644 index 0000000000..003e2319ba --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/product/GenericPointDataParameter.java @@ -0,0 +1,68 @@ +/** + * + * + * This code has been developed by the NCEP-SIB for use in the AWIPS2 system. + * + * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    	Engineer    Description
+ * -------		------- 	-------- 	-----------
+ * 05/30/2013				Chin J. Chen	Initial coding
+ *
+ *
+ * + * @author Chin J. Chen + * @version 1.0 + */ +package gov.noaa.nws.ncep.common.dataplugin.gpd.product; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; + +import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; +import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; + +@DynamicSerialize +@XmlAccessorType(XmlAccessType.NONE) +public class GenericPointDataParameter { + @DynamicSerializeElement + @XmlAttribute + private String name; + + @DynamicSerializeElement + @XmlAttribute + private float value; + + + + public GenericPointDataParameter() { + super(); + // TODO Auto-generated constructor stub + } + + public GenericPointDataParameter(String name, float value) { + super(); + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public float getValue() { + return value; + } + + public void setValue(float value) { + this.value = value; + } + + +} diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/product/GenericPointDataProductContainer.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/product/GenericPointDataProductContainer.java new file mode 100644 index 0000000000..178eca6a88 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/product/GenericPointDataProductContainer.java @@ -0,0 +1,106 @@ +/** + * + * + * This code has been developed by the NCEP-SIB for use in the AWIPS2 system. + * + * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    	Engineer    Description
+ * -------		------- 	-------- 	-----------
+ * 05/30/2013				Chin J. Chen	Initial coding
+ *
+ *
+ * + * @author Chin J. Chen + * @version 1.0 + */ +package gov.noaa.nws.ncep.common.dataplugin.gpd.product; + +//import gov.noaa.nws.ncep.common.dataplugin.gpd.GenericPointDataLocation; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; +import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; + +@DynamicSerialize +@XmlAccessorType(XmlAccessType.NONE) +@XmlRootElement(name = "GenericPointDataProduct") +public class GenericPointDataProductContainer { + + //private static final long serialVersionUID = 1L; + + // The data time for this product + @XmlElement(name="ProductTime") + @DynamicSerializeElement + protected Date refTime; + + @DynamicSerializeElement + @XmlElement(name="GPD-ProdInfo-Def") + private GenericPointDataProductInfo productInfo; + + //list of station product + @DynamicSerializeElement + @XmlElement(name="GPD-Station-Product") + private List stnProdLst = new ArrayList(); + + //when a same product (same report type and reftime) is issued for correction, a newer version number + //should be encoded. Otherwise, it will be dropped. + @DynamicSerializeElement + @XmlAttribute + private int productCorrectionVersion=0; + + public GenericPointDataProductContainer() { + super(); + // TODO Auto-generated constructor stub + } + + + public GenericPointDataProductInfo getProductInfo() { + return productInfo; + } + + public void setProductInfo(GenericPointDataProductInfo prodInfo) { + this.productInfo = prodInfo; + } + + + public Date getRefTime() { + return refTime; + } + + + public void setRefTime(Date refTime) { + this.refTime = refTime; + } + + + public List getStnProdLst() { + return stnProdLst; + } + + + public void setStnProdLst(List stnProdLst) { + this.stnProdLst = stnProdLst; + } + + + public int getProductCorrectionVersion() { + return productCorrectionVersion; + } + + + public void setProductCorrectionVersion(int productCorrectionVersion) { + this.productCorrectionVersion = productCorrectionVersion; + } + +} diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/product/GenericPointDataProductInfo.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/product/GenericPointDataProductInfo.java new file mode 100644 index 0000000000..144b8f6308 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/product/GenericPointDataProductInfo.java @@ -0,0 +1,167 @@ +/** + * + * + * This code has been developed by the NCEP-SIB for use in the AWIPS2 system. + * + * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    	Engineer    Description
+ * -------		------- 	-------- 	-----------
+ * 05/30/2013				Chin J. Chen	Initial coding
+ *
+ *
+ * + * @author Chin J. Chen + * @version 1.0 + */ +package gov.noaa.nws.ncep.common.dataplugin.gpd.product; + +import java.util.ArrayList; +import java.util.List; + +import javax.persistence.Embeddable; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToMany; +import javax.persistence.ManyToOne; +import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.Table; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +import com.raytheon.uf.common.dataplugin.level.MasterLevel; +import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject; +import com.raytheon.uf.common.parameter.Parameter; +import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; +import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; + +@Embeddable +@Entity +@Table(name = "gpd_productinfo") +@XmlAccessorType(XmlAccessType.NONE) +@XmlRootElement(name="GPD-ProdInfo-Def") +@DynamicSerialize +public class GenericPointDataProductInfo extends + PersistableDataObject { + private static final long serialVersionUID = 1L; + + @Id + @DynamicSerializeElement + @XmlAttribute(name = "prodName", required = true) + //@DataURI(position = 0) + private String name; + + @DynamicSerializeElement + @XmlAttribute + private int maxNumberOfLevel= 64; + + @ManyToOne(optional = false) + @PrimaryKeyJoinColumn + @XmlElement(name="GPD-Level-Def") + @DynamicSerializeElement + //@DataURI(position = 1, embedded = true) + private MasterLevel masterLevel; + + @ManyToMany + @DynamicSerializeElement + @XmlElement(name="GPD-Parameter-Def") + private List parameterLst = new ArrayList(); + + + public GenericPointDataProductInfo() { + super(); + //System.out.println("GenericPointDataProductInfo(1) entered"); + } + + public GenericPointDataProductInfo(String name, int maxNumberOfLevel + ) { + super(); + this.name = name; + this.maxNumberOfLevel = maxNumberOfLevel; + MasterLevel ml = new MasterLevel(); + ml.setName("UNKNOWN"); + this.masterLevel = ml; + //System.out.println("GenericPointDataProductInfo(4) entered"); + } + + public GenericPointDataProductInfo(String name, int maxNumberOfLevel, + MasterLevel masterLevel) { + super(); + this.name = name; + this.maxNumberOfLevel = maxNumberOfLevel; + this.masterLevel = masterLevel; + //System.out.println("GenericPointDataProductInfo(2) entered"); + } + + + + public GenericPointDataProductInfo(String name, int maxNumberOfLevel, + MasterLevel masterLevel, List parameterLst) { + super(); + this.name = name; + this.maxNumberOfLevel = maxNumberOfLevel; + this.masterLevel = masterLevel; + this.parameterLst = parameterLst; + //System.out.println("GenericPointDataProductInfo(3) entered"); + } + + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + + public MasterLevel getMasterLevel() { + return masterLevel; + } + + public void setMasterLevel(MasterLevel masterLevel) { + this.masterLevel = masterLevel; + } + + + public List getParameterLst() { + return parameterLst; + } + + + public void setParameterLst(List parameterLst) { + this.parameterLst = parameterLst; + } + + + public int getMaxNumberOfLevel() { + return maxNumberOfLevel; + } + + + public void setMaxNumberOfLevel(int maxNumberOfLevel) { + this.maxNumberOfLevel = maxNumberOfLevel; + } + + + @Override + public GenericPointDataProductInfo clone() throws CloneNotSupportedException { + GenericPointDataProductInfo rpt = new GenericPointDataProductInfo(this.name,this.maxNumberOfLevel,this.masterLevel); + rpt.getParameterLst().clear(); + for(Parameter parm:this.parameterLst){ + String abb = parm.getAbbreviation(); + String name = parm.getName(); + String units = parm.getUnitString(); + Parameter newParm = new Parameter(); + newParm.setAbbreviation(abb); + newParm.setUnitString(units); + newParm.setName(name); + rpt.getParameterLst().add(newParm); + } + return rpt; + } +} diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/product/GenericPointDataStationProduct.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/product/GenericPointDataStationProduct.java new file mode 100644 index 0000000000..8182ed68aa --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/product/GenericPointDataStationProduct.java @@ -0,0 +1,180 @@ +/** + * + * + * This code has been developed by the NCEP-SIB for use in the AWIPS2 system. + * + * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    	Engineer    Description
+ * -------		------- 	-------- 	-----------
+ * 05/30/2013				Chin J. Chen	Initial coding
+ *
+ *
+ * + * @author Chin J. Chen + * @version 1.0 + */ +package gov.noaa.nws.ncep.common.dataplugin.gpd.product; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +import com.raytheon.uf.common.pointdata.spatial.ObStation; +import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; +import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; + +@DynamicSerialize +@XmlAccessorType(XmlAccessType.NONE) +@XmlRootElement +public class GenericPointDataStationProduct { + + @DynamicSerializeElement + @XmlElement(name="GPD-Station-Def") + //private GenericPointDataLocation location; + private ObStation location = new ObStation(); + + @DynamicSerializeElement + @XmlAttribute + private float slat=-9999; + + @DynamicSerializeElement + @XmlAttribute + private float slon=-9999; + + @XmlAttribute + @DynamicSerializeElement + private int numLevel; + + @DynamicSerializeElement + @XmlAttribute + private int productVersion; + + @DynamicSerializeElement + @XmlAttribute + String productName; + + @DynamicSerializeElement + @XmlAttribute + protected Date refTime; + + //list of master level values + @DynamicSerializeElement + @XmlElement(name="GPD-Level-Parameters") + List levelLst = new ArrayList(); + + + public GenericPointDataStationProduct() { + super(); + // TODO Auto-generated constructor stub + } + + + public GenericPointDataStationProduct(int productVersion, String productName) { + super(); + this.productVersion = productVersion; + this.productName = productName; + } + + + public void cleanUp(){ + //this.refTime = null; + this.slat=-9999; + this.slon=-9999; + //this.location.setStationId("*"); + } + public ObStation getLocation() { + return location; + } + + + public void setLocation(ObStation location) { + this.location = location; + } + + + public float getSlat() { + return slat; + } + + + public void setSlat(float slat) { + this.slat = slat; + } + + + public float getSlon() { + return slon; + } + + + public void setSlon(float slon) { + this.slon = slon; + } + + + public int getNumLevel() { + return numLevel; + } + + + public void setNumLevel(int numLevel) { + this.numLevel = numLevel; + } + + + public List getLevelLst() { + return levelLst; + } + + + public void setLevelLst(List levelLst) { + this.levelLst = levelLst; + } + + + @Override + public Object clone() throws CloneNotSupportedException { + GenericPointDataStationProduct prod = new GenericPointDataStationProduct(); + return prod; + } + + + public int getProductVersion() { + return productVersion; + } + + + public void setProductVersion(int productVersion) { + this.productVersion = productVersion; + } + + + public String getProductName() { + return productName; + } + + + public void setProductName(String productName) { + this.productName = productName; + } + + + public Date getRefTime() { + return refTime; + } + + + public void setRefTime(Date refTime) { + this.refTime = refTime; + } + + +} diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/query/GenericPointDataQuery.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/query/GenericPointDataQuery.java new file mode 100644 index 0000000000..e55e603f4b --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/query/GenericPointDataQuery.java @@ -0,0 +1,262 @@ +/** + * + * + * This code has been developed by the NCEP-SIB for use in the AWIPS2 system. + * + * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    	Engineer    Description
+ * -------		------- 	-------- 	-----------
+ * 05/30/2013				Chin J. Chen	Initial coding
+ *
+ *
+ * + * @author Chin J. Chen + * @version 1.0 + */ +package gov.noaa.nws.ncep.common.dataplugin.gpd.query; + +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; + +import com.raytheon.edex.uengine.tasks.query.TableQuery; +import com.raytheon.uf.common.dataplugin.PluginException; +import com.raytheon.uf.common.datastorage.records.FloatDataRecord; +import com.raytheon.uf.common.datastorage.records.IDataRecord; +import com.raytheon.uf.common.datastorage.records.IntegerDataRecord; +import com.raytheon.uf.common.datastorage.records.LongDataRecord; +import com.raytheon.uf.common.datastorage.records.StringDataRecord; +import com.raytheon.uf.common.pointdata.PointDataContainer; +import com.raytheon.uf.common.pointdata.PointDataView; +import com.raytheon.uf.edex.database.DataAccessLayerException; +import com.raytheon.uf.edex.pointdata.DbParameterDescription; +import com.raytheon.uf.edex.pointdata.PointDataDbDescription; +import com.raytheon.uf.edex.pointdata.PointDataQuery; + +public class GenericPointDataQuery extends PointDataQuery { + + protected TableQuery tq; + public GenericPointDataQuery(String plugin) + throws DataAccessLayerException, PluginException { + super(plugin); + // TODO Auto-generated constructor stub + } + private List> performDbQuery(final List fields, + final int limit) throws Exception { + + for (String field : fields) { + query.addReturnedField(field); + } + query.setMaxResults(limit); + List queryResults = dao.queryByCriteria(query); + + List> results = new ArrayList>(); + + for (Object o : queryResults) { + Map workingMap = new HashMap(); + if (o instanceof Object[]) { + Object[] oArr = (Object[]) o; + for (int i = 0; i < fields.size(); i++) { + workingMap.put(fields.get(i), oArr[i]); + } + } else if (fields.size() == 1) { + workingMap.put(fields.get(0), o); + } + results.add(workingMap); + } + + return results; + + } + @Override + public PointDataContainer execute() throws Exception { + List hdf5attribList = new ArrayList(); + HashSet dbAttribSet = new HashSet(); + List dbParamDesc = new ArrayList(); + + //hdf5attribList.addAll(Arrays.asList(attribs)); + + PointDataDbDescription dbDesc = dao.getPointDataDbDescription(); + if (dbDesc == null) { + hdf5attribList.addAll(Arrays.asList(attribs)); + } else { + for (String attrib : attribs) { + DbParameterDescription desc = dbDesc.getDescription(attrib); + if (desc != null) { + dbAttribSet.add(desc.getQueryName()); + dbParamDesc.add(desc); + } else { + hdf5attribList.add(attrib); + } + } + } + + dbAttribSet.add("id"); + if (!hdf5attribList.isEmpty()) { + dbAttribSet.add("pointDataView.curIdx"); + dbAttribSet.addAll(Arrays.asList(dao.getKeysRequiredForFileName())); + } + //for (String dbfield: dbAttribSet) + // System.out.println("gpd GenericPointDataQuery dbAttribSet ="+dbfield); + List> dbResults = performDbQuery( + new ArrayList(dbAttribSet), 999999); + + if ((dbResults == null) || dbResults.isEmpty()) { + return null; + } + + + Map> dbResultMap = new HashMap>(); + PointDataContainer masterPDC = null; + + if (hdf5attribList.isEmpty()) { + int[] idArr = new int[dbResults.size()]; + for (int j = 0; j < dbResults.size(); j++) { + Map workingMap = dbResults.get(j); + idArr[j] = (Integer) workingMap.get("id"); + dbResultMap.put(idArr[j], workingMap); + } + masterPDC = PointDataContainer + .build(new IDataRecord[] { new IntegerDataRecord("id", "", + idArr) }); + masterPDC.setCurrentSz(masterPDC.getAllocatedSz()); + } else { + //for (String hdf: hdf5attribList) + // System.out.println("gpd GenericPointDataQuery hdf5 parameterlist="+hdf); + List files = new ArrayList(); + List> ids = new ArrayList>(); + List> indexes = new ArrayList>(); + //System.out.println("size of dbResults="+dbResults.size()); + for (Map workingMap : dbResults) { + //for(String par: workingMap.keySet()){ + // System.out.println(" db result parm="+par+ " obj="+workingMap.get(par)); + //} + int id = (Integer) workingMap.get("id"); + int idx = (Integer) workingMap.get("pointDataView.curIdx"); + dbResultMap.put(id, workingMap); + String fileName = dao.getPointDataFileName(workingMap); + int listIndex = files.indexOf(fileName); + if (listIndex == -1) { + listIndex = files.size(); + files.add(fileName); + ids.add(new ArrayList()); + indexes.add(new ArrayList()); + //These 3 line are not needed for Generic Point Data implementation. + //This is the only reason to create this class and extend from PointDataQuery + /*hdf5attribList.retainAll(Arrays.asList(dao + .getPointDataDescription(workingMap) + .getParameterNames()));*/ + } + ids.get(listIndex).add(id); + indexes.get(listIndex).add(idx); + } + long t0 = System.currentTimeMillis(); + for (int i = 0; i < files.size(); i++) { + File file = new File(files.get(i)); + //for(String att: hdf5attribList){ + // System.out.println("hdf5 attribute="+att); + //} + List attribSet = new ArrayList(hdf5attribList); + int[] idxArr = new int[indexes.get(i).size()]; + int[] idArr = new int[ids.get(i).size()]; + for (int j = 0; j < idArr.length; j++) { + idxArr[j] = indexes.get(i).get(j); + idArr[j] = ids.get(i).get(j); + // System.out.println("hdf5 idx="+idxArr[j]+ " id="+idArr[j]); + } + PointDataContainer pdc = dao.getPointData(file, idxArr, idArr, + attribSet.toArray(new String[0]), this.requestStyle); + if (masterPDC == null) { + masterPDC = pdc; + masterPDC.setCurrentSz(masterPDC.getAllocatedSz()); + } else { + masterPDC.combine(pdc); + masterPDC.setCurrentSz(masterPDC.getAllocatedSz()); + } + } + long t1 = System.currentTimeMillis(); + System.out + .println("Total time (ms) spent on pointdata hdf5 retrieval (all files): " + + (t1 - t0)); + } + + if (!dbParamDesc.isEmpty()) { + for (DbParameterDescription desc : dbParamDesc) { + switch (desc.getType()) { + case FLOAT: + float[] fdata = new float[masterPDC.getCurrentSz()]; + FloatDataRecord frec = new FloatDataRecord( + desc.getParameterName(), "", fdata); + if (desc.getFillValue() != null) { + frec.setFillValue(Float.parseFloat(desc.getFillValue())); + } + masterPDC.add(frec, desc.getUnit()); + break; + case INT: + int[] idata = new int[masterPDC.getCurrentSz()]; + masterPDC + .add(new IntegerDataRecord(desc.getParameterName(), + "", idata), desc.getUnit()); + break; + case LONG: + long[] ldata = new long[masterPDC.getCurrentSz()]; + masterPDC.add(new LongDataRecord(desc.getParameterName(), + "", ldata), desc.getUnit()); + break; + case STRING: + String[] sdata = new String[masterPDC.getCurrentSz()]; + masterPDC.add(new StringDataRecord(desc.getParameterName(), + "", sdata), desc.getUnit()); + break; + default: + break; + } + + } + for (int i = 0; i < masterPDC.getAllocatedSz(); i++) { + PointDataView pdv = masterPDC.readRandom(i); + Map dbMap = dbResultMap.get(pdv.getInt("id")); + for (DbParameterDescription desc : dbParamDesc) { + Object obj = dbMap.get(desc.getQueryName()); + if (obj == null) { + obj = pdv.getContainer() + .getParameterRecord(desc.getParameterName()) + .getFillValue(); + if (obj == null) { + continue; + } + } + switch (desc.getType()) { + case FLOAT: + pdv.setFloat(desc.getParameterName(), + ((Number) obj).floatValue()); + break; + case INT: + + pdv.setInt(desc.getParameterName(), + ((Number) obj).intValue()); + break; + case LONG: + pdv.setLong(desc.getParameterName(), + ((Number) obj).longValue()); + break; + case STRING: + pdv.setString(desc.getParameterName(), obj.toString()); + break; + default: + break; + } + } + } + } + + return masterPDC; + } + +} diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/query/GenericPointDataReqMsg.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/query/GenericPointDataReqMsg.java new file mode 100644 index 0000000000..2a641ce0e4 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/query/GenericPointDataReqMsg.java @@ -0,0 +1,332 @@ +package gov.noaa.nws.ncep.common.dataplugin.gpd.query; +/** + * + * + * This code has been developed by the NCEP-SIB for use in the AWIPS2 system. + * + * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    	Engineer    Description
+ * -------		------- 	-------- 	-----------
+ * 05/30/2013				Chin J. Chen	Initial coding
+ *
+ *
+ * + * @author Chin J. Chen + * @version 1.0 + */ +import java.util.Date; +import java.util.List; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; + +import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; +import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; +import com.raytheon.uf.common.serialization.comm.IServerRequest; + +@DynamicSerialize +@XmlRootElement(name = "GenericPointDataReqMsg") +@XmlAccessorType(XmlAccessType.NONE) +public class GenericPointDataReqMsg implements IServerRequest { + public static enum GenericPointDataReqType{ + // get GPD in Java Object format + GET_GPD_PRODUCT_OBJECT, + GET_GPD_STATION_PRODUCT_OBJECT, + GET_GPD_MOVING_PRODUCT_OBJECT, + GET_GPD_STATION_PRODUCT_OBJECT_LIST, + GET_GPD_MOVING_PRODUCT_OBJECT_LIST, + GET_GPD_PRODUCT_INFO_OBJECT, + //get/save product in XML format + GET_GPD_PRODUCT_XML, + GET_GPD_STATION_PRODUCT_XML, + GET_GPD_MOVING_PRODUCT_XML, + GET_GPD_PRODUCT_INFO_XML, + STORE_GPD_PRODUCT_FROM_XML, + //get/save product in GEMPAK table format + GET_GPD_PRODUCT_GEMPAK_TBL, + GET_GPD_STATION_PRODUCT_GEMPAK_TBL, + GET_GPD_MOVING_PRODUCT_GEMPAK_TBL, + GET_GPD_PRODUCT_INFO_GEMPAK_TBL, + STORE_GPD_PRODUCT_FROM_GEMPAK_TBL, + //Purge GPD DB + PURGE_GPD_PRODUCT_ONETIME, + PURGE_GPD_PRODUCT_ALLTIME, + PURGE_GPD_EXPIRED_PRODUCT, + PURGE_GPD_ALL_PRODUCTS + } + public static enum GenericPointDataQueryKey{ + BY_STN_ID, + BY_SLAT_SLON, + BY_REPORT_NAME + } + + //required for all + @DynamicSerializeElement + @XmlAttribute(required = true) + private GenericPointDataReqType reqType; + + //required for GPD_PRODUCT, and GPD_STATION_PRODUCT + @DynamicSerializeElement + @XmlAttribute + private Date refTime=null; + + //required for GPD_PRODUCT, GPD_REPORT_INFO, GPD_STATION_PRODUCT + //optional for + @DynamicSerializeElement + @XmlAttribute + private String productName=null; + + //required for GPD_STATION_PRODUCT + @DynamicSerializeElement + @XmlAttribute + private String stnId=null; + + //required for GPD_MOVING_PRODUCT + @DynamicSerializeElement + @XmlAttribute + private float slat; + + //required for GPD_MOVING_PRODUCT + @DynamicSerializeElement + @XmlAttribute + private float slon; + + //optional for GPD_STATION_PRODUCT, GPD_PRODUCT + @DynamicSerializeElement + @XmlAttribute + private int productVersion=0; + + //optional for GPD_STATION_PRODUCT, GPD_PRODUCT + //By default, this flag is false, and we will always return the "latest" version of product + //If this flag is set, we will return based on the version number set in "productVersion" field + @DynamicSerializeElement + @XmlAttribute + private boolean querySpecifiedProductVersion= false; + + @DynamicSerializeElement + @XmlAttribute + private GenericPointDataQueryKey queryKey; + + @DynamicSerializeElement + private int maxNumLevel=0; + + @DynamicSerializeElement + private String gpdDataString; + + // used for query a list of time line for one station or moving product + @DynamicSerializeElement + private List refTimeList; + + public GenericPointDataReqMsg() { + super(); + } + /* + public GenericPointDataProductContainer getGpdProduct(String productName, Date refTime, boolean useSpecifiedProdVersion, int productVersion){ + GenericPointDataProductContainer prodCon=null; + this.reqType = GenericPointDataReqType.GET_GPD_PRODUCT_OBJECT; + this.setProductName(productName); + this.setProductVersion(productVersion); + this.setQuerySpecifiedProductVersion(useSpecifiedProdVersion); + this.setRefTime(refTime); + try { + Object rslts = ThriftClient.sendRequest( this ); + if( (rslts instanceof GenericPointDataProductContainer) ){ + prodCon= (GenericPointDataProductContainer)rslts; + } + else { + System.out.println("Request Failed: "); + + } + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return prodCon; + } + @SuppressWarnings("unchecked") + public List getGpdStationProductList(String productName, GenericPointDataQueryKey queryKey, String stnId,float slat, float slon, List refTimeLst, boolean useSpecifiedProdVersion, int productVersion){ + if(GenericPointDataQueryKey.BY_STN_ID == queryKey){ + this.reqType = GenericPointDataReqType.GET_GPD_STATION_PRODUCT_OBJECT_LIST; + this.setStnId(stnId); + } + else{ + this.reqType = GenericPointDataReqType.GET_GPD_MOVING_PRODUCT_OBJECT_LIST; + this.setSlat(slat); + this.setSlon(slon); + } + this.setProductName(productName); + this.setProductVersion(productVersion); + this.setQuerySpecifiedProductVersion(useSpecifiedProdVersion); + this.setQueryKey(queryKey); + this.setRefTimeList(refTimeLst); + try { + Object rslts = ThriftClient.sendRequest( this ); + if( (rslts instanceof List) ){ + return ((List)rslts); + //System.out.println(" stnProd stnId= "+stnProd.getLocation().getStationId()+ " slat="+stnProd.getSlat()+ " slon="+stnProd.getSlon()); + } + else { + System.out.println("Request Failed: "); + + } + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + return null; + } + + public GenericPointDataProductContainer getGpdStationProduct(String productName, GenericPointDataQueryKey queryKey, String stnId,float slat, float slon, Date refTime, boolean useSpecifiedProdVersion, int productVersion){ + GenericPointDataProductContainer stnProd=null; + if(GenericPointDataQueryKey.BY_STN_ID == queryKey){ + this.reqType = GenericPointDataReqType.GET_GPD_STATION_PRODUCT_OBJECT; + this.setStnId(stnId); + } + else{ + this.reqType = GenericPointDataReqType.GET_GPD_MOVING_PRODUCT_OBJECT; + this.setSlat(slat); + this.setSlon(slon); + } + this.setProductName(productName); + this.setProductVersion(productVersion); + this.setQuerySpecifiedProductVersion(useSpecifiedProdVersion); + this.setQueryKey(queryKey); + //Date refTime = new Date(); + //refTime.setTime(0); + //refTime.setDate(8); + //refTime.setHours(15); + //refTime.setYear(113); + //refTime.setMonth(4); + //refTime.setMinutes(30); + //"2013-05-08 14:30:00" + //refTime.setTime(1368023400000L); + this.setRefTime(refTime); + try { + Object rslts = ThriftClient.sendRequest( this ); + if( (rslts instanceof GenericPointDataProductContainer) ){ + stnProd= (GenericPointDataProductContainer)rslts; + //System.out.println(" stnProd stnId= "+stnProd.getLocation().getStationId()+ " slat="+stnProd.getSlat()+ " slon="+stnProd.getSlon()); + + } + else { + System.out.println("Request Failed: "); + + } + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return stnProd; + } + + public GenericPointDataProductInfo getGpdProductInfo(String productName){ + GenericPointDataProductInfo prodInfo=null; + this.reqType = GenericPointDataReqType.GET_GPD_PRODUCT_INFO_OBJECT; + this.setProductName(productName); + try { + Object rslts = ThriftClient.sendRequest( this ); + if( (rslts instanceof GenericPointDataProductInfo) ) { + // + prodInfo = (GenericPointDataProductInfo)rslts; + System.out.println(" report name= "+prodInfo.getName()+ " master="+prodInfo.getMasterLevel().getName()+ " maxLevel="+prodInfo.getMaxNumberOfLevel()); + for(Parameter pam: prodInfo.getParameterLst() ){ + System.out.println("parm ="+pam.getAbbreviation()); + } + } + else { + System.out.println("Request Failed: "); + + } + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return prodInfo; + } + */ + public GenericPointDataReqType getReqType() { + return reqType; + } + public void setReqType(GenericPointDataReqType reqType) { + this.reqType = reqType; + } + public Date getRefTime() { + return refTime; + } + public void setRefTime(Date refTime) { + this.refTime = refTime; + } + public String getProductName() { + return productName; + } + public void setProductName (String productName) { + this.productName = productName; + } + public String getStnId() { + return stnId; + } + public void setStnId(String stnId) { + this.stnId = stnId; + } + public int getProductVersion() { + return productVersion; + } + public void setProductVersion(int productVersion) { + this.productVersion = productVersion; + } + public boolean isQuerySpecifiedProductVersion() { + return querySpecifiedProductVersion; + } + public void setQuerySpecifiedProductVersion(boolean querySpecifiedProductVersion) { + this.querySpecifiedProductVersion = querySpecifiedProductVersion; + } + public float getSlat() { + return slat; + } + public void setSlat(float slat) { + this.slat = slat; + } + public float getSlon() { + return slon; + } + public void setSlon(float slon) { + this.slon = slon; + } + public GenericPointDataQueryKey getQueryKey() { + return queryKey; + } + public void setQueryKey(GenericPointDataQueryKey queryKey) { + this.queryKey = queryKey; + } + + public String getGpdDataString() { + return gpdDataString; + } + + public void setGpdDataString(String gpdDataString) { + this.gpdDataString = gpdDataString; + } + + public int getMaxNumLevel() { + return maxNumLevel; + } + + public void setMaxNumLevel(int maxNumLevel) { + this.maxNumLevel = maxNumLevel; + } + + public List getRefTimeList() { + return refTimeList; + } + + public void setRefTimeList(List refTimeList) { + this.refTimeList = refTimeList; + } + + +} diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasSpatialFactory.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasSpatialFactory.java index 1996694e6e..dd1e676cce 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasSpatialFactory.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasSpatialFactory.java @@ -18,6 +18,8 @@ package gov.noaa.nws.ncep.common.dataplugin.mcidas; +import gov.noaa.nws.ncep.common.dataplugin.mcidas.dao.McidasMapCoverageDao; + import org.apache.commons.codec.binary.Base64; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -34,9 +36,6 @@ import com.raytheon.uf.edex.database.DataAccessLayerException; import com.vividsolutions.jts.geom.Geometry; import com.vividsolutions.jts.io.WKTReader; -import gov.noaa.nws.ncep.common.dataplugin.mcidas.McidasMapCoverage; -import gov.noaa.nws.ncep.common.dataplugin.mcidas.dao.McidasMapCoverageDao; - public class McidasSpatialFactory { /** The logger */ @@ -58,7 +57,8 @@ public class McidasSpatialFactory { } /** - * Retrieves or generates a satellite map coverage object for remapped projections + * Retrieves or generates a satellite map coverage object for remapped + * projections * * @param mapProjection * The projection @@ -88,30 +88,32 @@ public class McidasSpatialFactory { * If errors occur during db interaction or creation of the * coverage object */ - public synchronized McidasMapCoverage getMapCoverage( - Integer iproj, Integer nx, Integer ny, Float dx, Float dy, Float clon, - Float stdlat1, Float stdlat2, Float lllat, Float lllon, Float urlat, Float urlon) - throws Exception { + public synchronized McidasMapCoverage getMapCoverage(Integer iproj, + Integer nx, Integer ny, Float dx, Float dy, Float clon, + Float stdlat1, Float stdlat2, Float lllat, Float lllon, + Float urlat, Float urlon, double earthRadius) throws Exception { McidasMapCoverage mapCoverage = null; McidasMapCoverageDao satDao = new McidasMapCoverageDao(); try { // Check the database to see if a coverage already exists - mapCoverage = satDao.getSatCoverage(iproj, nx, ny, dx, dy, - clon, stdlat1, stdlat2, lllat, lllon, urlat, urlon); + mapCoverage = satDao.getSatCoverage(iproj, nx, ny, dx, dy, clon, + stdlat1, stdlat2, lllat, lllon, urlat, urlon); // If the database does not contain an existing sat map coverage for // the given values, create one if (mapCoverage == null) { - mapCoverage = createMapCoverage(iproj, nx, ny, dx, dy, - clon, stdlat1, stdlat2, lllat, lllon, urlat, urlon); - + mapCoverage = createMapCoverage(iproj, nx, ny, dx, dy, clon, + stdlat1, stdlat2, lllat, lllon, urlat, urlon, + earthRadius); + // Persist the new coverage to the database satDao.persist(mapCoverage); } } catch (Exception e) { throw new DataAccessLayerException( - "Unable to retrieve or construct valid Satellite Map Coverage", e); + "Unable to retrieve or construct valid Satellite Map Coverage", + e); } if (mapCoverage == null) { @@ -155,30 +157,30 @@ public class McidasSpatialFactory { */ private synchronized McidasMapCoverage createMapCoverage( Integer mapProjection, Integer nx, Integer ny, Float dx, Float dy, - Float clon, Float stdlat1, Float stdlat2, Float lllat, Float lllon, - Float urlat, Float urlon) throws Exception { + Float clon, Float stdlat1, Float stdlat2, Float lllat, Float lllon, + Float urlat, Float urlon, double earthRadius) throws Exception { logger.debug("Creating map coverage object"); ProjectedCRS crs = null; - + // Get the correct CRS if (mapProjection == 1) { - //double cm = 0.0; - //if ((lllon > 0.0) && (urlon < 0.0)) { - // cm = 180.0; - //} - crs = MapUtil.constructMercator(MapUtil.AWIPS_EARTH_RADIUS, - MapUtil.AWIPS_EARTH_RADIUS, stdlat1, clon); + // double cm = 0.0; + // if ((lllon > 0.0) && (urlon < 0.0)) { + // cm = 180.0; + // } + crs = MapUtil.constructMercator(earthRadius, earthRadius, stdlat1, + clon); } else if (mapProjection == 3) { - crs = MapUtil.constructLambertConformal(MapUtil.AWIPS_EARTH_RADIUS, - MapUtil.AWIPS_EARTH_RADIUS, stdlat1, stdlat2, clon); + crs = MapUtil.constructLambertConformal(earthRadius, earthRadius, + stdlat1, stdlat2, clon); } else { - if ( stdlat1 >= 0. ) - crs = MapUtil.constructNorthPolarStereo(MapUtil.AWIPS_EARTH_RADIUS, - MapUtil.AWIPS_EARTH_RADIUS, stdlat1, clon); - else - crs = constructSouthPolarStereo(MapUtil.AWIPS_EARTH_RADIUS, - MapUtil.AWIPS_EARTH_RADIUS, stdlat1, clon); + if (stdlat1 >= 0.) + crs = MapUtil.constructNorthPolarStereo(earthRadius, + earthRadius, stdlat1, clon); + else + crs = constructSouthPolarStereo(earthRadius, earthRadius, + stdlat1, clon); } DirectPosition2D firstPosition = null; @@ -191,8 +193,8 @@ public class McidasSpatialFactory { DirectPosition2D corner4 = new DirectPosition2D(); /* - * Projection is Mercator. Determine corner points from lllat,lllon,urlat,urlon - * provided in the satellite file + * Projection is Mercator. Determine corner points from + * lllat,lllon,urlat,urlon provided in the satellite file */ if (mapProjection == 1) { logger.debug("Determining corner points for Mercator projection"); @@ -214,8 +216,7 @@ public class McidasSpatialFactory { * the corner points must be calculated */ else { - logger - .debug("Determining corner points for Lambert Conformal or Polar Stereographic projection"); + logger.debug("Determining corner points for Lambert Conformal or Polar Stereographic projection"); // Get the transforms to be used to convert between meters and // lat/lon @@ -224,15 +225,18 @@ public class McidasSpatialFactory { // Use lllat and lllon to specify the first point firstPosition = new DirectPosition2D(); - fromLatLon.transform(new DirectPosition2D(lllon, lllat), firstPosition); + fromLatLon.transform(new DirectPosition2D(lllon, lllat), + firstPosition); + int nxm1 = nx - 1; + int nym1 = ny - 1; // Determine the 3 other corner points using the given dx,dy,nx, and // ny in meters - secondPosition = new DirectPosition2D(dx * nx + firstPosition.x, + secondPosition = new DirectPosition2D(dx * nxm1 + firstPosition.x, firstPosition.y); - thirdPosition = new DirectPosition2D(dx * nx + firstPosition.x, dy - * ny + firstPosition.y); - fourthPosition = new DirectPosition2D(firstPosition.x, dx * ny + thirdPosition = new DirectPosition2D(dx * nxm1 + firstPosition.x, + dy * nym1 + firstPosition.y); + fourthPosition = new DirectPosition2D(firstPosition.x, dy * nym1 + firstPosition.y); // Convert the corner points from meters to lat/lon @@ -256,12 +260,12 @@ public class McidasSpatialFactory { Geometry geometry = new WKTReader().read(buffer.toString()); McidasMapCoverage mapCoverage = new McidasMapCoverage(mapProjection, - nx, ny, dx, dy, clon, stdlat1, stdlat2, lllat, lllon, urlat, + nx, ny, dx, dy, clon, stdlat1, stdlat2, lllat, lllon, urlat, urlon, crs, geometry); return mapCoverage; } - + /** * Construct a south polar stereographic projection * @@ -278,7 +282,7 @@ public class McidasSpatialFactory { private ProjectedCRS constructSouthPolarStereo(double majorAxis, double minorAxis, double stdParallel, double centralMeridian) { try { - DefaultMathTransformFactory dmtFactory = new DefaultMathTransformFactory(); + DefaultMathTransformFactory dmtFactory = new DefaultMathTransformFactory(); ParameterValueGroup parameters = dmtFactory .getDefaultParameters("Stereographic_South_Pole"); @@ -299,49 +303,60 @@ public class McidasSpatialFactory { } } - /** - * Retrieves or generates a satellite map coverage object for native satellite navigation + * Retrieves or generates a satellite map coverage object for native + * satellite navigation + * * @param iproj - * @param nx Number of elements per line in area - * @param ny Number of lines in area - * @param reflon Reference Longitude - * @param upperLeftElement image element coordinate of area line 0, element 0 - * @param upperLeftLine image line coordinate of area line 0, element 0 - * @param xres Element resolution - * @param yres Line resolution - * @param navigation Satellite NAV BLOCK + * @param nx + * Number of elements per line in area + * @param ny + * Number of lines in area + * @param reflon + * Reference Longitude + * @param upperLeftElement + * image element coordinate of area line 0, element 0 + * @param upperLeftLine + * image line coordinate of area line 0, element 0 + * @param xres + * Element resolution + * @param yres + * Line resolution + * @param navigation + * Satellite NAV BLOCK * @return * @throws Exception */ - public McidasMapCoverage getMapCoverage(Integer iproj, Integer nx, - Integer ny, Float reflon, int upperLeftElement, int upperLeftLine, int xres, int yres, - byte[] navigation) throws Exception { + public McidasMapCoverage getMapCoverage(Integer iproj, Integer nx, + Integer ny, Float reflon, int upperLeftElement, int upperLeftLine, + int xres, int yres, byte[] navigation) throws Exception { McidasMapCoverage mapCoverage = null; McidasMapCoverageDao satDao = new McidasMapCoverageDao(); String type = new String(navigation, 0, 4); String encodedNav = encodeNavBlock(navigation); - + try { // Check the database to see if a coverage already exists - mapCoverage = satDao.getSatCoverage(iproj, nx, ny, upperLeftElement, - upperLeftLine, xres, yres, encodedNav); - //TODO - + mapCoverage = satDao.getSatCoverage(iproj, nx, ny, + upperLeftElement, upperLeftLine, xres, yres, encodedNav); + // TODO + // If the database does not contain an existing sat map coverage for // the given values, create one if (mapCoverage == null) { - mapCoverage = createMapCoverage(iproj, nx, ny, reflon, upperLeftElement, - upperLeftLine, xres, yres, type, encodedNav); - + mapCoverage = createMapCoverage(iproj, nx, ny, reflon, + upperLeftElement, upperLeftLine, xres, yres, type, + encodedNav); + // Persist the new coverage to the database satDao.persist(mapCoverage); } } catch (Exception e) { throw new DataAccessLayerException( - "Unable to retrieve or construct valid raw Satellite Map Coverage", e); + "Unable to retrieve or construct valid raw Satellite Map Coverage", + e); } if (mapCoverage == null) { @@ -350,84 +365,85 @@ public class McidasSpatialFactory { } return mapCoverage; - } + } - private McidasMapCoverage createMapCoverage(Integer mapProjection, Integer nx, - Integer ny, Float reflon, int upperLeftElement, int upperLeftLine, int xres, int yres, - String type, String encodedNav) throws Exception { + private McidasMapCoverage createMapCoverage(Integer mapProjection, + Integer nx, Integer ny, Float reflon, int upperLeftElement, + int upperLeftLine, int xres, int yres, String type, + String encodedNav) throws Exception { ProjectedCRS crs = null; - + // Get the correct CRS if (mapProjection == 7585) { crs = constructCRS(type, encodedNav); } - + // Construct the polygon constructor String StringBuffer buffer = new StringBuffer(); buffer.append("POLYGON(("); - buffer.append(reflon-90.+" -90.0,"); - buffer.append(reflon+90.+" -90.0,"); - buffer.append(reflon+90.+" 90.0,"); - buffer.append(reflon-90.+" 90.0,"); - buffer.append(reflon-90.+" -90.0"); + buffer.append(reflon - 90. + " -90.0,"); + buffer.append(reflon + 90. + " -90.0,"); + buffer.append(reflon + 90. + " 90.0,"); + buffer.append(reflon - 90. + " 90.0,"); + buffer.append(reflon - 90. + " -90.0"); buffer.append("))"); // Create the geometry from the constructed String Geometry geometry = new WKTReader().read(buffer.toString()); McidasMapCoverage mapCoverage = new McidasMapCoverage(mapProjection, - nx, ny, reflon, upperLeftElement, upperLeftLine, xres, yres, + nx, ny, reflon, upperLeftElement, upperLeftLine, xres, yres, crs, geometry); return mapCoverage; - - } - private String encodeNavBlock( byte[] navigation ) { - - Base64 b64 = new Base64(); - byte[] coded = b64.encode(navigation); + } - return new String(coded); - } - - public ProjectedCRS constructCRS(String type, String encoded) { - - ParameterValueGroup pvg = null; - - DefaultMathTransformFactory dmtFactory = new DefaultMathTransformFactory(); - try { - pvg = dmtFactory.getDefaultParameters("MCIDAS_AREA_NAV"); - } catch (NoSuchIdentifierException e1) { - e1.printStackTrace(); - } - - /* - * semi_major and semi_minor parameters are set to 1, so that no global scaling - * is performed during coordinate transforms by - * org.geotools.referencing.operation.projection.MapProjection - * based on the radius of earth - */ + private String encodeNavBlock(byte[] navigation) { + + Base64 b64 = new Base64(); + byte[] coded = b64.encode(navigation); + + return new String(coded); + } + + public ProjectedCRS constructCRS(String type, String encoded) { + + ParameterValueGroup pvg = null; + + DefaultMathTransformFactory dmtFactory = new DefaultMathTransformFactory(); + try { + pvg = dmtFactory.getDefaultParameters("MCIDAS_AREA_NAV"); + } catch (NoSuchIdentifierException e1) { + e1.printStackTrace(); + } + + /* + * semi_major and semi_minor parameters are set to 1, so that no global + * scaling is performed during coordinate transforms by + * org.geotools.referencing.operation.projection.MapProjection based on + * the radius of earth + */ pvg.parameter("semi_major").setValue(1.0); pvg.parameter("semi_minor").setValue(1.0); pvg.parameter("central_meridian").setValue(0.0); - //pvg.parameter("scale_factor").setValue(1.0); + // pvg.parameter("scale_factor").setValue(1.0); - pvg.parameter("NAV_BLOCK_BASE64").setValue(encoded); - //System.out.println(pvg.toString() ); - - String projectionName = "MCIDAS AREA "+type; - ProjectedCRS mcidasCRS = null; - try { - mcidasCRS = MapUtil.constructProjection(projectionName, pvg); - } catch (NoSuchIdentifierException e) { - e.printStackTrace(); - } catch (FactoryException e) { - e.printStackTrace(); - } - - return mcidasCRS; - } + pvg.parameter("NAV_BLOCK_BASE64").setValue(encoded); + // System.out.println(pvg.toString() ); + + String projectionName = "MCIDAS AREA " + type; + ProjectedCRS mcidasCRS = null; + try { + mcidasCRS = MapUtil.constructProjection(projectionName, pvg); + } catch (NoSuchIdentifierException e) { + e.printStackTrace(); + } catch (FactoryException e) { + e.printStackTrace(); + } + + return mcidasCRS; + } } diff --git a/ncep/gov.noaa.nws.ncep.common/src/gov/noaa/nws/ncep/common/tools/IDecoderConstantsN.java b/ncep/gov.noaa.nws.ncep.common/src/gov/noaa/nws/ncep/common/tools/IDecoderConstantsN.java index 33ff60334b..2ee2677807 100644 --- a/ncep/gov.noaa.nws.ncep.common/src/gov/noaa/nws/ncep/common/tools/IDecoderConstantsN.java +++ b/ncep/gov.noaa.nws.ncep.common/src/gov/noaa/nws/ncep/common/tools/IDecoderConstantsN.java @@ -21,6 +21,7 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools; * 7/2011 T. Lee Added STORM_BULLSEPARATOR * 9/2011 B. Hebbard Added CALENDAR_MISSING * 11/2011 S. Gurung Added NEGATIVE_FLOAT_MISSING and NEGATIVE_INTEGER_MISSING + * 08/2013 T. Lee Simplied stormtrack reg expression * * * @@ -57,7 +58,9 @@ public interface IDecoderConstantsN extends IDecoderConstants { "(([0-9]{1}|/)(.*)(\\r\\r\\n))*"; /** Regular expression for STORM_TRACK report */ +// public static final String STORM_BULLSEPARATOR = +// "(WP|IO|SH|CP|EP|AL|ML), +(\\d{1,2}|\\w{1,4}), +\\d{10}, +\\d{1,2}, +\\w{1,4}, +" +// +"(-|\\d)\\d{0,2}, +\\d{1,3}(N|S| ), +\\d{1,4}(E|W|\\W), +.*\\x0a"; public static final String STORM_BULLSEPARATOR = - "(WP|IO|SH|CP|EP|AL|ML), +(\\d{1,2}|\\w{1,4}), +\\d{10}, +\\d{1,2}, +\\w{1,4}, +" - +"(-|\\d)\\d{0,2}, +\\d{1,3}(N|S| ), +\\d{1,4}(E|W|\\W), +.*\\x0a"; + "(WP|IO|SH|CP|EP|AL|ML), +(\\d{1,2}|\\w{1,4}), +\\d{10}, +.*\\x0a"; } diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/decoder/AwwDecoder.java b/ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/decoder/AwwDecoder.java index 5653e062d7..19b65ed452 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/decoder/AwwDecoder.java +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/decoder/AwwDecoder.java @@ -28,6 +28,7 @@ * drop the record by throwing an exception * 2. comment out the end check "if(record == null") * because it is a dead code. + * 08/08/13 1028 G. Hull rm underscores from reportType and set mndTime in URI * * * This code has been developed by the SIB for use in the AWIPS2 system. @@ -252,12 +253,22 @@ public class AwwDecoder extends AbstractDecoder { */ if (record != null) { //T976 - check if the record has a valid UGC. If not return an empty PluginDataObject array - if ( record.getAwwUGC() == null || record.getAwwUGC().size() == 0 ) + if ( record.getAwwUGC() == null || record.getAwwUGC().size() == 0 ) { return new PluginDataObject[0]; + } - record.setReportType(reportType.trim().replace(' ', '_')); + record.setReportType( reportType.trim() ); record.setTraceId(traceId); record.setPluginName(pluginName); + // Set MND remark before the URI is constructed + if( mt.getMndTimeString() == null || + mt.getMndTimeString().trim().isEmpty() ) { + record.setMndTime( "unknown" ); + } + else { + record.setMndTime( mt.getMndTimeString() ); + } + try { record.constructDataURI(); } catch (PluginException e) { @@ -270,9 +281,6 @@ public class AwwDecoder extends AbstractDecoder { // Decode and set attention line record.setAttentionWFO(AwwParser.processATTN(theBulletin)); - // Set MND remark - record.setMndTime(mt.getMndTimeString()); - // Replace special characters to a blank so that it may be readable. if (theBulletin.length() < 40000) { record.setBullMessage(UtilN.removeLeadingWhiteSpaces(theBulletin @@ -307,11 +315,4 @@ public class AwwDecoder extends AbstractDecoder { return false; return ("WWUS30".equalsIgnoreCase(ar.getWmoHeader())); } - -// public static boolean isSevereWeatherStatus(AwwRecord awwReocrd) { -// boolean isSevereWeatherStatus = false; -// if("WOUS20".equalsIgnoreCase(awwReocrd.getWmoHeader())) -// isSevereWeatherStatus = true; -// return isSevereWeatherStatus; -// } } diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/util/AwwParser.java b/ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/util/AwwParser.java index 082b2e1e26..c18f425cd8 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/util/AwwParser.java +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/util/AwwParser.java @@ -18,6 +18,7 @@ * The change is made in the method processWMO(...) * 01/26/2011 N/A M. Gao Refactor: * change the WMO regular expression more flexible. + * 08/01/2013 1028 G. Hull sanity check on AwwReportType. * * * @@ -33,6 +34,7 @@ import gov.noaa.nws.ncep.common.dataplugin.aww.AwwFips; import gov.noaa.nws.ncep.common.dataplugin.aww.AwwHVtec; import gov.noaa.nws.ncep.common.dataplugin.aww.AwwLatlons; import gov.noaa.nws.ncep.common.dataplugin.aww.AwwRecord; +import gov.noaa.nws.ncep.common.dataplugin.aww.AwwRecord.AwwReportType; import gov.noaa.nws.ncep.common.dataplugin.aww.AwwUgc; import gov.noaa.nws.ncep.common.dataplugin.aww.AwwVtec; import gov.noaa.nws.ncep.edex.util.UtilN; @@ -1124,6 +1126,10 @@ if(wtchLatLonMatcher.find()){ reportType = getOtherType(bull); } + if( AwwReportType.getReportType( reportType ) == AwwReportType.UNKNOWN_AWW_REPORT_TYPE ) { + logger.warn( "Warning: decoded aww report type, "+reportType+ ", not recogized." ); + } + return reportType; } diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/META-INF/MANIFEST.MF index b16d9cb479..330fa57602 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/META-INF/MANIFEST.MF @@ -9,4 +9,5 @@ Require-Bundle: gov.noaa.nws.ncep.common.dataplugin.geomag;bundle-version="1.0.0", org.apache.commons.logging;bundle-version="1.1.1", com.raytheon.uf.common.localization;bundle-version="1.10.13" -Import-Package: com.raytheon.uf.edex.decodertools.time +Import-Package: com.raytheon.uf.common.message.response, + com.raytheon.uf.common.serialization.comm diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-common.xml index 889cf19b31..c6607b1cd3 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-common.xml +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-common.xml @@ -1,19 +1,27 @@ + xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd + http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"> + + + + + - + diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml index b90aa8d228..c89de9dd0f 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml @@ -1,20 +1,9 @@ - - @@ -35,6 +24,8 @@ + + - @@ -62,7 +52,7 @@ - + java.lang.Throwable @@ -70,12 +60,49 @@ - - - + + + + + + + + + + java.lang.Throwable + + + + + + + + diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-request b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-request new file mode 100644 index 0000000000..119e8dbace --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-request @@ -0,0 +1,41 @@ + + + + + + + + + + + + + geomag + + + + + + + + + + + + + java.lang.Throwable + + + + + + + + \ No newline at end of file diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/GeoMagDecoder.java b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/GeoMagDecoder.java index f01577874f..2254a337e4 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/GeoMagDecoder.java +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/GeoMagDecoder.java @@ -3,6 +3,7 @@ package gov.noaa.nws.ncep.edex.plugin.geomag; import gov.noaa.nws.ncep.common.dataplugin.geomag.GeoMagRecord; import gov.noaa.nws.ncep.common.dataplugin.geomag.dao.GeoMagDao; import gov.noaa.nws.ncep.common.dataplugin.geomag.exception.GeoMagException; +import gov.noaa.nws.ncep.common.dataplugin.geomag.table.GeoMagSource; import gov.noaa.nws.ncep.common.dataplugin.geomag.table.GeoMagStation; import gov.noaa.nws.ncep.common.dataplugin.geomag.table.Group; import gov.noaa.nws.ncep.common.dataplugin.geomag.util.GeoMagStationLookup; @@ -10,6 +11,7 @@ import gov.noaa.nws.ncep.common.dataplugin.geomag.util.TableTimeStamp; import java.io.BufferedReader; import java.io.File; +import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; import java.text.ParseException; @@ -27,7 +29,13 @@ import org.apache.commons.logging.LogFactory; import com.raytheon.edex.plugin.AbstractDecoder; import com.raytheon.uf.common.dataplugin.PluginDataObject; +import com.raytheon.uf.common.dataplugin.persist.IPersistable; +import com.raytheon.uf.common.datastorage.IDataStore; +import com.raytheon.uf.common.datastorage.StorageException; +import com.raytheon.uf.common.datastorage.records.IDataRecord; import com.raytheon.uf.common.time.DataTime; +import com.raytheon.uf.edex.database.DataAccessLayerException; +import com.raytheon.uf.edex.database.query.DatabaseQuery; /** * This java class decodes geomagnetic data. @@ -40,10 +48,18 @@ import com.raytheon.uf.common.time.DataTime; * ----------- ---------- ----------- -------------------------- * 03/27/2013 #975 sgurung Initial Creation * 04/26/2013 #975 qzhou Added unit checkup. Declared missingVal. - * 06/07/2013 #975 qzhou Fixed an error on conversion + * 06/07/2013 #975 qzhou Fixed error on conversion + * 07/16/2013 975 qzhou Decoder redesign: + * Changed the data entries in postgreSQL to minute(1440 entries). + * Changed data overwrite to insert new data. Added insertion loop. + * Changed the write to from hdf5 to post. Added 5 columns: H,D,Z,F and badData. + * Removed source and sourcePreference tables. + * Get source priority from GeoMagStaiton.xml + * Added handles for same stations but with or without header + * Fixed HAD default value * * - * @author sgurung + * @author sgurung, qzhou * @version 1 * */ @@ -82,27 +98,33 @@ public class GeoMagDecoder extends AbstractDecoder { private static final String COMPONENT_3 = "component3"; private static final String COMPONENT_4 = "component4"; - + private static final String UNIT = "unit"; - private static final float missingVal = 99999; + private static final float MISSING_VAL = 99999.99f; public GeoMagDecoder(String name) { pluginName = name; } - public PluginDataObject[] decode(File file) throws Exception { - - PluginDataObject[] retData = null; - + public PluginDataObject[] decode(File file) throws Exception { + List retData = new ArrayList(); GeoMagRecord record = null; - - List obsTimesList = new ArrayList(); + int sourceId = 101; + String stationCode = ""; + String suffix = ""; + + String format = "yyyy-MM-dd'_'HH:mm:ss.s"; + SimpleDateFormat sdf = new SimpleDateFormat(format); + + List obsTimesList = new ArrayList(); List comp1List = new ArrayList(); List comp2List = new ArrayList(); List comp3List = new ArrayList(); - List comp4List = new ArrayList(); + List comp4List = new ArrayList(); + + logger.info("******** Start meganetometer decoder."); if (file == null || (file.length() < 1)) return new PluginDataObject[0]; @@ -110,122 +132,141 @@ public class GeoMagDecoder extends AbstractDecoder { BufferedReader in = null; try{ - String input; - in = new BufferedReader(new FileReader(file)); - record = new GeoMagRecord(); - - // get station code from the file name - String stationCode = file.getName().substring(0,3).toUpperCase(); - - // for Hartland (HAD) data, filename does not have full station code - if (stationCode.startsWith("HA")) + String input; + in = new BufferedReader(new FileReader(file)); + + // get station code from the file name + String fileName = file.getName(); + stationCode = fileName.substring(0,3).toUpperCase(); + suffix = fileName.substring(fileName.indexOf(".")+1, fileName.length()); + + // for Hartland (HAD), Korea (JEJ) data, filename does not have full station code + if (stationCode.startsWith("HA")) stationCode = "HAD"; - // for Korea (JEJ) data, filename does not have the exact station code - else if (stationCode.startsWith("M")) + else if (stationCode.startsWith("MEA")) + stationCode = "MEA"; + else if (stationCode.startsWith("M")) stationCode = "JEJ"; - // get the station detail from metadata file 'geoMagStations.xml' - GeoMagStation station = getStationDetail(stationCode); - - if (station == null) { + // get the station detail from metadata file 'geoMagStations.xml' + // File has header & end with min. File has no header & end with min. File has no header & not end with min. + GeoMagStation station = null; + if ( !suffix.equals("min")) //reverse is not true + station = getStationDetail(stationCode, false); + else + station = getStationDetail(stationCode, true); + + + if (station == null) { logger.error("Error decoding geomag file! Station code not found in geoMagStations.xml file."); return new PluginDataObject[0]; - } + } + + boolean containsHeader = (station.getRawDataFormat().getHeaderFormat()!=null)?true:false; + boolean containsData = (station.getRawDataFormat().getDataFormat()!=null)?true:false; - String source = (station.getSource()!=null)?station.getSource()[0]:null; + Pattern HEADER_EXP = null; + Pattern DATA_EXP = null; + boolean conversionRequired = false; + HashMap headerGroupMap = new HashMap(); + HashMap dataGroupMap = new HashMap(); - boolean containsHeader = (station.getRawDataFormat().getHeaderFormat()!=null)?true:false; - boolean containsData = (station.getRawDataFormat().getDataFormat()!=null)?true:false; - - Pattern HEADER_EXP = null; - Pattern DATA_EXP = null; - boolean conversionRequired = false; - HashMap headerGroupMap = new HashMap(); - HashMap dataGroupMap = new HashMap(); - - /* Get regular expression for the header from the station metadata file */ - if (containsHeader) { + /* Get regular expression for the header from the station metadata file */ + if (containsHeader) { HEADER_EXP = Pattern.compile(station.getRawDataFormat().getHeaderFormat().getPattern()); - Group[] headerGroup = station.getRawDataFormat().getHeaderFormat().getGroup(); - + Group[] headerGroup = station.getRawDataFormat().getHeaderFormat().getGroup(); if (headerGroup != null) { for (Group group: headerGroup) { headerGroupMap.put(group.getName(), group); } } - } + } - /* Get regular expression for the data from the station metadata file */ - if (containsData) { + /* Get regular expression for the data from the station metadata file */ + if (containsData) { DATA_EXP = Pattern.compile(station.getRawDataFormat().getDataFormat().getPattern()); - Group[] dataGroup = station.getRawDataFormat().getDataFormat().getGroup(); - + + Group[] dataGroup = station.getRawDataFormat().getDataFormat().getGroup(); if (dataGroup != null) { for (Group group: dataGroup) { dataGroupMap.put(group.getName(), group); } - } - + } conversionRequired = station.getRawDataFormat().getDataFormat().getConversionRequired(); - } + } - boolean firstLine = true; - String unit = ""; - while((input = in.readLine()) != null){ - - int groupId = -1; - + boolean firstLine = true; + String unit = ""; + //int idx = 0; + DataTime headTime = null; + Calendar obsTime = null; + + + while((input = in.readLine()) != null){ + int groupId = -1; + + /* if this is the first line and header exists, parse the header information */ if (firstLine && containsHeader) { - /* if this is the first line and header exists, parse the header information */ - + Matcher headerMatcher = HEADER_EXP.matcher(input); - if (headerMatcher.find()) { - + if (headerMatcher.find()) { // set the station code groupId = (headerGroupMap.get(STATION_CODE) != null)? headerGroupMap.get(STATION_CODE).getId():-1; if (groupId != -1) - record.setStationCode(headerMatcher.group(groupId)); + stationCode = headerMatcher.group(groupId); // set the source groupId = (headerGroupMap.get(SOURCE) != null)? headerGroupMap.get(SOURCE).getId():-1; + if (groupId != -1) { - source = headerMatcher.group(groupId); + String source = headerMatcher.group(groupId); + ArrayList src = getStationDetail(stationCode, true).getSource(); + //System.out.println("***src "+src.size() +" "+ stationCode); + for (int i = 0; i < src.size(); i++) { + String name = src.get(i).getName(); + if (name.equalsIgnoreCase(source)) + sourceId = src.get(i).getPriority(); + } } - - // set the source + + // get the unit groupId = (headerGroupMap.get(UNIT) != null)? headerGroupMap.get(UNIT).getId():-1; if (groupId != -1) { unit = headerMatcher.group(groupId); } - record.setDataTime(getRecordDataTime(headerMatcher, headerGroupMap)); + // get the time + headTime = getRecordDataTime(headerMatcher, headerGroupMap); } } if (containsData) { - /* if data exists, parse the data information */ - + /* if data exists, parse the data information */ Matcher dataMatcher = DATA_EXP.matcher(input); - - if (dataMatcher.find()) { - - /* if this is the first line and header does not exist */ + + if (dataMatcher.find()) { + //if (dbLastTime == 0 || (dbLastTime != 0 && count > dbLastTime)) { + + /* if this is the first line and header does not exist */ if (firstLine && !containsHeader) { // set the station code, if it exists in the data section groupId = (dataGroupMap.get(STATION_CODE) != null)? dataGroupMap.get(STATION_CODE).getId():-1; - if (groupId != -1) - record.setStationCode(dataMatcher.group(groupId)); - - record.setDataTime(getRecordDataTime(dataMatcher, dataGroupMap)); + + if (groupId != -1) + stationCode = dataMatcher.group(groupId); + + headTime = getRecordDataTime(dataMatcher, dataGroupMap); + + // if no header, the sourceId is 101 + if (sourceId == 0) { + sourceId = 101; + } } + + firstLine = false; - // set the observation time for the minute data - Calendar obsTime = getObsTime(dataMatcher, dataGroupMap, record); - obsTimesList.add(obsTime.getTimeInMillis()); - - /* get and set the component values (h or x, d or y ,z, f) */ Float comp1Val = null; Float comp2Val = null; Float comp3Val = null; @@ -233,15 +274,19 @@ public class GeoMagDecoder extends AbstractDecoder { String comp1RefersTo = null; String comp2RefersTo = null; - String comp3RefersTo = null; - String comp4RefersTo = null; +// String comp3RefersTo = null; +// String comp4RefersTo = null; + // get the observation time for the minute data + obsTime = getObsTime(dataMatcher, dataGroupMap, headTime.getRefTimeAsCalendar()); + + // get and set the component values (h or x, d or y ,z, f) groupId = (dataGroupMap.get(COMPONENT_1) != null)? dataGroupMap.get(COMPONENT_1).getId():-1; if (groupId != -1) { comp1RefersTo = dataGroupMap.get(COMPONENT_1).getRefersTo(); comp1Val = Float.parseFloat(dataMatcher.group(groupId)); } - + groupId = (dataGroupMap.get(COMPONENT_2) != null)? dataGroupMap.get(COMPONENT_2).getId():-1; if (groupId != -1) { comp2RefersTo = dataGroupMap.get(COMPONENT_2).getRefersTo(); @@ -250,143 +295,267 @@ public class GeoMagDecoder extends AbstractDecoder { groupId = (dataGroupMap.get(COMPONENT_3) != null)? dataGroupMap.get(COMPONENT_3).getId():-1; if (groupId != -1) { - comp3RefersTo = dataGroupMap.get(COMPONENT_3).getRefersTo(); + //comp3RefersTo = dataGroupMap.get(COMPONENT_3).getRefersTo(); comp3Val = Float.parseFloat(dataMatcher.group(groupId)); + if (comp3Val == null) + comp3Val = MISSING_VAL; } groupId = (dataGroupMap.get(COMPONENT_4) != null)? dataGroupMap.get(COMPONENT_4).getId():-1; if (groupId != -1) { - comp4RefersTo = dataGroupMap.get(COMPONENT_4).getRefersTo(); - comp4Val = Float.parseFloat(dataMatcher.group(groupId)); + //comp4RefersTo = dataGroupMap.get(COMPONENT_4).getRefersTo(); + comp4Val = Float.parseFloat(dataMatcher.group(groupId)); //for BGS + if (comp4Val == null) + comp4Val = MISSING_VAL; } - + if (unit.equalsIgnoreCase("0.01nT")) { - /* - * title line defined unit, e.g. 0.01nT - */ + // title line defined unit, e.g. 0.01nT comp1Val = comp1Val/100; comp2Val = comp2Val/100; comp3Val = comp3Val/100; comp4Val = comp4Val/100; } - - if (conversionRequired) { - /* - * Raw data from some providers might not be reported in the appropriate format/units. - * These data needs to be converted to northward component (X) in nT and eastward component (Y) - * in nT using the general formula: - X = H Cos D - Y = H Sin D - */ - Float h = null; - Float d = null; - - if ("H".equalsIgnoreCase(comp1RefersTo) && comp1Val != null) - h = comp1Val; - else if ("D".equalsIgnoreCase(comp1RefersTo) && comp1Val != null) - d = comp1Val; - - if ("H".equalsIgnoreCase(comp2RefersTo) && comp2Val != null) - h = comp2Val; - else if ("D".equalsIgnoreCase(comp2RefersTo) && comp2Val != null) - d = comp2Val; - - if (h != null && d != null) { - comp1Val = (float) (h * Math.cos(Math.toRadians(d))); - comp2Val = (float) (h * Math.sin(Math.toRadians(d))); - } - - } - - if (comp1Val != null) - comp1List.add(comp1Val); - if (comp2Val != null) - comp2List.add(comp2Val); - if (comp3Val != null) - comp3List.add(comp3Val); - if (comp4Val != null) - comp4List.add(comp4Val); - - } - } - - firstLine = false; - - } - - // set obsTime list - long[] obsTimes = new long[obsTimesList.size()]; - for (int i = 0; i < obsTimes.length; i++) { - Long f = obsTimesList.get(i); - obsTimes[i] = (f != null ? f : 99999); - } - record.setObsTimes(obsTimes); - - // set component 1 data - float[] comp1_data = new float[(comp1List.size()>0)?comp1List.size():obsTimesList.size()]; - for (int i = 0; i < comp1_data.length; i++) { - comp1_data[i] = (comp1List.size()>0)?comp1List.get(i):missingVal; - } - record.setComp1Data(comp1_data); - - // set component 2 data - float[] comp2_data = new float[(comp2List.size()>0)?comp2List.size():obsTimesList.size()]; - for (int i = 0; i < comp2_data.length; i++) { - comp2_data[i] = (comp2List.size()>0)?comp2List.get(i):missingVal; - } - record.setComp2Data(comp2_data); - - // set component 3 data - float[] comp3_data = new float[(comp3List.size()>0)?comp3List.size():obsTimesList.size()]; - for (int i = 0; i < comp3_data.length; i++) { - comp3_data[i] = (comp3List.size()>0)?comp3List.get(i):missingVal; - } - record.setComp3Data(comp3_data); - - // set the component 4 list - float[] comp4_data = new float[(comp4List.size()>0)?comp4List.size():obsTimesList.size()]; - for (int i = 0; i < comp4_data.length; i++) { - comp4_data[i] = (comp4List.size()>0)?comp4List.get(i):missingVal; - } - record.setComp4Data(comp4_data); - - if (record.getStationCode() == null) - record.setStationCode(station.getStationCode()); - - if (source != null) { - /* - * Get and set the source ID from source name - */ - int sourceId = 0; - if ( dao.getGeoMagSourceId(source) != null ) { - sourceId = dao.getGeoMagSourceId(source.toLowerCase()); - } - record.setSourceId(sourceId); - } - - record.setReportType("GEOMAG"); - record.setPluginName(pluginName); - record.setOverwriteAllowed(true); - record.constructDataURI(); - - } catch (Exception e) { + + if (stationCode.equals("HAD")) { //HAD missing are 99999.9 and 999.999 + if (comp1Val == 99999.9f) + comp1Val = MISSING_VAL; + if ( comp2Val == 999.999f) + comp2Val = MISSING_VAL; + if (comp3Val == 99999.9f) + comp3Val = MISSING_VAL; + } + + if (comp1Val != null && comp1Val != MISSING_VAL && comp2Val != null && comp2Val != MISSING_VAL) { + if (conversionRequired) { + /* + * Raw data from some providers might not be reported in the appropriate format/units. + * These data needs to be converted to northward component (X) in nT and eastward component (Y) + * in nT using the general formula: + X = H Cos D; Y = H Sin D; + */ + Float h = null; + Float d = null; + + if ("H".equalsIgnoreCase(comp1RefersTo) && comp1Val != null) + h = comp1Val; + else if ("D".equalsIgnoreCase(comp1RefersTo) && comp1Val != null) + d = comp1Val; + + if ("H".equalsIgnoreCase(comp2RefersTo) && comp2Val != null) + h = comp2Val; + else if ("D".equalsIgnoreCase(comp2RefersTo) && comp2Val != null) + d = comp2Val; + + if (h != null && d != null) { + comp1Val = (float) (h * Math.cos(Math.toRadians(d))); + comp2Val = (float) (h * Math.sin(Math.toRadians(d))); + } + + } + + if (comp1Val != null) + comp1List.add( comp1Val); + if (comp2Val != null) + comp2List.add( comp2Val); + if (comp3Val != null) + comp3List.add( comp3Val); + if (comp4Val != null) + comp4List.add( comp4Val); + obsTimesList.add( obsTime.getTime()); + } + + } //if (dataMatcher.find()) + } //end if containData + } //end while + } + catch (Exception e) { logger.error("Failed to decode file: ["+ file.getAbsolutePath() + "]", e); - } finally { + } + finally { try { in.close(); } catch (IOException e) { throw new GeoMagException("", e); } } - if (record == null) { - retData = new PluginDataObject[0]; - } else { - retData = new PluginDataObject[] { record }; + + for (int i = 0; i < obsTimesList.size(); i++) { + record = new GeoMagRecord(); + + // find this time in database + Date time = obsTimesList.get(i); + String newUriTime = new String(sdf.format( time ) ); + //System.out.println("**time "+obsTimesList.get(i)+" "+stationCode +" "+sourceId); + String newUri = "/geomag/" +newUriTime +"/" +stationCode+"/"+sourceId+"/GEOMAG"; + + List resultsList = findUriFromDb(newUri); + + // set to record + if (resultsList == null || resultsList.isEmpty()) { + if (record.getStationCode() == null) + record.setStationCode(stationCode); + if (record.getSourceId() == 0) + record.setSourceId(sourceId); + record.setDataURI(newUri); + + record.setComponent_1(comp1List.get(i)); + record.setComponent_2(comp2List.get(i)); + if (!comp3List.isEmpty() && comp3List.get(i) != null) + record.setComponent_3(comp3List.get(i)); + if (!comp4List.isEmpty() && comp4List.get(i) != null) //for BGS, comp4 is null. Let it do not affect comp1 & comp2 + record.setComponent_4(comp4List.get(i)); + record.setDataTime(new DataTime(time)); + + record.setReportType("GEOMAG"); + record.setPluginName(pluginName); + record.setOverwriteAllowed(false); + record.constructDataURI(); + //System.out.println("record.getDataURI() "+record.getDataURI()+" "+record.getDataTime().getRefTime()+" "+retData.size() ); + retData.add(record); + } } - return retData; + //temporary here +// KStationCoefficient station2 = KStationCoefficientLookup.getInstance().getStationByCode("BOU"); +// System.out.println("*****Decoder2 "+ station2.getStationCode() +" "+ station2.getKFitTime().get(0).getCoeffA()); + +// String dataURI = "/geomag/2013-04-01_00:00:00.0/BOU/102/GEOMAG"; +// +// GeoMagRecord rec = new GeoMagRecord(dataURI); +// File loc = HDF5Util.findHDF5Location(rec); +// IDataStore dataStore = DataStoreFactory.getDataStore(loc); +// long[] obsTimes = null; +// float[] comp1 = new float[60]; +// float[] comp2 = new float[60]; +// +// try { +// IDataRecord[] dataRec = dataStore.retrieve(dataURI); +// for (int i = 0; i < dataRec.length; i++) { +// if (dataRec[i].getName().equals(GeoMagRecord.component1)) { +// long[] obs_times = (((LongDataRecord) dataRec[i]).getLongData()); +// +// } +// if (dataRec[i].getName().equals(GeoMagRecord.component1)) { +// float[] comp1_data = (((FloatDataRecord) dataRec[i]).getFloatData()); +// if (comp1_data.length > 1280){ +// int ihr = 0; +// for (int j = ihr*60; j < comp1_data.length; j++) +// comp1 += comp1_data[j]; +// } +// if (dataRec[i].getName().equals(GeoMagRecord.component2)) { +// float[] comp2_data = (((FloatDataRecord) dataRec[i]).getFloatData()); +// } +// +// } +// +// } catch (Exception se) { +// se.printStackTrace(); +// } + +// // set component 2 data +// float[] comp2_data = new float[(comp2List.size()>0)?comp2List.size():obsTimesList.size()]; +// for (int i = 0; i < comp2_data.length; i++) { +// comp2_data[i] = (comp2List.size()>0)?comp2List.get(i):MISSING_VAL; +// } +// // set dHrAvgs +//// for (int j = 0; j < comp2_data.length/60; j++) { +//// for (int i = 0; i < comp2_data.length; i++) { +//// if (i%60 == 59) +//// dHrAvgs[j] = CalcEach3hr.getSimpleHourAvg(comp2_data, j); +//// } +//// } +// record.setComp2Data(comp2_data); +//// record.setHrAvgD(dHrAvgs); + + + if (retData.isEmpty()) { + return new PluginDataObject[0]; + } + else { +// // last record +// long[] obs_time = new long[(obsTimesList.size())]; //new float[(comp1List.size()>0)?comp1List.size():obsTimesList.size()]; +// for (int i = 0; i < obs_time.length; i++) { +// //obs_time[i] = (obsTimesList.size()>0)?obsTimesList.get(i):99999; +// Long f = obsTimesList.get(i); +// obs_time[i] = (f != null ? f : 99999); +// } +// float[] comp1_data = new float[(obsTimesList.size())]; //new float[(comp1List.size()>0)?comp1List.size():obsTimesList.size()]; +// for (int i = 0; i < comp1_data.length; i++) { +// comp1_data[i] = (comp1List.size()>0)?comp1List.get(i):MISSING_VAL; +// } +// float[] comp2_data = new float[(obsTimesList.size())]; +// for (int i = 0; i < comp2_data.length; i++) { +// comp2_data[i] = (comp2List.size()>0)?comp2List.get(i):MISSING_VAL; +// } +// float[] comp3_data = new float[(obsTimesList.size())]; +// for (int i = 0; i < comp3_data.length; i++) { +// comp3_data[i] = (comp3List.size()>0)?comp3List.get(i):MISSING_VAL; +// } +// float[] comp4_data = new float[(obsTimesList.size())]; +// for (int i = 0; i < comp4_data.length; i++) { +// comp4_data[i] = (comp4List.size()>0)?comp4List.get(i):MISSING_VAL; +// } +// +// record.setObsTimes(obs_time); +// record.setComp1Data(comp1_data); +// record.setComp2Data(comp2_data); +// record.setComp3Data(comp3_data); +// record.setComp4Data(comp4_data); + + return retData.toArray(new PluginDataObject[retData.size()]); + } } - public DataTime getRecordDataTime(Matcher matcher, HashMap groupMap) throws ParseException { + public IDataRecord[] findRecordFromDb(String newUri) { + // find last obs_time in hdf5. /geomag/2013-05-20_00:00:00.0/HAD/101/GEOMAG + IDataRecord[] dataRec = null; + IDataStore dataStore = null; + GeoMagRecord record = null; + + DatabaseQuery query = new DatabaseQuery(GeoMagRecord.class.getName()); + query.addQueryParam("dataURI", newUri); + + List resultsList = null; + try { + resultsList = dao.queryByCriteria(query); + } catch (DataAccessLayerException e1) { + e1.printStackTrace(); + } + + // find dataRec + if (resultsList != null && resultsList.size() != 0) { + + record = new GeoMagRecord(newUri); + if (record != null) + dataStore = dao.getDataStore((IPersistable) record); + + try { + dataRec = dataStore.retrieve(newUri); //obs_time, compx...//size 7 + } catch (FileNotFoundException e1) { + e1.printStackTrace(); + } catch (StorageException e1) { + e1.printStackTrace(); + } + } + return dataRec; + } + + public List findUriFromDb(String newUri) { + + DatabaseQuery query = new DatabaseQuery(GeoMagRecord.class.getName()); + query.addQueryParam("dataURI", newUri); + + List resultsList = null; + try { + resultsList = dao.queryByCriteria(query); + } catch (DataAccessLayerException e1) { + e1.printStackTrace(); + } + + return resultsList; + } + + public DataTime getRecordDataTime(Matcher matcher, HashMap groupMap) throws ParseException { int groupId = -1; @@ -438,12 +607,14 @@ public class GeoMagDecoder extends AbstractDecoder { return dataTime; } - public Calendar getObsTime(Matcher matcher, HashMap groupMap, GeoMagRecord record) throws ParseException { + public Calendar getObsTime(Matcher matcher, HashMap groupMap, Calendar time) throws ParseException { int groupId = -1; String obsDateStr = null; String obsTimeStr = null; +// String obsYearStr = null; +// String obsDayOfYearStr = null; String obsHourStr = null; String obsMinuteStr = null; String obsMinuteNumStr = null; @@ -452,23 +623,44 @@ public class GeoMagDecoder extends AbstractDecoder { String timeFormat = "HH:mm:ss"; SimpleDateFormat inputDateFormat = new SimpleDateFormat(dateFormat + " " + timeFormat); - Calendar obsTime = record.getDataTime().getRefTimeAsCalendar(); - + Calendar obsTime = time; //record.getDataTime().getRefTimeAsCalendar(); + groupId = (groupMap.get(OBS_DATE) != null)? groupMap.get(OBS_DATE).getId():-1; if (groupId != -1) { obsDateStr = matcher.group(groupId); dateFormat = (groupMap.get(OBS_DATE).getFormat()!=null)?groupMap.get(OBS_DATE).getFormat():dateFormat; + } groupId = (groupMap.get(OBS_TIME) != null)? groupMap.get(OBS_TIME).getId():-1; if (groupId != -1) { obsTimeStr = matcher.group(groupId); timeFormat = (groupMap.get(OBS_TIME).getFormat()!=null)?groupMap.get(OBS_TIME).getFormat():timeFormat; + //.out.println("***obsTimeStr "+obsTimeStr +" "+timeFormat); } +// groupId = (groupMap.get(OBS_YEAR) != null)? groupMap.get(OBS_YEAR).getId():-1; +// if (groupId != -1) { +// obsYearStr = matcher.group(groupId); +// } +// +// groupId = (groupMap.get(OBS_DAY_OF_YEAR) != null)? groupMap.get(OBS_DAY_OF_YEAR).getId():-1; +// if (groupId != -1) { +// obsDayOfYearStr = matcher.group(groupId); +// if (obsYearStr != null && obsDayOfYearStr != null) { +// Calendar tmpCal = Calendar.getInstance(); +// tmpCal.set(Calendar.YEAR, Integer.parseInt(obsYearStr)); +// tmpCal.set(Calendar.DAY_OF_YEAR, Integer.parseInt(obsDayOfYearStr)); +// +// obsDateStr = obsTimeDateFormat.format(tmpCal.getTime()); +// System.out.println("***obsNumStr "+obsDateStr); +// } +// } + groupId = (groupMap.get(OBS_MINUTE_NUM) != null)? groupMap.get(OBS_MINUTE_NUM).getId():-1; if (groupId != -1) { obsMinuteNumStr = matcher.group(groupId); + } groupId = (groupMap.get(OBS_HOUR) != null)? groupMap.get(OBS_HOUR).getId():-1; @@ -487,9 +679,10 @@ public class GeoMagDecoder extends AbstractDecoder { } // get obsTime using obsHour and obsMinute else if (obsHourStr != null && obsMinuteStr != null) { - int minutes = Integer.parseInt(obsHourStr) * 3600 + Integer.parseInt(obsMinuteStr) * 60; + int minutes = Integer.parseInt(obsHourStr) * 60 + Integer.parseInt(obsMinuteStr) ; obsTime.add(Calendar.MINUTE, minutes); } + // get obsTime using obsDate and obsTime else if (obsDateStr != null && obsTimeStr != null) { String obsDateTimeStr = obsDateStr + " " + obsTimeStr; @@ -498,7 +691,7 @@ public class GeoMagDecoder extends AbstractDecoder { Date obsDateTime = (Date)inputDateFormat.parse(obsDateTimeStr); obsTime.setTime(obsDateTime); } - + return obsTime; } @@ -510,318 +703,15 @@ public class GeoMagDecoder extends AbstractDecoder { this.dao = dao; } - public GeoMagStation getStationDetail(String stnCode) throws GeoMagException { + public GeoMagStation getStationDetail(String stnCode, boolean hasHeader) throws GeoMagException { GeoMagStation station = null; if (stnCode != null) { TableTimeStamp.updateXmlTables(); - station = GeoMagStationLookup.getInstance().getStationByCode(stnCode); + station = GeoMagStationLookup.getInstance().getStationByCode(stnCode, hasHeader); } return station; } - -// -// public PluginDataObject[] decode(File file) throws Exception { -// -// parseGeoMagStationsFile(); -// -// PluginDataObject[] retData = null; -// -// GeoMagRecord record = null; -// -// List obsTimesList = new ArrayList(); -// List comp1List = new ArrayList(); -// List comp2List = new ArrayList(); -// List comp3List = new ArrayList(); -// List comp4List = new ArrayList(); -// -// if (file == null || (file.length() < 1)) -// return new PluginDataObject[0]; -// -// BufferedReader in = null; -// -// try{ -// String input; -// in = new BufferedReader(new FileReader(file)); -// record = new GeoMagRecord(); -// -// String stationCode = file.getName().substring(0,3).toUpperCase(); -// if (stationCode.startsWith("HA")) -// stationCode = "HAD"; -// else if (stationCode.startsWith("M")) -// stationCode = "JEJ"; -// -// GeoMagStation station = GEOMAGSTATIONS_MAP.get(stationCode); -// boolean containsHeader = (station.getRawDataFormat().getHeaderFormat()!=null)?true:false; -// boolean containsData = (station.getRawDataFormat().getDataFormat()!=null)?true:false; -// -// Pattern HEADER_EXP = null; -// Pattern DATA_EXP = null; -// -// if (containsHeader) -// HEADER_EXP = Pattern.compile(station.getRawDataFormat().getHeaderFormat().getPattern()); -// -// if (containsData) -// DATA_EXP = Pattern.compile(station.getRawDataFormat().getDataFormat().getPattern()); -// -// boolean firstLine = true; -// while((input = in.readLine()) != null){ -// -// -// if (station.getProvider().equalsIgnoreCase("USGS") || station.getProvider().equalsIgnoreCase("IGPP")) { -// -// if (firstLine) { -// Matcher headerMatcher = HEADER_EXP.matcher(input); -// -// if (headerMatcher.find()) { -// -// System.out.println(" input: " + input); -// -// record.setStationCode(headerMatcher.group(1)); -// record.setSource(headerMatcher.group(9)); -// -// Date startDate = obsTimeDateFormat.parse(obsTimeDateFormat.format(olddf.parse(headerMatcher.group(4)))); -// Calendar calendar= Calendar.getInstance(); -// calendar.setTime(startDate); -// -// DataTime dataTime = new DataTime(calendar); -// record.setDataTime(dataTime); -// } -// } -// -// Matcher dataMatcher = DATA_EXP.matcher(input); -// -// if (dataMatcher.find()) { -// -// String minute = dataMatcher.group(1); -// int minuteOfDay = Integer.parseInt(minute); -// -// Calendar obsTime = (record.getDataTime()!=null) ? record.getDataTime().getRefTimeAsCalendar() : Calendar.getInstance(); -// obsTime.add(Calendar.MINUTE, minuteOfDay); -// obsTimesList.add(obsTime.getTimeInMillis()); -// -// comp1List.add(Float.parseFloat(dataMatcher.group(2))); -// comp2List.add(Float.parseFloat(dataMatcher.group(3))); -// comp3List.add(Float.parseFloat(dataMatcher.group(4))); -// comp4List.add(Float.parseFloat(dataMatcher.group(5))); -// -// } -// } -// else if (station.getProvider().equalsIgnoreCase("BGS")) { -// -// -// record.setStationCode(station.getStationCode()); -// record.setSource(station.getSource()[0]); -// -// Matcher dataMatcher = DATA_EXP.matcher(input); -// -// if (dataMatcher.find()) { -// //System.out.println(" input: " + input); -// -// String year = dataMatcher.group(1); -// String dayOfYear = dataMatcher.group(2); -// String hour = dataMatcher.group(3); -// String minute = dataMatcher.group(4); -// -// int minutes = Integer.parseInt(hour) * 3600 + Integer.parseInt(minute) * 60; -// -// if (firstLine) { -// Calendar calendar = Calendar.getInstance(); -// calendar.set(Calendar.YEAR, Integer.parseInt(year)); -// calendar.set(Calendar.DAY_OF_YEAR, Integer.parseInt(dayOfYear)); -// -// Date obsDate = obsTimeDateFormat.parse(obsTimeDateFormat.format(calendar.getTime())); -// Calendar calendar2 = Calendar.getInstance(); -// calendar2.setTime(obsDate); -// -// DataTime dataTime = new DataTime(calendar2); -// record.setDataTime(dataTime); -// } -// -// Calendar obsTime = (record.getDataTime()!=null) ? record.getDataTime().getRefTimeAsCalendar() : Calendar.getInstance(); -// obsTime.add(Calendar.MINUTE, minutes); -// obsTimesList.add(obsTime.getTimeInMillis()); -// -// comp1List.add(Float.parseFloat(dataMatcher.group(5))); -// comp2List.add(Float.parseFloat(dataMatcher.group(6))); -// comp3List.add(Float.parseFloat(dataMatcher.group(7))); -// -// } -// } -// else if (station.getProvider().equalsIgnoreCase("GA") || station.getProvider().equalsIgnoreCase("GFZ")) { -// -// record.setStationCode(station.getStationCode()); -// record.setSource(station.getSource()[0]); -// -// Matcher dataMatcher = DATA_EXP.matcher(input); -// -// if (dataMatcher.find()) { -// -// String date = dataMatcher.group(1); -// String time = dataMatcher.group(2); -// String dayOfYear = dataMatcher.group(3); -// -// String obsDateTimeStr = date + " " + time; -// SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); -// -// Date obsDateTime = (Date)formatter.parse(obsDateTimeStr); -// Calendar obsTime = Calendar.getInstance(); -// obsTime.setTime(obsDateTime); -// -// if (firstLine) { -// DataTime dataTime = new DataTime(obsTime); -// record.setDataTime(dataTime); -// } -// -// obsTimesList.add(obsTime.getTimeInMillis()); -// -// comp1List.add(Float.parseFloat(dataMatcher.group(4))); -// comp2List.add(Float.parseFloat(dataMatcher.group(5))); -// comp3List.add(Float.parseFloat(dataMatcher.group(6))); -// comp4List.add(Float.parseFloat(dataMatcher.group(7))); -// -// } -// } -// else if (station.getProvider().equalsIgnoreCase("NRCAN")) { -// -// record.setStationCode(station.getStationCode()); -// record.setSource(station.getSource()[0]); -// -// Matcher dataMatcher = DATA_EXP.matcher(input); -// -// if (dataMatcher.find()) { -// -// String date = dataMatcher.group(2); -// String time = dataMatcher.group(3); -// -// String obsDateTimeStr = date + " " + time; -// SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); -// -// Date obsDateTime = (Date)formatter.parse(obsDateTimeStr); -// Calendar obsTime = Calendar.getInstance(); -// obsTime.setTime(obsDateTime); -// -// if (firstLine) { -// DataTime dataTime = new DataTime(obsTime); -// record.setDataTime(dataTime); -// } -// -// obsTimesList.add(obsTime.getTimeInMillis()); -// -// comp1List.add(Float.parseFloat(dataMatcher.group(4))); -// comp2List.add(Float.parseFloat(dataMatcher.group(5))); -// comp3List.add(Float.parseFloat(dataMatcher.group(6))); -// comp4List.add(Float.parseFloat(dataMatcher.group(7))); -// -// } -// } -// else if (station.getProvider().equalsIgnoreCase("KOREA")) { -// -// record.setStationCode(station.getStationCode()); -// record.setSource(station.getSource()[0]); -// -// Matcher dataMatcher = DATA_EXP.matcher(input); -// -// if (dataMatcher.find()) { -// -// String date = dataMatcher.group(1); -// String time = dataMatcher.group(2); -// -// String obsDateTimeStr = date + " " + time; -// SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); -// -// Date obsDateTime = (Date)formatter.parse(obsDateTimeStr); -// Calendar obsTime = Calendar.getInstance(); -// obsTime.setTime(obsDateTime); -// -// if (firstLine) { -// DataTime dataTime = new DataTime(obsTime); -// record.setDataTime(dataTime); -// } -// -// obsTimesList.add(obsTime.getTimeInMillis()); -// -// comp1List.add(Float.parseFloat(dataMatcher.group(3))); -// comp2List.add(Float.parseFloat(dataMatcher.group(4))); -// comp3List.add(Float.parseFloat(dataMatcher.group(5))); -// comp4List.add(Float.parseFloat(dataMatcher.group(6))); -// -// } -// } -// -// firstLine = false; -// -// } -// -// long[] obsTimes = new long[obsTimesList.size()]; -// for (int i = 0; i < obsTimes.length; i++) { -// Long f = obsTimesList.get(i); -// obsTimes[i] = (f != null ? f : missingVal); -// } -// record.setObsTimes(obsTimes); -// -// float[] h_data = new float[(comp1List.size()>0)?comp1List.size():obsTimesList.size()]; -// for (int i = 0; i < h_data.length; i++) { -// if (comp1List.size() > 0) { -// h_data[i] = comp1List.get(i); -// } else { -// h_data[i] = missingVal; -// } -// } -// record.setComp1Data(h_data); -// -// float[] d_data = new float[(comp2List.size()>0)?comp2List.size():obsTimesList.size()]; -// for (int i = 0; i < d_data.length; i++) { -// if (comp2List.size() > 0) { -// d_data[i] = comp2List.get(i); -// } else { -// d_data[i] = missingVal; -// } -// } -// record.setComp2Data(d_data); -// -// float[] z_data = new float[(comp3List.size()>0)?comp3List.size():obsTimesList.size()]; -// for (int i = 0; i < z_data.length; i++) { -// if (comp3List.size() > 0) { -// z_data[i] = comp3List.get(i); -// } else { -// z_data[i] = missingVal; -// } -// } -// record.setComp3Data(z_data); -// -// float[] f_data = new float[(comp4List.size()>0)?comp4List.size():obsTimesList.size()]; -// for (int i = 0; i < f_data.length; i++) { -// if (comp4List.size() > 0) { -// f_data[i] = comp4List.get(i); -// } else { -// f_data[i] = missingVal; -// } -// } -// record.setComp4Data(f_data); -// -// record.setReportType("GEOMAG"); -// record.setPluginName(pluginName); -// record.setOverwriteAllowed(true); -// record.constructDataURI(); -// -// } catch (Exception e) { -// logger.info("GeoMagDecoder: Error decoding : " + file.getAbsolutePath()); -// } finally { -// try { -// in.close(); -// } catch (IOException e) { -// logger.info("GeoMagDecoder: Error decoding : " + file.getAbsolutePath()); -// } -// } -// if (record == null) { -// retData = new PluginDataObject[0]; -// } else { -// retData = new PluginDataObject[] { record }; -// } -// return retData; -// } - -} - + +} \ No newline at end of file diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/TrigKCalculation.java b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/TrigKCalculation.java new file mode 100644 index 0000000000..1ad763d7cb --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/TrigKCalculation.java @@ -0,0 +1,1221 @@ +package gov.noaa.nws.ncep.edex.plugin.geomag; + +import gov.noaa.nws.ncep.common.dataplugin.geomag.GeoMagAvg; +import gov.noaa.nws.ncep.common.dataplugin.geomag.GeoMagK1min; +import gov.noaa.nws.ncep.common.dataplugin.geomag.GeoMagK3hr; +import gov.noaa.nws.ncep.common.dataplugin.geomag.GeoMagRecord; +import gov.noaa.nws.ncep.common.dataplugin.geomag.dao.GeoMagAvgDao; +import gov.noaa.nws.ncep.common.dataplugin.geomag.dao.GeoMagDao; +import gov.noaa.nws.ncep.common.dataplugin.geomag.dao.GeoMagK1minDao; +import gov.noaa.nws.ncep.common.dataplugin.geomag.dao.GeoMagK3hrDao; +import gov.noaa.nws.ncep.edex.plugin.geomag.calculation.CalcEach1min; +import gov.noaa.nws.ncep.edex.plugin.geomag.calculation.CalcEach3hr; +import gov.noaa.nws.ncep.edex.plugin.geomag.calculation.CalcKp; +import gov.noaa.nws.ncep.edex.plugin.geomag.calculation.CalcUtil; + +import java.io.FileNotFoundException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import com.raytheon.uf.common.dataplugin.message.DataURINotificationMessage; +import com.raytheon.uf.common.dataplugin.PluginException; +import com.raytheon.uf.common.dataplugin.persist.IPersistable; +import com.raytheon.uf.common.dataquery.db.QueryParam; +import com.raytheon.uf.common.datastorage.IDataStore; +import com.raytheon.uf.common.datastorage.StorageException; +import com.raytheon.uf.common.datastorage.records.IDataRecord; +import com.raytheon.uf.edex.database.DataAccessLayerException; +import com.raytheon.uf.edex.database.plugin.PluginFactory; +import com.raytheon.uf.edex.database.query.DatabaseQuery; + +/** + * This java class calculates magnetometer k index and related values. + * + * 
+ * OFTWARE HISTORY
+ *                   
+ * date         Ticket#     Engineer    Description
+ * -----------  ----------  ----------- --------------------------
+ * 06/07/2013   #989        qzhou       Initial Creation
+ *
+ * + * @author qzhou + * @version 1 + * */ + +public class TrigKCalculation { + private final Log logger = LogFactory.getLog(getClass()); + private static final String GeoMag = "geomag"; + private static final float MISSING_VAL = 99999.99f; + private static final int MISSING_INT = 99999; + private static final int DAYS = 30; + private static final int HOURS = 24; + private static final int MINUTES = 60; + + private static final int AVG_DATA_RANGE = 30; + private static final int HD_DATA_RANGE = 3; + private static final int MAX_SOURCES = 3; + + private static final int ITERATIONS = 5; + private static final int MAX_GAP_LENGTH = 15; + private static final int SMOOTH_WINDOW = 60; + private static final int TRANSITION_TIME = 60; + private static final int PHASE_POWER = 3; + private static final int HARM_ORDER = 5; + private GeoMagDao dao; //PluginDao dao; + private float[] defLength = new float[HOURS]; + + private Map> stationMap = new HashMap>(); //station, arrays + String format = "yyyy-MM-dd'_'HH:mm:ss.s"; + SimpleDateFormat sdf = new SimpleDateFormat(format); + + + public TrigKCalculation() { +// KStationCoefficientLookup look = KStationCoefficientLookup.getInstance(); +// Map stationMap = look.getStationsByCodeMap(); +// int size = 1+31; +// stations = new ArrayList();//String[]: station, uri0, ...uri31 +// for (Map.Entry entry : stationMap.entrySet()) { +// List astation = new ArrayList(); +// astation.add( entry.getKey()); +// stations.add(astation); +//// System.out.println("***entry "+ entry.getKey()); +// } + } + + public void trig1min(Object obj) throws StorageException { + + if( !(obj instanceof DataURINotificationMessage) ){ +// GeoMag.logError("Received msg that is not a DataURINotificationMessage? msg is "+ +// obj.getClass().getName() ); + logger.info("Received msg that is not a DataURINotificationMessage."); + } + + DataURINotificationMessage uriMsg = (DataURINotificationMessage)obj; + + String[] dataURIs = uriMsg.getDataURIs(); + + //sort + Arrays.sort(dataURIs); +// for (int i=0; i> kIndexMap = calcBy1min(dataURIs); +// long t4 = Calendar.getInstance().getTimeInMillis(); +// System.out.println("*****T4 "+ t4); +// +// calcK3h(dataURIs, kIndexMap); +// long t5 = Calendar.getInstance().getTimeInMillis(); +// System.out.println("*****T5 "+ t5); + } + + /* + * + */ + public List retrieveSingleAvg(String dataUri, Date time) { + GeoMagAvgDao avgDao = new GeoMagAvgDao(); + String station = CalcUtil.getStationFromUri(dataUri); + + DatabaseQuery query = new DatabaseQuery(GeoMagRecord.class.getName()); + query.addReturnedField("id"); + query.addQueryParam("avgTime", time); + query.addQueryParam("stationCode", station); + + List resultsList = null; + resultsList = avgDao.getSingleAvg(station, time); + + return resultsList; + + } + + /* + * + */ + public List retrieveUriForAvg(String dataUri, Date time) { + String station = CalcUtil.getStationFromUri(dataUri); + + DatabaseQuery query = new DatabaseQuery(GeoMagRecord.class.getName()); + //query.addReturnedField("id"); + query.addReturnedField("component_1"); + query.addReturnedField("component_2"); + query.addReturnedField("dataTime.refTime"); + query.addReturnedField("badDataPoint"); + query.addReturnedField("sourceId"); + query.addQueryParam("dataTime.refTime", time, QueryParam.QueryOperand.LESSTHANEQUALS); + Calendar cal = Calendar.getInstance(); + cal.setTime(time); + cal.add(Calendar.HOUR_OF_DAY, -1); // at least one day is needed for gt, lt + query.addQueryParam("dataTime.refTime", cal.getTime(), QueryParam.QueryOperand.GREATERTHAN); + query.addQueryParam("stationCode", station); + + List resultsList = null; + + try { + resultsList = dao.queryByCriteria(query); // 60 + } catch (DataAccessLayerException e1) { + e1.printStackTrace(); + } + + return resultsList; + } + + /* + * + */ + public List retrieveUriBy3hr(String dataUri, Date spTime){ + GeoMagAvgDao avgDao = new GeoMagAvgDao(); +// long t0 = Calendar.getInstance().getTimeInMillis(); +// System.out.println("*****ttt0 "+ t0); + String station = CalcUtil.getStationFromUri(dataUri); + + Calendar cal = Calendar.getInstance(); + cal.setTime(spTime); + cal.add(Calendar.DAY_OF_YEAR, -AVG_DATA_RANGE); // at least one day is needed for gt, lt + + List resultsList = null; + resultsList = avgDao.getAvgForStation(station, cal.getTime(), spTime); //720 + +// long t1 = Calendar.getInstance().getTimeInMillis(); +// System.out.println("*****ttt1 "+ t1); + + return resultsList; + } + + /* + * + */ + public List retrieveUriForK1min(String dataUri, Date epTime){ +// long t0 = Calendar.getInstance().getTimeInMillis(); +// System.out.println("*****tttt0 "+ t0+" "+epTime); + + String station = CalcUtil.getStationFromUri(dataUri); + + DatabaseQuery query = new DatabaseQuery(GeoMagRecord.class.getName()); + //query.addReturnedField("id"); + query.addReturnedField("component_1"); + query.addReturnedField("component_2"); + query.addReturnedField("dataTime.refTime"); + query.addReturnedField("badDataPoint"); + query.addReturnedField("sourceId"); + query.addQueryParam("dataTime.refTime", epTime, QueryParam.QueryOperand.LESSTHANEQUALS); + Calendar cal = Calendar.getInstance(); + cal.setTime(epTime); + cal.add(Calendar.HOUR_OF_DAY, -48); // at least one day is needed for gt, lt + query.addQueryParam("dataTime.refTime", cal.getTime(), QueryParam.QueryOperand.GREATERTHAN); + query.addQueryParam("stationCode", station); + + List resultsList = null; + + try { + resultsList = dao.queryByCriteria(query); // 2880 + } catch (DataAccessLayerException e1) { + e1.printStackTrace(); + } + +// long t1 = Calendar.getInstance().getTimeInMillis(); +// System.out.println("*****tttt1 k1min "+ t1); + + return resultsList; + } + + /* + * + */ + public List retrieveUriForK3hr(String dataUri, Date time){ + GeoMagK3hrDao k3hrDao = new GeoMagK3hrDao(); + String station = CalcUtil.getStationFromUri(dataUri); + + List resultsList = null; + resultsList = k3hrDao.getK3hrForStation(station, time); //1 + + return resultsList; + } + + /* + * + */ + public IDataRecord[] getDataRecords(String uri){ + IDataRecord[] dataRec = null; + IDataStore dataStore = null; + + GeoMagRecord record = new GeoMagRecord(uri); + if (record != null) + dataStore = dao.getDataStore((IPersistable) record); + + try { + dataRec = dataStore.retrieve(uri); //obs_time, compx...//size 7 + } catch (FileNotFoundException e1) { + //e1.printStackTrace(); + System.out.println("This uri didn't find the records."); + } catch (StorageException e1) { + System.out.println("This uri didn't find place to store the records."); + //e1.printStackTrace(); + } + + return dataRec; + } + + /* + * sort n lists + */ + static void sort(List... lists) { + assert lists.length > 0; + + Object[][] objects = new Object[lists[0].size()][lists.length]; + + for (int i = 0; i < lists.length; i++) { + int j = 0; + for (Object object : lists[i]) { + objects[j++][i] = object; + } + } + + Arrays.sort(objects, new Comparator() { + @SuppressWarnings("unchecked") + public int compare(Object[] o1, Object[] o2) { + return ((Comparable)o1[0]).compareTo(o2[0]); + } + }); + + for (int i = 0; i < lists.length; i++) { + lists[i].clear(); + for (Object[] tuple : objects) { + lists[i].add(tuple[i]); + } + } + } + + /* + * Input data of all source, output with higher priority source data + */ + public List getBestObserv(List dataList ) { + + //List idList = new ArrayList(); + List comp1List = new ArrayList(); + List comp2List = new ArrayList(); + List badPointList = new ArrayList(); + List dateList = new ArrayList(); + List sourceList = new ArrayList(); + + List bestList = new ArrayList(); + List fullBestList = new ArrayList(); + + if (dataList != null ) { + for (int i = 0; i < dataList.size(); i++) { + + Object[] row = (Object[]) dataList.get(i); + + //idList.add( (Integer) row[0]); + comp1List.add( (Float) row[0]); + comp2List.add( (Float) row[1]); + dateList.add( (Date) row[2]); + badPointList.add( (String) row[3]); + sourceList.add( (Integer) row[4]); + //System.out.println("***row "+dateList.get(i)+" "+sourceList.get(i)+" " +comp2List.get(i)); + } + + sort(dateList, sourceList, comp1List, comp2List, badPointList); //, idList); + + int count = 0; + int size = dateList.size(); + + /* + * tempList combine all lists for the first 4 items. size=4 + * newList put tempList ordered by source. size=3 + * bestList construct newList with best source + * bestListFull filled time gaps + */ + for (int i = 0; i < size; i=i+count) { + count = 0; + + List tempList1 = new ArrayList(); + List tempList2 = new ArrayList(); + List tempList3 = new ArrayList(); + + List newList = new ArrayList(); + newList.add(0, new ArrayList());//init 3 + newList.add(1, new ArrayList()); + newList.add(2, new ArrayList()); + + //tempList1.add(0, idList.get(i)); + tempList1.add( dateList.get(i)); + if (badPointList.get(i) != null && badPointList.get(i) != ""){ + tempList1.add(MISSING_VAL); + tempList1.add(MISSING_VAL); + } + else { + tempList1.add(comp1List.get(i)); + tempList1.add(comp2List.get(i)); + } + newList.set(sourceList.get(i)%100 -1, tempList1); + count++; + + if (i+1 < size && dateList.get(i).compareTo( dateList.get(i+1)) ==0) { + //tempList2.add(idList.get(i+1)); + tempList2.add(dateList.get(i+1)); + if (badPointList.get(i+1) != null && badPointList.get(i+1) != ""){ + tempList2.add(MISSING_VAL); + tempList2.add(MISSING_VAL); + } + else { + tempList2.add(comp1List.get(i+1)); + tempList2.add(comp2List.get(i+1)); + } + newList.set(sourceList.get(i+1)%100 -1, tempList2); + count++; + } + + if (i+2 < size && dateList.get(i).compareTo( dateList.get(i+2)) ==0) { + //tempList3.add(idList.get(i+2)); + tempList3.add(dateList.get(i+2)); + if (badPointList.get(i+2) != null && badPointList.get(i+2) != ""){ + tempList3.add(MISSING_VAL); + tempList3.add(MISSING_VAL); + } + else { + tempList3.add(comp1List.get(i+2)); + tempList3.add(comp2List.get(i+2)); + } + newList.set(sourceList.get(i+2)%100 -1, tempList3); + count++; + } + + if (newList.get(2) == null || newList.get(2).isEmpty()) //newList.get(0)= [3281750, 2013-05-06 00:00:00.0, 20829.85, -297.05] + newList.remove(2); + if (newList.get(1) == null || newList.get(1).isEmpty()) + newList.remove(1); + if (newList.get(0) == null || newList.get(0).isEmpty()) + newList.remove(0); + //System.out.println("***newList "+i+" "+count+" "+newList.size()+" "+newList.get(0)); + + // Now only check if comp2 (...get(2)) is MISSING_VAL + if (newList.get(0).get(2) != null && (Float) newList.get(0).get(2) != MISSING_VAL ) { + bestList.add( newList.get(0)); + } + else if (newList.size() >1 && (Float) newList.get(0).get(2) == MISSING_VAL && i+1< size) { + // if date i = date(i+1) && comp1 (i+1) != missing + if ((Date) newList.get(0).get(1) == (Date) newList.get(1).get(1) && newList.get(1).get(2) != null && (Float) newList.get(1).get(2) != MISSING_VAL) { + bestList.add( newList.get(1)); + } + else if (newList.size() >2 && (Float) newList.get(1).get(2) == MISSING_VAL && i+2 < size) { + if ((Date) newList.get(0).get(1) == (Date) newList.get(2).get(1) && (Float) newList.get(2).get(2) != MISSING_VAL) { + bestList.add( newList.get(2)); + } + else { + bestList.add( newList.get(0)); + } + } + } + } + } + //System.out.println("***bestList best "+bestList.size()); +// +// long t2 = Calendar.getInstance().getTimeInMillis(); +// System.out.println("*****tt2 "+ t2); + return bestList; + } + + public List fillHDTimeGaps(List bestList) { + List fullBestList= new ArrayList(); + // fill time gaps, get bestListFull + // fill missing in the beginning + Date date = (Date) bestList.get(0).get(0); //bestList.get(i) eq. newList. + int min0 = date.getMinutes(); + + if ( min0 != 0 ) { + for (int k = 0; k < min0; k++) { + List newList2 = new ArrayList(); // eq. newList + + Date dateNew = (Date)date.clone(); + dateNew.setMinutes(k); + + newList2.add(dateNew); + newList2.add(MISSING_VAL); + newList2.add(MISSING_VAL); + fullBestList.add( newList2); + + } + } + // fill missing in the middle + for (int j = 0; j < bestList.size(); j++ ) { //i=0 first non missing data + + Date date0 = (Date) bestList.get(j).get(0);//dateList.get(i); + fullBestList.add( bestList.get(j)); + + if (j+1 < bestList.size()) { + Date date1 = (Date) bestList.get(j+1).get(0);//dateList.get(i+1); + int diffMin = (int)(date1.getTime() - date0.getTime())/ (60*1000); + + if (diffMin != 1) { + for (int k = 0; k < diffMin-1; k++) { + List newList2 = new ArrayList(); // eq. newList + + newList2.add(new Date(date0.getTime() + 60*1000*(k+1))); + newList2.add(MISSING_VAL); + newList2.add(MISSING_VAL); + fullBestList.add( newList2); + + } + } + } + } + + + // fill missing in the end + date = (Date) bestList.get(bestList.size()-1).get(0); + int minEnd = date.getMinutes(); + + if ( minEnd < 59 ) { + for (int k = minEnd+1; k < 60; k++) { + List newList2 = new ArrayList(); // eq. newList + + Date dateNew = (Date)date.clone(); + dateNew.setMinutes(k); + + newList2.add(dateNew); + newList2.add(MISSING_VAL); + newList2.add(MISSING_VAL); + fullBestList.add( newList2); + + } + } + +// for (int i = 0; i < fullBestList.size(); i++) { +// System.out.println("***fullBestList "+fullBestList.size()+" "+fullBestList.get(i)); +// } + + return fullBestList; + } + + + /* + * when uri time is 59 min past the hour, calculate the averages and append to db + */ + public void calcSimpleHourAvg(String[] dataURIs) throws StorageException { + + if (dao != null && dataURIs != null) { + for (String dataURI : dataURIs ) { + String stationCode = CalcUtil.getStationFromUri(dataURI); + + Date time = null;; + try { + time = CalcUtil.getTimeFromUri(dataURI); + } catch (ParseException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + //int hour = time.getHours(); + int min = time.getMinutes(); + + List dataList = null; + if (min == 59) + dataList = retrieveUriForAvg(dataURI, time); + else + continue; + + + if (dataList != null && dataList.size() != 0) { + List bestList = getBestObserv( dataList ); + + float[] hrAvg = CalcEach3hr.getSimpleHourAvg(bestList); + + GeoMagAvg recAvg = new GeoMagAvg(); + + // look the avg table to see if the avg already exists + time.setMinutes(30); + List avgList = retrieveSingleAvg(dataURI, time); + + if (avgList != null && avgList.size() != 0) {//String newUri = dataURI.substring(0, 21) +":30:00.0"+ dataURI.substring(29, 34)+ "100/GEOMAG"; + for (int i = 0; i < avgList.size(); i++) { //1 + GeoMagAvg row = avgList.get(i); + List idList = new ArrayList(); + idList.add( (Integer) row.getId()); + recAvg.setId((int) idList.get(0)); + + } + } +// else { +// List idList = bestList.get(bestList.size()-1); //last data id +// recAvg.setId((int) idList.get(0)); +// System.out.println("**idList "+idList); +// } + + recAvg.setAvgTime(time); + recAvg.setInsertTime(Calendar.getInstance().getTime()); + recAvg.setStationCode(stationCode); + recAvg.setHHrAvg(hrAvg[0]); + recAvg.setDHrAvg(hrAvg[1]); + + GeoMagAvgDao avgDao = new GeoMagAvgDao(); + avgDao.persist(recAvg); + +// long t3 = Calendar.getInstance().getTimeInMillis(); +// System.out.println("*****tt3 "+ t3); + } + } + } + + // if min=59 record=missing, look the avg table to insert missing avg +// time.setMinutes(30); +// List avgList = retrieveSingleAvg(dataURI, time); + } + + + /* + * + */ + public Map> calcBy3hr(String[] dataURIs) { + GeoMagAvgDao avgDao = new GeoMagAvgDao(); + if (avgDao != null && dataURIs != null) { + for (String dataURI : dataURIs ) { + String stationCode = CalcUtil.getStationFromUri(dataURI); + + Date timeBy3 = null;; + try { + timeBy3 = CalcUtil.getTimeFromUri(dataURI); + } catch (ParseException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + int hour = timeBy3.getHours(); + int min = timeBy3.getMinutes(); + + Date spTime = CalcUtil.getSPTime( timeBy3); +// int spHour = spTime.getHours(); + + List dataList = null; + if ((hour%3 == 0 && min == 0 ) + || stationMap.entrySet().isEmpty() ) + dataList = retrieveUriBy3hr(dataURI, CalcUtil.getSPTime(timeBy3)); + else + continue; + + System.out.println("**resultsListby3.size() "+dataList.size()+" "+hour); + + + //List idList = new ArrayList(); + List dateList = new ArrayList(); + List hHrAvgList = new ArrayList(); + List dHrAvgList = new ArrayList(); + + if (dataList != null && dataList.size() >= 5) { + for (int i = 0; i < dataList.size(); i++) { //1 extra + + GeoMagAvg row = dataList.get(i); + + dateList.add( (Date) row.getAvgTime()); + hHrAvgList.add( (Float) row.getHHrAvg()); + dHrAvgList.add( (Float) row.getDHrAvg()); + //System.out.println("***row "+dateList.get(i)+" "+hHrAvgList.get(i)+" " +dHrAvgList.get(i)); + } + + + sort(dateList, hHrAvgList, dHrAvgList); + + for (int i = 0; i < dateList.size(); i++) { + System.out.println("***rowsortBy3 "+dateList.size()+" "+dateList.get(i)+" "+hHrAvgList.get(i)+" " +dHrAvgList.get(i)); + } + +// List recList = new ArrayList(); +// recList.add(dateList); +// recList.add(hHrAvgList); +// recList.add(dHrAvgList); +// List recListFinal = fillAvgTimeGaps(recList); + + // fill missing + //List idListFinal = new ArrayList(); + List dateListFinal = new ArrayList(); + List hHrAvgListFinal = new ArrayList(); + List dHrAvgListFinal = new ArrayList(); + + // fill missing in the beginning + Date date = (Date) dateList.get(0);//.get(0); //bestList.get(i) eq. newList. + int hr0 = date.getHours(); + + if ( hr0 != 0 ) { + for (int k = 0; k < hr0; k++) { + List newList2 = new ArrayList(); // eq. newList + + Date dateNew = (Date)date.clone(); + dateNew.setMinutes(k); + + dateListFinal.add( dateNew); + hHrAvgListFinal.add( MISSING_VAL); + hHrAvgListFinal.add( MISSING_VAL); + } + } + //// fill missing in the middle + for (int i = 0; i < dateList.size(); i++) { + if (i+1 < dateList.size()) { + Date date0 = dateList.get(i); + dateListFinal.add(date); + hHrAvgListFinal.add( hHrAvgList.get(i)); + hHrAvgListFinal.add( dHrAvgList.get(i)); + + Date date1 = (Date)dateList.get(i+1); + int diffHr = (int)(date1.getTime() - date.getTime())/ (3600*1000); + + if (diffHr != 1) { + for (int j = 0; j < diffHr-1; j++) { + dateListFinal.add( new Date(date.getTime() + 3600*1000*(j+1))); //append after i, i+1 + //idList.add( idList.get(i)+1); + hHrAvgListFinal.add( MISSING_VAL); + hHrAvgListFinal.add( MISSING_VAL); + + } + } + } + } + // fill missing in the end + date = (Date) dateList.get(dateList.size()-1); + int hrEnd = date.getMinutes(); + + if ( hrEnd < 59 ) { + for (int k = hrEnd+1; k < 60; k++) { + List newList2 = new ArrayList(); // eq. newList + + Date dateNew = (Date)date.clone(); + dateNew.setMinutes(k); + + dateListFinal.add( new Date(date.getTime() + 3600*1000*(k+1))); //append after i, i+1 + //idList.add( idList.get(i)+1); + hHrAvgListFinal.add( MISSING_VAL); + hHrAvgListFinal.add( MISSING_VAL); + + } + } + for (int i = 0; i < dateListFinal.size(); i++) { +// System.out.println("***rowsort2 "+dateListFinal.size()+" "+dateListFinal.get(i)+" "+hHrAvgListFinal.get(i)); + } + + + float[] hHrAvgs = CalcUtil.toFloatArray(hHrAvgList); + float[] dHrAvgs = CalcUtil.toFloatArray(dHrAvgList); + float[] dB = CalcEach3hr.getDisturbanceLevel(hHrAvgs, dHrAvgs); + // for ( int k = 0; k < 30; k++ ) + // System.out.println("*****dB "+ dB[k]); + @SuppressWarnings("unchecked") + Map dBsmall = CalcEach3hr.getSmallDisturbanceLevel(dB); + + float[] quietHHrAvg = CalcEach3hr.getQuietLevelHourAvg(dBsmall, hHrAvgs); + float[] quietDHrAvg = CalcEach3hr.getQuietLevelHourAvg(dBsmall, dHrAvgs); + // for (int i=0; i hdList = new ArrayList(); + hdList.add(qhaQdc); + hdList.add(qdaQdc); + hdList.add(hQdc); + hdList.add(dQdc); + hdList.add(qha); + hdList.add(qda); + stationMap.put(stationCode, hdList);// + + //init again + Arrays.fill(hHrAvgs, MISSING_VAL); + Arrays.fill(dHrAvgs, MISSING_VAL); + + for (Map.Entry> entry : stationMap.entrySet()) + System.out.println("***themap "+ entry.getKey()+" "+entry.getValue().size()+" "+CalcUtil.maxValue(entry.getValue().get(0)) +" "+ CalcUtil.minValue(entry.getValue().get(0))+" "+CalcUtil.maxValue(entry.getValue().get(1))); + + } + } + } + + return stationMap; + } + + + public Map> calcBy1min( String[] dataURIs) throws StorageException { + //Map> stationMap = new HashMap>(); + Map> kIndexMap = new HashMap>(); + + float[] qhaQdc = new float[HOURS]; + float[] qdaQdc = new float[HOURS]; + float[] hQdc = new float[HOURS]; + float[] dQdc = new float[HOURS]; + float[] qha = new float[HOURS]; + float[] qda = new float[HOURS]; + float[] hdata = new float[HD_DATA_RANGE*HOURS*MINUTES]; + float[] ddata = new float[HD_DATA_RANGE*HOURS*MINUTES]; + + Arrays.fill(hdata, MISSING_VAL); + Arrays.fill(ddata, MISSING_VAL); + + if (dao != null && dataURIs != null) { + for (String dataURI : dataURIs ) { + String stationCode = CalcUtil.getStationFromUri(dataURI); + + Date timeBy1 = null;; + try { + timeBy1 = CalcUtil.getTimeFromUri(dataURI); + } catch (ParseException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + int hour = timeBy1.getHours(); + int min = timeBy1.getMinutes(); + Date epTime = CalcUtil.getEPTime(timeBy1); + int epHour = epTime.getHours(); + + List dataList = retrieveUriForK1min(dataURI, epTime); + + if (dataList != null && dataList.size() != 0) { + // gest best observation data + List bestList = getBestObserv( dataList ); + System.out.println("**dataListBy1 size"+dataList.size()+" "+bestList.size()+" "+epTime); + + + // get hdata, ddata + for (int i = 0; i < bestList.size(); i++) { + List list = (List) bestList.get(i); + if (list != null && !list.isEmpty()) { + hdata[i] = list.get(1); + ddata[i] = list.get(2); + } + } + + System.out.println("***hdata "+hdata.length+" "+hdata[0]+" "+hdata[1]+" "+hdata[2880]+" "+hdata[2879]); + System.out.println("***ddata "+ddata.length+" "+ddata[0]+" "+ddata[1]+" "+ddata[2880]+" "+ddata[2879]); + + // calculate + //System.out.println("******stationMap " + stationMap.size()+ " "+ stationMap.entrySet().size() ); + for (Map.Entry> entry : stationMap.entrySet()) { + if (entry.getKey().equalsIgnoreCase(stationCode)) { + List list = entry.getValue(); + qhaQdc = list.get(0); + qdaQdc = list.get(1); + hQdc = list.get(2); + dQdc = list.get(3); + qha = list.get(4); + qda = list.get(5); + } + } + + + System.out.println("***hdata "+ CalcUtil.maxValue(hdata)+ " "+CalcUtil.minValue(hdata)+" "+hdata[0]+" "+hdata[2879]); + System.out.println("***ddata "+ CalcUtil.maxValue(ddata)+ " "+CalcUtil.minValue(ddata)+" "+ddata[0]+" "+ddata[2879]); + defLength = CalcEach3hr.getDefLength(stationCode, epHour); + + float[] hhdata = CalcEach1min.fillGaps(hdata); + float[] dddata = CalcEach1min.fillGaps(ddata); + + System.out.println("***hhdataGaps "+ CalcUtil.maxValue(hhdata)+ " "+CalcUtil.minValue(hhdata)+" "+hhdata[0]+" "+hhdata[10]); + System.out.println("***dddataGaps "+ CalcUtil.maxValue(dddata)+ " "+CalcUtil.minValue(dddata)+" "+dddata[0]+" "+dddata[10]); + System.out.println("***qhaQdc "+ CalcUtil.maxValue(qhaQdc)+ " "+CalcUtil.minValue(qhaQdc)+" "+qhaQdc[0]+" "+qhaQdc[10]); + System.out.println("***qdaQdc "+ CalcUtil.maxValue(qdaQdc)+ " "+CalcUtil.minValue(qdaQdc)+" "+qdaQdc[0]+" "+qdaQdc[10]); + System.out.println("***hQdc "+ CalcUtil.maxValue(hQdc)+ " "+CalcUtil.minValue(hQdc)+" "+hQdc[0]+" "+hQdc[10]); + System.out.println("***dQdc "+ CalcUtil.maxValue(dQdc)+ " "+CalcUtil.minValue(dQdc)+" "+dQdc[0]+" "+dQdc[10]); + + // for (int i=0; i=0; l--) + // if (hhdata[l] != MISSING_VAL && dddata[l] != MISSING_VAL) + // break; + // System.out.println("***lll "+l); + + + float[] hDev = CalcEach1min.getDev(hhdata, hQdc);//[1440] + float[] dDev = CalcEach1min.getDev(dddata, dQdc); + // for (int i=0; i kList = CalcEach1min.getKIndex(hDev, dDev, kLimit, missingFlag);//[8] + // System.out.println("***kList "+kList.size()); + float[] kIndex = kList.get(0); + float[] gamma = kList.get(1); + + float[] kLength = CalcUtil.geKLength();//[8] + float[] fitLength = CalcEach1min.getFitLength(defLength, kIndex, kLength);//[24] + + + float[] hcA = CalcEach1min.getCentHourAvg(hhdata, fitLength, kIndex);//middle [24] + float[] dcA = CalcEach1min.getCentHourAvg(dddata, fitLength, kIndex); + System.out.println("***hcA "+ CalcUtil.maxValue(hcA)+ " "+CalcUtil.minValue(hcA)+" "+hcA[0]+" "+hcA[10]+" "+stationCode); + System.out.println("***dcA "+ CalcUtil.maxValue(dcA)+ " "+CalcUtil.minValue(dcA)+" "+dcA[0]+" "+dcA[10]); + + hcA = CalcEach1min.adjustHrCentAvg(hcA, qha, gamma, kLimit); + dcA = CalcEach1min.adjustHrCentAvg(dcA, qda, gamma, kLimit); + System.out.println("***hcAAdj "+ CalcUtil.maxValue(hcA)+ " "+CalcUtil.minValue(hcA)+" "+hcA[0]+" "+hcA[10]); + System.out.println("***dcAAdj "+ CalcUtil.maxValue(dcA)+ " "+CalcUtil.minValue(dcA)+" "+dcA[0]+" "+dcA[10]); + + // Harmonic Fit to derive the qdc + for (int i=0; i> kIndexMap){ + if (dao != null && dataURIs != null) { + for (String dataURI : dataURIs ) { + String stationCode = CalcUtil.getStationFromUri(dataURI); + + Date time = null;; + try { + time = CalcUtil.getTimeFromUri(dataURI); + } catch (ParseException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + int hour = time.getHours(); + int min = time.getMinutes(); + int total = hour*MINUTES +min; + + Integer[] synopticPoint = {59, 119, 179, 359, 539, 719, 899, 1079, 1259, 1439}; + System.out.println("**stationMap "+stationMap.entrySet().isEmpty() +" "+stationMap.entrySet().size() +" "+Arrays.asList(synopticPoint).contains(total)); + + List dataList = null; + if (stationMap.entrySet().isEmpty() || Arrays.asList(synopticPoint).contains(total)) + dataList = retrieveUriForK3hr(dataURI, time); + else + continue; + + System.out.println("**resultsListfor3.size() "+dataList.size()); + + List bestList = getBestObserv( dataList ); + + int kindexDb = 0; + float krealDb = 0; + float kgammaDb = 0; + int k_index = 0; + float k_real = 0; + float k_gamma = 0; + + if (dataList != null ) { + for (int i = 0; i < dataList.size(); i++) { //1 extra + + GeoMagK3hr row = (GeoMagK3hr) dataList.get(i); + + Date date = (Date) row.getRefTime(); + kindexDb = (Integer) row.getKIndex(); + krealDb = (Float) row.getKReal(); + kgammaDb = (Float) row.getKGamma(); + //System.out.println("***row "+dateList.get(i)+" "+hHrAvgList.get(i)+" " +dHrAvgList.get(i)); + } + } + + List list = null; + for (Map.Entry> entry : kIndexMap.entrySet()) { + System.out.println("**kindex list "+entry); + if (entry.getKey().equalsIgnoreCase(stationCode)) + list = entry.getValue(); +// qhaQdc = list.get(0); +// qdaQdc = list.get(1); + } + + if (kindexDb == MISSING_VAL || kindexDb == 0) + k_index = (int) list.get(0)[7]; + if (krealDb == MISSING_VAL || krealDb == 0) + k_real = CalcKp.getKest(stationCode, (int) list.get(0)[7], list.get(1)[7]); //[7], gamma[7]); + if (kgammaDb == MISSING_VAL || kgammaDb == 0) + kgammaDb = list.get(1)[7]; + + GeoMagK3hr recK3hr = new GeoMagK3hr(); + //recK3hr.setId((int) l.get(0)); + recK3hr.setRefTime(time); + recK3hr.setLastUpdate(Calendar.getInstance().getTime()); + recK3hr.setStationCode(stationCode); + recK3hr.setKIndex(k_index); + recK3hr.setKReal(k_real); + recK3hr.setKGamma(k_gamma); + GeoMagK3hrDao k3hrDao = new GeoMagK3hrDao(); + k3hrDao.persist(recK3hr); + +// record.setKestIndex(kest_index); +// record.setKestGamma(kest_gamma); +// record.setKestReal(kest_real); +// record.setHKReal(hk_real); +// record.setHKGamma(hgamma); +// record.setDKReal(dk_real); +// record.setDKGamma(dgamma); + } + } + } + +} diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/calculation/CalcEach1min.java b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/calculation/CalcEach1min.java new file mode 100644 index 0000000000..15f942f93c --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/calculation/CalcEach1min.java @@ -0,0 +1,479 @@ +package gov.noaa.nws.ncep.edex.plugin.geomag.calculation; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.List; + +/* + * The calculation of k, 1 minute related. + * + * 
+ * SOFTWARE HISTORY
+ *                   
+ * ate          Ticket#     Engineer   Description
+ * -----------  ----------  ---------- --------------------------
+ * 05/14/2013   #989        qzhou      Initial Creation
+ *
+ * + * @author qzhou + * @version 1 + */ +public class CalcEach1min { + private static final float MISSING_VAL = 99999.99f; + private static final int MAX_GAP_LENGTH = 15; + private static final int SMOOTH_WINDOW = 60;// + private static final int TRANSITION_TIME = 60; + private static final int PHASE_POWER = 3; + private static final int HARM_ORDER = 5; + private static int HOURS = 24; + private static int MINUTES = 60; + /* + * @param dataIn -- data of 4320 + */ + public static float[] fillGaps(float[] data){ + //float[] data = dataIn.clone(); //z=4320 + int i = 0; + int size = data.length; + +// if (data.length != 4320 ) +// return data; + + while (i < size) { + + // Find the next missing value + int flag = 0; //flag used for break + while (i < size && flag == 0) { + if (data[i] == MISSING_VAL) + flag=1; + else + i++; + } + + // If a gap was found handle it + if (i < size) { + int gapIndex = i; //index of first missing value + + //Find the last missing point + flag = 0; + while (i < size && flag ==0) { + if (data[i] != MISSING_VAL) + flag=1; + else + i++; + } + + // Interpolate the gap if possible. We cannot extrapolate + if ((gapIndex > 0) && (i < size)) { + //Now i is the index of first non-missing value + // and GapIndex is the index of first missing value + int gapLength = i-gapIndex; //i is index of first non-missing value + + // Interpolate if the gap is small enough + if (gapLength < MAX_GAP_LENGTH) { + float value1 = data[gapIndex-1]; + float value2 = data[i]; + for (int j=1; j < gapLength+1; j++) + data[gapIndex] = value1 + (j * (value2-value1)) / (gapLength+1); + } + } + } + } + + return data; + } + + /* + * 24 element floating point array. (DefLength + 30 + kLength) + * Find out how many points are used to get the centered hour average + */ + public static float[] getFitLength(float[] defLength, float[] kIndex, float[] kLength) { + float[] fitLength = new float[HOURS]; + int[] ind = new int[HOURS]; + float[] curK = new float[HOURS]; + + for (int i = 0; i < HOURS; i++) { + fitLength[i] = 30.0f + defLength[i]; + ind[i] = (int) Math.floor(i/3); + curK[i] = kIndex[ind[i]]; + + if (curK[i] != MISSING_VAL ) + fitLength[i] += kLength[(int)curK[i]]; + //System.out.println("***fitLength "+fitLength[i] +" "+curK[i]+" "+defLength[i]); + if (fitLength[i] >1440) + fitLength[i] = 1440; + } +// for (int i = 0; i < HOURS; i++) +// System.out.print("***defLength "+defLength[i]+" "); +// for (int i = 0; i < HOURS; i++) +// System.out.print("***fitLength "+fitLength[i]+" "); +// System.out.println(" "); + return fitLength; + } + + /* @param data (hhdata, dddata), float[4320] + * @return -- 24 element floating point array. Calculate averages centered on each hour of the day + */ + public static float[] getCentHourAvg(float[] data, float[] fitLength, float[] defLength) { + + float[] HrAvg = new float[HOURS]; //double + Arrays.fill(HrAvg, MISSING_VAL); + + for (int ihr = 0; ihr < HOURS; ihr++) { + // take middle interval + int center = 1440 + ihr * MINUTES + 30; + int start = center - Math.round(fitLength[ihr]); + int end = center + Math.round(fitLength[ihr]); + int missing = 0; + double sum = 0; + + // if data[i] have no missing value + for ( int i = start; i < end+1; i++) { + //System.out.print("**here2 "+data[i] +" "); + if (data[i] != MISSING_VAL) { + sum += data[i]; + } + else { + missing++; + break;//this loop + } + } + + if (missing == 0) // no missing value + HrAvg[ihr] = (float) sum /(end - start + 1); + } + + // if HrAvg have missing value + // Extrapolate the first missing points--missing beginning + int hr0 = 0; + int flag = 0; + while (hr0 < HOURS && flag == 0) { + if (HrAvg[hr0] != MISSING_VAL) + flag=1; + else { + hr0++; + //System.out.println("**here2"); + } + } + if (hr0 > 0 && hr0 < HOURS) + for (int i = 0; i < hr0; i++) + HrAvg[i] = HrAvg[hr0]; + + // Extrapolate the last missing points--missing end + int hr1 = 23; + while ((hr1 > hr0) && (HrAvg[hr1] == MISSING_VAL)) + hr1--; + if (hr1 < 23) + for (int i = hr1+1; i < HOURS; i++) + HrAvg[i] = HrAvg[hr1]; + + // Interpolate the missing points between hour0 and hour1 + // Both hour0 and hour1 are hours where data exists + while (hr0 < hr1) { + //System.out.println("**here4"); + do { + hr0++; + } while (hr0 < hr1 && HrAvg[hr0] != MISSING_VAL ); + + if (hr0 < hr1) { + int hr = hr0; //first missing hour + while ((hr0 < hr1) && (HrAvg[hr0] == MISSING_VAL)) + hr0++; + int gapLength = hr0-hr; + float value1 = HrAvg[hr-1];//not missing + float value2 = HrAvg[hr0]; //not missing + System.out.println("***gapLength "+gapLength +" "+value1 +" "+value2); + for (int i=1; i < gapLength+1; i++) + HrAvg[hr++] = value1+(i*(value2-value1))/(gapLength+1); + } + } + for (int i=0;i list = new ArrayList(); + // Initialize the return data with MissingValue + float[] kIndex = new float[8]; + float[] hk = new float[8]; + float[] dk = new float[8]; + float[] gamma = new float[8]; + float[] hGamma = new float[8]; + float[] dGamma = new float[8]; + + Arrays.fill(kIndex, MISSING_VAL); + Arrays.fill(hk, MISSING_VAL); + Arrays.fill(dk, MISSING_VAL); + Arrays.fill(gamma, MISSING_VAL); + Arrays.fill(hGamma, MISSING_VAL); + Arrays.fill(dGamma, MISSING_VAL); + + // Check for bad input data + int npts = hdev.length; + if (npts != ddev.length) + return list; + if (npts < 1261 || npts > 1440) //21*60+1 + return list; + + // Step through each three hourly interval + for (int ipd=0; ipd < 8; ipd++) { + int istart = ipd * 180; + int iend = istart + 180 - 1; + if (iend >= npts) + iend = npts - 1 ; //allow for partial interval on the end + if (iend < istart) + continue ; //should never happen... + + // hhdev = hdev[istart:iend] + int i = 0; + int ii = 0; + int npdpts = iend - istart + 1 ; //number of possible points in the period, =180 + float[] hhdev = new float[npdpts]; + float[] dddev = new float[npdpts]; + + for (int j = istart; j < iend+1; j++) { + hhdev[j-istart] = hdev[j]; + dddev[j-istart] = ddev[j]; + } + + // get hdevGood + for (i = npdpts-1; i >=0; i--) + if (hhdev[i] != MISSING_VAL && hhdev[i] != 0) + break; + //System.out.println("***iii "+i); + for (ii = npdpts-1; ii >=0; ii--) + if (dddev[ii] != MISSING_VAL && dddev[i] != 0) + break; + + + // i, ii are the last data that is not missing + float[] hdevGood = new float[i+1]; + float[] ddevGood = new float[ii+1]; + if (i >-1) + for (int j = 0; j < i+1; j++) + hdevGood[j] = hhdev[j]; + if (ii > -1) + for (int j = 0; j < ii+1; j++) + ddevGood[j] = dddev[j]; + + System.out.println("**j " +hdevGood.length+" "+ddevGood.length); + if ( missingFlag == 0 || (i > -1 && ii > -1)) { + if (hdevGood != null && hdevGood.length != 0) + hGamma[ipd] = CalcUtil.maxValue(hdevGood) - CalcUtil.minValue(hdevGood); + if (hdevGood != null && hdevGood.length != 0) + dGamma[ipd] = CalcUtil.maxValue(ddevGood) - CalcUtil.minValue(ddevGood); + System.out.println("***Gamma "+ hGamma[ipd]+ " "+dGamma[ipd]); + + if (hGamma[ipd] != MISSING_VAL) + //for (int l = 0; l < 8; l++) + hk[ipd] = CalcUtil.getKfromTable(kLimit, hGamma[ipd]); + + if (dGamma[ipd] != MISSING_VAL) + //for (int l = 0; l < 8; l++) + dk[ipd] = CalcUtil.getKfromTable(kLimit, dGamma[ipd]); + + // get bigger one + if (hk[ipd] >= dk[ipd] && hGamma[ipd] != MISSING_VAL) { + kIndex[ipd] = hk[ipd]; + gamma[ipd] = hGamma[ipd]; + } + else if (dk[ipd] >= hk[ipd] && dGamma[ipd] != MISSING_VAL){ + kIndex[ipd] = dk[ipd]; + gamma[ipd] = dGamma[ipd]; + } + System.out.println("***kIndex "+ kIndex[ipd]); + + } + } + + list.add(0, kIndex); + list.add(1, gamma); + list.add(2, hk); + list.add(3, hGamma); + list.add(4, dk); + list.add(5, dGamma); + + return list; + } + + /* + * Force QHAQDC and QDAQDC to be continuous between the last and the first value using a +/- SMOOTH_WINDOW + */ + public static float[] getQHAQDC(float[] qdc){ + float[] data = qdc.clone(); //new float[1440]; + + if (qdc.length != 1440) + return data; +// for (int j=0; j= 0; i--) +// if (data[i] != MISSING_VAL){ +// j0 = i; +// break; +// } + + + if (data.length != 4320 || qhaQdc.length != 1440) + return data; + + System.out.println("***currentIndexVal "+data.length+" "+j0+" "+ data[j0-2]+" "+ data[j0-1] + " " + data[j0] + " " + data[j0+1]+ " " + data[j0+2]); + + if (data[j0] != MISSING_VAL) { + for (int j = j0 +1; j < 4320; j++) { + int w2 = j - j0 -1; //from .pro + int w1 = TRANSITION_TIME - w2; + if (w1 < 0) + w1 = 0; + //System.out.println("**qhaQdc "+qhaQdc[j % 1440]); + data[j] = (w1 * data[j0] + w2 * qhaQdc[j % 1440]) / (w1 + w2); + } + } + //System.out.println("***data.size " +data.length +" "+data[data.length-2]); + return data; + } + + public static float[] getDev(float[] data, float[] qdc){ + float[] dev = new float[1440]; + + if (data.length != 4320 || qdc.length != 1440) + return data; + + for (int i = 0; i < 1440; i++) { + System.out.print("***data-qdc "+i+" " +data[i+1440] +" "+qdc[i] +" "); + if (data[i+1440] != MISSING_VAL && qdc[i] != MISSING_VAL) + dev[i] = data[i+1440] - qdc[i]; + else + dev[i] = MISSING_VAL; + } + + return dev; + } + + public static float[] adjustHrCentAvg(float[] hcA, float [] qha, float[] gamma, int[] kLimit){ + float wh = 0; + + if (hcA.length != HOURS || gamma.length != 8) + return hcA; + + for (int ipd = 0; ipd < 8; ipd++) { + if (gamma[ipd] < kLimit[3]) + wh = 1; + else if (gamma[ipd] >= kLimit[3] && gamma[ipd] < kLimit[5]) + wh = (float) Math.pow( ((kLimit[5] - gamma[ipd]) /(kLimit[5] - kLimit[3])), PHASE_POWER); + else + wh = 0; + + for (int j = 0; j < 3; j++) { + hcA[ipd*3+j] = wh * hcA[ipd*3+j] + (1-wh) * qha[ipd*3+j];//? + //System.out.println("***WH "+wh+" "+hcA[ipd*3+j]); + } + } + + return hcA; + } +} + diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/calculation/CalcEach3hr.java b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/calculation/CalcEach3hr.java new file mode 100644 index 0000000000..1da92a6c7c --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/calculation/CalcEach3hr.java @@ -0,0 +1,469 @@ +package gov.noaa.nws.ncep.edex.plugin.geomag.calculation; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import com.vividsolutions.jts.geom.Coordinate; +/* + * The calculation of k, 3 hour related. + * + * 
+ * SOFTWARE HISTORY
+ *                   
+ * ate          Ticket#     Engineer   Description
+ * -----------  ----------  ---------- --------------------------
+ * 05/14/2013   #989        qzhou      Initial Creation
+ *
+ * + * @author qzhou + * @version 1 + */ +public class CalcEach3hr { + private static final float MISSING_VAL = 99999.99f; + private static final int NIGHT_LENGTH = 90; //min + private static final int DAWN_LENGTH = 60; + private static final int DAY_LENGTH = 0; + private static final int DUSK_LENGTH = 60; + private static int DAYS = 30; + private static int HOURS = 24; + private static int MINUTES = 60; + +// public class DBLevel implements Comparable{ +// private float dB; +// private int index; +// +// public DBLevel(int index, float db) { +// super(); +// this.index = index; +// this.dB = dB; +// +// } +// public int getIndex() { +// return index; +// } +// public void setIndex(int index) { +// this.index = index; +// } +// public float getDB() { +// return dB; +// } +// public void setDB(float dB) { +// this.dB = dB; +// } +// +// public class ChangeComparator implements Comparator { +//// public int compareTo(DBLevel compareDB) { +//// +//// float compareQuantity = ((DBLevel) compareDB).getDB(); +//// +//// //ascending order +//// return this.DBLevel - compareQuantity; +//// +//// //descending order +//// //return compareQuantity - this.quantity; +//// +//// } +//// +//// public static Comparator FruitNameComparator +//// = new Comparator() { +// +// public int compare(DBLevel fruit1, DBLevel fruit2) { +// +// Float db1 = fruit1.getDB(); +// Float db2 = fruit2.getDB(); +// +// //ascending order +// return db1.compareTo(db2); +// +// //descending order +// //return fruitName2.compareTo(fruitName1); +// } +// +// } +// @Override +// public int compareTo(DBLevel o) { +// // TODO Auto-generated method stub +// return 0; +// }; +// } + + /* + * calculate hrAvgs for this hour + * @param bestList -- contains 1 hour data + */ + public static float[] getSimpleHourAvg(List bestList){ + float[] simpHrAvg = new float[2]; + float simpHrAvg1 = 0; + float simpHrAvg2 = 0; + double sum1 = 0; + double sum2 = 0; + int rec1 = 0; + int rec2 = 0; + //System.out.println("***bestList sz "+bestList.size()); + for (int i = 0; i < bestList.size(); i++) { + //System.out.println("***bestList avg "+bestList.size()+" "+bestList.get(i)); + //List list = (List) bestList.get(i); + List list = (List) bestList.get(i); + //float comp1 = (Float)list.get(0).get(2); + float comp1 = (Float)list.get(1); + float comp2 = (Float)list.get(2); + //System.out.println("***comp12 " + comp1+" "+comp2); + if ( comp1 != MISSING_VAL) { + sum1 += comp1; + rec1++; + } + if ( comp2 != MISSING_VAL) { + sum2 += comp2; + rec2++; + } + } + + if (rec1 > 30) // less than half missing value + simpHrAvg1 = (float) sum1 / rec1; + else + simpHrAvg1 = MISSING_VAL; + + if (rec2 > 30) // less than half missing value + simpHrAvg2 = (float) sum2 / rec2; + else + simpHrAvg2 = MISSING_VAL; + + simpHrAvg[0] = simpHrAvg1; + simpHrAvg[1] = simpHrAvg2; + //System.out.println("***simpHrAvg " + rec1+" "+rec2+" "+simpHrAvg1 +" "+simpHrAvg2+ " "+bestList.size()); + return simpHrAvg; + } + + /* + * calculate hrAvgs for this day. + * @param data -- data of one day, 1440 + */ + public static float[] getSimpleHourAvg(float[] data){ //data 1440 + //System.out.println("**datalength "+data.length); + float[] simpHrAvg = new float[HOURS]; + + for (int ihr = 0; ihr < HOURS; ihr++) { + double sum = 0; + int missing = 0; + + for ( int i = ihr*MINUTES; i < ihr*MINUTES+MINUTES; i++) { + + if (data[i] != MISSING_VAL) + sum += data[i]; + else + missing++; + } + + if (missing < 30) // less than half missing value + simpHrAvg[ihr] = (float) sum / (MINUTES-missing); + else + simpHrAvg[ihr] = MISSING_VAL; + } + + return simpHrAvg; + } + + /* + * calculate hrAvgs for this hour in data array + * @param data -- data of one day, 1440 + */ + public static float getSimpleHourAvg(float[] data, int hour){ //one day 1440, avg for hour-1 + + float simpHrAvg = 0; + double sum = 0; + int rec = 0; + + if (data.length <= hour*MINUTES+MINUTES) + for (int i = hour*MINUTES; i < data.length; i++) { + if ( data[i] != MISSING_VAL) { + sum += data[i]; + rec++; + } + } + else + for (int i = hour*MINUTES; i < hour*MINUTES+MINUTES; i++) { + if ( data[i] != MISSING_VAL) { + sum += data[i]; + rec++; + } + } + + if (rec > 30) // less than half missing value + simpHrAvg = (float) sum / (rec); + else + simpHrAvg = MISSING_VAL; + + return simpHrAvg; + } + + /* + * @param simpHrAvgH -- data of 30 intervals(720 hours) + * @return disturbance levels for 30 intervals + */ + public static float[] getDisturbanceLevel(float[] simpHrAvgH, float[] simpHrAvgD){ + float[] dB = new float[30]; + + for (int j = 0; j < DAYS; j++) { + double sum = 0; + int missing = 0; + + int endOfArray = simpHrAvgH.length; + int endTime = (endOfArray > j*HOURS+HOURS) ? j*HOURS+HOURS :endOfArray; + + for ( int i = j*HOURS; i < endTime-1; i++) { + + if (simpHrAvgH[i] != MISSING_VAL && simpHrAvgD[i] != MISSING_VAL && + simpHrAvgH[i+1] != MISSING_VAL && simpHrAvgD[i+1] != MISSING_VAL ) { + sum += Math.sqrt( Math.pow((simpHrAvgH[i+1] - simpHrAvgH[i]), 2) + + Math.pow((simpHrAvgD[i+1] - simpHrAvgD[i]), 2) ); + } + else + missing++; + } + + if (missing <= 12) // not 12 or more missing + dB[j] = (float) sum / (HOURS-1-missing); + else + dB[j] = MISSING_VAL; + System.out.print("***dB[j] "+dB[j] + " "); + } + + return dB; + } + + /* + * @param dB -- float[30 ] + * @return --5 smallest disturbance levels + */ + public static Map getSmallDisturbanceLevel(float[] dB){ + //create a map that key=dBIndex and value=dBValue. + //create a duplicate array dBDup. Sort it. + //take 5 smallest dBDup[i]. Then find its index and value from the dB. Put them to the map + Map dBSmall = new HashMap(); +// Map temp = new HashMap(); +// Map tempDup = new HashMap(); +// for (int i = 0; i < dB.length; i++) { +// temp.put(dB[i], i); +// tempDup.put(dB[i], i); +// System.out.println("***temp "+dB[i] + " "+i); +// } + + float[] dBDup = new float[dB.length]; + for (int i = 0; i < dBDup.length; i++) { + dBDup[i] = dB[i]; + } + Arrays.sort(dBDup); +// for (int i = 0; i < dBDup.length; i++) { +// System.out.print("***dBsort "+dBDup[i] +" "); +// } + + float dupIndex = (int)MISSING_VAL ; + float wk = 0; + //take 5 smallest dBDup + for (int j = 0; j < 5; j++) { + for (int i = 0; i < dB.length; i++) { + if (dB[i] == dBDup[j] && i != dupIndex) { //for duplicated values + //System.out.println("***dBDup[j] "+dBDup[j] +" "+wk+" "+i +" "+j); + dBSmall.put(i, dB[i]); + dupIndex = i; + break; + } + } + } + +// for (int i = 0; i < 5; i++) { +// System.out.println("***temp.get(dB[i]) "+temp.get(dB[i]) ); +// //previous = temp.get(dB[i]); +// if (previous == temp.get(dB[i])) { +// +// System.out.println("***previous) "+previous +" "+i ); +// tempDup.remove(dB[i]); +// System.out.println("***tempDup) "+tempDup.size() +" "+tempDup.get(dB[i]) ); +// //put next dB[i] +// dBSmall.put(tempDup.get(dB[i]), dB[i]); +// +// } +// else { +// dBSmall.put(temp.get(dB[i]), dB[i]); +// previous = temp.get(dB[i]); +// } +// System.out.println("***dBSmall "+temp.get(dB[i]) + " "+dB[i]); +// } + + return dBSmall; + } +// public static Map getSmallDisturbanceLevel(float[] dB){ +// Arrays.sort(dB); +// Map dBSmall = new HashMap(); +// +// List dBlist = new ArrayList(); +// for (int i = 0; i < dB.length; i++) +// dBlist.add(dB[i]); +// +// //float[] smaller = new float[5];// index of hrAvg that has smallest dB +// int index = 0; +// float wk; +// float previousId = MISSING_VAL; +// +// for (int j = 0; j < 5; j++) { +// float minimum = MISSING_VAL; +// for (int i = 0; i < dBlist.size(); i++) { +// +// if (dBlist.get(i) < minimum) { +// minimum = dBlist.get(i); +// index = i; +// } +// } +// +// if (minimum < 1) +// wk = 1; +// else +// wk = 1 / (minimum *minimum); +// +// // since dBlist.remove(index); index needs to refer to original index +// if (previousId > index) { +// dBSmall.put(index, wk); +// previousId = index; +// } +// else { +// dBSmall.put(index+1, wk); // +j: original dB was reduced by j +// previousId = index; +// } +// System.out.println("dBlist "+index+" "+wk); +// dBlist.remove(index); +// } +// +// return dBSmall; +// } + + /* + * @param -- dBSmall, 5 set map + * @param -- simpHrAvg, -- float[720] + * @rturn -- quietLevelHourAvg, float[24] + */ + public static float[] getQuietLevelHourAvg(Map dBSmall, float[] simpHrAvg){ + if (dBSmall.entrySet().size() < 5) + return simpHrAvg; + + float[] quietHrAvg = new float[24]; + Arrays.fill(quietHrAvg, MISSING_VAL); + int[] index = new int [5]; + float[] dB = new float[5]; + + int k = 0; + Iterator iter = dBSmall.entrySet().iterator(); + while (iter.hasNext()) { + @SuppressWarnings("unchecked") + Map.Entry mEntry = (Map.Entry) iter.next(); //sorted on key + + index[k] = mEntry.getKey(); + dB[k] = mEntry.getValue(); + System.out.println("***index[k] "+k+" "+index[k] + " "+ dB[k]+" "+simpHrAvg.length); + k++; + } + + + //construct smallHrAvg array (24*5) from simpHrAvg (24*30) + float[] smallHrAvg = new float[24*5]; + + for (int j = 0; j < 5; j++) { //k=5 + int endOfArray = smallHrAvg.length; + int endTime = (endOfArray > j*HOURS+HOURS) ? j*HOURS+HOURS :endOfArray; + + for (int i = j*HOURS; i < endTime; i++) { + smallHrAvg[i] = simpHrAvg[ index[j]*HOURS + i%HOURS ]; //700 + } + } + + + for (int ihr = 0; ihr < HOURS; ihr++) { + float sumAvg = 0; + float sumWk = 0; + float wk = 0; + + for (int jk = 0; jk < 5; jk++) { + int ind = jk*HOURS+ihr; + if (dB[jk] < 1) + wk = 1; + else + wk = 1 / (dB[jk] *dB[jk]); + + if (smallHrAvg[ind] != MISSING_VAL){ + sumAvg += wk * smallHrAvg[ind]; + sumWk += wk; + } + } + + if (sumWk >0) + quietHrAvg[ihr] = sumAvg / sumWk; + + } + + return quietHrAvg; + } + + /* + * @param -- quietHrAvg, float[24] + * @return -- shifted quietLevelHourAvg, float[24] + */ + public static float[] getQHA(float[] quietHrAvg){ + float[] QHA = new float[24]; + + if (quietHrAvg.length != 24) + return quietHrAvg; + + for (int ihr = 0; ihr < 24; ihr++) { + QHA[ihr] = quietHrAvg[ (ihr+3) %24 ]; + } + + return QHA; + } + + + /* + * @return -- 24 element floating point array. Default fitting lengths. + * (one for each hour of the 24 hour interval that ends at EPtime). + */ + public static float[] getDefLength(String station, int epHour) { + float[] defLength = new float[24]; + float lon = CalcUtil.getLongitude(station); + int UTdiff = Math.round(1440.0f * lon / 360.0f); + int minute0 = epHour * MINUTES; + //System.out.println("**epHour "+epHour); + for (int ihr = 0; ihr < HOURS; ihr++) { + float sum = 0; + + for (int imin = 0; imin < MINUTES; imin++) { + int curMin = (minute0 + ihr*MINUTES + imin) % 1440; + int localMin = (curMin + UTdiff) % 1440; + + if (localMin >= 0 && localMin < 180) + sum += NIGHT_LENGTH; + else if (localMin >= 180 && localMin < 360) + sum += DAWN_LENGTH; + else if (localMin >= 360 && localMin < 1080) + sum += DAY_LENGTH; + else if (localMin >= 1080 && localMin < 1260) + sum += DUSK_LENGTH; + else if (localMin >= 1260 && localMin < 1440) + sum += NIGHT_LENGTH; + } + defLength[ihr] = sum / MINUTES; + //System.out.println("**defLength "+defLength[ihr]); + } + + return defLength; + } + +} + + diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/calculation/CalcKp.java b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/calculation/CalcKp.java new file mode 100644 index 0000000000..f59e433208 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/calculation/CalcKp.java @@ -0,0 +1,442 @@ +package gov.noaa.nws.ncep.edex.plugin.geomag.calculation; + +import gov.noaa.nws.ncep.common.dataplugin.geomag.table.KsThree; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +/* + * The calculation of Kp and related. + * + * 
+ * SOFTWARE HISTORY
+ *                   
+ * ate          Ticket#     Engineer   Description
+ * -----------  ----------  ---------- --------------------------
+ * 05/14/2013   #989        qzhou      Initial Creation
+ *
+ * + * @author qzhou + * @version 1 + */ +public class CalcKp { + private static final float MISSING_VAL = 99999.99f; + + public CalcKp() { + + } + + public static float[] getKest(String station, float[] kIndex, float[] gamma) { + float[] kest = new float[8]; + + for (int i=0; i<8; i++) { + int[] gammaLimit = CalcUtil.getKLimit(station); //.getGammaFromK(station, gamma); + if (kIndex[i] < 9) { + kest[i] = kIndex[i] + (gamma[i] - gammaLimit[(int)kIndex[i]]) / (gammaLimit[(int)kIndex[i]+1] - gammaLimit[(int)kIndex[i]]);} + else if (kIndex[i] == MISSING_VAL) + kest[i] = MISSING_VAL; + else + kest[i] = 9.0f; + System.out.println("**kest "+kest[i] +" "+kIndex[i]+" "+gamma[i]); + } + + return kest; + } + + public static float getKest(String station, int kIndex, float gamma) { + float kest = 0; + + int[] gammaLimit = CalcUtil.getKLimit(station); + if (kIndex < 9) + kest = kIndex + (gamma - gammaLimit[kIndex])/(gammaLimit[kIndex+1] - gammaLimit[kIndex]); + else if (kIndex == MISSING_VAL) + kest = MISSING_VAL; + else + kest = 9.0f; + //System.out.println("****kest "+kest +" "+kIndex); + + return kest; + } +// public static float getKest(String station,int[] kLimit, float gamma) { +// float kest = 0; +// int kIndex = CalcUtil.getKfromTable(kLimit, gamma); +// +// int gammaLimit = CalcUtil.getGammaFromK(station, kIndex+1); //kLimit[kIndex]; //getGammaLimit( station, kIndex); +// int gammaLimit1 = CalcUtil.getGammaFromK(station, kIndex+1); //kLimit[kIndex+1]; //getKLimit( station, kIndex+1);; +// +// if (gammaLimit1 > gammaLimit) +// kest = kIndex + (gamma - gammaLimit) / (gammaLimit1 - gammaLimit); +// +// return kest; +// } +// protected float[] getKest(String station, float[] gamma) { +// float kest = 0; +// int kIndex[] = CalcUtil.getKfromTable(station, gamma); +// +// int gammaLimit = CalcUtil.getGammaFromK(station, kIndex+1); //kLimit[kIndex]; //getGammaLimit( station, kIndex); +// int gammaLimit1 = CalcUtil.getGammaFromK(station, kIndex+1); //kLimit[kIndex+1]; //getKLimit( station, kIndex+1);; +// +// if (gammaLimit1 > gammaLimit) +// kest = kIndex + (gamma - gammaLimit) / (gammaLimit1 - gammaLimit); +// +// return kest; +// } + /* + * list of the station coefficient values in the order of 00-03, 03-06... + */ + public static ArrayList getKsThreeList(String station) { + + ArrayList threeKsList = CalcUtil.getStationCoeff().getStationByCode(station).getKsThree();//size 24 + + return threeKsList; + } + + public static List getKsThree(Date time, String station, int k) { + List ks = new ArrayList();; + //KsThree ksThree = null; + ArrayList ksThreeList = getKsThreeList(station); + + if (ksThreeList != null && !ksThreeList.isEmpty()) { + + int hour = CalcUtil.getSPTime(time).getHours(); + int period = hour/3;// 24 -> 8 + + KsThree ksThree = ksThreeList.get(period); + System.out.println("**kss "+ksThree.getK1()+" "+ksThree.getK2()+" "+ksThree.getK3()+" "+ksThree.getK5()+" "+ksThree.getK6()+" "+getKsOfKsThree(k, ksThree)); + if (ksThree != null) + ks.add(getKsOfKsThree(k, ksThree)); + + ksThree = ksThreeList.get(period + 8); + System.out.println("**kss "+ksThree.getK1()+" "+ksThree.getK2()+" "+ksThree.getK3()+" "+ksThree.getK5()+" "+ksThree.getK6()+" "+getKsOfKsThree(k, ksThree)); + if (ksThree != null) + ks.add(getKsOfKsThree(k, ksThree)); + + ksThree = ksThreeList.get(period + 16); + if (ksThree != null) + ks.add(getKsOfKsThree(k, ksThree)); + +// ksThree = ksThreeList.get(period); +// if (ksThree != null) +// ks.add(getKsOfKsThree(k, ksThree)); +// +// if (mon == 1 || mon == 2 || mon == 11 || mon == 12) { +// ksThree = ksThreeList.get(hour/3 -1); +// ks = getKsOfKsThree(k, ksThree); +// } +// else if (mon == 3 || mon == 4 || mon == 9 || mon == 10) { +// ksThree = ksThreeList.get(8 + hour/3 -1); +// ks = getKsOfKsThree(k, ksThree); +// } +// else if (mon >= 5 && mon <= 8) { +// ksThree = ksThreeList.get(16 + hour/3 -1); +// ks = getKsOfKsThree(k, ksThree); +// } + } +// for (int i = 0; i < threeKs.size(); i++) { +// String season = threeKs.get(i).getSeason(); +// String period = threeKs.get(i).getPeriod(); +// int k1 = threeKs.get(i).getK1(); +// int k2 = threeKs.get(i).getK2(); +// int k3 = threeKs.get(i).getK3(); +// int k4 = threeKs.get(i).getK4(); +// int k5 = threeKs.get(i).getK5(); +// int k6 = threeKs.get(i).getK6(); +// int k7 = threeKs.get(i).getK7(); +// int k8 = threeKs.get(i).getK8(); +// int k9 = threeKs.get(i).getK9(); +// int k10 = threeKs.get(i).getK10(); +// System.out.println("**k1 k2 "+season+" "+period+" "+k1+" "+k2); +// } + return ks; + } + + private static int getKsOfKsThree(int k, KsThree ksThree) { + int ks = 0; + + if (k == 0) + ks = ksThree.getK0(); + else if (k == 1) + ks = ksThree.getK1(); + else if (k == 2) + ks = ksThree.getK2(); + else if (k == 3) + ks = ksThree.getK3(); + else if (k == 4) + ks = ksThree.getK4(); + else if (k == 5) + ks = ksThree.getK5(); + else if (k == 6) + ks = ksThree.getK6(); + else if (k == 7) + ks = ksThree.getK7(); + else if (k == 8) + ks = ksThree.getK8(); + else if (k == 9) + ks = ksThree.getK9(); + return ks; + } + public static float getKs(String station, int k, Date time) throws ParseException { + float a = 0; + float b = 0; + float ks = 0; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + + //int year = time.getYear();113 + Calendar cal = Calendar.getInstance(); + cal.setTime(time); + int year = cal.get(Calendar.YEAR); + + Date date1 = sdf.parse(year+"-01-01"); + Date date2 = sdf.parse(year+"-02-14"); + Date date3 = sdf.parse(year+"-02-24"); + Date date4 = sdf.parse(year+"-03-06"); + Date date5 = sdf.parse(year+"-03-16"); + Date date6 = sdf.parse(year+"-04-16"); + Date date7 = sdf.parse(year+"-04-26"); + Date date8 = sdf.parse(year+"-05-06"); + Date date9 = sdf.parse(year+"-05-16"); + Date date10 = sdf.parse(year+"-08-17"); + Date date11 = sdf.parse(year+"-08-27"); + Date date12 = sdf.parse(year+"-09-06"); + Date date13 = sdf.parse(year+"-09-16"); + Date date14 = sdf.parse(year+"-10-17"); + Date date15 = sdf.parse(year+"-10-27"); + Date date16 = sdf.parse(year+"-11-06"); + Date date17 = sdf.parse(year+"-11-16"); + Date date18 = sdf.parse(year+"-12-31"); + + Date date2Leep = sdf.parse(year+"-02-15"); + Date date3Leep = sdf.parse(year+"-02-25"); + + List ksThree = getKsThree(time, station, k ); + + if(time.compareTo(date1) >= 0 && time.compareTo(date2) < 0){ + ks = ksThree.get(0) /3; + } + else if (time.compareTo(date4) >= 0 && time.compareTo(date5) < 0){ + ks = (0.25f*ksThree.get(0) + 0.75f*ksThree.get(1)) /3; + } + else if (time.compareTo(date5) >= 0 && time.compareTo(date6) < 0){ + ks = ksThree.get(1) /3; + } + else if (time.compareTo(date6) >= 0 && time.compareTo(date7) < 0){ + ks = (0.75f*ksThree.get(1) + 0.25f*ksThree.get(2)) /3; + } + else if (time.compareTo(date7) >= 0 && time.compareTo(date8) < 0){ + ks = (0.5f*ksThree.get(1) + 0.5f*ksThree.get(2)) /3; + } + else if (time.compareTo(date8) >= 0 && time.compareTo(date9) < 0){ + ks = (0.25f*ksThree.get(1) + 0.75f*ksThree.get(2)) /3; + } + else if (time.compareTo(date9) >= 0 && time.compareTo(date10) < 0){ + ks = ksThree.get(2) /3; + } + else if (time.compareTo(date10) >= 0 && time.compareTo(date11) < 0){ + ks = (0.75f*ksThree.get(2) + 0.25f*ksThree.get(1)) /3; + } + else if (time.compareTo(date11) >= 0 && time.compareTo(date12) < 0){ + ks = (0.5f*ksThree.get(2) + 0.5f*ksThree.get(1)) /3; + } + else if (time.compareTo(date12) >= 0 && time.compareTo(date13) < 0){ + ks = (0.25f*ksThree.get(2) + 0.75f*ksThree.get(1)) /3; + } + else if (time.compareTo(date13) >= 0 && time.compareTo(date14) < 0){ + ks = ksThree.get(1) /3; + } + else if (time.compareTo(date14) >= 0 && time.compareTo(date15) < 0){ + ks = (0.75f*ksThree.get(1) + 0.25f*ksThree.get(0)) /3; + } + else if (time.compareTo(date15) >= 0 && time.compareTo(date16) < 0){ + ks = (0.5f*ksThree.get(1) + 0.5f*ksThree.get(0)) /3; + } + else if (time.compareTo(date16) >= 0 && time.compareTo(date17) < 0){ + ks = (0.25f*ksThree.get(1) + 0.75f*ksThree.get(0)) /3; + } + else if (time.compareTo(date17) >= 0 && time.compareTo(date18) <= 0){ + ks = ksThree.get(0) /3; + } + else if (CalcUtil.isLeapYear(year)) { + if(time.compareTo(date2Leep) >= 0 && time.compareTo(date3Leep) < 0){ + ks = (0.75f*ksThree.get(0) + 0.25f*ksThree.get(1)) /3; + } + else if(time.compareTo(date3Leep) >= 0 && time.compareTo(date4) < 0){ + ks = (0.5f*ksThree.get(0) + 0.5f*ksThree.get(1)) /3; + } + } + else { + if(time.compareTo(date2) >= 0 && time.compareTo(date3) < 0){ + ks = (0.75f*ksThree.get(0) + 0.25f*ksThree.get(1)) /3; + } + else if(time.compareTo(date3) >= 0 && time.compareTo(date4) < 0){ + ks = (0.5f*ksThree.get(0) + 0.5f*ksThree.get(1)) /3; + } + } + + return ks; + } + +// protected float[] getKs(String station, float[] kest) { +// float a = 0; +// float b = 0; +// float[] ks = new float[8]; +// +// Map abCoeff = CalcUtil.getCoeffAandB(station); +// if (abCoeff.size() != 8) +// return ks; +// +// int i = 0; +// Iterator iter = abCoeff.entrySet().iterator(); +// while (iter.hasNext()) { +// @SuppressWarnings("unchecked") +// Map.Entry mEntry = (Map.Entry) iter.next(); +// +// a = mEntry.getKey(); +// b = mEntry.getValue(); +// ks[i] = a + b * kest[i]; +// i++; +// } +// +// return ks; +// } + + public static float getKs(String station, float kest, String timePrd) { + float a = 0; + float b = 0; + float ks = 0; + + Map abCoeff = CalcUtil.getCoeffAandB(station); + if (abCoeff.size() != 8) + return ks; + + int j = 0; + if (timePrd.equalsIgnoreCase("00-03")) + j = 0; + else if (timePrd.equalsIgnoreCase("03-06")) + j = 1; + else if (timePrd.equalsIgnoreCase("06-09")) + j = 2; + else if (timePrd.equalsIgnoreCase("09-12")) + j = 3; + else if (timePrd.equalsIgnoreCase("12-15")) + j = 4; + else if (timePrd.equalsIgnoreCase("15-18")) + j = 5; + else if (timePrd.equalsIgnoreCase("18-21")) + j = 6; + else if (timePrd.equalsIgnoreCase("21-24")) + j = 7; + + int i = 0; + Iterator iter = abCoeff.entrySet().iterator(); + while (iter.hasNext()) { + @SuppressWarnings("unchecked") + Map.Entry mEntry = (Map.Entry) iter.next(); + + if (i == j) { + a = mEntry.getKey(); + b = mEntry.getValue(); + ks = a + b * kest; + break; + } + i++; + } + return ks; + } + public static int getAest(String station, int kIndex) { + return CalcUtil.geta2k(kIndex); + } + + @SuppressWarnings("unchecked") + public static float[] getKpEst(String[] station, float[] ks ) { + float kpEst[] = new float[ks.length]; + float[][] wcoeff = new float[station.length][ks.length]; + + if (ks.length != 8) + return kpEst; + + for (int i = 0; i < station.length; i++) { + Map coeff = CalcUtil.getCoeffW(station[i]); + int j = 0; + + Iterator iter = coeff.entrySet().iterator(); + while (iter.hasNext()) { + wcoeff[i][j] = ((Map.Entry) iter.next()).getValue(); + j++; + } + } + + float sumW = 0; + float sumWK = 0; + + for (int j = 0; j < ks.length; j++) { + for (int i = 0; i < station.length; i++) { + sumW += wcoeff[i][j]; + sumWK += wcoeff[i][j] * ks[i]; + } + //kpEst[i] = (float) (Math.round(3 * sumWK / sumW)) / 3; + kpEst[j] = sumWK / sumW; + kpEst[j] = (int)kpEst[j] + CalcUtil.getThird(kpEst[j]); + } + + return kpEst; + } + @SuppressWarnings("unchecked") + public static float getKpEst(String[] station, float ks, String fitTime ) { + float kpEst = 0; + float[] wcoeff = new float[8]; + + for (int i = 0; i < station.length; i++) { + Map coeff = CalcUtil.getCoeffW(station[i]); + int j = 0; + Iterator iter = coeff.entrySet().iterator(); + while (iter.hasNext()) { + if (((Map.Entry) iter.next()).getKey().equalsIgnoreCase(fitTime)) { + wcoeff[i] = ((Map.Entry) iter.next()).getValue(); + break; + } + j++; + } + } + + float sumW = 0; + float sumWK = 0; + + + for (int i = 0; i < station.length; i++) { + sumW += wcoeff[i]; + sumWK += wcoeff[i] * ks; + } + + kpEst = sumWK / sumW; + kpEst = (int)kpEst + CalcUtil.getThird(kpEst); + + return kpEst; + } + + public static String[] getKp(float kpEst[], String[] kpModifier ) { + String[] kp = new String[kpEst.length]; + if (kpEst.length != kpModifier.length) + return kp; + + for (int i = 0; i < kpEst.length; i++) { + int k = Math.round(kpEst[i]); + kp[i] = k + kpModifier[i]; + } + + return kp; + } + + public static String getKp(float kpEst, String kpModifier ) { + int kp = Math.round(kpEst); + + return kp + kpModifier; + } +} + diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/calculation/CalcUtil.java b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/calculation/CalcUtil.java new file mode 100644 index 0000000000..a9fa8e957e --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/calculation/CalcUtil.java @@ -0,0 +1,715 @@ +package gov.noaa.nws.ncep.edex.plugin.geomag.calculation; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import gov.noaa.nws.ncep.common.dataplugin.geomag.table.KFitTime; +import gov.noaa.nws.ncep.common.dataplugin.geomag.table.KsThree; +import gov.noaa.nws.ncep.common.dataplugin.geomag.util.KStationCoefficientLookup; + +/* + * The k index and decoder calculation utility. + * + * 
+ * SOFTWARE HISTORY
+ *                   
+ * ate          Ticket#     Engineer   Description
+ * -----------  ----------  ---------- --------------------------
+ * 05/14/2013   #989        qzhou      Initial Creation
+ *
+ * + * @author qzhou + * @version 1 + */ + +public class CalcUtil { + private static final float MISSING_VAL = 99999.99f; + private static final float K_EXPONENT = 3.3f; + private static KStationCoefficientLookup stationCoeff = KStationCoefficientLookup.getInstance(); + +// public static enum Stations { BOU,FRD,FRN,NEW,SIT,HAD,CL2,CNB,OTT,MEA,NGK,WNG} +// BOU(500, 254.76f), +// CL2(500, 2.261f), +// CNB(450, 149.36f), +// FRD(500, 282.63f), +// FRN(350, 240.28f), +// HAD(500, 355.517f), +// NEW(700, 242.88f), +// SIT(1000, 224.67f), +// CMO(2500, 212.14f); +// +// private final int k9Limit; +// private final float longitude; +// private Stations (int k9Limit, float longitude) { +// this.k9Limit = k9Limit; +// this.longitude = longitude; +// } +// } + + // Gamma limit table + private static enum Limit { + K0(0), + K1(5), + K2(10), + K3(20), + K4(40), + K5(70), + K6(120), + K7(200), + K8(330), + K9(500); + + private final int kConst; + private Limit (int kConst) { + this.kConst = kConst; + } + } + +// public static String getStations() { +// return Stations; +// } + + public static int getKConst(int k) { + int kConst = 0; + if (k == 0) + kConst = Limit.K0.kConst; + else if (k == 1) + kConst = Limit.K1.kConst; + else if (k == 2) + kConst = Limit.K2.kConst; + else if (k == 3) + kConst = Limit.K3.kConst; + else if (k == 4) + kConst = Limit.K4.kConst; + else if (k == 5) + kConst = Limit.K5.kConst; + else if (k == 6) + kConst = Limit.K6.kConst; + else if (k == 7) + kConst = Limit.K7.kConst; + else if (k == 8) + kConst = Limit.K8.kConst; + else if (k == 9) + kConst = Limit.K9.kConst; + + return kConst; + } + + // A-index table + private static enum K2a { + a0(0), + a1(3), + a2(7), + a3(15), + a4(27), + a5(48), + a6(80), + a7(140), + a8(240), + a9(400); + + private final int a; + private K2a (int a) { + this.a = a; + } + } + + public static int geta2k(int k) { + int a = 0; + if (k == 0) + a = K2a.a0.a; + else if (k == 1) + a = K2a.a1.a; + else if (k == 2) + a = K2a.a2.a; + else if (k == 3) + a = K2a.a3.a; + else if (k == 4) + a = K2a.a4.a; + else if (k == 5) + a = K2a.a5.a; + else if (k == 6) + a = K2a.a6.a; + else if (k == 7) + a = K2a.a7.a; + else if (k == 8) + a = K2a.a8.a; + else if (k == 9) + a = K2a.a9.a; + + return a; + } + + public static KStationCoefficientLookup getStationCoeff() { + return stationCoeff; + } + + public static int getK9Limit(String station) throws NumberFormatException { + int k9 = 0; + + String k9Limit = getStationCoeff().getStationByCode(station).getK9Limit(); + k9 = Integer.parseInt(k9Limit); + + return k9; + } + + public static float getLongitude(String station) throws NumberFormatException { + float lon = 0; + if (station != null && !station.equalsIgnoreCase("")) { + String longitude = getStationCoeff().getStationByCode(station).getLongitude(); + lon = Float.parseFloat(longitude); + } + return lon; + } + + + /* + * map of the A and the B values in the order of 00-03, 03-06... + */ + public static Map getCoeffAandB(String station) { + Map abCoeff = new HashMap(); + + List fitTime = getStationCoeff().getStationByCode(station).getKFitTime(); + if (fitTime.size() != 8) + return abCoeff; + + for (int i = 0; i < 8; i++) { + float a = fitTime.get(i).getCoeffA(); + float b = fitTime.get(i).getCoeffB(); + abCoeff.put(a, b); + } +// KStationCoefficientLookup look = KStationCoefficientLookup.getInstance(); +// Map stationMap = look.getStationsByCodeMap(); +// int size = 1+31; +// stations = new ArrayList();//String[]: station, uri0, ...uri31 +// for (Map.Entry entry : stationMap.entrySet()) { +// List astation = new ArrayList(); +// astation.add( entry.getKey()); +// stations.add(astation); +//// System.out.println("***entry "+ entry.getKey()); +// } + return abCoeff; + } + + /* + * map of the time period and the W values in the order of 00-03, 03-06... + */ + public static Map getCoeffW(String station) { + Map wCoeff = new HashMap(); + + List fitTime = getStationCoeff().getStationByCode(station).getKFitTime(); + if (fitTime.size() != 8) + return wCoeff; + + for (int i = 0; i < 8; i++) { + String a = fitTime.get(i).getKey(); + float b = fitTime.get(i).getCoeffW(); + wCoeff.put(a, b); + } + + return wCoeff; + } + +// public static int getK9Limit(String station) { +// int k9Limit = 0; +// if (station.equalsIgnoreCase(Stations.BOU.toString())) +// k9Limit = Stations.BOU.k9Limit; +// else if (station.equalsIgnoreCase(Stations.CL2.toString())) +// k9Limit = Stations.CL2.k9Limit; +// else if (station.equalsIgnoreCase(Stations.CNB.toString())) +// k9Limit = Stations.CNB.k9Limit; +// else if (station.equalsIgnoreCase(Stations.FRD.toString())) +// k9Limit = Stations.FRD.k9Limit; +// else if (station.equalsIgnoreCase(Stations.FRN.toString())) +// k9Limit = Stations.FRN.k9Limit; +// else if (station.equalsIgnoreCase(Stations.HAD.toString())) +// k9Limit = Stations.HAD.k9Limit; +// else if (station.equalsIgnoreCase(Stations.NEW.toString())) +// k9Limit = Stations.NEW.k9Limit; +// else if (station.equalsIgnoreCase(Stations.SIT.toString())) +// k9Limit = Stations.SIT.k9Limit; +// else if (station.equalsIgnoreCase(Stations.CMO.toString())) +// k9Limit = Stations.CMO.k9Limit; +// +// return k9Limit; +// } +// +// public static float getLongitude(String station) { +// float longitude = 0; +// if (station.equalsIgnoreCase(Stations.BOU.toString())) +// longitude = Stations.BOU.longitude; +// else if (station.equalsIgnoreCase(Stations.CL2.toString())) +// longitude = Stations.CL2.longitude; +// else if (station.equalsIgnoreCase(Stations.CNB.toString())) +// longitude = Stations.CNB.longitude; +// else if (station.equalsIgnoreCase(Stations.FRD.toString())) +// longitude = Stations.FRD.longitude; +// else if (station.equalsIgnoreCase(Stations.FRN.toString())) +// longitude = Stations.FRN.longitude; +// else if (station.equalsIgnoreCase(Stations.HAD.toString())) +// longitude = Stations.HAD.longitude; +// else if (station.equalsIgnoreCase(Stations.NEW.toString())) +// longitude = Stations.NEW.longitude; +// else if (station.equalsIgnoreCase(Stations.SIT.toString())) +// longitude = Stations.SIT.longitude; +// else if (station.equalsIgnoreCase(Stations.CMO.toString())) +// longitude = Stations.CMO.longitude; +// +// return longitude; +// } + + public static int[] getKLimit(String station) { + int[] kLimit = new int[10]; + int k9Limit = getK9Limit(station); + for (int i = 0; i < kLimit.length; i++) { + kLimit[i] = Math.round( k9Limit * getKConst(i) /500); + } + return kLimit; + } + +// public static int[] getAIndex(String station, float[] k-index) { +// int[] aIndex = new int[10]; +// //int k9Limit = getK9Limit(station); +// for (int i = 0; i < kLimit.length; i++) { +// aIndex[i] = Math.round( getK2a(i)); +// } +// return aIndex; +// } + + public static int getKfromTable(int[] kLimit, float gamma) { + int kIndex; + //int[] kLimit = getKLimit(station); + + int i = 0; + for ( i = 0; i < 10; i++) { + if (gamma > kLimit[i]) + continue; + else + break; + } + + //take the lower of i + if (i > 0) + i = i-1; + + if (i <= 9) + kIndex = i; + else + kIndex = 9; + + return kIndex; + } + + public static int getGammaFromK(String station, int kIndex) { + int gamma = getK9Limit(station) * getKConst(kIndex) / 500; + + return gamma; + } +// // assume db time format yyyy-mm-dd hh:mm:ss +// public static int getYear(String time) { +// int year = 0; +// +// String t = time.substring(0, 4); +// try { +// year = Integer.parseInt(t); +// } catch (NumberFormatException e) { +// e.printStackTrace(); +// } +// +// return year; +// } +// +// public static int getMonth(String time) { +// int month = 0; +// +// String t = time.substring(5, 7); +// try { +// month = Integer.parseInt(t); +// } catch (NumberFormatException e) { +// e.printStackTrace(); +// } +// return month; +// } +// +// public static int getDay(String time) { +// int day = 0; +// +// String t = time.substring(8, 10); +// try { +// day = Integer.parseInt(t); +// } catch (NumberFormatException e) { +// e.printStackTrace(); +// } +// return day; +// } +// +// public static int getHour(String time) { +// int hr = 0; +// +// String t = time.substring(11, 13); +// try { +// hr = Integer.parseInt(t); +// } catch (NumberFormatException e) { +// e.printStackTrace(); +// } +// return hr; +// } +// +// public static int getMin(String time) { +// int min = 0; +// +// String t = time.substring(14, 16); +// try { +// min = Integer.parseInt(t); +// } catch (NumberFormatException e) { +// e.printStackTrace(); +// } +// return min; +// } +// +// public static int getSecond(String time) { +// int ss = 0; +// +// String t = time.substring(17); +// try { +// ss = Integer.parseInt(t); +// } catch (NumberFormatException e) { +// e.printStackTrace(); +// } +// return ss; +// } + + // assume db time format yyyy-mm-dd hh:mm:ss + public static Date getSPTime(Date currTime ){ + Date spTime = currTime; + + int hour = currTime.getHours(); + + if (hour >= 0 && hour < 3) + hour = 0; + else if (hour >= 3 && hour < 6) + hour = 3; + else if (hour >= 6 && hour < 9) + hour = 6; + else if (hour >= 9 && hour < 12) + hour = 9; + else if (hour >= 12 && hour < 15) + hour = 12; + else if (hour >= 15 && hour < 18) + hour = 15; + else if (hour >= 18 && hour < 21) + hour = 18; + else if (hour >= 21 && hour < 24) + hour = 21; + + spTime.setHours(hour); + spTime.setMinutes(0); + spTime.setSeconds(0); +// spTime = String.valueOf(currTime.getYear()) + "-" + +// String.valueOf(currTime.getMonth()) + "-" + +// String.valueOf(currTime.getDay()) + " " + +// hour + ":" + "00:00.0"; + + return spTime; + } + public static Date getEPTime(Date currTime ){ + Date epTime = (Date)currTime.clone(); + + int hour = currTime.getHours(); + if (hour >= 0 && hour < 3) + hour = 3; + else if (hour >= 3 && hour < 6) + hour = 6; + else if (hour >= 6 && hour < 9) + hour = 9; + else if (hour >= 9 && hour < 12) + hour = 12; + else if (hour >= 12 && hour < 15) + hour = 15; + else if (hour >= 15 && hour < 18) + hour = 18; + else if (hour >= 18 && hour < 21) + hour = 21; + else if (hour >= 21 && hour < 24) + hour = 0; + + if (hour != 0) + epTime.setHours(hour); + else { + int day = currTime.getDate() +1; + epTime.setDate(day); + epTime.setHours(hour); + } + + epTime.setMinutes(0); + epTime.setSeconds(0); + + return epTime; + } + public static boolean isHalfMissing(float[] items) { + boolean halfMissaing = false; + + int i = 0; + for (i = 0; i < items.length; i++) { + if (items[i] == MISSING_VAL) + i++; + } + if (i > items.length/2) + halfMissaing = true; + + return halfMissaing; + } + + public static float getThird(float kpEst) { + float half = 0.333333f/2; + float x = kpEst - (int) kpEst; //get decimal fraction + + if (x >= 0 && x <= half) + x = 0; + else if (x >= half && x <= 2*half) + x = 0.333333f; + else if (x >= 2*half && x <= 3*half) + x = 0.333333f; + else if (x >= 3*half && x <= 4*half) + x = 0.666666f; + else if (x >= 4*half && x <= 5*half) + x = 0.666666f; + else if (x >= 5*half && x <= 6*half) + x = 1; + + return x; + } + + public static float maxValue(float[] dev) { + float max = -99999; + for (int i = 0; i < dev.length; i++) { + if (dev[i] > max && dev[i] < MISSING_VAL) { + max = dev[i]; + } + } + return max; + } + + public static float minValue(float[] dev) { + float min = 99999; + for (int i = 0; i < dev.length; i++) { + if (dev[i] < min && dev[i] > -MISSING_VAL) { + min = dev[i]; + } + } + return min; + } + + /* + * 10 element floating point array + */ + public static float[] geKLength() { + float[] kLength = new float[10]; + + kLength[0] = 0; + for (int i = 1; i < 10; i++) { + kLength[i] = (float) Math.exp( K_EXPONENT * Math.log(i)); + if (kLength[i] > 1080) + kLength[i] = 1080; + } + + return kLength; + } + + // uri: /geomag/2013-05-20_00:00:00.0/HAD/101/GEOMAG + public static String getSourceFromUri(String uri) { + if (uri != null && uri.length() >= 37) + return uri.substring(34, 37); + else + return ""; + } + + public static String getStationFromUri(String uri) { + if (uri != null && uri.length() >= 37) + return uri.substring(30, 33); + else + return ""; + } + + public static Date getTimeFromUri(String uri) throws ParseException { + String format = "yyyy-MM-dd'_'HH:mm:ss.s"; + SimpleDateFormat sdf = new SimpleDateFormat(format); + + if (uri != null && uri.length() >= 37) { + String time = uri.substring(8, 29); + Date date = sdf.parse(time); + return date; + } + else + return new Date(); + } + + // get the front part before the source in the uri + public static String separateSourceFrontUri(String uri) { + if (uri != null && uri.length() >= 37) + return uri.substring(0, 34); + else + return ""; + } + + public static float[] toFloatArray(List list) { + float[] ret = new float[list.size()]; + int i = 0; + for (Float e : list) + ret[i++] = e.floatValue(); + return ret; + } + public static int[] toIntArray(List list) { + int[] ret = new int[list.size()]; + int i = 0; + for (Integer e : list) + ret[i++] = e.intValue(); + return ret; + } + + public static boolean isLeapYear(int year) { + boolean isLeap; + + if (year/400 ==0) + isLeap = true; + else if (year/100 == 0) + isLeap = false; + else if (year/4 == 0) + isLeap = true; + else + isLeap = false; + + return isLeap; + } + +// public static String getMonthDayFromNumber(int year, int number) { //CL22013041.min +// String temp = ""; +// String month = ""; +// String day = ""; +// String monthDay = ""; +// Boolean isLeapYear = isLeapYear( year); +// int[] days = {31,28,31,30,31,30,31,31,30,31,30,31}; +// int[] leapDays = {31,29,31,30,31,30,31,31,30,31,30,31}; +// Calendar cal = Calendar.getInstance(); +// cal.get(Calendar.DAY_OF_MONTH); +// cal.get(Calendar.MONTH); +// cal.get(Calendar.DAY_OF_YEAR); +// cal.set(Calendar.DAY_OF_YEAR, number); +// int[] num = +// if (isLeapYear) { +// +// } +// else { +// +// } +// if (number<=31){ //JEJ, m130212.txt +// month = "01"; +// day = String.valueOf(number); +// } +// else if (number > 31 && number <= 59){ +// month = "02"; +// day = String.valueOf(number-31); +// } +// else if (number > 31 && number <= 59){ +// month = "03"; +// day = String.valueOf(number-31); +// } +// else if (fileName.startsWith("ha")){ CNB,NGK, WNG +// temp = fileName.substring(3, 10); +// year = temp.substring(0, 4); +// } +// +// return monthDay; +// } + + public static String getTimeFromFileName(String fileName) { //CL22013041.min + String time = ""; + String temp = ""; + String year = ""; + String month = ""; + String day = ""; + String num = ""; + + Calendar cal = Calendar.getInstance(); + + if (fileName.startsWith("m")){ //JEJ, m130212.txt + temp = fileName.substring(1, 7); + year = "20"+temp.substring(4, 6); + month = temp.substring(2, 4); + day = temp.substring(0, 2); + } + else if (fileName.startsWith("ha")){ + temp = fileName.substring(2, 9); + year = temp.substring(3, 7); + num = temp.substring(0, 3); + try { + cal.set(Calendar.DAY_OF_YEAR, Integer.parseInt(num)); + } catch (NumberFormatException e) { + + } + month = String.valueOf(cal.get(Calendar.MONTH)); + day = String.valueOf(cal.get(Calendar.DAY_OF_MONTH)); + } + else if (fileName.startsWith("BOU") || fileName.startsWith("CL2") || fileName.startsWith("CMO") + || fileName.startsWith("OTT") || fileName.startsWith("MEA")) { + temp = fileName.substring(3, 10); + year = temp.substring(0, 4); + num = temp.substring(4, 7); + + try { + cal.set(Calendar.DAY_OF_YEAR, Integer.parseInt(num)); + } catch (NumberFormatException e) { + + } + month = String.valueOf(cal.get(Calendar.MONTH) +1); + day = String.valueOf(cal.get(Calendar.DAY_OF_MONTH)); + } + else if (fileName.startsWith("ha") || fileName.startsWith("CNB") + || fileName.startsWith("OTT") || fileName.startsWith("WNG")) { + temp = fileName.substring(3, 10); + year = temp.substring(0, 4); + month = temp.substring(4, 6); + day = temp.substring(6, 8); + } + + if (month.length() == 1) + month = "0"+ month; + if (day.length() == 1) + day = "0" + day; + time = year + "-" + month + "-" + day; + return time; + } + + public static float getMedian(float[] array) { + float median = 0; + if (array.length <= 1) + return array[0]; + + float[] arraySort = array.clone(); + Arrays.sort(arraySort); + + // remove missing data + List newArray = new ArrayList(); + for ( int k = 0; k < arraySort.length-1; k++ ) + if (arraySort[k] != MISSING_VAL) + newArray.add(arraySort[k]); + else + break; //to sorted arraySort + + int size = newArray.size(); + if (size/2 == 0) + median = (newArray.get(size/2) + newArray.get(size/2 -1) ) / 2; + else + median = newArray.get((size-1)/2); + + return median; + } +} + diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/utility/common_static/base/ncep/geomag/geoMagStations.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/utility/common_static/base/ncep/geomag/geoMagStations.xml index a9f4bab8c1..8716bf9fcc 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/utility/common_static/base/ncep/geomag/geoMagStations.xml +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/utility/common_static/base/ncep/geomag/geoMagStations.xml @@ -5,11 +5,11 @@ USGS true true - direct - magworm - domsat + + + HDZF - + ^(\w{3})\s*(\d{4})\s*(\d{3})\s*(\d{2}-\w{3}-\d{2})\s*(\w{4})\s*(-?\d+\.\d+\w*)\s*(\w*?\d+\.\d+)\s*(\w*)\s*(\w*)$ @@ -38,11 +38,11 @@ USGS true true - direct - magworm - domsat + + + HDZF - + ^(\w{3})\s*(\d{4})\s*(\d{3})\s*(\d{2}-\w{3}-\d{2})\s*(\w{4})\s*(-?\d+\.\d+\w*)\s*(\w*?\d+\.\d+)\s*(\w*)\s*(\w*)$ @@ -71,11 +71,11 @@ USGS true true - direct - magworm - domsat + + + HDZF - + ^(\w{3})\s*(\d{4})\s*(\d{3})\s*(\d{2}-\w{3}-\d{2})\s*(\w{4})\s*(-?\d+\.\d+\w*)\s*(\w*?\d+\.\d+)\s*(\w*)\s*(\w*)$ @@ -104,11 +104,44 @@ USGS true true - direct - magworm - domsat + + + HDZF - + + + + ^(\w{3})\s*(\d{4})\s*(\d{3})\s*(\d{2}-\w{3}-\d{2})\s*(\w{4})\s*(-?\d+\.\d+\w*)\s*(\w*?\d+\.\d+)\s*(\w*)\s*(\w*)$ + + + + + + + + + + + + ^(\d{4})\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*)$ + + + + + + + + + + FRD + USGS + true + true + + + + HDZF + ^(\w{3})\s*(\d{4})\s*(\d{3})\s*(\d{2}-\w{3}-\d{2})\s*(\w{4})\s*(-?\d+\.\d+\w*)\s*(\w*?\d+\.\d+)\s*(\w*)\s*(\w*)$ @@ -131,17 +164,116 @@ - + - FRD + MEA USGS true - true - direct - magworm - domsat + true + + + HDZF - + + + + ^(\w{3})\s*(\d{4})\s*(\d{3})\s*(\d{2}-\w{3}-\d{2})\s*(\w{4})\s*(-?\d+\.\d+\w*)\s*(\w*?\d+\.\d+)\s*(\w*)\s*(\w*)$ + + + + + + + + + + + + ^(\d{4})\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*)$ + + + + + + + + + + OTT + USGS + true + true + + + + HDZF + + + + ^(\w{3})\s*(\d{4})\s*(\d{3})\s*(\d{2}-\w{3}-\d{2})\s*(\w{4})\s*(-?\d+\.\d+\w*)\s*(\w*?\d+\.\d+)\s*(\w*)\s*(\w*)$ + + + + + + + + + + + + ^(\d{4})\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*)$ + + + + + + + + + + HAD + USGS + true + true + + + + HDZF + + + + ^(\w{3})\s*(\d{4})\s*(\d{3})\s*(\d{2}-\w{3}-\d{2})\s*(\w{4})\s*(-?\d+\.\d+\w*)\s*(\w*?\d+\.\d+)\s*(\w*)\s*(\w*)$ + + + + + + + + + + + + ^(\d{4})\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*)$ + + + + + + + + + + CL2 + USGS + true + true + + + + HDZF + ^(\w{3})\s*(\d{4})\s*(\d{3})\s*(\d{2}-\w{3}-\d{2})\s*(\w{4})\s*(-?\d+\.\d+\w*)\s*(\w*?\d+\.\d+)\s*(\w*)\s*(\w*)$ @@ -170,9 +302,9 @@ BGS true true - direct + HDZF - + ^(\d{4})\s*(\d{3})\s(\d{2})\s*(\d{2})\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*) @@ -191,9 +323,9 @@ GA true true - direct + XYZF - + ^(\d{4}-\d{2}-\d{2})\s*(\d{2}:\d{2}:\d{2}\.\d{3})\s*(\d{3})\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*) @@ -212,9 +344,9 @@ GFZ true true - direct + XYZF - + ^(\d{4}-\d{2}-\d{2})\s*(\d{2}:\d{2}:\d{2}\.\d{3})\s*(\d{3})\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*) @@ -233,9 +365,9 @@ GFZ true true - direct + XYZF - + ^(\d{4}-\d{2}-\d{2})\s*(\d{2}:\d{2}:\d{2}\.\d{3})\s*(\d{3})\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*)\s*(-?\d+\.?\d*) @@ -254,9 +386,11 @@ IPGP true true - magworm + + + XYZF - + ^(\w{3})\s*(\d{4})\s*(\d{3})\s*(\d{2}-\w{3}-\d{2})\s*(\w{4})\s*(-?\d+\.\d+\w*)\s*(\w*?\d+\.\d+)\s*(\w*)\s*(\w*)$ @@ -285,10 +419,10 @@ NRCAN true true - direct - domsat + + XYZF - + ^(\w{3}),\s*(\d{4}-\d{2}-\d{2})\s*(\d{2}:\d{2}:\d{2}),\s*(-?\d+\.?\d*),\s*(-?\d+\.?\d*),\s*(-?\d+\.?\d*),\s*(-?\d+\.?\d*) @@ -307,10 +441,10 @@ NRCAN true true - direct - domsat + + XYZF - + ^(\w{3}),\s*(\d{4}-\d{2}-\d{2})\s*(\d{2}:\d{2}:\d{2}),\s*(-?\d+\.?\d*),\s*(-?\d+\.?\d*),\s*(-?\d+\.?\d*),\s*(-?\d+\.?\d*) @@ -329,9 +463,9 @@ KOREA false false - direct + XYZF - + ^(\d{2}/\d{2}/\d{2})\s*(\d{2}:\d{2}:\d{2}),\s*(-?\d+\.?\d*),\s*(-?\d+\.?\d*),\s*(-?\d+\.?\d*),\s*(-?\d+\.?\d*),\s*(-?\d+\.?\d*),\s*(-?\d+\.?\d*),\s*(-?\d+\.?\d*),\s*(-?\d+\.?\d*),\s*(-?\d+\.?\d*),\s*(-?\d+\.?\d*),\s*(-?\d+\.?\d*),\s*(-?\d+\.?\d*),\s*(\w*),\s*(\+?\-?\d*),\s*(\d*) diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/utility/common_static/base/ncep/geomag/kStandardLookup.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/utility/common_static/base/ncep/geomag/kStandardLookup.xml new file mode 100644 index 0000000000..7186b3e1d1 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/utility/common_static/base/ncep/geomag/kStandardLookup.xml @@ -0,0 +1,375 @@ + + + + BOU + USGS + 500 + 254.76 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + FRD + USGS + 500 + 282.63 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + FRN + USGS + 350 + 240.28 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + NEW + USGS + 700 + 242.88 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + SIT + USGS + 1000 + 224.67 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + HAD + BGS + 500 + 355.517 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + CL2 + IPGP + 500 + 2.261 + false + + + + + + + + + + + + + + + + + + + + + + + + + + + CNB + GA + 450 + 149.36 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + OTT + NRCAN + 750 + 284.448 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + MEA + NRCAN + 1500 + 246.653 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + NGK + GFZ + 500 + 12.675 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + WNG + GFZ + 500 + 9.073 + true + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/utility/common_static/base/ncep/geomag/kStationCoefficients.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/utility/common_static/base/ncep/geomag/kStationCoefficients.xml new file mode 100644 index 0000000000..acae1780c1 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/utility/common_static/base/ncep/geomag/kStationCoefficients.xml @@ -0,0 +1,171 @@ + + + + BOU + USGS + 500 + 254.76 + + + + + + + + + + + FRD + USGS + 500 + 282.63 + + + + + + + + + + + FRN + USGS + 350 + 240.28 + + + + + + + + + + + NEW + USGS + 700 + 242.88 + + + + + + + + + + + SIT + USGS + 1000 + 224.67 + + + + + + + + + + + HAD + BGS + 500 + 355.517 + + + + + + + + + + + CL2 + IPGP + 500 + 2.261 + + + + + + + + + + + CNB + GA + 450 + 149.36 + + + + + + + + + + + OTT + NRCAN + 750 + 284.448 + + + + + + + + + + + MEA + NRCAN + 1500 + 246.653 + + + + + + + + + + + NGK + GFZ + 500 + 12.675 + + + + + + + + + + + WNG + GFZ + 500 + 9.073 + + + + + + + + + + \ No newline at end of file diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/utility/common_static/base/purge/geomagPurgeRules.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/utility/common_static/base/purge/geomagPurgeRules.xml index 71320c1422..84a7463d77 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/utility/common_static/base/purge/geomagPurgeRules.xml +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/utility/common_static/base/purge/geomagPurgeRules.xml @@ -1,6 +1,6 @@ - 30-00:00:00 + diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.svrl/.classpath b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/.classpath similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.rsc.svrl/.classpath rename to ncep/gov.noaa.nws.ncep.edex.plugin.gpd/.classpath diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.warn/.project b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/.project similarity index 92% rename from ncep/gov.noaa.nws.ncep.viz.rsc.warn/.project rename to ncep/gov.noaa.nws.ncep.edex.plugin.gpd/.project index 8e31007069..a7e2778728 100644 --- a/ncep/gov.noaa.nws.ncep.viz.rsc.warn/.project +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/.project @@ -1,6 +1,6 @@ - gov.noaa.nws.ncep.viz.rsc.warn + gov.noaa.nws.ncep.edex.plugin.gpd diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.svrl/.settings/org.eclipse.jdt.core.prefs b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/.settings/org.eclipse.jdt.core.prefs similarity index 75% rename from ncep/gov.noaa.nws.ncep.viz.rsc.svrl/.settings/org.eclipse.jdt.core.prefs rename to ncep/gov.noaa.nws.ncep.edex.plugin.gpd/.settings/org.eclipse.jdt.core.prefs index 67e7f5f44e..11d2e89e91 100644 --- a/ncep/gov.noaa.nws.ncep.viz.rsc.svrl/.settings/org.eclipse.jdt.core.prefs +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,6 @@ -#Thu May 27 14:43:50 EDT 2010 +#Fri Apr 05 14:55:42 EDT 2013 eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..1b1e1a259b --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/META-INF/MANIFEST.MF @@ -0,0 +1,20 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Pgd +Bundle-SymbolicName: gov.noaa.nws.ncep.edex.plugin.gpd +Bundle-Version: 1.0.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Import-Package: com.raytheon.edex.exception, + com.raytheon.edex.plugin, + com.raytheon.uf.common.dataplugin, + com.raytheon.uf.common.dataplugin.obs.metar, + com.raytheon.uf.common.parameter, + com.raytheon.uf.common.pointdata, + com.raytheon.uf.common.serialization.comm, + javax.measure.unit +Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174", + gov.noaa.nws.ncep.common.dataplugin.gpd;bundle-version="1.0.0", + com.raytheon.uf.common.dataplugin.level;bundle-version="1.12.1174", + com.raytheon.uf.common.pointdata;bundle-version="1.12.1174", + com.raytheon.uf.edex.pointdata;bundle-version="1.12.1174", + com.raytheon.edex.ingestsrv;bundle-version="1.12.1174" diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.ffa/build.properties b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/build.properties similarity index 57% rename from ncep/gov.noaa.nws.ncep.viz.rsc.ffa/build.properties rename to ncep/gov.noaa.nws.ncep.edex.plugin.gpd/build.properties index 6e2f847b66..5791d48d5f 100644 --- a/ncep/gov.noaa.nws.ncep.viz.rsc.ffa/build.properties +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/build.properties @@ -2,5 +2,4 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ .,\ - plugin.xml,\ - localization/ + res/ diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/component-deploy.xml new file mode 100644 index 0000000000..9739ac30ef --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/component-deploy.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.svrl/gov.noaa.nws.ncep.viz.rsc.svrl.ecl b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/gov.noaa.nws.ncep.edex.plugin.gpd.ecl similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.rsc.svrl/gov.noaa.nws.ncep.viz.rsc.svrl.ecl rename to ncep/gov.noaa.nws.ncep.edex.plugin.gpd/gov.noaa.nws.ncep.edex.plugin.gpd.ecl diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProduct.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProduct.xml new file mode 100644 index 0000000000..2d93631bcb --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProduct.xml @@ -0,0 +1,252 @@ + + + 2013-05-06T17:02:06.065Z + + + + TEMP0 + temperature 0 + K + + + TEMP1 + temperature 1 + K + + + TEMP2 + temperature 2 + K + + + TEMP3 + temperature 3 + K + + + TEMP4 + temperature 4 + K + + + TEMP5 + temperature 5 + K + + + TEMP6 + temperature 6 + K + + + TEMP7 + temperature 7 + K + + + TEMP8 + temperature 8 + K + + + TEMP9 + temperature 9 + K + + + + + POINT (-100 100) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + POINT (-100 100) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + POINT (-100 100) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProduct.xsd b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProduct.xsd new file mode 100644 index 0000000000..97e63d091f --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProduct.xsd @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProductChin.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProductChin.xml new file mode 100644 index 0000000000..c3ada6eb40 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProductChin.xml @@ -0,0 +1,252 @@ + + + 2013-05-06T17:02:06.065Z + + + + WINDSP0 + wind speed 0 + Knot + + + WINDSP1 + wind speed 1 + Knot + + + WINDSP2 + wind speed 2 + Knot + + + WINDSP3 + wind speed 3 + Knot + + + WINDSP4 + wind speed 4 + Knot + + + WINDSP5 + wind speed 5 + Knot + + + WINDSP6 + wind speed 6 + Knot + + + WINDSP7 + wind speed 7 + Knot + + + WINDSP8 + wind speed 8 + Knot + + + WINDSP9 + wind speed 9 + Knot + + + + + POINT (-90 90) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + POINT (-10 10) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + POINT (-100 100) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProductInfo.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProductInfo.xml new file mode 100644 index 0000000000..05343b8a25 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProductInfo.xml @@ -0,0 +1,57 @@ + + + 2013-05-06T17:02:06.065Z + + + + TEMP0 + temperature 0 + K + + + TEMP1 + temperature 1 + K + + + TEMP2 + temperature 2 + K + + + TEMP3 + temperature 3 + K + + + TEMP4 + temperature 4 + K + + + TEMP5 + temperature 5 + K + + + TEMP6 + temperature 6 + K + + + TEMP7 + temperature 7 + K + + + TEMP8 + temperature 8 + K + + + TEMP9 + temperature 9 + K + + + diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProductOld1.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProductOld1.xml new file mode 100644 index 0000000000..c018ade4df --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProductOld1.xml @@ -0,0 +1,246 @@ + + + 2013-04-24T12:04:33.274Z + + + + TEMP0 + temperature 0 + K + + + TEMP1 + temperature 1 + K + + + TEMP2 + temperature 2 + K + + + TEMP3 + temperature 3 + K + + + TEMP4 + temperature 4 + K + + + TEMP5 + temperature 5 + K + + + TEMP6 + temperature 6 + K + + + TEMP7 + temperature 7 + K + + + TEMP8 + temperature 8 + K + + + TEMP9 + temperature 9 + K + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProductOld1.xsd b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProductOld1.xsd new file mode 100644 index 0000000000..c5d42a689f --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProductOld1.xsd @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProductShip.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProductShip.xml new file mode 100644 index 0000000000..faed1ff64e --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpdProductShip.xml @@ -0,0 +1,252 @@ + + + 2013-05-30T17:00:00.000Z + + + + WINDSP0 + wind speed 0 + Knot + + + WINDSP1 + wind speed 1 + Knot + + + WINDSP2 + wind speed 2 + Knot + + + WINDSP3 + wind speed 3 + Knot + + + WINDSP4 + wind speed 4 + Knot + + + WINDSP5 + wind speed 5 + Knot + + + WINDSP6 + wind speed 6 + Knot + + + WINDSP7 + wind speed 7 + Knot + + + WINDSP8 + wind speed 8 + Knot + + + WINDSP9 + wind speed 9 + Knot + + + + + POINT (-90 90) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + POINT (-90 90) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + POINT (-90 90) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpddb.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpddb.xml new file mode 100644 index 0000000000..d50216326c --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/pointdata/gpddb.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-common.xml new file mode 100644 index 0000000000..aabd160479 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-common.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + com.raytheon.uf.common.dataplugin.level + com.raytheon.uf.common.parameter + com.raytheon.uf.common.pointdata + + + + + + + + + + + + \ No newline at end of file diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml new file mode 100644 index 0000000000..7d14442b1c --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + gpd + + + + + + + + + gpd + + + + + + + + + java.lang.Throwable + + + + + + + + + \ No newline at end of file diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-request.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-request.xml new file mode 100644 index 0000000000..3c74e5713e --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-request.xml @@ -0,0 +1,17 @@ + + + + + + + + + + \ No newline at end of file diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/src/gov/noaa/nws/ncep/edex/plugin/gpd/decoder/GenericPointDataDecoder.java b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/src/gov/noaa/nws/ncep/edex/plugin/gpd/decoder/GenericPointDataDecoder.java new file mode 100644 index 0000000000..0f5af606f4 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/src/gov/noaa/nws/ncep/edex/plugin/gpd/decoder/GenericPointDataDecoder.java @@ -0,0 +1,1562 @@ +/** + * + * + * This code has been developed by the NCEP-SIB for use in the AWIPS2 system. + * + * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    	Engineer    Description
+ * -------		------- 	-------- 	-----------
+ * 05/30/2013				Chin J. Chen	Initial coding
+ *
+ *
+ * + * @author Chin J. Chen + * @version 1.0 + */ +package gov.noaa.nws.ncep.edex.plugin.gpd.decoder; + +import gov.noaa.nws.ncep.common.dataplugin.gpd.GenericPointDataConstants; +import gov.noaa.nws.ncep.common.dataplugin.gpd.GenericPointDataRecord; +import gov.noaa.nws.ncep.common.dataplugin.gpd.dao.GenericPointDataDao; +import gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataLevel; +import gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataParameter; +import gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataProductContainer; +import gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataProductInfo; +import gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataStationProduct; + +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStream; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.SchemaOutputResolver; +import javax.xml.bind.Unmarshaller; +import javax.xml.transform.Result; +import javax.xml.transform.stream.StreamResult; + +import com.raytheon.edex.exception.DecoderException; +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.parameter.Parameter; +import com.raytheon.uf.common.pointdata.Dimension; +import com.raytheon.uf.common.pointdata.ParameterDescription; +import com.raytheon.uf.common.pointdata.PointDataContainer; +import com.raytheon.uf.common.pointdata.PointDataDescription; +import com.raytheon.uf.common.pointdata.PointDataDescription.Type; +import com.raytheon.uf.common.pointdata.PointDataView; +import com.raytheon.uf.common.pointdata.spatial.ObStation; +import com.raytheon.uf.common.time.DataTime; +import com.raytheon.uf.edex.core.EDEXUtil; + +public class GenericPointDataDecoder extends AbstractDecoder { + private String pluginName; + private GenericPointDataDao gpdDao ; + private static GenericPointDataDecoder instance= null; + private long totalHDF5Time; + private static String OK= "ok"; + private static int BLOCKSIZE = 50; + private PointDataDescription createPointDataDescription(GenericPointDataProductInfo prodInfo){ + int parmsize= prodInfo.getParameterLst().size(); + if(parmsize<=0) + return null; + PointDataDescription newPdd = new PointDataDescription(); + int i=0; + //String maxLevel = Integer.toString(rptType.getMaxNumberOfLevel()); + newPdd.parameters = new ParameterDescription[parmsize+ GenericPointDataConstants.MANDATORY_DATASET_NUM]; + ParameterDescription[] parameterDescriptions = newPdd.parameters; + for (Parameter parm: prodInfo.getParameterLst()){ + parameterDescriptions[i]=new ParameterDescription(parm.getAbbreviation(),Type.FLOAT,GenericPointDataConstants.GPD_INVALID_FLOAT_VALUE, + parm.getUnitString()); + if(prodInfo.getMaxNumberOfLevel() > 1){ + // 2 dimensional parameters, when level is more than one, ie. sounding product + parameterDescriptions[i].setNumDims(2); + parameterDescriptions[i].setDimension(GenericPointDataConstants.MAX_LEVELS); + } + i++; + } + //numOfLevel is one dmension + parameterDescriptions[i]=new ParameterDescription(GenericPointDataConstants.HDF5_NUM_LEVEL,Type.INT); + i++; + // stationId is one dimension + parameterDescriptions[i]=new ParameterDescription(GenericPointDataConstants.HDF5_STN_ID,Type.STRING); + parameterDescriptions[i].setMaxLength(GenericPointDataConstants.MAX_STNID_STRING_SIZE); + i++; + //level values is 1 or 2 dimensional, 2 dimensional when level is more than one, ie. sounding product + parameterDescriptions[i]=new ParameterDescription(GenericPointDataConstants.HDF5_LEVEL_VALUE,Type.FLOAT); + if(prodInfo.getMaxNumberOfLevel() > 1){ + parameterDescriptions[i].setNumDims(2); + parameterDescriptions[i].setDimension(GenericPointDataConstants.MAX_LEVELS); + } + + newPdd.dimensions = new Dimension[1]; + newPdd.dimensions[0] = new Dimension(); + newPdd.dimensions[0].setDimensionLength(prodInfo.getMaxNumberOfLevel()); + newPdd.dimensions[0].setDimensionName(GenericPointDataConstants.MAX_LEVELS);// not important, but we need to set a name here. + //for(int k=0; k < newPdd.parameters.length; k++) + //{ + //System.out.println("PointDataDescription is creating Parm="+newPdd.parameters[k].getParameterName()); + //} + newPdd.resolveDimensions(); + return newPdd; + } + + private PointDataView createPointDataView(PointDataDescription pdd, GenericPointDataStationProduct stnPd){ + PointDataView pdv = null; + try{ + PointDataContainer container = PointDataContainer.build(pdd); + + pdv = container.append(); + //set 1-dimensional mandatory datasets STN_ID and NUM_LEVEL + pdv.setString(GenericPointDataConstants.HDF5_STN_ID,stnPd.getLocation().getStationId()); + pdv.setInt(GenericPointDataConstants.HDF5_NUM_LEVEL,stnPd.getNumLevel()); + for(int index=0; index < stnPd.getNumLevel(); index++){ + GenericPointDataLevel gpdLevel= stnPd.getLevelLst().get(index); + //set 2-dimensional mandatory dataset LEVEL_VALUE + pdv.setFloat(GenericPointDataConstants.HDF5_LEVEL_VALUE, (float)gpdLevel.getLevelValue(), index); + + //set all optional 2-dimensional datasets + for (GenericPointDataParameter gpdParm: gpdLevel.getGpdParameters()){ + pdv.setFloat(gpdParm.getName(), gpdParm.getValue(),index); + } + } + } catch (OutOfMemoryError e) { + System.out.println("out of memory when createPointDataView for stnId = "+stnPd.getLocation().getStationId()); + e.printStackTrace(); + } + //System.out.println("createPointDataView for stnId = "+stnPd.getLocation().getStationId()+" is created"); + return pdv; + } + public GenericPointDataDecoder() throws DecoderException{ + instance = this; + try { + gpdDao = new GenericPointDataDao("gpd"); + + } catch (PluginException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + public static GenericPointDataDecoder getInstance(){ + if (instance!=null) + return instance; + else{ + try { + instance = new GenericPointDataDecoder(); + } catch (DecoderException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return instance; + } + } + /** + * @param inputFile : XML file in String + * @return ok or erro message + * @throws DecoderException + * @throws PluginException + * + public String decodeProdInfo(String inputFile)throws DecoderException, PluginException { + InputStream is = null; + GenericPointDataProductInfo prodInfo=null; + JAXBContext ctx; + is = new ByteArrayInputStream(inputFile.getBytes()); + try { + ctx = JAXBContext.newInstance(GenericPointDataProductContainer.class); + if (ctx != null && is !=null) { + + Unmarshaller um = ctx.createUnmarshaller(); + if(um !=null){ + // test example: to unmarshal from file system + //String strmPath = "/res/pointdata/gpdProduct.xml"; + //GenericPointDataProductContainer gpdc = (GenericPointDataProductContainer)um.unmarshal(GenericPointDataProductContainer.class.getResourceAsStream(strmPath)); + Object result = um.unmarshal(is); + if(result instanceof GenericPointDataProductInfo) + prodInfo = (GenericPointDataProductInfo)result; + else + return "Data persistence failed. XML file is not formatted correctly!"; + } + } + + } catch (JAXBException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + return "Data persistence failed. JAXBException happened!"; + } + if(prodInfo!=null){ + GenericPointDataProductInfo updatedProdInfo = gpdDao.updateProductInfo(prodInfo); + if(updatedProdInfo == null) + return "Update product information failed"; + else + return "Update product information done!"; + + } + return "Data persistence failed! XML file is not valid."; + } */ + /* + * Parsing Gempak generated point data profile (3D) table. + * Input example- sounding data + * ******************************************************************* +SNPARM = PRES;TMPC;DWPT;HGHT;DRCT;SKNT;TMPK;RELH;MIXR;UKNT;VKNT;THTA;THTE + STNPRM = LIFT;SHOW;KINX + + STID = FFC STNM = 72215 TIME = 130731/1200 + SLAT = 33.36 SLON = -84.57 SELV = 245.0 + STIM = 1200 + + LIFT = -1.56 SHOW = 0.38 KINX = 36.10 + + PRES TMPC DWPT HGHT DRCT SKNT TMPK RELH + MIXR UKNT VKNT THTA THTE + 992.00 21.80 21.00 245.00 0.00 0.00 294.95 95.21 + 16.06 0.00 0.00 295.63 341.92 + 1000.00 -9999.00 -9999.00 170.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 925.00 22.00 18.40 851.00 210.00 10.99 295.15 80.03 + 14.62 5.50 9.52 301.80 345.11 + 850.00 17.00 13.90 1581.00 230.00 16.01 290.15 81.96 + 11.88 12.26 10.29 303.94 339.55 + 700.00 5.80 4.30 3209.00 225.00 27.00 278.95 90.08 + 7.49 19.09 19.09 308.88 332.09 + 500.00 -6.70 -7.60 5900.00 10.00 6.99 266.45 93.30 + 4.34 -1.21 -6.89 324.81 339.47 + 400.00 -16.10 -18.70 7630.00 245.00 8.00 257.05 80.35 + 2.20 7.25 3.38 333.98 341.92 + 300.00 -31.70 -36.70 9730.00 275.00 21.00 241.45 61.19 + 0.55 20.92 -1.83 340.58 342.79 + 250.00 -42.90 -51.90 10980.00 315.00 27.99 230.25 36.51 + 0.13 19.79 -19.79 342.15 342.70 + 200.00 -54.10 -62.10 12450.00 310.00 42.00 219.05 36.72 + 0.04 32.17 -27.00 346.94 347.14 + 150.00 -65.70 -74.70 14250.00 310.00 35.99 207.45 27.52 + 0.01 27.57 -23.14 356.71 356.76 + 100.00 -70.70 -78.70 16650.00 305.00 17.00 202.45 29.86 + 0.01 13.92 -9.75 390.87 390.92 + + STID = BMX STNM = 72230 TIME = 130731/1200 + SLAT = 33.16 SLON = -86.76 SELV = 178.0 + STIM = 1200 + + LIFT = -7.20 SHOW = -4.07 KINX = 34.50 + + PRES TMPC DWPT HGHT DRCT SKNT TMPK RELH + MIXR UKNT VKNT THTA THTE + 998.00 24.40 22.80 178.00 0.00 0.00 297.55 90.80 + 17.87 0.00 0.00 297.72 349.73 + 1000.00 -9999.00 -9999.00 158.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + ******************************************************************************************** + * + */ + private String parseSoundingTable(String prodTblString,String prodName,int versionNum, int levelNumMax){ + if( levelNumMax < 2) {//should set to a minimum of 2, see comments in parseSurfaceTable() + return "Bad input, max number of level should be greater than 1"; + } + + GenericPointDataProductInfo prodInfo = new GenericPointDataProductInfo(prodName, levelNumMax ); + prodInfo.setMaxNumberOfLevel(levelNumMax); + String returnStatus = ""; + //input start with "SNPARM =" and followed by a list of sounding parameters + int firstEqualSignIndex= prodTblString.indexOf('='); + // optional station parameter line + int stnprmIndex = prodTblString.indexOf(GenericPointDataConstants.SND_STN_PARM); + //station id line + int stnIdIndex = prodTblString.indexOf(GenericPointDataConstants.SND_STN_ID); + if(stnIdIndex <0){ + if(stnIdIndex <0){ + return "Bad input, no STID key word, could not determine sounding parameters!"; + } + } + String sndParmStr="", stnParmStr=""; + String[] sndParmArray=null, stnParmArray=null; + if(stnprmIndex <0){ + //optional station parameter line is not provided + if(stnIdIndex > firstEqualSignIndex){ + sndParmStr = prodTblString.substring(firstEqualSignIndex+1,stnIdIndex); + } + else{ + return "Bad input, no STNPRM and STID, could not determine sounding parameters!"; + } + } + else{ + //optional station parameter line is provided + //get station parameters + stnParmStr = prodTblString.substring(stnprmIndex); + sndParmStr = prodTblString.substring(firstEqualSignIndex+1,stnprmIndex); + int stnParmEqualIndex = stnParmStr.indexOf('='); + int stnIdIndex2 = stnParmStr.indexOf(GenericPointDataConstants.SND_STN_ID); + if(stnIdIndex2 > firstEqualSignIndex){ + stnParmStr = stnParmStr.substring(stnParmEqualIndex+1, stnIdIndex2); + stnParmStr = stnParmStr.trim(); + stnParmArray = stnParmStr.split("[; \n]+"); + } + } + if(sndParmStr.length() <=0){ + return "Bad input, no SNPARM (sounding parameters) defined!"; + } + sndParmStr = sndParmStr.trim(); + sndParmArray = sndParmStr.split("[; \n]+"); + int numSndParm = sndParmArray.length; + int numSndParmAtLastLine = numSndParm % GenericPointDataConstants.SND_PARM_PER_LINE; + int numLinePerLevel ; + if(numSndParmAtLastLine ==0){ + numLinePerLevel = numSndParm/ GenericPointDataConstants.SND_PARM_PER_LINE; + numSndParmAtLastLine =GenericPointDataConstants.SND_PARM_PER_LINE; + } + else { + numLinePerLevel = numSndParm/ GenericPointDataConstants.SND_PARM_PER_LINE+1; + } + System.out.println("sndParmStr= "+sndParmStr+"\nNum of snd parm ="+numSndParm); + //System.out.println("numLinePerLevel= "+numLinePerLevel); + for(String pm: sndParmArray){ + Parameter parm= new Parameter(pm); + prodInfo.getParameterLst().add(parm); + //System.out.println(pm + " length="+ pm.length()); + } + boolean found = true; + //remainDataString: point to data starting from first STID + String remainDataString = prodTblString.substring(stnIdIndex); + //split remaining data and parse data for each station. + Date date=null; + boolean firstRoundOfPersistence = true; + PointDataDescription pdd=null; + int blockCount=0; + List stnProdList = new ArrayList(); + /* + * Chin Note: To speed up HDF5 persistence speed and also avoid out of heap memory problem, + * we have to split input data to smaller blocks. Each block has N (BLOCKSIZE) number of station/time line data. + * We did not pre-allocate memory here. We do that for parseSurfaceTable. If we ran into mempry issue, then we will + * have to do that here too. + */ + while(found) { + int nextStnIdIndex = remainDataString.indexOf(GenericPointDataConstants.SND_STN_ID, GenericPointDataConstants.SND_STN_ID.length()); + //System.out.println("nextId="+nextStnIdIndex); + //stnDataString: pointer to each station data section + String stnDataString; + if(nextStnIdIndex >0){ + stnDataString = remainDataString.substring(0, nextStnIdIndex); + remainDataString = remainDataString.substring(nextStnIdIndex); + } + else { + stnDataString = remainDataString; + found = false; + } + //System.out.println(stnDataString); + int stnSndParmIndex = stnDataString.indexOf(sndParmArray[0]); + //System.out.println("stnSndParmIndex=" + stnSndParmIndex); + if(stnSndParmIndex < 0)// this stn does not have real sounding data + continue; + int stnParmIndex; + //stnMetaDataStr: first part of station data section, containing station specific + // meta data information e.g STID = ALB STNM = 72518 + // AND reference time, e.g. TIME = 130724/1200 + String stnMetaDataStr; + //stnParamDataStr: Optional 2nd part of station data section, containing + // optional station parameters, e.g STNPRM = KINX;SWET;LIFT + //String stnParamDataStr; + + String[] stnMetaArray; + + //String[] stnParmDataArray; + if(stnParmArray!=null){ + stnParmIndex = stnDataString.indexOf(stnParmArray[0]); + stnMetaDataStr = stnDataString.substring(0,stnParmIndex); + //stnParamDataStr = stnDataString.substring(stnParmIndex,stnSndParmIndex); + //System.out.println("stnParmIndex="+stnParmIndex+"\n stnMetaDataStr="+stnMetaDataStr+"\n stnParamDataStr="+stnParamDataStr); + //stnParmDataArray = stnParamDataStr.split("[ =\n]+"); + //for(String pm: stnParmDataArray){ + // System.out.println("STNPRM="+pm); + //TBD...if we decide to save STNPRM, then we have to decode stnParmDataArray and save them into GenericPointDataStationProduct + //} + } + else { + stnMetaDataStr = stnDataString.substring(0,stnSndParmIndex); + } + stnMetaArray= stnMetaDataStr.split("[ =\n]+"); + int i=0; + GenericPointDataStationProduct stnProd = new GenericPointDataStationProduct(versionNum,prodName); + boolean reftimeNotAvail = true, stnIdNotAvail=true; + String stid="", reftime=""; + for(String pm: stnMetaArray){ + //System.out.println("Metainfo="+pm); + if(pm.equals(GenericPointDataConstants.SND_STN_ID)){ + if(i+1 < stnMetaArray.length && stnMetaArray[i+1].equals(GenericPointDataConstants.SND_STN_NUM)==false){ + stnProd.getLocation().setStationId(stnMetaArray[i+1]); + stnIdNotAvail=false; + stid = stnMetaArray[i+1]; + } + } + else if(pm.equals(GenericPointDataConstants.SND_STN_NUM) && stnIdNotAvail == true){ + //if not stid then try stnm + if(i+1 < stnMetaArray.length && stnMetaArray[i+1].equals(GenericPointDataConstants.SND_REFTIME)==false){ + stnProd.getLocation().setStationId(stnMetaArray[i+1]); + stnIdNotAvail=false; + stid = stnMetaArray[i+1]; + } + else{ + returnStatus = "*****************************************\nDropped one station product. STID / STNM not found \n"+ stnMetaDataStr + "\n"; + break; + } + } + else if(pm.equals(GenericPointDataConstants.SND_STN_LAT)){ + if(i+1 < stnMetaArray.length){ + try{ + float lat = Float.parseFloat(stnMetaArray[i+1]); + stnProd.setSlat(lat); + } + catch ( NumberFormatException e){ + stnProd.setSlat(-9999.00f); + } + } + } + else if(pm.equals(GenericPointDataConstants.SND_STN_LON)){ + if(i+1 < stnMetaArray.length){ + try{ + float lon = Float.parseFloat(stnMetaArray[i+1]); + stnProd.setSlon(lon); + } + catch ( NumberFormatException e){ + stnProd.setSlon(-9999.00f); + } + } + } + else if(pm.equals(GenericPointDataConstants.SND_STN_ELEVATION)){ + if(i+1 < stnMetaArray.length){ + try{ + float elv = Float.parseFloat(stnMetaArray[i+1]); + stnProd.getLocation().setElevation((int)(Math.round(elv))); + } + catch ( NumberFormatException e){ + stnProd.getLocation().setElevation(0); + } + } + } + else if(pm.equals(GenericPointDataConstants.SND_REFTIME)){ + if(i+1 < stnMetaArray.length&& stnMetaArray[i+1].equals(GenericPointDataConstants.SND_STN_LAT)==false){ + SimpleDateFormat df = new SimpleDateFormat("yyMMdd/HHmm"); + + try { + date = df.parse(stnMetaArray[i+1]); + reftime = stnMetaArray[i+1]; + //System.out.println("date="+date.toString()); + reftimeNotAvail=false; + } catch (ParseException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + if(date!=null) + stnProd.setRefTime(date); + else { + //no mandatory reference time found + returnStatus = "*****************************************\nDropped one station product. TIME not found. \n"+ stnMetaDataStr + "\n"; + break; + } + } + } + /*else if(pm.equals(GenericPointDataConstants.SND_STN_IM)){ + + }*/ + i++; + } + if(reftimeNotAvail == false && stnIdNotAvail == false){ + //Chin Note: for each station... + //stnSndDataStr: 3rd part of station data section, containing sounding parameters, + // e.g. PRES TMPC DWPT HGHT DRCT SKNT TMPK RELH + // MIXR UKNT VKNT THTA THTE + // 998.00 24.40 22.80 178.00 0.00 0.00 297.55 90.80 + // 17.87 0.00 0.00 297.72 349.73 + // + + String stnSndDataStr = stnDataString.substring(stnSndParmIndex); + stnSndDataStr = stnSndDataStr.trim(); + String[] stnSndDataLineArray = stnSndDataStr.split("[\n]+"); + //adjust max level number in prodInfo, note that, the value should be the largest for all station. + //Chin NOTE:: : since we use fixed levelNumMax, not necessary to do the following for now + //if(levelNumMax < stnSndDataLineArray.length/numLinePerLevel){ + // levelNumMax = stnSndDataLineArray.length/numLinePerLevel; + // prodInfo.setMaxNumberOfLevel(levelNumMax); + //System.out.println("max num of level = "+ levelNumMax); + //} + //We do not get Master Level info from CLI, therefore, level value is not really used for now. + // just incrementing 1 per level advanced + int levelValue =1; + //first N (=numLinePerLevel) lines are parameter names, like, "PRES THTA MIXR DRCT SPED TVRK HGHT etc", just skip them. + //Therefore, for loop starts from N (=numLinePerLevel). + //System.out.println("Number of lines: "+stnSndDataLineArray.length); + int stnLevelNum=1; + for(int j=numLinePerLevel; j< stnSndDataLineArray.length; j= j+numLinePerLevel){ + if(stnLevelNum > levelNumMax){ + // can not save more data exceeding levelNumMax + break; + } + stnLevelNum++; + GenericPointDataLevel gpdLevel= new GenericPointDataLevel(); + gpdLevel.setLevelValue(levelValue++); + boolean goodLevel = true; + for(int lineCountWithinlevel=0; lineCountWithinlevel< numLinePerLevel;lineCountWithinlevel++){ + if(j+lineCountWithinlevel >= stnSndDataLineArray.length){ + goodLevel = false; + break; + } + String lineStr = stnSndDataLineArray[j+lineCountWithinlevel]; + lineStr= lineStr.trim(); + //System.out.println("SNDPRM Line " + (j+lineCountAtlevel)+" = "+lineStr); + String[] stnSndDataParmAtCurLineArray = lineStr.split("[ ]+"); + int numSndParmAtLine; + if(lineCountWithinlevel == numLinePerLevel-1){ + numSndParmAtLine = numSndParmAtLastLine; + } + else { + numSndParmAtLine = GenericPointDataConstants.SND_PARM_PER_LINE; + } + if(stnSndDataParmAtCurLineArray.length == numSndParmAtLine){ + for(int k=0; k< stnSndDataParmAtCurLineArray.length; k++){ + String pmStr = stnSndDataParmAtCurLineArray[k]; + float pmValue = -9999; + try{ + pmValue = Float.parseFloat(pmStr); + //System.out.println("SNDPRM " + k+" = "+pmStr); + //sndParmArray contains all parms in one dimension, therefore, when refer to it using index k, need add line count adjustment to it. + GenericPointDataParameter gpdParm = new GenericPointDataParameter(sndParmArray[k+lineCountWithinlevel*GenericPointDataConstants.SND_PARM_PER_LINE],pmValue); + gpdLevel.getGpdParameters().add(gpdParm); + } + catch ( NumberFormatException e){ + System.out.println("Bad parameter value:"+ pmStr); + } + GenericPointDataParameter gpdParm = new GenericPointDataParameter(sndParmArray[k+lineCountWithinlevel*GenericPointDataConstants.SND_PARM_PER_LINE],pmValue); + gpdLevel.getGpdParameters().add(gpdParm); + } + } + else{ + //Chin NOTE: with this simple error handling design, + //When a missing line in input table, we will drop all data for its station after the missing line. + //System.out.println("sdnParmlength="+stnSndDataParmAtCurLineArray.length+" should be"+ numSndParmAtLine); + returnStatus = returnStatus +"Dropped incomplete sounding data line @ "+ stid+ " Time="+reftime+"\n"+ lineStr + "\n"; + goodLevel = false; + break; + } + + } + if(goodLevel) + stnProd.getLevelLst().add(gpdLevel); + } + stnProdList.add(stnProd); + } + if(firstRoundOfPersistence == true ){ + //NOte: we assume at first round, we will already have max level set for generating + // pdd + pdd = createPointDataDescription(prodInfo); + } + if(pdd != null && stnProdList.size() >=BLOCKSIZE ){ + try { + String sts = performPersist( prodInfo,stnProdList + ,versionNum, date, pdd, firstRoundOfPersistence) ; + + if(sts.equals(OK)== false){ + //either product info or version is not right, stop parsing. + return returnStatus+ sts; + } + firstRoundOfPersistence = false; //only check once + stnProdList.clear(); + } catch (PluginException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + blockCount++; + } + } + //System.out.println("Prod " + prodName+": persisted "+ (blockCount*BLOCKSIZE + stnProdList.size())+ " records."); + + // finish up the last round of stations data + if(pdd!=null && stnProdList.size() > 0 ){ + try { + String sts = performPersist( prodInfo,stnProdList + ,versionNum, date, pdd, firstRoundOfPersistence) ; + if(sts.equals(OK)== false){ + //either product info or version is not right, stop parsing. + return returnStatus+ sts; + } + stnProdList.clear(); + } catch (PluginException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + return returnStatus; + } + /* + * Parsing Gempak generated point data surface (2D) table. + * Input example- surface data - single station, multiple time lines + * ******************************************************************* + PARM = PMSL;ALTI;TMPC;DWPC;SKNT;DRCT;GUST;WNUM;CHC1;CHC2;CHC3;VSBY;P03D;P03I; + MSUN;SNOW;WEQS;P24I;TDXC;TDNC;P03C;CTYL;CTYM;CTYH;P06I;T6XC;T6NC;CEIL; + P01I;SNEW + + STN YYMMDD/HHMM PMSL ALTI TMPC DWPC SKNT DRCT + GUST WNUM CHC1 CHC2 CHC3 VSBY + P03D P03I MSUN SNOW WEQS P24I + TDXC TDNC P03C CTYL CTYM CTYH + P06I T6XC T6NC CEIL P01I SNEW + DCA 130724/0000 1005.00 29.68 29.40 17.80 8.00 330.00 + -9999.00 -9999.00 556.00 2502.00 -9999.00 10.00 + 3002.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.20 -9999.00 -9999.00 -9999.00 + -9999.00 31.70 29.40 -9999.00 -9999.00 -9999.00 + DCA 130724/0100 1005.40 29.69 28.90 17.80 6.00 330.00 + -9999.00 -9999.00 1506.00 2502.00 -9999.00 10.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + ******************************************************************************************** + * Input example- surface data - multiple stations, + * ******************************************************************* + PARM = SLAT;SLON;PMSL;PRES;P03D;TMPC;DWPC;TMWC;SPED;DRCT;VSBK;WWMO;PWWM;CFRT; + CFRL;CTYL;CLHL;SSTC;WPER;WHGT;PWHR;PWMN;PWDR;PWSP;TOST;CBAS;POWW;HOWW; + DOSW;POSW;HOSW;DOS2;POS2;HOS2;IDTH;ROIA;GUST;ALTI;SHPD;SHPK;PKWD;PKWS; + PKWT;PMN1 + + STN YYMMDD/HHMM SLAT SLON PMSL PRES P03D TMPC + DWPC TMWC SPED DRCT VSBK WWMO + PWWM CFRT CFRL CTYL CLHL SSTC + WPER WHGT PWHR PWMN PWDR PWSP + TOST CBAS POWW HOWW DOSW POSW + HOSW DOS2 POS2 HOS2 IDTH ROIA + GUST ALTI SHPD SHPK PKWD PKWS + PKWT PMN1 + + WDF7019 130724/1200 44.50 -83.00 1015.90 -9999.00 3010.00 27.70 + -9999.00 -9999.00 5.10 350.00 10.00 -9999.00 + -9999.00 2.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 2.00 0.50 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.00 3.00 -9999.00 -9999.00 + -9999.00 -9999.00 + KCDK 130724/1200 34.60 -75.40 1007.00 -9999.00 2002.00 26.10 + 23.00 23.90 6.70 180.00 20.00 -9999.00 + 0.00 2.00 1.00 1.00 74.00 -9999.00 + -9999.00 1.10 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 8.00 2.00 0.50 190.00 6.00 + 1.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 45.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + WDD2876 130724/1200 43.40 -86.90 1017.20 -9999.00 -9999.00 16.60 + -9999.00 -9999.00 5.10 60.00 50.00 3.00 + 0.00 2.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 1.00 -1.00 -9999.00 1.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 180.00 13.00 -9999.00 -9999.00 + -9999.00 -9999.00 + ******************************************************************************************** + NOTE:::: Based on Gempak Fortran source code. The max number of parameters per line is + defined as "6". A fixed number. Our decoding is based on this number. If + Gempak source code changed, then we will have to change code as well. + + */ + private String parseSurfaceTable(String prodTblString,String prodName, int versionNum){ + int levelNumMax = 1; + GenericPointDataProductInfo prodInfo = new GenericPointDataProductInfo(prodName, levelNumMax ); + String returnStatus = ""; + //input start with "PARM =" and followed by a list of sounding parameters, terminated at STN + int parmindex = prodTblString.indexOf(GenericPointDataConstants.SFC_PARM); + if(parmindex <0){ + return "Bad input, no PARM key word, could not determine sounding parameters!"; + } + else{ + //make sure no more PARM= line. + if(prodTblString.substring(parmindex+1).indexOf(GenericPointDataConstants.SFC_PARM)>=0){ + return "Bad input, more than one PARM key word, could not determine sounding parameters!"; + } + } + int firstEqualSignIndex= prodTblString.indexOf('='); + //station id line + int stnIdIndex = prodTblString.indexOf(GenericPointDataConstants.SFC_STN); + if(stnIdIndex <0){ + return "Bad input, no STN key word, could not determine sounding parameters!"; + } + else { + if(prodTblString.indexOf(GenericPointDataConstants.SFC_STN, stnIdIndex+1)>=0){ + return "Bad input, double STN key word, could not determine sounding parameters!"; + } + } + String parmStr=""; + String[] parmArray=null; + if(stnIdIndex > firstEqualSignIndex){ + parmStr = prodTblString.substring(firstEqualSignIndex+1,stnIdIndex); + } + else{ + return "Bad input, wrong STN key word position, could not determine sounding parameters!"; + } + + if(parmStr.length() <=0){ + return "Bad input, no PARM (weather parameters) defined!"; + } + parmStr = parmStr.trim(); + parmArray = parmStr.split("[; \n]+"); + System.out.println("ParmStr= "+parmStr+"\nNum of parm ="+parmArray.length); + int parmNumInLastLine = parmArray.length % GenericPointDataConstants.SFC_PARM_PER_LINE; + //create product info parameter list + for(String pm: parmArray){ + //slat/slon saved in postgres only, this parm list is for saving weather parameters in HDF5 + if(pm.equals(GenericPointDataConstants.SFC_LAT)){ + continue; + } + if(pm.equals(GenericPointDataConstants.SFC_LON)){ + continue; + } + Parameter parm= new Parameter(pm); + prodInfo.getParameterLst().add(parm); + //System.out.println(pm + " length="+ pm.length()); + } + + //remainDataString: point to data starting from STN key word + String remainDataString = prodTblString.substring(stnIdIndex); + remainDataString = remainDataString.trim(); + String[] stnDataLineArray = remainDataString.split("[\n]+"); + + int numDataLinePerStn= parmArray.length / GenericPointDataConstants.SFC_PARM_PER_LINE; + if((parmArray.length % GenericPointDataConstants.SFC_PARM_PER_LINE) >0) + numDataLinePerStn++; + int numStation = stnDataLineArray.length / numDataLinePerStn - 1; + System.out.println("Total line number = "+ stnDataLineArray.length+", around "+ numStation + " stations in input table, each station has "+ numDataLinePerStn + " line"); + List> headerTbl = new ArrayList>(); + int parmNumInFirstLine =2; + // create header table for reference by each station data and find slat/slon index for ship data + for(int lineIndex= 0; lineIndex < numDataLinePerStn; lineIndex++){ + String lineStr = stnDataLineArray[lineIndex]; + //System.out.println("header line: "+lineStr + " length="+ lineStr.length()); + lineStr = lineStr.trim(); + String[] parmArry = lineStr.split("[ ]+"); + if(lineIndex==0){ + parmNumInFirstLine = parmArry.length; + } + headerTbl.add(new ArrayList(Arrays.asList(parmArry))); + } + // keep records of slat, slon index + int lineNum=0,slatLn=-1, slatRow=-1,slonLn=-1,slonRow=-1; + for(List hdrLine: headerTbl ){ + for(int k=0; k < hdrLine.size(); k++){ + String pmStr = hdrLine.get(k); + if(pmStr.equals(GenericPointDataConstants.SFC_LAT)){ + slatLn=lineNum; + slatRow=k; + } + if(pmStr.equals(GenericPointDataConstants.SFC_LON)){ + slonLn=lineNum; + slonRow=k; + } + } + lineNum++; + } + // drop stn, time, slat, slon from table to speed up parsing. + // stn and time are always in first line + List hdrLst = headerTbl.get(0); + hdrLst.remove(GenericPointDataConstants.SFC_STN); + hdrLst.remove(GenericPointDataConstants.SFC_REFTIME); + if(slatLn>=0){ + hdrLst = headerTbl.get(slatLn); + hdrLst.remove(GenericPointDataConstants.SFC_LAT); + } + if(slonLn>=0){ + hdrLst = headerTbl.get(slonLn); + hdrLst.remove(GenericPointDataConstants.SFC_LON); + } + boolean firstRoundOfPersistence = true; + PointDataDescription pdd=null; + SimpleDateFormat df = new SimpleDateFormat("yyMMdd/HHmm"); + + // Chin Note::To speed up HDF5 persistence speed and also avoid out of heap memory problem, + // we have to split input data to smaller blocks. Each block has N (BLOCKSIZE) number of station/time line data. + // We also allocate N (BLOCKSIZE) number of GenericPointDataStationProduct memory in advance here. + // This is for reuse memory when there are big number of stations/time lines are input. + // If not doing this, we may run into out of heap memory problem. As Java garbage collection + // is too slow for our need. + int stnBlockSize; + if(numStation > BLOCKSIZE){ + stnBlockSize = BLOCKSIZE; + } + else { + stnBlockSize = numStation; + } + List stnProdList = new ArrayList(); + for (int i=0; i< stnBlockSize ; i++){ + GenericPointDataStationProduct stnProd = new GenericPointDataStationProduct(versionNum,prodName); + GenericPointDataLevel gpdLevel= new GenericPointDataLevel(0); + for(List hdrLine: headerTbl ){ + for(int k=0; k < hdrLine.size(); k++){ + String pmStr = hdrLine.get(k); + //System.out.println("PARM " + k+" = "+pmStr); + GenericPointDataParameter gpdParm = new GenericPointDataParameter(pmStr,-9999.00f); + gpdLevel.getGpdParameters().add(gpdParm); + } + } + stnProd.getLevelLst().add(gpdLevel); + stnProdList.add(stnProd); + } + List> stnTbl = new ArrayList>(); + //allocate memory for decoding end + + int stnIndexInBlock = 0; + int blockCount=0; + for(int currentIndex=numDataLinePerStn; currentIndex lineLst = stnTbl.get(0); + lineLst.remove(stnIdStr); + lineLst.remove(refTime); + if(slatLn>=0 && slatStr!=null){ + lineLst = stnTbl.get(slatLn); + lineLst.remove(slatStr); + } + if(slonLn>=0 && slonStr!=null){ + lineLst = stnTbl.get(slonLn); + lineLst.remove(slonStr); + } + lineNum=0; + int totalParmIndex=0; + for(List hdrLine: headerTbl ){ + if(stnTbl.get(lineNum).size() < hdrLine.size()){ + // this stn data line has less parameter data than expected. It should have same number (length) of data as header line. + // drop this line. + returnStatus = returnStatus + "Dropped one data line.\n"+ hdrLine+"\n"+ stnTbl.get(lineNum) + "\n"; + continue; + } + + for(int k=0; k < hdrLine.size(); k++){ + try{ + float value = Float.parseFloat(stnTbl.get(lineNum).get(k)); + gpdLevel.getGpdParameters().get(k+totalParmIndex).setValue(value); + //System.out.println("PARM " + (k+totalParmIndex)+" = "+gpdLevel.getGpdParameters().get(k+totalParmIndex).getName()+ "value="+value); + } + catch ( NumberFormatException e){ + gpdLevel.getGpdParameters().get(k+totalParmIndex).setValue(-9999); + System.out.println("Bad parameter value:"+ stnTbl.get(lineNum).get(k)); + } + } + totalParmIndex= totalParmIndex + hdrLine.size(); + lineNum++; + } + stnIndexInBlock++; + stnTbl.clear(); + if(firstRoundOfPersistence == true ){ + pdd = createPointDataDescription(prodInfo); + + } + if(pdd != null && stnIndexInBlock >=BLOCKSIZE ){ + try { + String sts = performPersist( prodInfo,stnProdList + ,versionNum, stnProdList.get(0).getRefTime(), pdd, firstRoundOfPersistence) ; + if(sts.equals(OK)== false){ + //either product info or version is not right, stop parsing. + return returnStatus+ sts; + } + + firstRoundOfPersistence = false; //only check once + stnIndexInBlock=0; + blockCount++; + } catch (PluginException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + } + //System.out.println("Prod " + prodName+": persisted "+ (blockCount*BLOCKSIZE + stnProdList.size())+ " records."); + // finish up the last round of stations data (size of stnIndexInBlock) that was not persisted yet. + if(pdd!=null && stnIndexInBlock > 0 ){ + try { + String sts = performPersist( prodInfo,stnProdList + ,versionNum, stnProdList.get(0).getRefTime(), pdd, firstRoundOfPersistence) ; + if(sts.equals(OK)== false){ + //either product info or version is not right, stop parsing. + return returnStatus+ sts; + } + stnProdList.clear(); + } catch (PluginException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + return returnStatus; + } + + /* + * Return status: OK or error status + */ + private String performPersist(GenericPointDataProductInfo prodInfo,List stnProdLst + , int prodVersion, Date refTime, PointDataDescription pdd, boolean firstRoundOfPersist) throws PluginException { + String prodName = prodInfo.getName(); + List rtObLst =null; + if(firstRoundOfPersist == true){ + int latestProdVersion = gpdDao.getGpdProductLatestVersion(refTime, prodName); + if(prodVersion <= latestProdVersion) + //input product should not have version smaller or equal to same product's latest product version in DB + //If a new product, its product version should be 0 and latestProdVersion should be -1. + return "Data persistence failed. Wrong version number!\n"; + prodInfo = gpdDao.lookupUpdateGpdProdInfo(prodInfo, true, prodVersion); + if(prodInfo == null) + return "Data persistence failed. Bad Product info\n"; + } + + DataTime dataTime; + //System.out.println("GenericPointDataProductInfo is obtained! report name="+prodInfo.getName()+ + // " Reftime="+ dataTime.getRefTimeAsCalendar().getTime()+" in ms="+ dataTime.getRefTimeAsCalendar().getTimeInMillis()+ " stnLstSize="+lstSize + " numMaxLvls="+prodInfo.getMaxNumberOfLevel()); + if(pdd!=null){ + rtObLst = new ArrayList(); + int stnProdSize = stnProdLst.size(); + GenericPointDataRecord gpdRec; + for(int i = 0; i < stnProdSize; i++){ + GenericPointDataStationProduct stnPd = stnProdLst.get(i); + int numLevel = stnPd.getLevelLst().size(); + ObStation location= stnPd.getLocation(); + if(numLevel >0 && location.getStationId() !=null){ + if(location.getCatalogType()==null) + location.setCatalogType(ObStation.CAT_TYPE_MESONET); + //construct gid as it is not an xml element in OBStation definition + location.setGid(location.getCatalogType()+"-"+location.getStationId()); + //System.out.println("gpd location gid = "+location.getGid()); + gpdDao.lookupGpdLocation(location, true); + stnPd.setNumLevel(numLevel); + PointDataView view = createPointDataView(pdd, stnPd); + if(view !=null){ + dataTime = new DataTime(stnPd.getRefTime()); + gpdRec= new GenericPointDataRecord(prodInfo,location,stnPd.getSlat(), stnPd.getSlon(),view, dataTime, prodVersion); + rtObLst.add(gpdRec); + } + } + } + PluginDataObject [] recordObjects = rtObLst.toArray(new PluginDataObject[rtObLst.size()]); + EDEXUtil.checkPersistenceTimes(recordObjects); + long t0 = System.currentTimeMillis(); + gpdDao.persistToHDF5(recordObjects); + long t1 = System.currentTimeMillis(); + gpdDao.persistToDatabase(recordObjects); + long t2 = System.currentTimeMillis(); + System.out.println("\nTime spent to persist "+recordObjects.length+ " records to HDF5: " + + (t1 - t0)+" persist to Postgres: " + + (t2 - t1)); + totalHDF5Time = totalHDF5Time + (t1 - t0); + } + return OK; + } + /** + * @param prodTblString : Gempak product table file in String + * @param ProdName : Gempak product name + * @return ok or error message + * @throws DecoderException + * @throws PluginException + */ + public String decodeTblProdFmCli(String prodTblString, String ProdName,int versionNum, int maxNumOfLevel)throws DecoderException, PluginException { + long tin = System.currentTimeMillis(); + String returnStatus=""; + if ( prodTblString !=null) { + //check to see what type of product is + if(prodTblString.contains(GenericPointDataConstants.SND_PARM)){ + //"SNPARM" is an unique string in sounding table file + totalHDF5Time=0; + returnStatus= parseSoundingTable(prodTblString, ProdName, versionNum,maxNumOfLevel); + } + else if(prodTblString.contains(GenericPointDataConstants.SFC_REFTIME)){ + totalHDF5Time=0; + //"YYMMDD/HHMM" is an unique string in surface table file + returnStatus = parseSurfaceTable(prodTblString, ProdName,versionNum); + } + else{ + return("Decode failed! Bad product type, can not tell what product type is input!"); + } + } + else{ + return("Failed! Empty product input!"); + } + long tout = System.currentTimeMillis(); + System.out.println("Total Time spent in decoding product: "+ (tout-tin) + " msecs, to HDF5= "+ totalHDF5Time +" msecs"); + return "Data persistence done!!\n"+ returnStatus; + } + /** + * @param prodXMLString : product XML file in String + * @return ok or error message + * @throws DecoderException + * @throws PluginException + * Note: Since operation product is not going through this route, this function does not split product to smaller chucks. + * If ran into out of heap memory issue, then we will have to do it. See parseSurfaceTable() or parseSoundingTable(). + */ + public String decodeXmlProdFmCli(String prodXMLString)throws DecoderException, PluginException { + System.out.println("IN GPD XML String decode!"); + long tin = System.currentTimeMillis(); + PluginDataObject[] recordObjects = new PluginDataObject[0]; + + InputStream is = null; + GenericPointDataProductContainer gpdc=null; + GenericPointDataRecord gpdRec=null; + JAXBContext ctx; + is = new ByteArrayInputStream(prodXMLString.getBytes()); + try { + ctx = JAXBContext.newInstance(GenericPointDataProductContainer.class); + if (ctx != null && is !=null) { + + Unmarshaller um = ctx.createUnmarshaller(); + if(um !=null){ + // test example: to unmarshal from file system + //String strmPath = "/res/pointdata/gpdProduct.xml"; + //GenericPointDataProductContainer gpdc = (GenericPointDataProductContainer)um.unmarshal(GenericPointDataProductContainer.class.getResourceAsStream(strmPath)); + Object result = um.unmarshal(is); + if(result instanceof GenericPointDataProductContainer) + gpdc = (GenericPointDataProductContainer)result; + else + return "Data persistence failed. XML file is not formatted correctly!"; + } + } + + } catch (JAXBException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + return "Data persistence failed. JAXBException happened!"; + } + List rtObLst =null; + if(gpdc!=null){ + int prodVersion = gpdc.getProductCorrectionVersion(); + GenericPointDataProductInfo prodInfo=gpdc.getProductInfo(); + int latestProdVersion = gpdDao.getGpdProductLatestVersion(gpdc.getRefTime(), prodInfo.getName()); + if(prodVersion <= latestProdVersion) + //input product should not have version smaller or equal to same product's latest product version in DB + //If a new product, its product version should be 0 and latestProdVersion should be -1. + return "Data persistence failed. Wrong version number!"; + List stnProdLst = gpdc.getStnProdLst(); + int lstSize = stnProdLst.size(); + if(lstSize <= 0) + return "Data persistence failed. No stn product"; + prodInfo = gpdDao.lookupUpdateGpdProdInfo(prodInfo, true, prodVersion); + if(prodInfo == null) + return "Data persistence failed. Bad Product info"; + DataTime dataTime = new DataTime(gpdc.getRefTime()); + System.out.println("GenericPointDataProductInfo is obtained! report name="+prodInfo.getName()+ + " Reftime="+ dataTime.getRefTimeAsCalendar().getTime()+" in ms="+ dataTime.getRefTimeAsCalendar().getTimeInMillis()+ " stnLstSize="+lstSize + " numMaxLvls="+prodInfo.getMaxNumberOfLevel()); + + PointDataDescription pdd = createPointDataDescription(prodInfo); + if(pdd!=null){ + rtObLst = new ArrayList(); + for(GenericPointDataStationProduct stnPd: stnProdLst){ + int numLevel = stnPd.getLevelLst().size(); + if(numLevel <=0) + continue; + ObStation location= stnPd.getLocation(); + if(location.getCatalogType()==null) + location.setCatalogType(ObStation.CAT_TYPE_MESONET); + //construct gid as it is not an xml element in OBStation definition + location.setGid(location.getCatalogType()+"-"+location.getStationId()); + gpdDao.lookupGpdLocation(location, true); + stnPd.setNumLevel(numLevel); + PointDataView view = createPointDataView(pdd, stnPd); + gpdRec= new GenericPointDataRecord(prodInfo,location,stnPd.getSlat(), stnPd.getSlon(),view, dataTime, gpdc.getProductCorrectionVersion()); + //gpdRec.constructTransientListAndMap(stnPd); + //gpdRec.constructDataURI(); + //if(gpdDao.lookupGpdDataUri(gpdRec.getDataURI())== true ){ + // System.out.println("daturi existing!!"); + // continue; + //} + rtObLst.add(gpdRec); + } + } + } + if(rtObLst == null || rtObLst.size() <=0) + return "Data persistence failed. XML file contains all duplicated data or does not contain any good data!"; + // batch persist + int objCount=rtObLst.size(); + int loopCount = objCount/50+1; + int restCount = objCount%50; + int fromObjIx=0, toObjIx=0; + for(int loop= 0; loop < loopCount; loop++){ + if(loop == loopCount-1){ + toObjIx = fromObjIx+ restCount; + } + else { + toObjIx = fromObjIx+ 50; + } + recordObjects = rtObLst.subList(fromObjIx, toObjIx).toArray(new PluginDataObject[toObjIx-fromObjIx]); + EDEXUtil.checkPersistenceTimes(recordObjects); + gpdDao.persistToHDF5(recordObjects); + gpdDao.persistToDatabase(recordObjects); + fromObjIx = fromObjIx + 50; + + } + long tout = System.currentTimeMillis(); + System.out.println("Total Time spent in decoding product: "+ (tout-tin) ); + + // end batch persist + //recordObjects = rtObLst.toArray(new PluginDataObject[rtObLst.size()]); + //EDEXUtil.checkPersistenceTimes(recordObjects); + //gpdDao.persistToHDF5(recordObjects); + //gpdDao.persistToDatabase(recordObjects); + return "Data persistence done!!"; + } + + /* + //test code to persistent to DB and HDF5, and to generate xml and schema + try { + pdd = gpdDao.getPointDataDescription(); + } catch (JAXBException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + returnObjects = new PluginDataObject[1]; + gpdRec= new GenericPointDataRecord(); + gpdRec.setPluginName("gpd"); + gpdRec.setSlat(30.0); + gpdRec.setNumLevel(1); + gpdRec.getLevelValueLst().add(10.0f); + gpdRec.getMap_ParmToValue().put("temp", 270.6); + gpdRec.getMap_LevelToParmValueMap().put(10.0f, gpdRec.getMap_ParmToValue()); + GenericPointDataReporttype reportType = new GenericPointDataReporttype(); + reportType.setName("sib1"); + MasterLevel masterLevel = new MasterLevel(); + masterLevel.setName("MB"); + masterLevel.setDescription("isobaric surface"); + masterLevel.setUnitString("hPa"); + masterLevel.setType("DEC"); + reportType.setMasterLevel(masterLevel); + for(int i=0;i<10;i++){ + Parameter p= new Parameter("TEMP"+i, "temperature "+i,"K"); + reportType.getParameterLst().add( p); + } + + gpdRec.setReportType(reportType); + gpdRec.setProductVersion(0); + //Old code GenericPointDataLocation location = new GenericPointDataLocation(); + //location.setLatitude(35.0); + //location.setLongitude(130.0); + //location.setStnId("BWI"); + //location.setCountry("USA"); + //location.setElevation(100); + //location.setState("MD"); + //location.setStationName("Baltimore"); + + ObStation location = new ObStation(); + Coordinate coord = new Coordinate(-100, 100); + GeometryFactory geometryFactory = new GeometryFactory(); + Point pt = geometryFactory.createPoint(coord); + location.setStationGeom(pt); + location.setStationId("MYIAD"); + location.setCountry("USA"); + location.setElevation(200); + location.setState("VA"); + location.setName("Dulles"); + location.setCatalogType(1000); + location.setGid(location.getCatalogType()+"-"+location.getStationId()); + gpdRec.setLocation(location); + + gpdDao.lookupGpdLocation(location, true); + gpdDao.lookupGpdReportType(reportType, true); + + Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT")); + DataTime dataTime = new DataTime(cal); + gpdRec.setDataTime(dataTime); + gpdRec.constructDataURI(); + + returnObjects[0] = gpdRec; + System.out.println("retrun ojct set"); + PointDataContainer container = PointDataContainer.build(pdd); + PointDataView view = container.append(); + view.setString("REPORTTYPE","sib1"); + view.setInt("UTC", 5); + gpdRec.setPointDataView(view); + String path = gpdDao.getFullFilePath(gpdRec).getAbsolutePath(); + String filename = gpdDao.getPointDataFileName(gpdRec); + System.out.println("hdf5 path="+path + " name="+filename); + + //*** generate XML schema and XML file for development use + GenericPointDataProductContainer pdCon= new GenericPointDataProductContainer(); + pdCon.setReportType(reportType); + for(int j=1; j<4; j++){ + GenericPointDataStationProduct stnP= new GenericPointDataStationProduct(); + //GenericPointDataLocation stn = new GenericPointDataLocation(); + ObStation stn = new ObStation(); + stn.setStationGeom(pt); + stn.setCatalogType(1000); + stn.setStationId("BWI"+j); + stn.setCountry("USA"); + stn.setElevation(100); + stn.setState("MD"); + stn.setName("Baltimore"); + stn.setGid(location.getCatalogType()+"-"+location.getStationId()); + stnP.setLocation(stn); + for(int k=0; k<5;k++){ + GenericPointDataLevel lv = new GenericPointDataLevel(50+k); + for(int i=0;i<10;i++){ + GenericPointDataParameter gpram = new GenericPointDataParameter("TEMP"+i,273+i+k*5+j*2); + lv.getGpdParameters().add(gpram); + } + stnP.getLevelLst().add(lv); + } + pdCon.getStnProdLst().add(stnP); + } + pdCon.setRefTime(dataTime.getRefTime()); + + try { + ctx = JAXBContext.newInstance(GenericPointDataProductContainer.class); + if (ctx != null ) { + // + // This block is to generate point data product container XML schema + // + try { + ctx.generateSchema(new gpdSchemaOutputResolver("/awips2/edex/data/hdf5/gpd/gpdProduct.xsd")); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + // This block to to generate XML + Marshaller mar = ctx.createMarshaller(); + if (mar != null) { + mar.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); + mar.marshal(pdCon, System.out); + } + } + } catch (JAXBException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + ***/ + + private enum INPUT_TYPE{ + GPD_PROD, + GPD_PRODINFO, + GPD_UNKNOWN + } + private INPUT_TYPE getInputType(File inputFile){ + String currentLine; + int lineCounter=0; + int numLinesToRead= 5; + FileReader fileReader; + try { + fileReader = new FileReader(inputFile.getAbsoluteFile()); + BufferedReader bufferedReader = new BufferedReader(fileReader); + StringBuffer stringBuffer = new StringBuffer(); + while((currentLine = bufferedReader.readLine()) != null && lineCounter < numLinesToRead){ + stringBuffer.append(currentLine); + lineCounter++; + } + bufferedReader.close(); + String headerLinesStr = stringBuffer.toString(); + int index =headerLinesStr.indexOf("GenericPointDataProduct"); + if(index >0) + return INPUT_TYPE.GPD_PROD; + /* Chin: do not support update product info only + index =headerLinesStr.indexOf("GPD-ProdInfo-Def"); + if(index >0) + return INPUT_TYPE.GPD_PRODINFO; */ + + } catch (FileNotFoundException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return INPUT_TYPE.GPD_UNKNOWN; + } + /** + * Decode GPD XML file input from SBN/gpd + * @param inputProdStr : XML file + * @return PluginDataObject[] + * @throws DecoderException + * @throws PluginException + * Note: Since operation product is not going through this route, this function does not split product to smaller chucks. + * If ran into out of heap memory issue, then we will have to do it. See parseSurfaceTable() or parseSoundingTable(). + * + */ + + public void decodeXmlProdFmSbn(File inputFile)throws DecoderException, PluginException { + System.out.println("GPD decode() entered!"); + PluginDataObject[] recordObjects = new PluginDataObject[0]; + if(inputFile.getName().equals("test")){ + test(inputFile); + return;// returnObjects; + } + + InputStream is = null; + GenericPointDataProductContainer gpdc=null; + GenericPointDataProductInfo prodInfo=null; + GenericPointDataRecord gpdRec=null; + JAXBContext ctx; + try { + is = new FileInputStream(inputFile); + } catch (FileNotFoundException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + return;// returnObjects; + } + //INPUT_TYPE inType = getInputType(inputFile); + try { + //if(inType == INPUT_TYPE.GPD_PROD) + ctx = JAXBContext.newInstance(GenericPointDataProductContainer.class); + //else if(inType == INPUT_TYPE.GPD_PRODINFO) + // ctx = JAXBContext.newInstance(GenericPointDataProductInfo.class); + //else + // ctx=null; + if (ctx != null && is !=null) { + + Unmarshaller um = ctx.createUnmarshaller(); + if(um !=null){ + // test example: to unmarshal from file system + //String strmPath = "/res/pointdata/gpdProduct.xml"; + //GenericPointDataProductContainer gpdc = (GenericPointDataProductContainer)um.unmarshal(GenericPointDataProductContainer.class.getResourceAsStream(strmPath)); + Object result = um.unmarshal(is); + if(result instanceof GenericPointDataProductContainer) + gpdc = (GenericPointDataProductContainer)result; + //else if(result instanceof GenericPointDataProductInfo) + //prodInfo = (GenericPointDataProductInfo)result; + } + } + + } catch (JAXBException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + return;// returnObjects; + } + List rtObLst =null; + if(gpdc!=null){ + prodInfo=gpdc.getProductInfo(); + int prodVersion = gpdc.getProductCorrectionVersion(); + int latestProdVersion = gpdDao.getGpdProductLatestVersion(gpdc.getRefTime(), prodInfo.getName()); + if(prodVersion <= latestProdVersion) + //input product should not have version smaller or equal to same product's latest product version in DB + //If a new product, its product version should be 0 and latestProdVersion should be -1. + return; + List stnProdLst = gpdc.getStnProdLst(); + DataTime dataTime = new DataTime(gpdc.getRefTime()); + int lstSize = stnProdLst.size(); + if(lstSize <= 0) + return;// returnObjects; + prodInfo = gpdDao.lookupUpdateGpdProdInfo(prodInfo, true,prodVersion); + if(prodInfo == null) + return;// returnObjects; + System.out.println("GenericPointDataProductContainer is obtained! prod name="+prodInfo.getName()+ + " Reftime="+ dataTime.getRefTimeAsCalendar().getTime()+" in ms="+ dataTime.getRefTimeAsCalendar().getTimeInMillis()+ " stnLstSize="+lstSize + " numMaxLvls="+prodInfo.getMaxNumberOfLevel()); + + PointDataDescription pdd = createPointDataDescription(prodInfo); + if(pdd!=null){ + rtObLst = new ArrayList(); + for(GenericPointDataStationProduct stnPd: stnProdLst){ + int numLevel = stnPd.getLevelLst().size(); + if(numLevel <=0) + continue; + ObStation location= stnPd.getLocation(); + if(location.getCatalogType()==null) + location.setCatalogType(ObStation.CAT_TYPE_MESONET); + //construct gid as it is not an xml element in OBStation definition + location.setGid(location.getCatalogType()+"-"+location.getStationId()); + gpdDao.lookupGpdLocation(location, true); + stnPd.setNumLevel(numLevel); + PointDataView view = createPointDataView(pdd, stnPd); + gpdRec= new GenericPointDataRecord(prodInfo,location,stnPd.getSlat(), stnPd.getSlon(),view, dataTime, gpdc.getProductCorrectionVersion()); + //gpdRec.constructTransientListAndMap(stnPd); + //gpdRec.constructDataURI(); + //if(gpdDao.lookupGpdDataUri(gpdRec.getDataURI())== true ){ + // continue; + //} + System.out.println("adding record "+gpdRec.getLocation().getStationId()); + rtObLst.add(gpdRec); + } + } + + } + //else if(prodInfo!=null){ + //just update/replace product information meta data in Postgres DB + // gpdDao.updateProductInfo(prodInfo); + //} + if(rtObLst == null || rtObLst.size() <=0) + return;// returnObjects; + recordObjects = rtObLst.toArray(new PluginDataObject[rtObLst.size()]); + System.out.println("returnObjects size "+recordObjects.length); + for(int k=0; k target, String filePath) { + + JAXBContext ctx=null; + try { + ctx = JAXBContext.newInstance(target); + } catch (JAXBException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + }// e.g. (GenericPointDataProductContainer.class); + if (ctx != null) { + + try { + ctx.generateSchema(new gpdSchemaOutputResolver(filePath));// e.g ("/awips2/edex/data/hdf5/gpd/gpdProduct.xsd")); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + } + class gpdSchemaOutputResolver extends SchemaOutputResolver { + + private String filePath; + + public gpdSchemaOutputResolver(String filePath) { + super(); + this.filePath = filePath; + } + + @Override + public Result createOutput(String namespaceUri, String suggestedFileName) + throws IOException { + + + // create new file + File file = new File(filePath); + // + // create stream result + StreamResult result = new StreamResult(file); + + // set system id + result.setSystemId(file.toURI().toURL().toString()); + + // return result + return result; + } + } + public void test(File inputFile){ + GenericPointDataProductInfo report = gpdDao.getGpdProdInfo("sib1");//GenericPointDataReportQuery.getReport(); + System.out.println(" report name= "+report.getName()+ " master="+report.getMasterLevel().getName()+ " maxLevel="+report.getMaxNumberOfLevel()); + for(Parameter pam: report.getParameterLst() ){ + System.out.println("parm ="+pam.getAbbreviation()); + } + } +} diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/src/gov/noaa/nws/ncep/edex/plugin/gpd/handler/GenericPointDataRequestHandler.java b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/src/gov/noaa/nws/ncep/edex/plugin/gpd/handler/GenericPointDataRequestHandler.java new file mode 100644 index 0000000000..32657b9c05 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/src/gov/noaa/nws/ncep/edex/plugin/gpd/handler/GenericPointDataRequestHandler.java @@ -0,0 +1,506 @@ +/** + * + * + * This code has been developed by the NCEP-SIB for use in the AWIPS2 system. + * + * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    	Engineer    Description
+ * -------		------- 	-------- 	-----------
+ * 05/30/2013				Chin J. Chen	Initial coding
+ *
+ *
+ * + * @author Chin J. Chen + * @version 1.0 + */ +package gov.noaa.nws.ncep.edex.plugin.gpd.handler; + +import gov.noaa.nws.ncep.common.dataplugin.gpd.GenericPointDataConstants; +import gov.noaa.nws.ncep.common.dataplugin.gpd.dao.GenericPointDataDao; +import gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataLevel; +import gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataParameter; +import gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataProductContainer; +import gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataProductInfo; +import gov.noaa.nws.ncep.common.dataplugin.gpd.product.GenericPointDataStationProduct; +import gov.noaa.nws.ncep.common.dataplugin.gpd.query.GenericPointDataReqMsg; +import gov.noaa.nws.ncep.common.dataplugin.gpd.query.GenericPointDataReqMsg.GenericPointDataQueryKey; +import gov.noaa.nws.ncep.common.dataplugin.gpd.query.GenericPointDataReqMsg.GenericPointDataReqType; +import gov.noaa.nws.ncep.edex.plugin.gpd.decoder.GenericPointDataDecoder; + +import java.io.ByteArrayOutputStream; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.List; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; + +import com.raytheon.edex.exception.DecoderException; +import com.raytheon.uf.common.dataplugin.PluginException; +import com.raytheon.uf.common.parameter.Parameter; +import com.raytheon.uf.common.serialization.comm.IRequestHandler; + +public class GenericPointDataRequestHandler implements IRequestHandler { + + private GenericPointDataDao gpdDao; + private GenericPointDataDecoder decoder; + + public GenericPointDataRequestHandler() throws DecoderException { + super(); + try { + gpdDao = new GenericPointDataDao("gpd"); + decoder = new GenericPointDataDecoder(); + + } catch (PluginException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + private String createGempakFileString(GenericPointDataProductInfo prodInfo) { + StringBuilder fileStr = new StringBuilder(); + List pmLst =prodInfo.getParameterLst(); + int pmSz= pmLst.size(); + if(prodInfo.getMaxNumberOfLevel() <= 2){ + // we defined surface data with MaxNumberOfLevel = 2, see parseSurfaceTable() comments + //surface data - single level + + // Add PARM hdr + fileStr.append(" "+GenericPointDataConstants.SFC_PARM +"= "+GenericPointDataConstants.SFC_LAT+ + ";"+GenericPointDataConstants.SFC_LON+";"); + int pmCount=3; //start from 3 as we added slat ans slon already. + for(int i=0; iGenericPointDataConstants.SFC_HDR_PARM_PER_LINE){ + fileStr.append("\n "); + pmCount=1; + } + } + } + else { + //sounding data - multiple levels + // Add SNDPARM hdr + fileStr.append(" "+GenericPointDataConstants.SND_PARM +" = "); + int pmCount=1; + for(int i=0; iGenericPointDataConstants.SND_HDR_PARM_PER_LINE){ + fileStr.append("\n "); + pmCount=1; + } + } + //TBD:: Add STNPARM hdr + } + return fileStr.toString(); + } + /* + * createGempakFileString() + * Surface data table format::: + PARM = PMSL;ALTI;TMPC;DWPC;SKNT;DRCT;GUST;WNUM;CHC1;CHC2;CHC3;VSBY;P03D;P03I; + MSUN;SNOW;WEQS;P24I;TDXC;TDNC;P03C;CTYL;CTYM;CTYH;P06I;T6XC;T6NC;CEIL; + P01I;SNEW + + STN YYMMDD/HHMM PMSL ALTI TMPC DWPC SKNT DRCT + GUST WNUM CHC1 CHC2 CHC3 VSBY + P03D P03I MSUN SNOW WEQS P24I + TDXC TDNC P03C CTYL CTYM CTYH + P06I T6XC T6NC CEIL P01I SNEW + DCA 130724/0000 1005.00 29.68 29.40 17.80 8.00 330.00 + -9999.00 -9999.00 556.00 2502.00 -9999.00 10.00 + 3002.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 0.20 -9999.00 -9999.00 -9999.00 + -9999.00 31.70 29.40 -9999.00 -9999.00 -9999.00 + DCA 130724/0100 1005.40 29.69 28.90 17.80 6.00 330.00 + -9999.00 -9999.00 1506.00 2502.00 -9999.00 10.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + ****************************************************************************************** + Sounding data table format::: + SNPARM = PRES;TMPC;DWPT;HGHT;DRCT;SKNT;TMPK;RELH;MIXR;UKNT;VKNT;THTA;THTE + STNPRM = LIFT;SHOW;KINX + + STID = FFC STNM = 72215 TIME = 130731/1200 + SLAT = 33.36 SLON = -84.57 SELV = 245.0 + STIM = 1200 + + LIFT = -1.56 SHOW = 0.38 KINX = 36.10 + + PRES TMPC DWPT HGHT DRCT SKNT TMPK RELH + MIXR UKNT VKNT THTA THTE + 992.00 21.80 21.00 245.00 0.00 0.00 294.95 95.21 + 16.06 0.00 0.00 295.63 341.92 + 1000.00 -9999.00 -9999.00 170.00 -9999.00 -9999.00 -9999.00 -9999.00 + -9999.00 -9999.00 -9999.00 -9999.00 -9999.00 + 925.00 22.00 18.40 851.00 210.00 10.99 295.15 80.03 + 14.62 5.50 9.52 301.80 345.11 + 850.00 17.00 13.90 1581.00 230.00 16.01 290.15 81.96 + 11.88 12.26 10.29 303.94 339.55 + 700.00 5.80 4.30 3209.00 225.00 27.00 278.95 90.08 + 7.49 19.09 19.09 308.88 332.09 + 500.00 -6.70 -7.60 5900.00 10.00 6.99 266.45 93.30 + 4.34 -1.21 -6.89 324.81 339.47 + 400.00 -16.10 -18.70 7630.00 245.00 8.00 257.05 80.35 + 2.20 7.25 3.38 333.98 341.92 + 300.00 -31.70 -36.70 9730.00 275.00 21.00 241.45 61.19 + 0.55 20.92 -1.83 340.58 342.79 + 250.00 -42.90 -51.90 10980.00 315.00 27.99 230.25 36.51 + 0.13 19.79 -19.79 342.15 342.70 + 200.00 -54.10 -62.10 12450.00 310.00 42.00 219.05 36.72 + 0.04 32.17 -27.00 346.94 347.14 + 150.00 -65.70 -74.70 14250.00 310.00 35.99 207.45 27.52 + 0.01 27.57 -23.14 356.71 356.76 + 100.00 -70.70 -78.70 16650.00 305.00 17.00 202.45 29.86 + 0.01 13.92 -9.75 390.87 390.92 + + STID = BMX STNM = 72230 TIME = 130731/1200 + SLAT = 33.16 SLON = -86.76 SELV = 178.0 + STIM = 1200 + + LIFT = -7.20 SHOW = -4.07 KINX = 34.50 + + PRES TMPC DWPT HGHT DRCT SKNT TMPK RELH + MIXR UKNT VKNT THTA THTE + 998.00 24.40 22.80 178.00 0.00 0.00 297.55 90.80 + 17.87 0.00 0.00 297.72 349.73 + + */ + private String createGempakFileString(GenericPointDataProductContainer pdCon) { + GenericPointDataProductInfo prodInfo = pdCon.getProductInfo(); + + List stnLst = pdCon.getStnProdLst(); + if(stnLst.size()<=0) + return null; + SimpleDateFormat df = new SimpleDateFormat("yyMMdd/HHmm"); + StringBuilder fileStr = new StringBuilder(); + List pmLst =prodInfo.getParameterLst(); + int pmSz= pmLst.size(); + if(prodInfo.getMaxNumberOfLevel() <= 2 && stnLst.get(0).getNumLevel() <=1 ){ + // we defined surface data with MaxNumberOfLevel = 2, see parseSurfaceTable() comments + //surface data - single level + + // Add PARM hdr + fileStr.append(" "+GenericPointDataConstants.SFC_PARM +"= "+GenericPointDataConstants.SFC_LAT+ + ";"+GenericPointDataConstants.SFC_LON+";"); + int pmCount=3; //start from 3 as we added slat ans slon already. + for(int i=0; iGenericPointDataConstants.SFC_HDR_PARM_PER_LINE){ + fileStr.append("\n "); + pmCount=1; + } + } + // Note: List in GenericPointDataLevel is not in sync with pmLst + // use this map to save stn parameters to be in sync with product parameter list, + // so, we can list all parameters value in sync with parameter name listed. + HashMappmMap = new HashMap(pmSz); + //Add stn/time/parm header + pmCount=3;//start from 3 as we added slat ans slon already. + String titleStr = " STN YYMMDD/HHMM "+GenericPointDataConstants.SFC_LAT+" "+GenericPointDataConstants.SFC_LON+" "; + String blankStr = " "; + fileStr.append(titleStr); + for(int i=0; iGenericPointDataConstants.SFC_PARM_PER_LINE){ + fileStr.append("\n"+blankStr); + pmCount=1; + } + else + fileStr.append(" "); + } + // add stn/time/parm data + Date time = pdCon.getRefTime(); + String timeStr = df.format(time); + for(GenericPointDataStationProduct stnPd: stnLst ){ + for(GenericPointDataParameter pam: stnPd.getLevelLst().get(0).getGpdParameters()){ + //System.out.println("lP ="+pam.getName()); + pmMap.put(pam.getName(), pam.getValue()); + } + fileStr.append(String.format("%9s %s %9.2f%9.2f",stnPd.getLocation().getStationId(),timeStr,stnPd.getSlat(),stnPd.getSlon())); + pmCount=3;//start from 3 as we added slat ans slon already. + for(int i=0; iGenericPointDataConstants.SFC_PARM_PER_LINE){ + fileStr.append(String.format("\n%26s"," ")); + pmCount=1; + } + + } + } + } + else { + //sounding data - multiple levels + // Add SNDPARM hdr + fileStr.append(" "+GenericPointDataConstants.SND_PARM +" = "); + int pmCount=1; + for(int i=0; iGenericPointDataConstants.SND_HDR_PARM_PER_LINE){ + fileStr.append("\n "); + pmCount=1; + } + } + //TBD:: Add STNPARM hdr + + // Note: List in GenericPointDataLevel is not in sync with pmLst + // use this map to save stn parameters to be in sync with product parameter list, + // so, we can list all parameters value in sync with parameter name listed. + // All stations have same parameters name to be listed first, therefore constructed it here once for used by + // all stations. + HashMappmMap = new HashMap(pmSz); + //create parm header + pmCount=1; + String blankStr = " "; + StringBuilder parmHdrStr = new StringBuilder(blankStr); + for(int i=0; iGenericPointDataConstants.SND_PARM_PER_LINE){ + parmHdrStr.append("\n "); + pmCount=1; + } + } + + // add stn/time/parm data + Date time = pdCon.getRefTime(); + String timeStr = df.format(time); + for(GenericPointDataStationProduct stnPd: stnLst ){ + //add station meta info, e.g. STID = FFC STNM = 72215 TIME = 130731/1200 + //Note: STNM is not saved now + fileStr.append(String.format(" %s = %4s %s = %11s%s =%s\n",GenericPointDataConstants.SND_STN_ID,stnPd.getLocation().getStationId(), + GenericPointDataConstants.SND_STN_NUM,"",GenericPointDataConstants.SND_REFTIME,timeStr)); + + // add station meta info, e.g.SLAT = 33.36 SLON = -84.57 SELV = 245.0 + fileStr.append(String.format(" %s = %6.2f %s = %6.2f %s = %6.2f\n", GenericPointDataConstants.SND_STN_LAT,stnPd.getSlat(),GenericPointDataConstants.SND_STN_LON, + stnPd.getSlon(),GenericPointDataConstants.SND_STN_ELEVATION,stnPd.getLocation().getElevation())); + //add STIM line, Note we do not save its value now.. + fileStr.append(" "+GenericPointDataConstants.SND_STN_IM+ " = \n\n"); + + //TBD::: add STNPARM value + + // add SNDPARM hdr + fileStr.append(parmHdrStr); + + // put SNDPARM to pmMap, so we can easily to retrieve and list it later in same order as pmLst + List levelLst = stnPd.getLevelLst(); + for(GenericPointDataLevel level: levelLst){ + for(GenericPointDataParameter pam: level.getGpdParameters()){ + //System.out.println("lP ="+pam.getName()); + pmMap.put(pam.getName(), pam.getValue()); + } + // add SNDPARM values + pmCount=1; + for(int i=0; iGenericPointDataConstants.SND_PARM_PER_LINE){ + fileStr.append("\n "); + pmCount=1; + } + + } + + } + fileStr.append("\n"); + } + } + return fileStr.toString(); + } + private Object createXmlFileString(Class targetClass, Object targetInstance) { + try { + JAXBContext ctx; + ctx = JAXBContext.newInstance(targetClass); + if (ctx != null ) { + //System.out.println("XML marshalling................."); + // This block to to generate XML + Marshaller mar = ctx.createMarshaller(); + if (mar != null) { + mar.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); + ByteArrayOutputStream os = new ByteArrayOutputStream(); + mar.marshal(targetInstance, os);//System.out); + return (Object)(os.toString()); + } + } + } catch (JAXBException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + + } + return null; + } + + @Override + public Object handleRequest(GenericPointDataReqMsg request) + throws Exception { + if(gpdDao== null) + return null; + GenericPointDataReqType msgType = request.getReqType(); + String reportName; + Date refTime; + float slon ; + float slat; + GenericPointDataProductContainer stnProd; + switch(msgType) { + case GET_GPD_PRODUCT_INFO_GEMPAK_TBL: + case GET_GPD_PRODUCT_INFO_OBJECT: + case GET_GPD_PRODUCT_INFO_XML: + reportName = request.getProductName(); + if(reportName !=null){ + GenericPointDataProductInfo prodInfo = gpdDao.getGpdProdInfo(reportName); + //*System.out.println(" report name= "+prodInfo.getName()+ " master="+prodInfo.getMasterLevel().getName()+ " maxLevel="+prodInfo.getMaxNumberOfLevel()); + //for(Parameter pam: prodInfo.getParameterLst() ){ + // System.out.println("parm ="+pam.getAbbreviation()); + //} + if(prodInfo!=null) + if(msgType.equals(GenericPointDataReqType.GET_GPD_PRODUCT_INFO_OBJECT)) + return (Object)prodInfo; + else if(msgType.equals(GenericPointDataReqType.GET_GPD_PRODUCT_INFO_GEMPAK_TBL)) + return createGempakFileString(prodInfo); + else + return createXmlFileString(GenericPointDataProductInfo.class,(Object)prodInfo); + } + break; + case GET_GPD_STATION_PRODUCT_GEMPAK_TBL: + case GET_GPD_STATION_PRODUCT_OBJECT: + case GET_GPD_STATION_PRODUCT_XML: + reportName = request.getProductName(); + String stnId = request.getStnId(); + refTime = request.getRefTime(); + stnProd=gpdDao.getGpdProduct(refTime,GenericPointDataQueryKey.BY_STN_ID, stnId,-9999,-9999,reportName,request.isQuerySpecifiedProductVersion(), request.getProductVersion()); + //System.out.println("stnProduct id="+ stnProd.getLocation().getStationId()); + if(stnProd!=null) + if(msgType.equals(GenericPointDataReqType.GET_GPD_STATION_PRODUCT_OBJECT)){ + //System.out.println("GET_GPD_STATION_PRODUCT................."); + return (Object)stnProd; + } + else if(msgType.equals(GenericPointDataReqType.GET_GPD_STATION_PRODUCT_GEMPAK_TBL)){ + return createGempakFileString(stnProd); + } + else{ + return createXmlFileString(GenericPointDataProductContainer.class,(Object)stnProd); + } + break; + case GET_GPD_MOVING_PRODUCT_GEMPAK_TBL: + case GET_GPD_MOVING_PRODUCT_OBJECT: + case GET_GPD_MOVING_PRODUCT_XML: + reportName = request.getProductName(); + slon = request.getSlon(); + slat = request.getSlat(); + refTime = request.getRefTime(); + stnProd=gpdDao.getGpdProduct(refTime,GenericPointDataQueryKey.BY_SLAT_SLON,null, slat,slon,reportName,request.isQuerySpecifiedProductVersion(), request.getProductVersion()); + //System.out.println("stnProduct id="+ stnProd.getLocation().getStationId()); + if(stnProd!=null) + if(msgType.equals(GenericPointDataReqType.GET_GPD_MOVING_PRODUCT_OBJECT)){ + //System.out.println("GET_GPD_MOVING_PRODUCT................."); + return (Object)stnProd; + } + else if(msgType.equals(GenericPointDataReqType.GET_GPD_MOVING_PRODUCT_GEMPAK_TBL)){ + return createGempakFileString(stnProd); + } + else{ + return createXmlFileString(GenericPointDataProductContainer.class,(Object)stnProd); + } + break; + case GET_GPD_PRODUCT_GEMPAK_TBL: + case GET_GPD_PRODUCT_OBJECT: + case GET_GPD_PRODUCT_XML: + reportName = request.getProductName(); + refTime = request.getRefTime(); + GenericPointDataProductContainer pdCon=gpdDao.getGpdProduct(refTime,GenericPointDataQueryKey.BY_REPORT_NAME,null, -9999,-9999,reportName,request.isQuerySpecifiedProductVersion(), request.getProductVersion());//(refTime, reportName,request.isQuerySpecifiedProductVersion(), request.getProductVersion()); + //System.out.println("stnProduct id="+ stnProd.getLocation().getStationId()); + if(pdCon!=null) + if(msgType.equals(GenericPointDataReqType.GET_GPD_PRODUCT_OBJECT)){ + //System.out.println("GET_GPD_PRODUCT................."); + return (Object)pdCon; + } + else if(msgType.equals(GenericPointDataReqType.GET_GPD_PRODUCT_GEMPAK_TBL)){ + return createGempakFileString(pdCon); + } + else{ + return createXmlFileString(GenericPointDataProductContainer.class,(Object)pdCon); + } + break; + case GET_GPD_STATION_PRODUCT_OBJECT_LIST: + reportName = request.getProductName(); + stnId = request.getStnId(); + return (Object)gpdDao.getGpdStationProduct(request.getRefTimeList(),GenericPointDataQueryKey.BY_STN_ID, stnId,-9999,-9999,reportName); + //System.out.println("stnProduct id="+ stnProd.getLocation().getStationId()); + case GET_GPD_MOVING_PRODUCT_OBJECT_LIST: + reportName = request.getProductName(); + slon = request.getSlon(); + slat = request.getSlat(); + return (Object)gpdDao.getGpdStationProduct(request.getRefTimeList(),GenericPointDataQueryKey.BY_SLAT_SLON, null,slat,slon,reportName); + //System.out.println("stnProduct id="+ stnProd.getLocation().getStationId()); + + case STORE_GPD_PRODUCT_FROM_XML: + return (decoder.decodeXmlProdFmCli(request.getGpdDataString())); + case STORE_GPD_PRODUCT_FROM_GEMPAK_TBL: + return (decoder.decodeTblProdFmCli(request.getGpdDataString(), request.getProductName(), request.getProductVersion(), request.getMaxNumLevel())); + case PURGE_GPD_EXPIRED_PRODUCT: + gpdDao.purgeExpiredData(); + break; + case PURGE_GPD_ALL_PRODUCTS: + gpdDao.purgeAllData(); + break; + default: + break; + } + return null; + } + +} diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/utility/common_static/base/path/gpdPathKeys.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/utility/common_static/base/path/gpdPathKeys.xml new file mode 100644 index 0000000000..07ab5ffaf5 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/utility/common_static/base/path/gpdPathKeys.xml @@ -0,0 +1,11 @@ + + + + productInfo.name + 0 + + + \ No newline at end of file diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/utility/common_static/base/purge/gpdPurgeRules.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/utility/common_static/base/purge/gpdPurgeRules.xml new file mode 100644 index 0000000000..b0ecab443c --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.gpd/utility/common_static/base/purge/gpdPurgeRules.xml @@ -0,0 +1,15 @@ + + + productInfo.name + + 3 + 03-00:00:00 + + + + \ No newline at end of file diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/src/gov/noaa/nws/ncep/edex/plugin/mcidas/decoder/McidasDecoder.java b/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/src/gov/noaa/nws/ncep/edex/plugin/mcidas/decoder/McidasDecoder.java index c5739461f6..10be30d202 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/src/gov/noaa/nws/ncep/edex/plugin/mcidas/decoder/McidasDecoder.java +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/src/gov/noaa/nws/ncep/edex/plugin/mcidas/decoder/McidasDecoder.java @@ -24,6 +24,11 @@ package gov.noaa.nws.ncep.edex.plugin.mcidas.decoder; +import gov.noaa.nws.ncep.common.dataplugin.mcidas.McidasMapCoverage; +import gov.noaa.nws.ncep.common.dataplugin.mcidas.McidasRecord; +import gov.noaa.nws.ncep.common.dataplugin.mcidas.McidasSpatialFactory; +import gov.noaa.nws.ncep.common.dataplugin.mcidas.dao.McidasDao; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -38,881 +43,886 @@ import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataplugin.PluginException; import com.raytheon.uf.common.time.DataTime; import com.raytheon.uf.edex.decodertools.time.TimeTools; -import gov.noaa.nws.ncep.common.dataplugin.mcidas.McidasMapCoverage; -import gov.noaa.nws.ncep.common.dataplugin.mcidas.McidasRecord; -import gov.noaa.nws.ncep.common.dataplugin.mcidas.McidasSpatialFactory; -import gov.noaa.nws.ncep.common.dataplugin.mcidas.dao.McidasDao; public class McidasDecoder extends AbstractDecoder { - final int RADIUS = 6371200; - final int SIZE_OF_AREA = 256; - final double PI = 3.14159265; - final double HALFPI = PI/2.; - final double RTD = 180./PI; - final double DTR = PI/180.; - private String traceId = ""; - private McidasDao dao; - Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("GMT")); - private McidasRecord mr = new McidasRecord(); + final int RADIUS = 6371200; - public PluginDataObject[] decode(byte[] data, Headers headers) throws Exception { - int endian = 0; - byte[] area = null; - byte[] nonAreaBlock = new byte[data.length - SIZE_OF_AREA]; - McidasRecord record = new McidasRecord(); - String areaName = null; + final int SIZE_OF_AREA = 256; - /* - * Separate area file and non-area block. - */ - record.setSizeRecords(data.length); + final double PI = 3.14159265; - area = new byte[SIZE_OF_AREA]; - System.arraycopy(data, 0, area, 0, SIZE_OF_AREA); - System.arraycopy(data, SIZE_OF_AREA, nonAreaBlock, 0, nonAreaBlock.length); + final double HALFPI = PI / 2.; - /* - * First word contains all zero for a valid record - */ - if (byteArrayToInt (area, 0, 0) == 0) { + final double RTD = 180. / PI; - /* - * Check endians for 2nd word, if it is not 4, i.e., big endian, swapping bytes. - */ - if (byteArrayToInt (area, 4, 0) != 4) { - endian = 1; - } + final double DTR = PI / 180.; - /* - * Satellite identification number (SID) - */ - int sid = byteArrayToInt (area, 8, endian); - record.setSatelliteId(sid); + private String traceId = ""; - /* - * Get and set the satellite name from SID - */ - String satelliteName=""; - if ( dao.getSatelliteId(sid) == null ) { - satelliteName = Integer.toString(sid); + private McidasDao dao; + + Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("GMT")); + + private McidasRecord mr = new McidasRecord(); + + public PluginDataObject[] decode(byte[] data, Headers headers) + throws Exception { + int endian = 0; + byte[] area = null; + byte[] nonAreaBlock = new byte[data.length - SIZE_OF_AREA]; + McidasRecord record = new McidasRecord(); + String areaName = null; + + /* + * Separate area file and non-area block. + */ + record.setSizeRecords(data.length); + + area = new byte[SIZE_OF_AREA]; + System.arraycopy(data, 0, area, 0, SIZE_OF_AREA); + System.arraycopy(data, SIZE_OF_AREA, nonAreaBlock, 0, + nonAreaBlock.length); + + /* + * First word contains all zero for a valid record + */ + if (byteArrayToInt(area, 0, 0) == 0) { + + /* + * Check endians for 2nd word, if it is not 4, i.e., big endian, + * swapping bytes. + */ + if (byteArrayToInt(area, 4, 0) != 4) { + endian = 1; } - else { - satelliteName = dao.getSatelliteId(sid).getSatelliteName(); + + /* + * Satellite identification number (SID) + */ + int sid = byteArrayToInt(area, 8, endian); + record.setSatelliteId(sid); + + /* + * Get and set the satellite name from SID + */ + String satelliteName = ""; + if (dao.getSatelliteId(sid) == null) { + satelliteName = Integer.toString(sid); + } else { + satelliteName = dao.getSatelliteId(sid).getSatelliteName(); } - record.setSatelliteName(satelliteName); + record.setSatelliteName(satelliteName); - /* - * Nominal year and Julian day - */ - int yyddd = byteArrayToInt (area, 12,endian); + /* + * Nominal year and Julian day + */ + int yyddd = byteArrayToInt(area, 12, endian); - /* - * Nominal image time - */ - int hhmmss = byteArrayToInt (area, 16, endian); + /* + * Nominal image time + */ + int hhmmss = byteArrayToInt(area, 16, endian); - /* - * Set nominal time as data time and set seconds/millid - */ - Calendar cal = convertJulianToCalendar(yyddd,hhmmss); - cal.set(Calendar.SECOND, 0); - cal.set(Calendar.MILLISECOND, 0); - record.setDataTime(new DataTime(cal)); + /* + * Set nominal time as data time and set seconds/millid + */ + Calendar cal = convertJulianToCalendar(yyddd, hhmmss); + cal.set(Calendar.SECOND, 0); + cal.set(Calendar.MILLISECOND, 0); + record.setDataTime(new DataTime(cal)); - /* - * Upper-left line in satellite coordinates - */ - int ulline = byteArrayToInt (area, 20, endian); + /* + * Upper-left line in satellite coordinates + */ + int ulline = byteArrayToInt(area, 20, endian); - /* - * Upper-left element in satellite coordinates - */ - int ulelem = byteArrayToInt (area, 24, endian); + /* + * Upper-left element in satellite coordinates + */ + int ulelem = byteArrayToInt(area, 24, endian); - /* - * Number of lines in y-axis - */ - Integer ny = byteArrayToInt (area, 32, endian); + /* + * Number of lines in y-axis + */ + Integer ny = byteArrayToInt(area, 32, endian); - /* - * Number of pixels in x-axis - */ - Integer nx = byteArrayToInt (area, 36, endian); + /* + * Number of pixels in x-axis + */ + Integer nx = byteArrayToInt(area, 36, endian); - /* - * Number of bytes each element (1, 2 or 4) - * int zdim = byteArrayToInt (area, 40, endian); - */ + /* + * Number of bytes each element (1, 2 or 4) int zdim = + * byteArrayToInt (area, 40, endian); + */ - /* - * Line resolution - */ - int yres = byteArrayToInt (area, 44, endian); + /* + * Line resolution + */ + int yres = byteArrayToInt(area, 44, endian); - /* - * Element (pixel) resolution - */ - int xres = byteArrayToInt (area, 48, endian); + /* + * Element (pixel) resolution + */ + int xres = byteArrayToInt(area, 48, endian); - /* - * Maximum number of bands per scan line - * int zres = byteArrayToInt (area, 52, endian); - */ - - /* - * Length of the data block line prefix - */ - int prefix = byteArrayToInt (area, 56, endian); - record.setPrefix (prefix); + /* + * Maximum number of bands per scan line int zres = byteArrayToInt + * (area, 52, endian); + */ - /* - * User project number under which the area is created - * int task = byteArrayToInt (area, 60, endian); - */ + /* + * Length of the data block line prefix + */ + int prefix = byteArrayToInt(area, 56, endian); + record.setPrefix(prefix); - /* - * Get and set the area creation time - */ - yyddd = byteArrayToInt (area, 64, endian); - hhmmss = byteArrayToInt (area, 68, endian); + /* + * User project number under which the area is created int task = + * byteArrayToInt (area, 60, endian); + */ - if ( hhmmss != 0 ) { - cal = convertJulianToCalendar(yyddd, hhmmss); + /* + * Get and set the area creation time + */ + yyddd = byteArrayToInt(area, 64, endian); + hhmmss = byteArrayToInt(area, 68, endian); + + if (hhmmss != 0) { + cal = convertJulianToCalendar(yyddd, hhmmss); } record.setCreationTime(cal); - /* - * Get and set image type, e.g., VIS, IR, IR2 from satellite name and - * image type number - */ - int imageTypeNumber = byteArrayToInt (area, 72, endian); - record.setImageTypeNumber(imageTypeNumber); - if ( imageTypeNumber <= 0 ) imageTypeNumber = -1; - String imageType=dao.getImageType(Integer.toString(sid), - Integer.toString(imageTypeNumber)).get(0).getImageType(); - - /* String memo = - * byteArrayToString(area,96,endian) + byteArrayToString(area,100,endian) + - * byteArrayToString(area,104,endian) + byteArrayToString(area,108,endian) + - * byteArrayToString(area,112,endian) + byteArrayToString(area,116,endian) + - * byteArrayToString(area,120,endian) + byteArrayToString(area,124,endian) + - * byteArrayToString(area,128,endian); - * - * Get area file number (AFN) - */ - int areaId = byteArrayToInt (area, 128, endian); - - /* - * Get and set the area name from AFN. If area name has a "|", parse the file - * and the 1st part is the group name for the satellite. The 2nd part is the - * area name. - */ - if ( dao.getAreaId(areaId) == null ) { - areaName = Integer.toString(areaId); - } else { - areaName = dao.getAreaId(areaId).getAreaName(); - } - - if ( areaName.contains("|")) { - String[] yyy = areaName.split("\\|",2); + /* + * Get and set image type, e.g., VIS, IR, IR2 from satellite name + * and image type number + */ + int imageTypeNumber = byteArrayToInt(area, 72, endian); + record.setImageTypeNumber(imageTypeNumber); + if (imageTypeNumber <= 0) + imageTypeNumber = -1; + String imageType = dao + .getImageType(Integer.toString(sid), + Integer.toString(imageTypeNumber)).get(0) + .getImageType(); - /* - * Handle special cases for duplicate area file numbers (see Design document) - */ - if ( areaId == 281 || areaId == 280 ) { - if (satelliteName.equals("Global")) { - if (areaId == 281) { - areaName = "TPW_PCT"; - } else { - areaName = "TPW_GPS"; - } - } else { - satelliteName = yyy[0]; - areaName = yyy[1]; - record.setSatelliteName(satelliteName); - } - } else { - satelliteName = yyy[0]; - areaName = yyy[1]; - record.setSatelliteName(satelliteName); - } - } - record.setAreaName(areaName); - String fileName = ""; - if ( headers != null ) { - fileName = (String) headers.get("traceId"); - } - record.setInputFileName(fileName); - - /* - * Acquire image type from input file name if needed. - */ - if (imageType.equals("UNKNOWN") || satelliteName.equals("VAAC")) { - if ( fileName.contains("_20") ) { - int index = fileName.indexOf("_20");; - imageType = fileName.substring(0,index); - if ( imageType.contains("_") ) { - index = imageType.lastIndexOf("_"); - imageType = imageType.substring (index + 1, imageType.length()); - } - } - } - record.setImageType(imageType); - - /* - * Area file number - * int filno = byteArrayToInt (area, 128, endian); - */ + /* + * String memo = byteArrayToString(area,96,endian) + + * byteArrayToString(area,100,endian) + + * byteArrayToString(area,104,endian) + + * byteArrayToString(area,108,endian) + + * byteArrayToString(area,112,endian) + + * byteArrayToString(area,116,endian) + + * byteArrayToString(area,120,endian) + + * byteArrayToString(area,124,endian) + + * byteArrayToString(area,128,endian); + * + * Get area file number (AFN) + */ + int areaId = byteArrayToInt(area, 128, endian); - /* - * Data offset: byte offset to the start of the data block - */ - int dataoff = byteArrayToInt (area, 132, endian); - byte [] header = new byte [dataoff]; - record.setHeaderBlock(header); - - /* - * Navigation offset: byte offset to the start of the navigation block - * - */ - int navoff = byteArrayToInt (area, 136, endian); - - /* - * Validity code: if these bytes are non-zero, they must match the first four - * bytes of each DATA block line prefix or the line's data is ignored. - */ - int validcode = byteArrayToInt (area, 140, endian); - record.setValidCode (validcode); - - /* - * Get and set actual image scan time - */ - yyddd = byteArrayToInt (area, 180, endian); - hhmmss = byteArrayToInt (area, 184, endian); - - if ( hhmmss != 0 ) { - cal = convertJulianToCalendar(yyddd,hhmmss); + /* + * Get and set the area name from AFN. If area name has a "|", parse + * the file and the 1st part is the group name for the satellite. + * The 2nd part is the area name. + */ + if (dao.getAreaId(areaId) == null) { + areaName = Integer.toString(areaId); + } else { + areaName = dao.getAreaId(areaId).getAreaName(); } - record.setImageTime(cal); - /* - * Actual starting scan - * int ascan = byteArrayToInt (area, 188, endian); - * - * Line prefix documentation section length in bytes - * int predoc = byteArrayToInt (area, 192, endian); - * - * Line prefix calibration section length in bytes - * int precal = byteArrayToInt (area, 196, endian); - * - * Line prefix level map section length in bytes - * int prelvl = byteArrayToInt (area, 200, endian); - * - * Image source type: "VISR', "VAS', 'AAA', ERBE', "AVHR' - * String srctyp = byteArrayToString (area, 204, endian); - */ - - /* - * Calibration type: 'RAW', "TEMP', 'BRIT' - * - */ - String caltyp = byteArrayToString (area, 208, endian); - record.setCalType(caltyp); - - /* Processing type - * int prctyp = byteArrayToInt (area, 212, endian); - * - * POES signal type - * int sigtyp = byteArrayToInt (area, 216, endian); - * - * POES ascending/descending - * int phase = byteArrayToInt (area, 220, endian); - * - * Original source srctyp - * String orgtyp = byteArrayToString (area, 224, endian); - */ - - /* - * Byte offset to the start of the calibration block - */ - int offcal = byteArrayToInt (area, 248, endian); + if (areaName.contains("|")) { + String[] yyy = areaName.split("\\|", 2); - /* - * Number of card image comments - */ - int icomment = byteArrayToInt (area, 252, endian); + /* + * Handle special cases for duplicate area file numbers (see + * Design document) + */ + if (areaId == 281 || areaId == 280) { + if (satelliteName.equals("Global")) { + if (areaId == 281) { + areaName = "TPW_PCT"; + } else { + areaName = "TPW_GPS"; + } + } else { + satelliteName = yyy[0]; + areaName = yyy[1]; + record.setSatelliteName(satelliteName); + } + } else { + satelliteName = yyy[0]; + areaName = yyy[1]; + record.setSatelliteName(satelliteName); + } + } + record.setAreaName(areaName); + String fileName = ""; + if (headers != null) { + fileName = (String) headers.get("traceId"); + } + record.setInputFileName(fileName); - /* - * Create navigation block - */ - int navsize; - if ( offcal == 0 ) { - navsize = dataoff - navoff; - } - else { - navsize = offcal - navoff; - } - byte [] navigation = new byte [navsize]; - System.arraycopy(nonAreaBlock, 0, navigation, 0, navsize); + /* + * Acquire image type from input file name if needed. + */ + if (imageType.equals("UNKNOWN") || satelliteName.equals("VAAC")) { + if (fileName.contains("_20")) { + int index = fileName.indexOf("_20"); + ; + imageType = fileName.substring(0, index); + if (imageType.contains("_")) { + index = imageType.lastIndexOf("_"); + imageType = imageType.substring(index + 1, + imageType.length()); + } + } + } + record.setImageType(imageType); - /* - * Set data block. - */ - byte [] imageData = new byte [data.length - dataoff - 80*icomment]; - System.arraycopy(data, dataoff, imageData, 0, imageData.length); - record.setMessageData(imageData); + /* + * Area file number int filno = byteArrayToInt (area, 128, endian); + */ - /* - * Projection type - */ - String navtyp = byteArrayToString (navigation, 0, endian); + /* + * Data offset: byte offset to the start of the data block + */ + int dataoff = byteArrayToInt(area, 132, endian); + byte[] header = new byte[dataoff]; + record.setHeaderBlock(header); - /* - * For map coverage compliance: 1: Mecator (MERC), 3: Lamber Conformal (LAMB), - * 5: Polar Steoreographic (PS) - */ - int resolution = 0; - Integer iproj = 0; - if (navtyp.trim().equals("PS") || navtyp.equals("MERC") || - navtyp.trim().equals("MET")) { - resolution = byteArrayToInt (navigation, 16, endian) / 1000; + /* + * Navigation offset: byte offset to the start of the navigation + * block + */ + int navoff = byteArrayToInt(area, 136, endian); - if (navtyp.equals("MERC")) { - iproj = 1; - } - else if (navtyp.trim().equals("PS")){ - iproj = 5; - } - } - else if (navtyp.equals("LAMB") || navtyp.equals("TANC")) { - resolution = byteArrayToInt (navigation, 20, endian) / 1000; - if ( navtyp.equals ("TANC")) { - resolution = resolution / 1000; - } - iproj = 3; - } - else { - // native satellite projections ( not remapped ) - iproj = 7585; - } - record.setResolution(resolution); + /* + * Validity code: if these bytes are non-zero, they must match the + * first four bytes of each DATA block line prefix or the line's + * data is ignored. + */ + int validcode = byteArrayToInt(area, 140, endian); + record.setValidCode(validcode); - /* - * Create map coverage. n4: standard latitude or spacing for TANC - */ - int n4 = byteArrayToInt (navigation, 12, endian); - int angdd = n4 / 10000; - int angmm = n4 / 100 - angdd * 100; - int angss = n4 - angdd * 10000 - angmm * 100; - Float stdlat1 = (float) ( angdd + angmm / 60. + angss / 3600.); - Float stdlat2 = stdlat1; - double phi0r = stdlat1 * DTR; - double sign = 1.; - if (phi0r < 0.) { - sign = -1.; - } + /* + * Get and set actual image scan time + */ + yyddd = byteArrayToInt(area, 180, endian); + hhmmss = byteArrayToInt(area, 184, endian); - /* - * Central longitude - */ - int n6 = byteArrayToInt (navigation, 20, endian); - angdd = n6 / 10000; - angmm = n6 / 100 - angdd * 100; - angss = n6 - angdd * 10000 - angmm * 100; - Float clon = (float) (angdd + angmm / 60. + angss / 3600.); - if (byteArrayToInt (navigation, 36, endian) >= 0) { - clon = -clon; - } + if (hhmmss != 0) { + cal = convertJulianToCalendar(yyddd, hhmmss); + } + record.setImageTime(cal); - /* - * Set pixel/grid spacing and earth radius and eccentricity. For TANC, - * n5 is the standard latitude. - */ - int spacing = byteArrayToInt (navigation, 16, endian); - Float dx = (float)(spacing * xres); + /* + * Actual starting scan int ascan = byteArrayToInt (area, 188, + * endian); + * + * Line prefix documentation section length in bytes int predoc = + * byteArrayToInt (area, 192, endian); + * + * Line prefix calibration section length in bytes int precal = + * byteArrayToInt (area, 196, endian); + * + * Line prefix level map section length in bytes int prelvl = + * byteArrayToInt (area, 200, endian); + * + * Image source type: "VISR', "VAS', 'AAA', ERBE', "AVHR' String + * srctyp = byteArrayToString (area, 204, endian); + */ - /* - * Earth radius - */ - int re = byteArrayToInt (navigation, 24, endian); + /* + * Calibration type: 'RAW', "TEMP', 'BRIT' + */ + String caltyp = byteArrayToString(area, 208, endian); + record.setCalType(caltyp); - /* - * Eccentricity - * int n8 = byteArrayToInt (navigation, 28, endian); - * double ecc = n8 / 1000000.; - */ - + /* + * Processing type int prctyp = byteArrayToInt (area, 212, endian); + * + * POES signal type int sigtyp = byteArrayToInt (area, 216, endian); + * + * POES ascending/descending int phase = byteArrayToInt (area, 220, + * endian); + * + * Original source srctyp String orgtyp = byteArrayToString (area, + * 224, endian); + */ - /* - * Image y-coordinate of north pole - */ - int n2 = byteArrayToInt (navigation, 4, endian); + /* + * Byte offset to the start of the calibration block + */ + int offcal = byteArrayToInt(area, 248, endian); - /* - * Image x-coordinate of north pole - */ - int n3 = byteArrayToInt (navigation, 8, endian); + /* + * Number of card image comments + */ + int icomment = byteArrayToInt(area, 252, endian); - /* - * location of pole point (rxp, ryp); (1,1) at lower-left corner. - */ - double rxp = ((double) (n3 - ulelem) / xres + 1.); - double ryp = (ny - (double) (n2 - ulline) / yres); + /* + * Create navigation block + */ + int navsize; + if (offcal == 0) { + navsize = dataoff - navoff; + } else { + navsize = offcal - navoff; + } + byte[] navigation = new byte[navsize]; + System.arraycopy(nonAreaBlock, 0, navigation, 0, navsize); - /* - * Polar steoreographic projection (PS) - */ - Float dy = 0.f; - Float lllat = 0.f, lllon = 0.f, urlat = 0.f, urlon = 0.f; - String proj = null; - if (iproj == 5) { - proj = "STR"; - dy = (float) spacing * yres; + /* + * Set data block. + */ + byte[] imageData = new byte[data.length - dataoff - 80 * icomment]; + System.arraycopy(data, dataoff, imageData, 0, imageData.length); + record.setMessageData(imageData); - /* - * Compute lat/lon of the lower-left corner - */ - double dxp = (1. - rxp) * dx; - double dyp = (1. - ryp) * dy; - double alpha = 1. + Math.sin(Math.abs(phi0r)); - double rm = Math.sqrt((dxp*dxp + dyp*dyp)) / alpha ; - lllat = (float) (sign * ((HALFPI - 2. * Math.atan(rm/re))) * RTD); - double thta; - if (dyp != 0) { - dyp = (-dyp) * sign; - thta = (Math.atan2(dxp,dyp)) * RTD; - lllon = prnlon ((float) (clon + thta)); - } - else { - lllon = (float) clon; - } + /* + * Projection type + */ + String navtyp = byteArrayToString(navigation, 0, endian); - /* - * Compute lat/lon of the upper-right corner - */ - dxp = (nx - rxp) * dx; - dyp = (ny - ryp) * dy; - rm = Math.sqrt((dxp*dxp + dyp*dyp)) / alpha; - urlat = (float) (sign * ((HALFPI - 2. * Math.atan(rm/re))) * RTD); + /* + * For map coverage compliance: 1: Mecator (MERC), 3: Lamber + * Conformal (LAMB), 5: Polar Steoreographic (PS) + */ + int resolution = 0; + Integer iproj = 0; + if (navtyp.trim().equals("PS") || navtyp.equals("MERC") + || navtyp.trim().equals("MET")) { + resolution = byteArrayToInt(navigation, 16, endian) / 1000; - if (dyp != 0) { - dyp = (-dyp) * sign; - thta = (Math.atan2(dxp,dyp)) * RTD; - urlon = prnlon((float) (clon + thta)); - } - else { - urlon = (float) clon; - } - } + if (navtyp.equals("MERC")) { + iproj = 1; + } else if (navtyp.trim().equals("PS")) { + iproj = 5; + } + } else if (navtyp.equals("LAMB") || navtyp.equals("TANC")) { + resolution = byteArrayToInt(navigation, 20, endian) / 1000; + if (navtyp.equals("TANC")) { + resolution = resolution / 1000; + } + iproj = 3; + } else { + // native satellite projections ( not remapped ) + iproj = 7585; + } + record.setResolution(resolution); - /* - * Mercator projection - */ - else if (iproj == 1) { - proj = "MER"; - dy = (float) spacing * yres; + /* + * Create map coverage. n4: standard latitude or spacing for TANC + */ + int n4 = byteArrayToInt(navigation, 12, endian); + int angdd = n4 / 10000; + int angmm = n4 / 100 - angdd * 100; + int angss = n4 - angdd * 10000 - angmm * 100; + Float stdlat1 = (float) (angdd + angmm / 60. + angss / 3600.); + Float stdlat2 = stdlat1; + double phi0r = stdlat1 * DTR; + double sign = 1.; + if (phi0r < 0.) { + sign = -1.; + } - /* - * compute lat/lon of the lower-left corner - */ - double dxp = 1. - rxp; - double dyp = 1. - ryp; - double rm = dx * dyp; - double rcos = re * Math.cos(phi0r); - double arg = Math.exp(rm/rcos); - lllat = (float) ((2. * Math.atan(arg) - HALFPI ) * RTD); - lllon = prnlon ((float) (clon + ((dx * dxp) / rcos) * RTD)); + /* + * Central longitude + */ + int n6 = byteArrayToInt(navigation, 20, endian); + angdd = n6 / 10000; + angmm = n6 / 100 - angdd * 100; + angss = n6 - angdd * 10000 - angmm * 100; + Float clon = (float) (angdd + angmm / 60. + angss / 3600.); + if (byteArrayToInt(navigation, 36, endian) >= 0) { + clon = -clon; + } - /* - * compute lat/lon of the upper-right corner - */ - dxp = nx -rxp; - dyp = ny -ryp; - rm = dx * dyp; - arg = Math.exp(rm / rcos); - urlat = (float) ((2. * Math.atan(arg) - HALFPI ) * RTD); - urlon = prnlon ((float) (clon + ((dx * dxp) / rcos) * RTD)); - urlon = prnlon (urlon); - - /* - * Lamber conformal conic projection (LAMB) - */ - } else if (iproj == 3) { - if ( stdlat1 > 0 ) { - proj = "LCC"; - } else { - proj = "SCC"; - } + /* + * Set pixel/grid spacing and earth radius and eccentricity. For + * TANC, n5 is the standard latitude. + */ + int spacing = byteArrayToInt(navigation, 16, endian); + Float dx = (float) (spacing * xres); - if (navtyp.equals ("LAMB")) { - // earth radius - re = byteArrayToInt (navigation, 28, endian); + /* + * Earth radius + */ + int re = byteArrayToInt(navigation, 24, endian); - if (re <= 6200000.) { - re = RADIUS; - } + /* + * Eccentricity int n8 = byteArrayToInt (navigation, 28, endian); + * double ecc = n8 / 1000000.; + */ - /* - * Standard latitude 2 - */ - int n5 = byteArrayToInt (navigation, 16, endian); - angdd = n5 / 10000; - angmm = n5 / 100 - angdd * 100; - angss = n5 - angdd * 10000 - angmm * 100; - stdlat2 = (float) (angdd + angmm / 60. + angss / 3600.); - - /* - * Central longitude. If west positive, make west negative. - */ - int n7 = byteArrayToInt (navigation, 24, endian); - angdd = n7 / 10000; - angmm = n7 / 100 - angdd * 100; - angss = n7 - angdd * 10000 - angmm * 100; - clon = (float) (angdd + angmm / 60. + angss / 3600.); - - if (byteArrayToInt (navigation, 36, endian) >= 0) { - clon = -clon; - } + /* + * Image y-coordinate of north pole + */ + int n2 = byteArrayToInt(navigation, 4, endian); - /* - * compute pixel/grid spacing and colatitudes - */ - n6 = byteArrayToInt (navigation, 20, endian); - dx = (float) n6 * xres; - dy = (float) n6 * yres; - } - else if (navtyp.equals("TANC") ) { - - /* - * McIDAS uses Earth Radius 6371.1 (RADIUS). Navigation block km per pixel - * scaled by 10000., convert to meters - */ - re = RADIUS; - dx = (n4 / 10000.f * xres) * 1000.f; - dy = (n4 / 10000.f * yres) * 1000.f; - rxp = ((double) (n3/10000. - ulelem) / xres + 1.); - ryp = (ny - (double) (n2/10000. - ulline) / yres); + /* + * Image x-coordinate of north pole + */ + int n3 = byteArrayToInt(navigation, 8, endian); - /* - * Standard angles are in decimal degree for TANC only - */ - int n5 = byteArrayToInt (navigation, 16, endian); - stdlat1 = n5/10000.f; - stdlat2 = stdlat1; - phi0r = stdlat1 * DTR; - if (phi0r < 0.) { - sign = -1.; - proj = "SCC"; - } else { - proj = "LCC"; - } - } - - /* - * compute pixel/grid spacing and colatitude. - */ - double psi1 = HALFPI - Math.abs (stdlat1) * DTR; - double psi2 = HALFPI - Math.abs (stdlat2) * DTR; + /* + * location of pole point (rxp, ryp); (1,1) at lower-left corner. + */ + double rxp = ((double) (n3 - ulelem) / xres + 1.); + double ryp = (ny - (double) (n2 - ulline) / yres); - /* - * compute cone constant - */ - double ccone; - if (psi1 == psi2) { - ccone = Math.cos (psi1); - } - else { - double tmp1 = Math.log (Math.sin(psi2) / Math.sin(psi1)); - double tmp2 = Math.log (Math.tan(psi2/2.) / Math.tan(psi1/2.)); - ccone = tmp1 / tmp2; - } + /* + * Polar steoreographic projection (PS) + */ + Float dy = 0.f; + Float lllat = 0.f, lllon = 0.f, urlat = 0.f, urlon = 0.f; + String proj = null; + if (iproj == 5) { + proj = "STR"; + dy = (float) spacing * yres; - /* - * Compute lat/lon of the lower-left corner. Sing = 1/-1 denotes NH/SH - */ - double dxp = 1. - rxp; - double dyp = 1. - ryp; - double rm = dx * Math.sqrt((dxp*dxp + dyp*dyp)); - double tmp = ccone / (re * Math.sin (psi1)); - double arg = Math.pow (rm * tmp, 1. / ccone) * Math.tan(psi1/2.); - lllat = (float) (sign * (HALFPI - 2. * Math.atan(arg)) * RTD); + /* + * Compute lat/lon of the lower-left corner + */ + double dxp = (1. - rxp) * dx; + double dyp = (1. - ryp) * dy; + double alpha = 1. + Math.sin(Math.abs(phi0r)); + double rm = Math.sqrt((dxp * dxp + dyp * dyp)) / alpha; + lllat = (float) (sign * ((HALFPI - 2. * Math.atan(rm / re))) * RTD); + double thta; + if (dyp != 0) { + dyp = (-dyp) * sign; + thta = (Math.atan2(dxp, dyp)) * RTD; + lllon = prnlon((float) (clon + thta)); + } else { + lllon = (float) clon; + } - double thta; - if (dyp != 0) { - dyp = -dyp; - thta = (Math.atan2(dxp,dyp)) * RTD / ccone; - lllon = prnlon ((float) (clon + thta)) ; - } - else { - lllon = (float) clon; - } + /* + * Compute lat/lon of the upper-right corner + */ + dxp = (nx - rxp) * dx; + dyp = (ny - ryp) * dy; + rm = Math.sqrt((dxp * dxp + dyp * dyp)) / alpha; + urlat = (float) (sign * ((HALFPI - 2. * Math.atan(rm / re))) * RTD); - /* - * compute lat/lon of the upper-right corner - */ - dxp = nx - rxp; - dyp = ny - ryp; - rm = dx * Math.sqrt((dxp*dxp + dyp*dyp)); - arg = Math.pow (rm * tmp, 1. / ccone) * Math.tan(psi1/2.); - urlat = (float) (sign * ((HALFPI - 2. * Math.atan(arg))) * RTD); + if (dyp != 0) { + dyp = (-dyp) * sign; + thta = (Math.atan2(dxp, dyp)) * RTD; + urlon = prnlon((float) (clon + thta)); + } else { + urlon = (float) clon; + } + } - if (dyp != 0) { - dyp = -dyp; - thta = (Math.atan2(dxp,dyp)) * RTD / ccone; - urlon = (float) (clon + thta); - urlon = prnlon (urlon); - } - else { - urlon = (float) clon; - } - } - else if ( iproj == 7585 ) { - // native satellite projections ( not remapped ) - proj = navtyp; - int ilonrad = byteArrayToInt (navigation, 20, endian); - clon = (float)ilonrad/10000000.f; - clon = (float)Math.toDegrees((double)clon); - - } - record.setProjection(proj); - - /* - * Create map coverage. - */ - McidasMapCoverage mapCoverage = null; - try { - if ( iproj <= 5 ) { - mapCoverage = McidasSpatialFactory.getInstance().getMapCoverage (iproj, - nx, ny, dx, dy, clon, stdlat1, stdlat2, lllat, lllon, urlat, urlon); - } - else { - // non-remapped Navigations - mapCoverage = McidasSpatialFactory.getInstance().getMapCoverage (iproj, - nx, ny, clon, ulelem, ulline, xres, yres, navigation); - } - } catch (Exception e) { - StringBuffer buf = new StringBuffer(); - if ( iproj <=5 ) { - buf.append("Error getting or constructing SatMapCoverage for values: ").append("\n\t"); - buf.append("mapProjection=" + iproj).append("\n\t"); - buf.append("nx=" + nx).append("\n\t"); - buf.append("ny=" + ny).append("\n\t"); - buf.append("dx=" + dx).append("\n\t"); - buf.append("dy=" + dy).append("\n\t"); - buf.append("clon=" + clon).append("\n\t"); - buf.append("stdlat1=" + stdlat1).append("\n\t"); - buf.append("stdlat2=" + stdlat2).append("\n\t"); - buf.append("la1=" + lllat).append("\n\t"); - buf.append("lo1=" + lllon).append("\n\t"); - buf.append("la2=" + urlat).append("\n\t"); - buf.append("lo2=" + urlon).append("\n"); - } - else { - buf.append("Error getting or constructing SatMapCoverage for Navigation Type "+proj).append("\n"); - } - throw new DecoderException(buf.toString(), e); - } + /* + * Mercator projection + */ + else if (iproj == 1) { + proj = "MER"; + dy = (float) spacing * yres; - record.setReportType("mcidas"); - if (record != null) { - record.setTraceId(traceId); - record.setCoverage(mapCoverage); - record.setPersistenceTime(TimeTools.getSystemCalendar()); - record.setPluginName("mcidas"); - try { - record.constructDataURI(); - } catch (PluginException e) { - e.printStackTrace(); - } - } - return new PluginDataObject[] {record}; - } - else { - return new PluginDataObject[0]; - } - } + /* + * compute lat/lon of the lower-left corner + */ + double dxp = 1. - rxp; + double dyp = 1. - ryp; + double rm = dx * dyp; + double rcos = re * Math.cos(phi0r); + double arg = Math.exp(rm / rcos); + lllat = (float) ((2. * Math.atan(arg) - HALFPI) * RTD); + lllon = prnlon((float) (clon + ((dx * dxp) / rcos) * RTD)); - /** - * Convert from a Julian date to a Gregorian date - * - * @param julian The julian date - * @return The Calendar - */ + /* + * compute lat/lon of the upper-right corner + */ + dxp = nx - rxp; + dyp = ny - ryp; + rm = dx * dyp; + arg = Math.exp(rm / rcos); + urlat = (float) ((2. * Math.atan(arg) - HALFPI) * RTD); + urlon = prnlon((float) (clon + ((dx * dxp) / rcos) * RTD)); + urlon = prnlon(urlon); - private Calendar convertJulianToCalendar(int julian, int hhmmss) { + /* + * Lamber conformal conic projection (LAMB) + */ + } else if (iproj == 3) { + if (stdlat1 > 0) { + proj = "LCC"; + } else { + proj = "SCC"; + } - /* - * The Julian day format is nYYDDD where n = 1, year > 2000 and n = 0, year - * is prior to 2001. For example, 109244 -> 2009/244. - */ - if (julian > 100000) { - julian = julian + 1900000; - } - else { - julian = julian + 1800000; - } - Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT")); - cal.set(Calendar.YEAR, julian/1000); - cal.set(Calendar.DAY_OF_YEAR, julian - (julian/1000) * 1000); - - int ihour = hhmmss/10000; - cal.set(Calendar.HOUR_OF_DAY, ihour); - int minute = (hhmmss - ihour * 10000) / 100; - cal.set(Calendar.MINUTE, minute); - int second = hhmmss - ihour * 10000 - minute * 100; - cal.set(Calendar.SECOND, second); - cal.set(Calendar.MILLISECOND, 0); - return cal; - } - - - /** - * Convert the byte array to an int starting from the given offset. - * - * @param b The byte array - * @param offset The array offset - * @param endian endian flag - * @return The Integer - */ - public Integer byteArrayToInt(byte[] b, int offset, int endian) { - Integer value = 0; - - // little endian (MSB at the highest memory address) - if (endian == 0) { - for (int i = 0; i < 4; i++) { - int shift = (3 - i) * 8; - value += (b[i + offset] & 0x000000FF) << shift; - } - } + if (navtyp.equals("LAMB")) { + // earth radius + re = byteArrayToInt(navigation, 28, endian); - // big endian (MSB at the lowest memory address) - else if (endian == 1) { - for (int i = 0; i < 4; i++) { - int shift = i * 8; - value += (b[i + offset] & 0x000000FF) << shift; - } - } - else { - System.out.println (" Illegal endian input "); - } - return value; - } + if (re <= 6200000.) { + re = RADIUS; + } - /** - * Convert the byte array to a string starting from the given offset. - * - * @param b - * The byte array - * @param offset - * The array offset - * @param endian - * little and big endian flag - * @return The integer - */ - public String byteArrayToString(byte[] b, int offset, int endian) { - String str = null; - - /* - * little endian (MSB at the highest memory address) - */ - if (endian == 0) { - byte[] byteArray = new byte[] { b[offset+3], b[offset+2], - b[offset+1], b[offset+0] }; - str = new String(byteArray); - } + /* + * Standard latitude 2 + */ + int n5 = byteArrayToInt(navigation, 16, endian); + angdd = n5 / 10000; + angmm = n5 / 100 - angdd * 100; + angss = n5 - angdd * 10000 - angmm * 100; + stdlat2 = (float) (angdd + angmm / 60. + angss / 3600.); - /* - * big endian (MSB at the lowest memory address) - */ - else if (endian == 1) { - byte[] byteArray = new byte[] { b[offset+0], b[offset+1], - b[offset+2], b[offset+3] }; - str = new String (byteArray); - } - else { - System.out.println (" Illegal endian input "); - } - return str; - } + /* + * Central longitude. If west positive, make west negative. + */ + int n7 = byteArrayToInt(navigation, 24, endian); + angdd = n7 / 10000; + angmm = n7 / 100 - angdd * 100; + angss = n7 - angdd * 10000 - angmm * 100; + clon = (float) (angdd + angmm / 60. + angss / 3600.); - /** - * Convert a longitude in degrees which fall within the range -180 to 180. - * @param lon - * @return - */ - public float prnlon (float lon) { - float dlon = lon - (int)(lon / 360.f) * 360.f; - if (lon < -180.) { - dlon = lon + 360.f; - } - else if (lon > 180.) { - dlon = (float) (lon - 360.); - } - return dlon; - } + if (byteArrayToInt(navigation, 36, endian) >= 0) { + clon = -clon; + } - public McidasDao getDao() { - return dao; - } + /* + * compute pixel/grid spacing and colatitudes + */ + n6 = byteArrayToInt(navigation, 20, endian); + dx = (float) n6 * xres; + dy = (float) n6 * yres; + } else if (navtyp.equals("TANC")) { - public void setDao(McidasDao dao) { - this.dao = dao; - } - + /* + * McIDAS uses Earth Radius 6371.1 (RADIUS). Navigation + * block km per pixel scaled by 10000., convert to meters + */ + re = RADIUS; + dx = (n4 / 10000.f * xres) * 1000.f; + dy = (n4 / 10000.f * yres) * 1000.f; + rxp = ((double) (n3 / 10000. - ulelem) / xres + 1.); + ryp = (ny - (double) (n2 / 10000. - ulline) / yres); - /** - * @param data - * @return - * @throws Exception - */ + /* + * Standard angles are in decimal degree for TANC only + */ + int n5 = byteArrayToInt(navigation, 16, endian); + stdlat1 = n5 / 10000.f; + stdlat2 = stdlat1; + phi0r = stdlat1 * DTR; + if (phi0r < 0.) { + sign = -1.; + proj = "SCC"; + } else { + proj = "LCC"; + } + } - public PluginDataObject[] decodeFile(File inputFile) throws Exception { - byte [] fileData = null; - InputStream is = null; - try { - try { - is = new FileInputStream(inputFile); + /* + * compute pixel/grid spacing and colatitude. + */ + double psi1 = HALFPI - Math.abs(stdlat1) * DTR; + double psi2 = HALFPI - Math.abs(stdlat2) * DTR; + + /* + * compute cone constant + */ + double ccone; + if (psi1 == psi2) { + ccone = Math.cos(psi1); + } else { + double tmp1 = Math.log(Math.sin(psi2) / Math.sin(psi1)); + double tmp2 = Math.log(Math.tan(psi2 / 2.) + / Math.tan(psi1 / 2.)); + ccone = tmp1 / tmp2; + } + + /* + * Compute lat/lon of the lower-left corner. Sing = 1/-1 denotes + * NH/SH + */ + double dxp = 1. - rxp; + double dyp = 1. - ryp; + double rm = dx * Math.sqrt((dxp * dxp + dyp * dyp)); + double tmp = ccone / (re * Math.sin(psi1)); + double arg = Math.pow(rm * tmp, 1. / ccone) + * Math.tan(psi1 / 2.); + lllat = (float) (sign * (HALFPI - 2. * Math.atan(arg)) * RTD); + + double thta; + if (dyp != 0) { + dyp = -dyp; + thta = (Math.atan2(dxp, dyp)) * RTD / ccone; + lllon = prnlon((float) (clon + thta)); + } else { + lllon = (float) clon; + } + + /* + * compute lat/lon of the upper-right corner + */ + dxp = nx - rxp; + dyp = ny - ryp; + rm = dx * Math.sqrt((dxp * dxp + dyp * dyp)); + arg = Math.pow(rm * tmp, 1. / ccone) * Math.tan(psi1 / 2.); + urlat = (float) (sign * ((HALFPI - 2. * Math.atan(arg))) * RTD); + + if (dyp != 0) { + dyp = -dyp; + thta = (Math.atan2(dxp, dyp)) * RTD / ccone; + urlon = (float) (clon + thta); + urlon = prnlon(urlon); + } else { + urlon = (float) clon; + } + } else if (iproj == 7585) { + // native satellite projections ( not remapped ) + proj = navtyp; + int ilonrad = byteArrayToInt(navigation, 20, endian); + clon = (float) ilonrad / 10000000.f; + clon = (float) Math.toDegrees((double) clon); + + } + record.setProjection(proj); + + /* + * Create map coverage. + */ + McidasMapCoverage mapCoverage = null; + try { + if (iproj <= 5) { + mapCoverage = McidasSpatialFactory.getInstance() + .getMapCoverage(iproj, nx, ny, dx, dy, clon, + stdlat1, stdlat2, lllat, lllon, urlat, + urlon, (double) re); + } else { + // non-remapped Navigations + mapCoverage = McidasSpatialFactory.getInstance() + .getMapCoverage(iproj, nx, ny, clon, ulelem, + ulline, xres, yres, navigation); + } + } catch (Exception e) { + StringBuffer buf = new StringBuffer(); + if (iproj <= 5) { + buf.append( + "Error getting or constructing SatMapCoverage for values: ") + .append("\n\t"); + buf.append("mapProjection=" + iproj).append("\n\t"); + buf.append("nx=" + nx).append("\n\t"); + buf.append("ny=" + ny).append("\n\t"); + buf.append("dx=" + dx).append("\n\t"); + buf.append("dy=" + dy).append("\n\t"); + buf.append("clon=" + clon).append("\n\t"); + buf.append("stdlat1=" + stdlat1).append("\n\t"); + buf.append("stdlat2=" + stdlat2).append("\n\t"); + buf.append("la1=" + lllat).append("\n\t"); + buf.append("lo1=" + lllon).append("\n\t"); + buf.append("la2=" + urlat).append("\n\t"); + buf.append("lo2=" + urlon).append("\n"); + } else { + buf.append( + "Error getting or constructing SatMapCoverage for Navigation Type " + + proj).append("\n"); + } + throw new DecoderException(buf.toString(), e); + } + + record.setReportType("mcidas"); + if (record != null) { + record.setTraceId(traceId); + record.setCoverage(mapCoverage); + record.setPersistenceTime(TimeTools.getSystemCalendar()); + record.setPluginName("mcidas"); + try { + record.constructDataURI(); + } catch (PluginException e) { + e.printStackTrace(); + } + } + return new PluginDataObject[] { record }; + } else { + return new PluginDataObject[0]; + } + } + + /** + * Convert from a Julian date to a Gregorian date + * + * @param julian + * The julian date + * @return The Calendar + */ + + private Calendar convertJulianToCalendar(int julian, int hhmmss) { + + /* + * The Julian day format is nYYDDD where n = 1, year > 2000 and n = 0, + * year is prior to 2001. For example, 109244 -> 2009/244. + */ + if (julian > 100000) { + julian = julian + 1900000; + } else { + julian = julian + 1800000; + } + Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT")); + cal.set(Calendar.YEAR, julian / 1000); + cal.set(Calendar.DAY_OF_YEAR, julian - (julian / 1000) * 1000); + + int ihour = hhmmss / 10000; + cal.set(Calendar.HOUR_OF_DAY, ihour); + int minute = (hhmmss - ihour * 10000) / 100; + cal.set(Calendar.MINUTE, minute); + int second = hhmmss - ihour * 10000 - minute * 100; + cal.set(Calendar.SECOND, second); + cal.set(Calendar.MILLISECOND, 0); + return cal; + } + + /** + * Convert the byte array to an int starting from the given offset. + * + * @param b + * The byte array + * @param offset + * The array offset + * @param endian + * endian flag + * @return The Integer + */ + public Integer byteArrayToInt(byte[] b, int offset, int endian) { + Integer value = 0; + + // little endian (MSB at the highest memory address) + if (endian == 0) { + for (int i = 0; i < 4; i++) { + int shift = (3 - i) * 8; + value += (b[i + offset] & 0x000000FF) << shift; + } + } + + // big endian (MSB at the lowest memory address) + else if (endian == 1) { + for (int i = 0; i < 4; i++) { + int shift = i * 8; + value += (b[i + offset] & 0x000000FF) << shift; + } + } else { + System.out.println(" Illegal endian input "); + } + return value; + } + + /** + * Convert the byte array to a string starting from the given offset. + * + * @param b + * The byte array + * @param offset + * The array offset + * @param endian + * little and big endian flag + * @return The integer + */ + public String byteArrayToString(byte[] b, int offset, int endian) { + String str = null; + + /* + * little endian (MSB at the highest memory address) + */ + if (endian == 0) { + byte[] byteArray = new byte[] { b[offset + 3], b[offset + 2], + b[offset + 1], b[offset + 0] }; + str = new String(byteArray); + } + + /* + * big endian (MSB at the lowest memory address) + */ + else if (endian == 1) { + byte[] byteArray = new byte[] { b[offset + 0], b[offset + 1], + b[offset + 2], b[offset + 3] }; + str = new String(byteArray); + } else { + System.out.println(" Illegal endian input "); + } + return str; + } + + /** + * Convert a longitude in degrees which fall within the range -180 to 180. + * + * @param lon + * @return + */ + public float prnlon(float lon) { + float dlon = lon - (int) (lon / 360.f) * 360.f; + if (lon < -180.) { + dlon = lon + 360.f; + } else if (lon > 180.) { + dlon = (float) (lon - 360.); + } + return dlon; + } + + public McidasDao getDao() { + return dao; + } + + public void setDao(McidasDao dao) { + this.dao = dao; + } + + /** + * @param data + * @return + * @throws Exception + */ + + public PluginDataObject[] decodeFile(File inputFile) throws Exception { + byte[] fileData = null; + InputStream is = null; + try { + try { + is = new FileInputStream(inputFile); + + fileData = new byte[(int) inputFile.length()]; + int bytesRead = is.read(fileData); + // If we didn't or couldn't read all the data, signal the + // fact by setting the data to null; + if (bytesRead != fileData.length) { + fileData = null; + } + fileName = inputFile.getName(); + mr.setInputFileName(fileName); + } catch (IOException ioe) { + logger.error("Error reading input file " + inputFile.getName(), + ioe); + fileData = null; + } + } finally { + if (is != null) { + try { + is.close(); + } catch (IOException ioe) { + logger.error("Could not close input file " + + inputFile.getName()); + } + } + } + return decode(fileData, null); + } + + /* + * public static void main(String[] args) throws Exception { File infile = + * new File( + * "/export-3/ncosrvnfs/images/satellite/GOES-W/Full_Disk/IR/IR_20100810_0900" + * ); FileInputStream inpt = new FileInputStream(infile); + * System.out.println(infile.length()); int size = (int)infile.length(); + * byte[] payload = new byte[size]; inpt.read(payload); inpt.close(); + * DefaultMathTransformFactory dmtf = new DefaultMathTransformFactory(); + * dmtf.scanForPlugins(); McidasDecoder dec = new McidasDecoder(); + * dec.decode(payload); } + */ - fileData = new byte[(int) inputFile.length()]; - int bytesRead = is.read(fileData); - // If we didn't or couldn't read all the data, signal the - // fact by setting the data to null; - if (bytesRead != fileData.length) { - fileData = null; - } - fileName = inputFile.getName(); - mr.setInputFileName(fileName); - } catch (IOException ioe) { - logger.error("Error reading input file " + inputFile.getName(), ioe); - fileData = null; - } - } finally { - if (is != null) { - try { - is.close(); - } catch (IOException ioe) { - logger.error("Could not close input file " + inputFile.getName()); - } - } - } - return decode(fileData, null); - } - - /* - public static void main(String[] args) throws Exception { - File infile = new File("/export-3/ncosrvnfs/images/satellite/GOES-W/Full_Disk/IR/IR_20100810_0900"); - FileInputStream inpt = new FileInputStream(infile); - System.out.println(infile.length()); - int size = (int)infile.length(); - byte[] payload = new byte[size]; - inpt.read(payload); - inpt.close(); - DefaultMathTransformFactory dmtf = new DefaultMathTransformFactory(); - dmtf.scanForPlugins(); - McidasDecoder dec = new McidasDecoder(); - dec.decode(payload); - } - */ - } - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml index 0bed17b1bf..ef20a4c43a 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml @@ -52,7 +52,7 @@ - + diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/src/gov/noaa/nws/ncep/edex/plugin/stormtrack/decoder/StormTrackDecoder.java b/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/src/gov/noaa/nws/ncep/edex/plugin/stormtrack/decoder/StormTrackDecoder.java index 376b4d054e..46b51338a4 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/src/gov/noaa/nws/ncep/edex/plugin/stormtrack/decoder/StormTrackDecoder.java +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/src/gov/noaa/nws/ncep/edex/plugin/stormtrack/decoder/StormTrackDecoder.java @@ -16,6 +16,8 @@ import gov.noaa.nws.ncep.common.dataplugin.stormtrack.StormTrackRecord; import gov.noaa.nws.ncep.edex.plugin.stormtrack.util.StormTrackParser; import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN; +import java.util.ArrayList; +import java.util.List; import java.util.Calendar; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -39,6 +41,7 @@ import com.raytheon.uf.common.dataplugin.PluginException; * ------------ ---------- ----------- -------------------------- * 08/2011 T. Lee ATCF and Ensemble storm tracks * 06/2012 #606 G. Hull constructDataURI() after setReportType so it gets into the URI + * 07/2013 T. Lee Improved performance via batch processing * * * @@ -66,10 +69,9 @@ public class StormTrackDecoder extends AbstractDecoder { pluginName = name; } - public synchronized PluginDataObject[] decode(byte[] data, Headers headers) + public PluginDataObject[] decode(byte[] data, Headers headers) throws DecoderException { String traceId = ""; - String theBulletin = null; byte[] messageData = null; // STORMTRACK_DATA is REGEX for a StormTrack record final String STORMTRACK_DATA = IDecoderConstantsN.STORM_BULLSEPARATOR; @@ -82,31 +84,33 @@ public class StormTrackDecoder extends AbstractDecoder { /* * Check if there are more records */ + StormTrackRecord record = null; + List records = new ArrayList (); StormTrackSeparator sep = StormTrackSeparator.separate(data, headers); + + while (sep.hasNext()) { messageData = sep.next(); String theMessage = new String(messageData); - theBulletin = theMessage; - StormTrackRecord record = null; try { - Matcher stormTrackMatcher = stormTrackPattern.matcher(theBulletin); + Matcher stormTrackMatcher = stormTrackPattern.matcher(theMessage); if (stormTrackMatcher.find()) { } else { System.out.println("StormTrack WARNING: Ignored invalid record: " - + theBulletin); + + theMessage); } } catch (Exception e) { System.out.println("StormTrack WARNING exception: Unable to decode: " - + theBulletin); + + theMessage); e.printStackTrace(); } /* * Process the StormTrack fields */ - record = StormTrackParser.processFields(theBulletin); + record = StormTrackParser.processFields(theMessage); /* * Check the StormTrack record object @@ -126,6 +130,10 @@ public class StormTrackDecoder extends AbstractDecoder { } record.constructDataURI(); + if ( record.getClat() != IDecoderConstantsN.FLOAT_MISSING && + record.getClon() != IDecoderConstantsN.FLOAT_MISSING ) { + records.add(record); + } } catch (PluginException e) { throw new DecoderException( @@ -133,16 +141,15 @@ public class StormTrackDecoder extends AbstractDecoder { e); } } + } /* * Return StormTrack record object if not null */ - - if (record == null) { return new PluginDataObject[0]; } else { - return new PluginDataObject[] { record }; + return records.toArray (new PluginDataObject[records.size()]); } } } diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/src/gov/noaa/nws/ncep/edex/plugin/stormtrack/decoder/StormTrackSeparator.java b/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/src/gov/noaa/nws/ncep/edex/plugin/stormtrack/decoder/StormTrackSeparator.java index 925dc48c0e..a530d25b8b 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/src/gov/noaa/nws/ncep/edex/plugin/stormtrack/decoder/StormTrackSeparator.java +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/src/gov/noaa/nws/ncep/edex/plugin/stormtrack/decoder/StormTrackSeparator.java @@ -37,6 +37,7 @@ import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN; * Date Ticket# Engineer Description * -------- ------- -------- ---------------- * 06/23/10 283 F. J. Yen Initial creation + * 07/2013 T. Lee Batch processing * * * @@ -62,12 +63,21 @@ public class StormTrackSeparator extends AbstractRecordSeparator { private Iterator iterator = null; + /** Number of records in batch processing */ + private static int MAX_RECORD = 100; + public static StormTrackSeparator separate(byte[] data, Headers headers) { StormTrackSeparator stormTrackSeparator = new StormTrackSeparator(); stormTrackSeparator.setData(data, headers); return stormTrackSeparator; } + public static StormTrackSeparator batchSeparate(byte[] data, Headers headers) { + StormTrackSeparator stormTrackSeparator = new StormTrackSeparator(); + stormTrackSeparator.setBatchData(data, headers); + return stormTrackSeparator; + } + /** * StormTrackSeparator() Constructor. * @@ -87,6 +97,11 @@ public class StormTrackSeparator extends AbstractRecordSeparator { iterator = records.iterator(); } + public void setBatchData(byte[] data, Headers headers) { + doBatchSeparate(data); + iterator = records.iterator(); + } + /* * (non-Javadoc) * @@ -131,19 +146,37 @@ public class StormTrackSeparator extends AbstractRecordSeparator { records.add(matcher.group()); } } - /* - * Append the raw data files to the records - */ - for (int i = 0; i < records.size(); i++) { - if (i < records.size() - 1) { - records.set(i, message.substring( - message.indexOf(records.get(i)), - message.indexOf(records.get(i + 1)))); - } else { - records.set(i, - message.substring(message.indexOf(records.get(i)))); + } catch (Exception e) { + e.printStackTrace(); + theLogger.warn("====in separate: No valid StormTrack records found."); } + return; } + + private void doBatchSeparate(byte[] message) { + try { + pattern = Pattern.compile(BULLETINSEPARATOR); + matcher = pattern.matcher(new String(message)); + Integer counter; + String dataStream; + counter = 0; + dataStream = ""; + Integer nfile = 0; + while (matcher.find()) { + if ( counter <= MAX_RECORD ) { + dataStream += matcher.group(); + counter++; + } + else { + dataStream += matcher.group(); + records.add(dataStream); + counter = 0; + dataStream = ""; + nfile++; + } + } + records.add(dataStream); + } catch (Exception e) { e.printStackTrace(); theLogger.warn("====in separate: No valid StormTrack records found."); diff --git a/ncep/gov.noaa.nws.ncep.staticdataprovider/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.staticdataprovider/META-INF/MANIFEST.MF index 1296ea1d4b..53ef03cc85 100644 --- a/ncep/gov.noaa.nws.ncep.staticdataprovider/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.staticdataprovider/META-INF/MANIFEST.MF @@ -19,7 +19,6 @@ Import-Package: com.vividsolutions.jts.geom, gov.noaa.nws.ncep.viz.common.dbQuery, gov.noaa.nws.ncep.viz.localization, gov.noaa.nws.ncep.viz.resources, - gov.noaa.nws.ncep.viz.rsc.wtch.util, org.dom4j, org.dom4j.io Export-Package: gov.noaa.nws.ncep.staticdataprovider diff --git a/ncep/gov.noaa.nws.ncep.staticdataprovider/src/gov/noaa/nws/ncep/staticdataprovider/ContinuingWatch.java b/ncep/gov.noaa.nws.ncep.staticdataprovider/src/gov/noaa/nws/ncep/staticdataprovider/ContinuingWatch.java index 0b59824189..b437aea41c 100644 --- a/ncep/gov.noaa.nws.ncep.staticdataprovider/src/gov/noaa/nws/ncep/staticdataprovider/ContinuingWatch.java +++ b/ncep/gov.noaa.nws.ncep.staticdataprovider/src/gov/noaa/nws/ncep/staticdataprovider/ContinuingWatch.java @@ -10,8 +10,7 @@ package gov.noaa.nws.ncep.staticdataprovider; import gov.noaa.nws.ncep.common.dataplugin.aww.AwwRecord; import gov.noaa.nws.ncep.common.dataplugin.aww.AwwUgc; import gov.noaa.nws.ncep.common.dataplugin.aww.AwwVtec; -import gov.noaa.nws.ncep.viz.rsc.wtch.util.WtchConstant; -import gov.noaa.nws.ncep.viz.rsc.wtch.util.WtchUtil; +import gov.noaa.nws.ncep.common.dataplugin.aww.AwwRecord.AwwReportType; import java.util.ArrayList; import java.util.Calendar; @@ -40,6 +39,7 @@ import com.raytheon.uf.viz.core.rsc.ResourceType; * ------------ ---------- ----------- -------------------------- * 08/12 #770 Q. Zhou Initial Creation. * 09/12 #770 Q. Zhou Clean up and change selectedWatch to a collection + * 08/13 #1028 G. Hull rm dependency on viz.rsc.wtch project * * * @author Q. Zhou @@ -78,7 +78,8 @@ public class ContinuingWatch { GregorianCalendar currCal = new GregorianCalendar(TimeZone.getTimeZone("GMT")); Calendar endTime = null; - if(WtchUtil.isWtchRecord(awwRecord)) { + + if( isWtchRecord(awwRecord)) { WtchRscDataObj wtchData = new WtchRscDataObj(); wtchData.issueTime = new DataTime(awwRecord.getIssueTime()); wtchData.reportType = awwRecord.getReportType(); @@ -133,12 +134,17 @@ public class ContinuingWatch { AwwRecord awwRecord = null; HashMap metadataMap = new HashMap(); - String wtch[]={WtchConstant.SEVERE_WEATHER_STATUS_REPORT, WtchConstant.SEVERE_WEATHER_THUNDERSTORM_WATCH, WtchConstant.SEVERE_WEATHER_TORNADO_WATCH}; + + // TODO : from WtchContant but I don't think these were all correct. + + String wtch[]= { "TORNADO REPORT", "THUNDERSTORM REPORT", "STATUS REPORT" }; + //WtchConstant.SEVERE_WEATHER_STATUS_REPORT, WtchConstant.SEVERE_WEATHER_THUNDERSTORM_WATCH, WtchConstant.SEVERE_WEATHER_TORNADO_WATCH}; RequestConstraint ids = new RequestConstraint(); ids.setConstraintType(ConstraintType.IN); ids.setConstraintValueList(wtch); - metadataMap.put("reportType",ids); + // query everything and let WtchUtil.isWtchRecord filter out the others. + metadataMap.put( "reportType",ids ); metadataMap.put( "pluginName", new RequestConstraint("aww") ); HashMap queryList = new HashMap(metadataMap); @@ -158,7 +164,7 @@ public class ContinuingWatch { awwRecord = (AwwRecord) pdo; Collection num = getAwwRecord( awwRecord ); if (num != null && !num.isEmpty()) - contWatch.addAll( num); + contWatch.addAll( num ); } //Retrieving unique items from the list @@ -168,4 +174,25 @@ public class ContinuingWatch { return contWatch; } + // from WtchUtil + private static boolean isWtchRecord(AwwRecord awwRecord) { + + if( awwRecord == null ) { + return false; + } + /* + * This IF condition may be not necessary if a constrain condition added in WTCH.xml + */ + AwwReportType rt = AwwReportType.getReportType( awwRecord.getReportType() ); + +// if(WtchConstant.SEVERE_WEATHER_TORNADO_WATCH.equalsIgnoreCase(reportType) +// || WtchConstant.SEVERE_WEATHER_THUNDERSTORM_WATCH.equalsIgnoreCase(reportType) +// || WtchConstant.SEVERE_WEATHER_STATUS_REPORT.equalsIgnoreCase(reportType)) +// result = true; + + return ( rt == AwwReportType.TORNADO_REPORT ); // || +// rt == AwwReportType.THUNDERSTORM_REPORT ??? +// rt == AwwReportType.STATUS_REPORT ); ??? + } + } diff --git a/ncep/gov.noaa.nws.ncep.staticdataprovider/src/gov/noaa/nws/ncep/staticdataprovider/GreatLakeProvider.java b/ncep/gov.noaa.nws.ncep.staticdataprovider/src/gov/noaa/nws/ncep/staticdataprovider/GreatLakeProvider.java index e7c8d550a7..58939bbf2c 100644 --- a/ncep/gov.noaa.nws.ncep.staticdataprovider/src/gov/noaa/nws/ncep/staticdataprovider/GreatLakeProvider.java +++ b/ncep/gov.noaa.nws.ncep.staticdataprovider/src/gov/noaa/nws/ncep/staticdataprovider/GreatLakeProvider.java @@ -28,6 +28,7 @@ import com.vividsolutions.jts.io.WKBReader; * ------------ ---------- ----------- -------------------------- * 02/12 ? B. Yin Initial Creation. * 05/12 ? B. Yin Changed column 'area' to 'name in SQL string + * 07/13 ? J. Wu Used mapdata.lake since NCEP DB has invalid geometries * * * @@ -40,20 +41,29 @@ public class GreatLakeProvider { private static List greatLakes; private static volatile boolean greatLakesLoaded = false; + private static String[] lakeNames = { "Lake Erie","Lake Michigan", "Lake Huron", + "Lake Ontario", "Lake Superior" }; + + /** * Get Great Lake information * @return - list of Great Lakes */ public static List getGreatLakes(){ if ( !greatLakesLoaded ){ - loadGreatLakeTable(); + loadGreatLakeMaps(); } return greatLakes; } /** - * Load Great Lake information from the database + * Load Great Lake information from NCEP database. + * + * This one fails to load bounds since the bounds in NCEP DB have invalid + * geometries (e.g., stick-outs). Instead we should use mapdata.lake unless + * we correct the bounds in NCEP DB. + * * @return - list of Great Lakes */ public static synchronized List loadGreatLakeTable(){ @@ -102,4 +112,142 @@ public class GreatLakeProvider { return greatLakes; } + + /** + * Load Great Lake information from the maps database. + * + * This one reads those 5 lakes, one at a time from DB. This one is + * faster than loadGreatLakeMaps1(). + * + * @return - list of Great Lakes + */ + public static synchronized List loadGreatLakeMaps(){ + + greatLakes = new ArrayList(); + + for ( String gls : lakeNames ) { + String sql = "select name, lat, lon, AsBinary(the_geom) from " + "mapdata.lake" + + " where name = '" + gls + "'"; + List results; + + try { + results = NcDirectDbQuery.executeQuery( sql, "maps", QueryLanguage.SQL ); + + WKBReader wkbReader = new WKBReader(); + + for ( Object[] fa : results ){ + if ( fa[0] != null && fa[3] != null ) { + + Geometry g = wkbReader.read((byte[]) fa[3]); + + Coordinate loc = new Coordinate( 0, 0 );; + try { + loc.x = ((Number)fa[2]).doubleValue(); + loc.y = ((Number)fa[1]).doubleValue(); + } + catch ( Exception e ){ + // center location missing in database + } + + if ( g.isValid() ){ + + if ( loc.x == 0 && loc.y == 0 ) { + loc = new Coordinate( g.getCentroid().getX(), g.getCentroid().getY() ); + } + + String[] gn = ((String)fa[0]).split(" "); + String shortName = new String( gn[0].substring(0,1) + gn[1].substring(0,1)); + + greatLakes.add( new GreatLake( "", (String)fa[0], loc, 1, shortName, g ) ); + } + } + } + } + catch (Exception e ){ + System.out.println("db exception reading the Great Lake bounds table!"); + e.printStackTrace(); + } + + } + + return greatLakes; + } + + /** + * Load Great Lake information from the maps database (mapdata.lake). + * + * This one first reads all lakes in from DB. Then pick those 5 lakes. It is + * faster than loadGreatLakeMaps() since tehre are about one thousand lakes in DB. + * + * @return - list of Great Lakes + */ + public static synchronized List loadGreatLakeMaps1(){ + + if ( !greatLakesLoaded ) { + + greatLakes = new ArrayList(); + String sql = "select name, lat, lon, AsBinary(the_geom) from " + "mapdata.lake" ; + List results; + + try { + results = NcDirectDbQuery.executeQuery(sql, "maps", QueryLanguage.SQL); + + WKBReader wkbReader = new WKBReader(); + + for ( Object[] fa : results ){ + if ( fa[0] != null && fa[3] != null ) { + + if ( !isGreatLake( (String)fa[0] ) ) { + continue; + } + + Geometry g = wkbReader.read((byte[]) fa[3]); + + Coordinate loc = new Coordinate( 0, 0 );; + try { + loc.x = ((Number)fa[2]).doubleValue(); + loc.y = ((Number)fa[1]).doubleValue(); + } + catch ( Exception e ){ + // center location missing in database + } + + if ( g.isValid() ){ + + if ( loc.x == 0 && loc.y == 0 ) { + loc = new Coordinate( g.getCentroid().getX(), g.getCentroid().getY() ); + } + + String[] gn = ((String)fa[0]).split(" "); + String shortName = new String( gn[0].substring(0,1) + gn[1].substring(0,1)); + + greatLakes.add( new GreatLake( "", (String)fa[0], loc, 1, shortName, g ) ); + } + } + } + } + catch (Exception e ){ + System.out.println("db exception reading the Great Lake bounds table!"); + e.printStackTrace(); + } + } + + return greatLakes; + + } + + /* + * Check if a lake name is one of the Great Lake. + */ + private static boolean isGreatLake( String name ) { + + for ( String ss : lakeNames ) { + if ( name.equalsIgnoreCase( ss ) ) { + return true; + } + } + + return false; + } + } diff --git a/ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/palette/NctextuiPaletteWindow.java b/ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/palette/NctextuiPaletteWindow.java index f0cfb2ebd0..dfe98a857a 100644 --- a/ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/palette/NctextuiPaletteWindow.java +++ b/ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/palette/NctextuiPaletteWindow.java @@ -22,13 +22,19 @@ */ package gov.noaa.nws.ncep.ui.nctextui.palette; +import gov.noaa.nws.ncep.ui.nctextui.dbutil.EReportTimeRange; +import gov.noaa.nws.ncep.ui.nctextui.dbutil.NctextDbQuery; +import gov.noaa.nws.ncep.ui.nctextui.dbutil.NctextStationInfo; +import gov.noaa.nws.ncep.ui.nctextui.rsc.NctextuiResource; +import gov.noaa.nws.ncep.viz.ui.display.NatlCntrsEditor; +import gov.noaa.nws.ncep.viz.ui.display.NcDisplayMngr; + import java.util.ArrayList; import java.util.List; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; -import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Font; @@ -54,84 +60,108 @@ import com.raytheon.uf.viz.core.drawables.IRenderableDisplay; import com.raytheon.uf.viz.core.drawables.ResourcePair; import com.raytheon.viz.ui.UiUtil; -import gov.noaa.nws.ncep.ui.nctextui.dbutil.EReportTimeRange; -import gov.noaa.nws.ncep.ui.nctextui.dbutil.NctextDbQuery; -import gov.noaa.nws.ncep.ui.nctextui.dbutil.NctextStationInfo; -import gov.noaa.nws.ncep.ui.nctextui.rsc.NctextuiResource; -import gov.noaa.nws.ncep.viz.ui.display.NatlCntrsEditor; -import gov.noaa.nws.ncep.viz.ui.display.NcDisplayMngr; +public class NctextuiPaletteWindow extends ViewPart implements + SelectionListener, DisposeListener, IPartListener { + private String selectedGp = null; -public class NctextuiPaletteWindow extends ViewPart implements SelectionListener, - DisposeListener, IPartListener{ - + private String selectedType = null; - private String selectedGp=null; - private String selectedType=null; private IWorkbenchPage page; private org.eclipse.swt.widgets.List gpWdgList = null; + private org.eclipse.swt.widgets.List typeWdgList = null; + private NctextDbQuery query; + private EReportTimeRange timeCovered = EReportTimeRange.TWELVE_HOURS; + private boolean isState = false; + private boolean replaceText = true; + private String gpLabelStr = "Select Data Type Group "; + private String productLabelStr = "Select Data Type Product"; + private Group dataTypeGp; + private Group prodListGp; + private Group timeGp; + private Group staStnGp; + private Group textGp; + private String currentProductName = null; + private int colWidth = 200; + private int listHeight = 150; + private int btnGapY = 5; + private int btnGapX = 5; + private int timeBtnWidth = 40; + private int staBtnWidth = 75; + private int btnHeight = 20; + private int pushbtnHeight = 25; + private int labelGap = 20; + private static int ASCII_CR_VAL = 13; + private Text text; + private Button nextBtn, prevBtn; + private java.util.List points = new ArrayList(); - //private static NCMapEditor mapEditor = null; + + // private static NCMapEditor mapEditor = null; private HandlePrinting printingHandle; private boolean isEditorVisible = true; + private int dataTypeGpItem = 0; - private int dataTypePdItem = 0; + private int dataTypePdItem = 0; - /*public static NCMapEditor getMapEditor() { - if(mapEditor== null) - createMapEditor(); - return mapEditor; - }*/ - //handle Text Mode + /* + * public static NCMapEditor getMapEditor() { if(mapEditor== null) + * createMapEditor(); return mapEditor; } + */ + // handle Text Mode private java.util.List currentTextReports = null; + private int currentTextIndex; public int getCurrentTextIndex() { return currentTextIndex; } + public void setCurrentTextIndex(int currentTextIndex) { this.currentTextIndex = currentTextIndex; } + public java.util.List getCurrentTextReports() { return currentTextReports; } - public void setCurrentTextReports(java.util.List currentTextReports) { + + public void setCurrentTextReports( + java.util.List currentTextReports) { this.currentTextReports = currentTextReports; } - - public java.util.List getPoints() { return points; } + public void setPoints(java.util.List points) { this.points = points; } @@ -139,6 +169,7 @@ public class NctextuiPaletteWindow extends ViewPart implements SelectionListener public boolean isReplaceText() { return replaceText; } + public void setReplaceText(boolean replaceText) { this.replaceText = replaceText; } @@ -146,73 +177,73 @@ public class NctextuiPaletteWindow extends ViewPart implements SelectionListener public EReportTimeRange getTimeCovered() { return timeCovered; } + public void setTimeCovered(EReportTimeRange timeCovered) { this.timeCovered = timeCovered; } + public boolean isState() { return isState; } + public void setState(boolean isState) { this.isState = isState; } + public String getCurrentProductName() { return currentProductName; } + public void setCurrentProductName(String currentProductName) { this.currentProductName = currentProductName; } - public void enableNextBtn(boolean enable) { nextBtn.setEnabled(enable); } + public void enablePrevBtn(boolean enable) { prevBtn.setEnabled(enable); } - public void setEditorVisible ( boolean isVisible ) { + public void setEditorVisible(boolean isVisible) { this.isEditorVisible = isVisible; } - public boolean getEditorVisible ( ) { + public boolean getEditorVisible() { return this.isEditorVisible; } - public void setDataTypeGroupItem ( int item ) { + public void setDataTypeGroupItem(int item) { this.dataTypeGpItem = item; } - public int getDataTypeGroupItem () { + public int getDataTypeGroupItem() { return this.dataTypeGpItem; } - public void setDataTypeProductItem ( int item ) { + public void setDataTypeProductItem(int item) { this.dataTypePdItem = item; } - public int getDataTypeProductItem () { + public int getDataTypeProductItem() { return this.dataTypePdItem; } + /* - private static void createMapEditor(){ - // create an editor MapEditor - if(mapEditor != null) - return; - File rbdFile = LocalizationManager.getInstance().getLocalizationFile("defaultRBDFile"); - try { - mapEditor = NcDisplayMngr.createNatlCntrsEditor("NCText-Map","NCTEXT" ); - NcMapRBD rbd = NcMapRBD.unmarshalRBD( rbdFile, null ); - rbd.setNcEditor( mapEditor ); - ResourceBndlLoader rbdLoader = new ResourceBndlLoader("DefaultMap"); - rbdLoader.addRBD( rbd ); - VizApp.runSync( rbdLoader ); - //System.out.println("NctextuiPaletteWindow create editor "+ mapEditor.toString()); - } - catch ( Exception ve ) { - System.out.println("Could not load initial editor: " + ve.getMessage()); - ve.printStackTrace(); - } - }*/ + * private static void createMapEditor(){ // create an editor MapEditor + * if(mapEditor != null) return; File rbdFile = + * LocalizationManager.getInstance().getLocalizationFile("defaultRBDFile"); + * try { mapEditor = + * NcDisplayMngr.createNatlCntrsEditor("NCText-Map","NCTEXT" ); NcMapRBD rbd + * = NcMapRBD.unmarshalRBD( rbdFile, null ); rbd.setNcEditor( mapEditor ); + * ResourceBndlLoader rbdLoader = new ResourceBndlLoader("DefaultMap"); + * rbdLoader.addRBD( rbd ); VizApp.runSync( rbdLoader ); + * //System.out.println("NctextuiPaletteWindow create editor "+ + * mapEditor.toString()); } catch ( Exception ve ) { + * System.out.println("Could not load initial editor: " + ve.getMessage()); + * ve.printStackTrace(); } } + */ /** * Constructor * @@ -220,26 +251,31 @@ public class NctextuiPaletteWindow extends ViewPart implements SelectionListener public NctextuiPaletteWindow() { super(); - if(nctextuiPaletteWindow == null) + if (nctextuiPaletteWindow == null) nctextuiPaletteWindow = this; else { NctextuiPaletteWindow tmp = nctextuiPaletteWindow; nctextuiPaletteWindow = this; - nctextuiPaletteWindow.setCurrentProductName( tmp.getCurrentProductName() ); - nctextuiPaletteWindow.setDataTypeGroupItem( tmp.getDataTypeGroupItem()); - nctextuiPaletteWindow.setDataTypeProductItem( tmp.getDataTypeProductItem());; + nctextuiPaletteWindow.setCurrentProductName(tmp + .getCurrentProductName()); + nctextuiPaletteWindow.setDataTypeGroupItem(tmp + .getDataTypeGroupItem()); + nctextuiPaletteWindow.setDataTypeProductItem(tmp + .getDataTypeProductItem()); + ; nctextuiPaletteWindow.selectedGp = tmp.selectedGp; nctextuiPaletteWindow.selectedType = tmp.selectedType; - nctextuiPaletteWindow.setTimeCovered(tmp.getTimeCovered() ); - nctextuiPaletteWindow.setState( tmp.isState() ); + nctextuiPaletteWindow.setTimeCovered(tmp.getTimeCovered()); + nctextuiPaletteWindow.setState(tmp.isState()); } - //System.out.println("nctextuiPaletteWindow is created!!!!!!!!!!!!"); + // System.out.println("nctextuiPaletteWindow is created!!!!!!!!!!!!"); // create an editor - //createMapEditor(); + // createMapEditor(); } - //create this singleton object + + // create this singleton object private static NctextuiPaletteWindow nctextuiPaletteWindow = null; public static NctextuiPaletteWindow getAccess() { @@ -249,13 +285,13 @@ public class NctextuiPaletteWindow extends ViewPart implements SelectionListener /** * Invoked by the workbench to initialize this View. */ - public void init( IViewSite site ) { - //System.out.println("nctextuiPaletteWindow inited!!"); + public void init(IViewSite site) { + // System.out.println("nctextuiPaletteWindow inited!!"); try { - super.init( site ); + super.init(site); - } catch ( PartInitException pie ) { + } catch (PartInitException pie) { pie.printStackTrace(); @@ -270,23 +306,25 @@ public class NctextuiPaletteWindow extends ViewPart implements SelectionListener * Disposes resource. invoked by the workbench */ public void dispose() { - // System.out.println("NctextuiPaletteWindow dispose me, isEditorVisible="+ isEditorVisible); - if ( ! isEditorVisible ){ + // System.out.println("NctextuiPaletteWindow dispose me, isEditorVisible="+ + // isEditorVisible); + if (!isEditorVisible) { NctextuiResource.unregisterMouseHandler(); return; - } - else { + } else { super.dispose(); - NatlCntrsEditor editor = NctextuiResource.getMapEditor(); - if( editor !=null ) { - for ( IRenderableDisplay display : UiUtil.getDisplaysFromContainer(editor) ) { - //System.out.println("display " + display.toString()); - for ( ResourcePair rp : display.getDescriptor().getResourceList() ) { - if ( rp.getResource() instanceof NctextuiResource ) { - NctextuiResource rsc = (NctextuiResource)rp.getResource(); + if (editor != null) { + for (IRenderableDisplay display : UiUtil + .getDisplaysFromContainer(editor)) { + // System.out.println("display " + display.toString()); + for (ResourcePair rp : display.getDescriptor() + .getResourceList()) { + if (rp.getResource() instanceof NctextuiResource) { + NctextuiResource rsc = (NctextuiResource) rp + .getResource(); rsc.unload(); } } @@ -294,7 +332,6 @@ public class NctextuiPaletteWindow extends ViewPart implements SelectionListener } nctextuiPaletteWindow = null; - /* * remove the workbench part listener */ @@ -303,475 +340,528 @@ public class NctextuiPaletteWindow extends ViewPart implements SelectionListener } - private void close () { - IWorkbenchPage wpage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); + private void close() { + IWorkbenchPage wpage = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage(); - IViewPart vpart = wpage.findView( "gov.noaa.nws.ncep.ui.NCTEXTUI" ); + IViewPart vpart = wpage.findView("gov.noaa.nws.ncep.ui.NCTEXTUI"); wpage.hideView(vpart); NcDisplayMngr.setPanningMode(); } + /** - * Invoked by the workbench, this method sets up the SWT controls for the nctext palette + * Invoked by the workbench, this method sets up the SWT controls for the + * nctext palette */ @Override - public void createPartControl( Composite parent ) { + public void createPartControl(Composite parent) { - parent.setLayout( new GridLayout( 1, false ) ); - //create textGp group. It contains text and textMode group - textGp = new Group(parent,SWT.SHADOW_OUT); - textGp.setLayout( new GridLayout() ); + parent.setLayout(new GridLayout(1, false)); + // create textGp group. It contains text and textMode group + textGp = new Group(parent, SWT.SHADOW_OUT); + textGp.setLayout(new GridLayout()); textGp.setText("Text Report"); - GridData data = new GridData (SWT.FILL, SWT.FILL, true, true); - textGp.setLayoutData (data); + GridData data = new GridData(SWT.FILL, SWT.FILL, true, true); + textGp.setLayoutData(data); createTextArea(textGp); createTextModeGp(textGp); - //Create ConfigGp group. It contains dataTypegp, dataProductGp, time cover group and state/stn group - Group configGp =new Group(parent,SWT.SHADOW_ETCHED_OUT); - configGp.setLayout( new GridLayout(3, false) ); + // Create ConfigGp group. It contains dataTypegp, dataProductGp, time + // cover group and state/stn group + Group configGp = new Group(parent, SWT.SHADOW_ETCHED_OUT); + configGp.setLayout(new GridLayout(3, false)); createGpList(configGp); createProductList(configGp); createTimeCoverBtns(configGp); - if ( currentProductName !=null) - handleStnMarkingRequestByBtn (); -// createStaStnBtns(configGp); + if (currentProductName != null) + handleStnMarkingRequestByBtn(); + // createStaStnBtns(configGp); } public void createGpList(Composite parent) { - dataTypeGp = new Group(parent,SWT.SHADOW_ETCHED_IN); + dataTypeGp = new Group(parent, SWT.SHADOW_ETCHED_IN); dataTypeGp.setText(gpLabelStr); - - //create GP widget list - gpWdgList = new org.eclipse.swt.widgets.List(dataTypeGp, SWT.SINGLE | SWT.V_SCROLL ); - gpWdgList.setBounds(dataTypeGp.getBounds().x + btnGapX, dataTypeGp.getBounds().y + labelGap, colWidth,listHeight); + // create GP widget list + gpWdgList = new org.eclipse.swt.widgets.List(dataTypeGp, SWT.SINGLE + | SWT.V_SCROLL); + gpWdgList.setBounds(dataTypeGp.getBounds().x + btnGapX, + dataTypeGp.getBounds().y + labelGap, colWidth, listHeight); // query gp list form nctextdbrsc query = NctextDbQuery.getAccess(); - //query = NctextDbQueryX.getAccess(); + // query = NctextDbQueryX.getAccess(); java.util.List groupList = query.getDataTypeGpList(); - if((groupList != null)&& (groupList.size()>0) && (dataTypeGpItem < groupList.size() )) - selectedGp = groupList.get(dataTypeGpItem); /* set default select gp to first gp in the list */ + if ((groupList != null) && (groupList.size() > 0) + && (dataTypeGpItem < groupList.size())) + selectedGp = groupList.get(dataTypeGpItem); /* + * set default select gp + * to first gp in the + * list + */ else return; - //add gp item to gp widget list - for ( String str : groupList ) { - gpWdgList.add( str ); + // add gp item to gp widget list + for (String str : groupList) { + gpWdgList.add(str); } - gpWdgList.setSelection( dataTypeGpItem ); + gpWdgList.setSelection(dataTypeGpItem); - //create a selection listener to handle user's selection on gp list - gpWdgList.addListener ( SWT.Selection, new Listener () { + // create a selection listener to handle user's selection on gp list + gpWdgList.addListener(SWT.Selection, new Listener() { java.util.List prodTypeList; - public void handleEvent (Event e) { - if ( gpWdgList.getSelectionCount() > 0 ) { + + public void handleEvent(Event e) { + if (gpWdgList.getSelectionCount() > 0) { selectedGp = gpWdgList.getSelection()[0]; - //System.out.println("selected gp is " + selectedGp); + // System.out.println("selected gp is " + selectedGp); // query selected gp's product type list form nctextdbrsc prodTypeList = query.getGpProductList(selectedGp); typeWdgList.removeAll(); - for ( String str : prodTypeList ) { - //add product type list to widget list, note that Widgget list was created earlier. This part of code is - // listener event handler and is invoked when user picks gp - typeWdgList.add( str ); + for (String str : prodTypeList) { + // add product type list to widget list, note that + // Widgget list was created earlier. This part of code + // is + // listener event handler and is invoked when user picks + // gp + typeWdgList.add(str); } - typeWdgList.setSelection( 0 ); - setDataTypeGroupItem (gpWdgList.getSelectionIndex()); + typeWdgList.setSelection(0); + setDataTypeGroupItem(gpWdgList.getSelectionIndex()); } } }); } + public void createProductList(Composite parent) { - prodListGp = new Group(parent,SWT.SHADOW_ETCHED_IN); + prodListGp = new Group(parent, SWT.SHADOW_ETCHED_IN); prodListGp.setText(productLabelStr); - //create product type widget list - typeWdgList = new org.eclipse.swt.widgets.List(prodListGp, SWT.SINGLE | SWT.V_SCROLL | SWT.H_SCROLL); + // create product type widget list + typeWdgList = new org.eclipse.swt.widgets.List(prodListGp, SWT.SINGLE + | SWT.V_SCROLL | SWT.H_SCROLL); - typeWdgList.setBounds(prodListGp.getBounds().x + btnGapX, prodListGp.getBounds().y + labelGap, colWidth,listHeight); + typeWdgList.setBounds(prodListGp.getBounds().x + btnGapX, + prodListGp.getBounds().y + labelGap, colWidth, listHeight); /* add default product type list */ java.util.List tempprodTypeList; tempprodTypeList = query.getGpProductList(selectedGp); typeWdgList.removeAll(); - if(tempprodTypeList == null || tempprodTypeList.size() == 0) + if (tempprodTypeList == null || tempprodTypeList.size() == 0) return; - for ( String str : tempprodTypeList ) { - //add default product type list to widget list, note that Widgget list was created earlier. - typeWdgList.add( str ); + for (String str : tempprodTypeList) { + // add default product type list to widget list, note that Widgget + // list was created earlier. + typeWdgList.add(str); } - typeWdgList.setSelection( dataTypePdItem ); - typeWdgList.addListener ( SWT.Selection, new Listener () { - public void handleEvent (Event e) { - if ( typeWdgList.getSelectionCount() > 0 ) { + typeWdgList.setSelection(dataTypePdItem); + typeWdgList.addListener(SWT.Selection, new Listener() { + public void handleEvent(Event e) { + if (typeWdgList.getSelectionCount() > 0) { selectedType = typeWdgList.getSelection()[0]; - //System.out.println("selected type is " + selectedType); + // System.out.println("selected type is " + selectedType); currentProductName = selectedType; - //handle station marking here, when user picked product type + // handle station marking here, when user picked product + // type handleProductTypeStnMarking(); - setDataTypeProductItem (typeWdgList.getSelectionIndex()); + setDataTypeProductItem(typeWdgList.getSelectionIndex()); } } }); } + private void handleProductTypeStnMarking() { points = query.getProductStaList(selectedType, timeCovered); - if (points != null && points.size() == 1){ + if (points != null && points.size() == 1) { NctextuiResource.getNctextuiResource().setPoints(points); NctextuiResource.getNctextuiResource().setPickedStnPt(points); - displayProduct( points.get(0)); - } - else { + displayProduct(points.get(0)); + } else { - if(points != null && points.size() >1 ) { + if (points != null && points.size() > 1) { text.setText(" "); - } - else { + } else { text.setText("No Station Reports This Product At Selected Time Range"); } nextBtn.setEnabled(false); prevBtn.setEnabled(false); NatlCntrsEditor mapEditor = NctextuiResource.getMapEditor(); - if(mapEditor!=null){ + if (mapEditor != null) { mapEditor.refresh(); - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().bringToTop(mapEditor); + PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getActivePage().bringToTop(mapEditor); } NctextuiResource.getNctextuiResource().setPoints(points); NctextuiResource.getNctextuiResource().setPickedStnPt(null); - //NctextuiModalTool.setModal(); + // NctextuiModalTool.setModal(); } } private void handleStnMarkingRequestByBtn() { points = query.getProductStaList(selectedType, timeCovered); - if (points != null && points.size() == 1){ + if (points != null && points.size() == 1) { NctextuiResource.getNctextuiResource().setPoints(points); NctextuiResource.getNctextuiResource().setPickedStnPt(points); - displayProduct( points.get(0)); - } - else { - if((points != null) && (points.size() != 0)){ + displayProduct(points.get(0)); + } else { + if ((points != null) && (points.size() != 0)) { - if(replaceText) + if (replaceText) text.setText(" "); - } - else { - if(replaceText) + } else { + if (replaceText) text.setText("No Report Available"); } nextBtn.setEnabled(false); prevBtn.setEnabled(false); NatlCntrsEditor mapEditor = NctextuiResource.getMapEditor(); - if(mapEditor!=null){ + if (mapEditor != null) { mapEditor.refresh(); - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().bringToTop(mapEditor); + PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getActivePage().bringToTop(mapEditor); } - NctextuiResource.getNctextuiResource().setPoints(points); - if(replaceText) + if (replaceText) NctextuiResource.getNctextuiResource().setPickedStnPt(null); - //NctextuiModalTool.setModal(); + // NctextuiModalTool.setModal(); } } + public void createTimeCoverBtns(Composite parent) { - Group composite = new Group(parent, SWT.NORMAL ); + Group composite = new Group(parent, SWT.NORMAL); composite.setLayout(new GridLayout(1, false)); timeGp = new Group(composite, SWT.SHADOW_ETCHED_IN); timeGp.setText("Hour Covered"); - Listener btnListeener = new Listener() { public void handleEvent(Event event) { - String btnText = ((Button)(event.widget)).getText(); - if(btnText.equals("1")) + String btnText = ((Button) (event.widget)).getText(); + if (btnText.equals("1")) timeCovered = EReportTimeRange.ONE_HOUR; - else if(btnText.equals("3")) + else if (btnText.equals("3")) timeCovered = EReportTimeRange.THREE_HOURS; - else if(btnText.equals("6")) + else if (btnText.equals("6")) timeCovered = EReportTimeRange.SIX_HOURS; - else if(btnText.equals("12")) + else if (btnText.equals("12")) timeCovered = EReportTimeRange.TWELVE_HOURS; - else if(btnText.equals("24")) + else if (btnText.equals("24")) timeCovered = EReportTimeRange.TWENTYFOUR_HOURS; - else if(btnText.equals("48")) + else if (btnText.equals("48")) timeCovered = EReportTimeRange.FORTYEIGHT_HOURS; else timeCovered = EReportTimeRange.NONE; handleStnMarkingRequestByBtn(); - System.out.println("button event # "+ ((Button)(event.widget)).getText()); + System.out.println("button event # " + + ((Button) (event.widget)).getText()); } }; - Button oneHrBtn = new Button(timeGp, SWT.RADIO | SWT.BORDER); oneHrBtn.setText("1"); - oneHrBtn.setEnabled( true ); - oneHrBtn.setBounds(timeGp.getBounds().x+ btnGapX, timeGp.getBounds().y + labelGap, timeBtnWidth,btnHeight); - oneHrBtn.addListener( SWT.MouseUp, btnListeener); - + oneHrBtn.setEnabled(true); + oneHrBtn.setBounds(timeGp.getBounds().x + btnGapX, timeGp.getBounds().y + + labelGap, timeBtnWidth, btnHeight); + oneHrBtn.addListener(SWT.MouseUp, btnListeener); Button threeHrBtn = new Button(timeGp, SWT.RADIO); threeHrBtn.setText("3"); - threeHrBtn.setEnabled( true ); - threeHrBtn.setBounds( btnGapX +oneHrBtn.getBounds().x + oneHrBtn.getBounds().width, timeGp.getBounds().y + labelGap, timeBtnWidth,btnHeight); + threeHrBtn.setEnabled(true); + threeHrBtn.setBounds( + btnGapX + oneHrBtn.getBounds().x + oneHrBtn.getBounds().width, + timeGp.getBounds().y + labelGap, timeBtnWidth, btnHeight); - threeHrBtn.addListener( SWT.MouseUp, btnListeener); + threeHrBtn.addListener(SWT.MouseUp, btnListeener); Button sixHrBtn = new Button(timeGp, SWT.RADIO); sixHrBtn.setText("6"); - sixHrBtn.setEnabled( true ); - sixHrBtn.setBounds(threeHrBtn.getBounds().x + threeHrBtn.getBounds().width+ btnGapX, timeGp.getBounds().y + labelGap, timeBtnWidth,btnHeight); + sixHrBtn.setEnabled(true); + sixHrBtn.setBounds(threeHrBtn.getBounds().x + + threeHrBtn.getBounds().width + btnGapX, timeGp.getBounds().y + + labelGap, timeBtnWidth, btnHeight); - sixHrBtn.addListener( SWT.MouseUp, btnListeener); + sixHrBtn.addListener(SWT.MouseUp, btnListeener); Button twelveHrBtn = new Button(timeGp, SWT.RADIO); twelveHrBtn.setText("12"); - twelveHrBtn.setEnabled( true ); -// twelveHrBtn.setSelection(true);//default selection - twelveHrBtn.setBounds(timeGp.getBounds().x+ btnGapX, oneHrBtn.getBounds().y + oneHrBtn.getBounds().height+ btnGapY, timeBtnWidth,btnHeight); + twelveHrBtn.setEnabled(true); + // twelveHrBtn.setSelection(true);//default selection + twelveHrBtn.setBounds(timeGp.getBounds().x + btnGapX, + oneHrBtn.getBounds().y + oneHrBtn.getBounds().height + btnGapY, + timeBtnWidth, btnHeight); - twelveHrBtn.addListener( SWT.MouseUp, btnListeener); + twelveHrBtn.addListener(SWT.MouseUp, btnListeener); Button twentyfourHrBtn = new Button(timeGp, SWT.RADIO); twentyfourHrBtn.setText("24"); - twentyfourHrBtn.setEnabled( true ); - twentyfourHrBtn.setBounds(btnGapX +twelveHrBtn.getBounds().x + twelveHrBtn.getBounds().width, threeHrBtn.getBounds().y + threeHrBtn.getBounds().height+ btnGapY, timeBtnWidth,btnHeight); + twentyfourHrBtn.setEnabled(true); + twentyfourHrBtn.setBounds(btnGapX + twelveHrBtn.getBounds().x + + twelveHrBtn.getBounds().width, threeHrBtn.getBounds().y + + threeHrBtn.getBounds().height + btnGapY, timeBtnWidth, + btnHeight); - twentyfourHrBtn.addListener( SWT.MouseUp, btnListeener); + twentyfourHrBtn.addListener(SWT.MouseUp, btnListeener); Button fourtyeightHrBtn = new Button(timeGp, SWT.RADIO); fourtyeightHrBtn.setText("48"); - fourtyeightHrBtn.setEnabled( true ); - fourtyeightHrBtn.setBounds(btnGapX +twentyfourHrBtn.getBounds().x + twentyfourHrBtn.getBounds().width, sixHrBtn.getBounds().y + sixHrBtn.getBounds().height+ btnGapY, timeBtnWidth,btnHeight); + fourtyeightHrBtn.setEnabled(true); + fourtyeightHrBtn.setBounds(btnGapX + twentyfourHrBtn.getBounds().x + + twentyfourHrBtn.getBounds().width, sixHrBtn.getBounds().y + + sixHrBtn.getBounds().height + btnGapY, timeBtnWidth, + btnHeight); - fourtyeightHrBtn.addListener( SWT.MouseUp, btnListeener); + fourtyeightHrBtn.addListener(SWT.MouseUp, btnListeener); Button allHrBtn = new Button(timeGp, SWT.RADIO); allHrBtn.setText("all"); - allHrBtn.setEnabled( true ); - allHrBtn.setBounds(btnGapX +fourtyeightHrBtn.getBounds().x + fourtyeightHrBtn.getBounds().width, sixHrBtn.getBounds().y + sixHrBtn.getBounds().height+ btnGapY, timeBtnWidth,btnHeight); + allHrBtn.setEnabled(true); + allHrBtn.setBounds(btnGapX + fourtyeightHrBtn.getBounds().x + + fourtyeightHrBtn.getBounds().width, sixHrBtn.getBounds().y + + sixHrBtn.getBounds().height + btnGapY, timeBtnWidth, + btnHeight); if (timeCovered == EReportTimeRange.ONE_HOUR) oneHrBtn.setSelection(true); else if (timeCovered == EReportTimeRange.THREE_HOURS) threeHrBtn.setSelection(true); - else if ( timeCovered == EReportTimeRange.SIX_HOURS) + else if (timeCovered == EReportTimeRange.SIX_HOURS) sixHrBtn.setSelection(true); - else if(timeCovered == EReportTimeRange.TWELVE_HOURS) + else if (timeCovered == EReportTimeRange.TWELVE_HOURS) twelveHrBtn.setSelection(true); - else if(timeCovered == EReportTimeRange.TWENTYFOUR_HOURS) + else if (timeCovered == EReportTimeRange.TWENTYFOUR_HOURS) twentyfourHrBtn.setSelection(true); - else if(timeCovered == EReportTimeRange.FORTYEIGHT_HOURS) + else if (timeCovered == EReportTimeRange.FORTYEIGHT_HOURS) fourtyeightHrBtn.setSelection(true); else allHrBtn.setSelection(true); - allHrBtn.addListener( SWT.MouseUp, btnListeener); - createStaStnBtns ( composite ); + allHrBtn.addListener(SWT.MouseUp, btnListeener); + createStaStnBtns(composite); } public void createStaStnBtns(Composite parent) { - staStnGp = new Group(parent,SWT.LEFT); + staStnGp = new Group(parent, SWT.LEFT); staStnGp.setText("Select By "); Button stationBtn = new Button(staStnGp, SWT.RADIO); stationBtn.setText("station"); - stationBtn.setEnabled( true ); - stationBtn.setBounds(staStnGp.getBounds().x+ btnGapX, staStnGp.getBounds().y + labelGap, staBtnWidth,btnHeight); - if ( ! isState) + stationBtn.setEnabled(true); + stationBtn.setBounds(staStnGp.getBounds().x + btnGapX, + staStnGp.getBounds().y + labelGap, staBtnWidth, btnHeight); + if (!isState) stationBtn.setSelection(true); - stationBtn.addListener( SWT.MouseUp, new Listener() { + stationBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { isState = false; handleStnMarkingRequestByBtn(); } - } ); + }); Button stateBtn = new Button(staStnGp, SWT.RADIO); stateBtn.setText("state"); - stateBtn.setEnabled( true ); - if ( isState ) + stateBtn.setEnabled(true); + if (isState) stateBtn.setSelection(true); - stateBtn.setBounds(stationBtn.getBounds().x+ stationBtn.getBounds().width + btnGapX, staStnGp.getBounds().y + labelGap, staBtnWidth,btnHeight); + stateBtn.setBounds(stationBtn.getBounds().x + + stationBtn.getBounds().width + btnGapX, + staStnGp.getBounds().y + labelGap, staBtnWidth, btnHeight); - stateBtn.addListener( SWT.MouseUp, new Listener() { + stateBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { isState = true; handleStnMarkingRequestByBtn(); } - } ); + }); } - public void createTextArea(Composite parent){ + public void createTextArea(Composite parent) { - //Text display area - text = new Text(parent, SWT.V_SCROLL| SWT.H_SCROLL); + // Text display area + text = new Text(parent, SWT.V_SCROLL | SWT.H_SCROLL); - GridData data = new GridData (SWT.FILL,SWT.FILL, true, true); - text.setLayoutData (data); + GridData data = new GridData(SWT.FILL, SWT.FILL, true, true); + text.setLayoutData(data); Font font = text.getFont(); FontData[] fontData = font.getFontData(); for (int i = 0; i < fontData.length; i++) { - //fontData[i].setHeight(12); + // fontData[i].setHeight(12); fontData[i].setName("courier"); } Font newFont = new Font(font.getDevice(), fontData); text.setFont(newFont); } - public Text getText() { return text; } + public void setText(Text text) { this.text = text; } - private String removeCR(String curStr){ + private String removeCR(String curStr) { int i = ASCII_CR_VAL; - char asciiCr = (char)i; + char asciiCr = (char) i; String newStr = curStr.replace(asciiCr, ' '); return newStr; } - public void createTextModeGp(Composite parent){ + + public void createTextModeGp(Composite parent) { printingHandle = HandlePrinting.getPrintHandle(); - Group textModeGp = new Group(parent,SWT.SHADOW_OUT); + Group textModeGp = new Group(parent, SWT.SHADOW_OUT); textModeGp.setText("Text Mode:"); Button replaceBtn = new Button(textModeGp, SWT.RADIO); replaceBtn.setText("Replace"); - replaceBtn.setEnabled( true ); - replaceBtn.setBounds(textModeGp.getBounds().x+ btnGapX, textModeGp.getBounds().y + labelGap, staBtnWidth,btnHeight); + replaceBtn.setEnabled(true); + replaceBtn.setBounds(textModeGp.getBounds().x + btnGapX, + textModeGp.getBounds().y + labelGap, staBtnWidth, btnHeight); replaceBtn.setSelection(true); - replaceBtn.addListener( SWT.MouseUp, new Listener() { + replaceBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { replaceText = true; text.setText(""); handleStnMarkingRequestByBtn(); } - } ); + }); Button appendBtn = new Button(textModeGp, SWT.RADIO); appendBtn.setText("Append"); - appendBtn.setEnabled( true ); - appendBtn.setBounds(replaceBtn.getBounds().x+ replaceBtn.getBounds().width+btnGapX, textModeGp.getBounds().y + labelGap, staBtnWidth,btnHeight); + appendBtn.setEnabled(true); + appendBtn.setBounds(replaceBtn.getBounds().x + + replaceBtn.getBounds().width + btnGapX, + textModeGp.getBounds().y + labelGap, staBtnWidth, btnHeight); - appendBtn.addListener( SWT.MouseUp, new Listener() { + appendBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { replaceText = false; nextBtn.setEnabled(false); prevBtn.setEnabled(false); } - } ); + }); // Push buttons for Previous text info prevBtn = new Button(textModeGp, SWT.PUSH); prevBtn.setText("Previous"); prevBtn.setEnabled(false); - prevBtn.setBounds(appendBtn.getBounds().x+ appendBtn.getBounds().width+btnGapX, textModeGp.getBounds().y + labelGap, staBtnWidth,pushbtnHeight); + prevBtn.setBounds(appendBtn.getBounds().x + appendBtn.getBounds().width + + btnGapX, textModeGp.getBounds().y + labelGap, staBtnWidth, + pushbtnHeight); - prevBtn.addListener( SWT.MouseUp, new Listener() { + prevBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { // Action to display previous text report - if( (currentTextReports != null)&&(currentTextReports.size()>currentTextIndex+1)){ - String dispStr = removeCR((String)currentTextReports.get(currentTextIndex+1)[0]); + if ((currentTextReports != null) + && (currentTextReports.size() > currentTextIndex + 1)) { + String dispStr = removeCR((String) currentTextReports + .get(currentTextIndex + 1)[0]); String curText = text.getText(); int endIndex = curText.indexOf("----"); - if(endIndex != -1){ - curText = curText.substring(0, endIndex+4); - text.setText(curText + "\n"+dispStr); - } - else + if (endIndex != -1) { + curText = curText.substring(0, endIndex + 4); + text.setText(curText + "\n" + dispStr); + } else text.setText(dispStr); nextBtn.setEnabled(true); currentTextIndex++; - if(currentTextReports.size()<= currentTextIndex+1){ - prevBtn.setEnabled(false ); + if (currentTextReports.size() <= currentTextIndex + 1) { + prevBtn.setEnabled(false); } } } - } ); + }); // Push buttons for Next text info nextBtn = new Button(textModeGp, SWT.PUSH); nextBtn.setText("Next"); nextBtn.setEnabled(false); - nextBtn.setBounds(prevBtn.getBounds().x+ prevBtn.getBounds().width+btnGapX, textModeGp.getBounds().y + labelGap, staBtnWidth,pushbtnHeight); + nextBtn.setBounds(prevBtn.getBounds().x + prevBtn.getBounds().width + + btnGapX, textModeGp.getBounds().y + labelGap, staBtnWidth, + pushbtnHeight); - nextBtn.addListener( SWT.MouseUp, new Listener() { + nextBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { // Action to display next text report - if( (currentTextReports != null)&&(currentTextReports.size()>currentTextIndex)&&(currentTextIndex >= 1)){ - String dispStr = removeCR((String)currentTextReports.get(currentTextIndex-1)[0]); + if ((currentTextReports != null) + && (currentTextReports.size() > currentTextIndex) + && (currentTextIndex >= 1)) { + String dispStr = removeCR((String) currentTextReports + .get(currentTextIndex - 1)[0]); String curText = text.getText(); int endIndex = curText.indexOf("----"); - if(endIndex != -1){ - curText = curText.substring(0, endIndex+4); - text.setText(curText + "\n"+dispStr); - } - else + if (endIndex != -1) { + curText = curText.substring(0, endIndex + 4); + text.setText(curText + "\n" + dispStr); + } else text.setText(dispStr); prevBtn.setEnabled(true); currentTextIndex--; - if(currentTextIndex == 0){ + if (currentTextIndex == 0) { nextBtn.setEnabled(false); } } } - } ); + }); // Push buttons for print text info Button printBtn = new Button(textModeGp, SWT.PUSH); printBtn.setText("Print"); - printBtn.setEnabled( true ); - printBtn.setBounds(nextBtn.getBounds().x+ nextBtn.getBounds().width+btnGapX, textModeGp.getBounds().y + labelGap, staBtnWidth,pushbtnHeight); + printBtn.setEnabled(true); + printBtn.setBounds(nextBtn.getBounds().x + nextBtn.getBounds().width + + btnGapX, textModeGp.getBounds().y + labelGap, staBtnWidth, + pushbtnHeight); - printBtn.addListener( SWT.MouseUp, new Listener() { + printBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { // Action to print text report printingHandle.handlePrint(text.getText()); } - } ); + }); } - - public void widgetDefaultSelected( SelectionEvent se ) { + public void widgetDefaultSelected(SelectionEvent se) { } /* * invoked when widget is disposed - * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent) + * + * @see + * org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt + * .events.DisposeEvent) */ - public void widgetDisposed( DisposeEvent event ) { + public void widgetDisposed(DisposeEvent event) { } - @Override public void partActivated(IWorkbenchPart part) { - + if (part instanceof NctextuiPaletteWindow) { + NctextuiResource rsc = NctextuiResource.getNctextuiResource(); + if (rsc != null) + rsc.setEditable(true); + } } @Override @@ -781,7 +871,8 @@ public class NctextuiPaletteWindow extends ViewPart implements SelectionListener @Override public void partClosed(IWorkbenchPart part) { - //System.out.println("NctextuiPaletteWindow::Something closed: "+part.getClass().getCanonicalName() ); + // System.out.println("NctextuiPaletteWindow::Something closed: "+part.getClass().getCanonicalName() + // ); } @Override @@ -790,14 +881,15 @@ public class NctextuiPaletteWindow extends ViewPart implements SelectionListener @Override public void partOpened(IWorkbenchPart part) { - //System.out.println("Something Opened: "+part.getClass().getCanonicalName() ); + // System.out.println("Something Opened: "+part.getClass().getCanonicalName() + // ); } /** * * @return the currently selected category on the palette */ - public String getCurrentCategory(){ + public String getCurrentCategory() { return null; } @@ -816,113 +908,140 @@ public class NctextuiPaletteWindow extends ViewPart implements SelectionListener public void displayProduct(NctextStationInfo StnPt) { NatlCntrsEditor mapEditor = NctextuiResource.getMapEditor(); - if(StnPt != null && (mapEditor!= null)){ - //add RED "X" marker(s) on picked stn - List rtnStateStnLst = new ArrayList (); - if(nctextuiPaletteWindow.isState() == true) { + if (StnPt != null && (mapEditor != null)) { + // add RED "X" marker(s) on picked stn + List rtnStateStnLst = new ArrayList(); + if (nctextuiPaletteWindow.isState() == true) { - List stateStnLst = - query.getStateStationInfoList(nctextuiPaletteWindow.getCurrentProductName()+StnPt.getState()); - //need to filter out those stns does not have reports in DB now, use points list for reference - for (NctextStationInfo stnInState : stateStnLst){ - for (NctextStationInfo stnHasRpt : points){ - if(stnInState.getStnid().equals(stnHasRpt.getStnid()) == true){ + List stateStnLst = query + .getStateStationInfoList(nctextuiPaletteWindow + .getCurrentProductName() + StnPt.getState()); + // need to filter out those stns does not have reports in DB + // now, use points list for reference + for (NctextStationInfo stnInState : stateStnLst) { + for (NctextStationInfo stnHasRpt : points) { + if (stnInState.getStnid().equals(stnHasRpt.getStnid()) == true) { rtnStateStnLst.add(stnInState); break; } } } - } - else{ + } else { rtnStateStnLst.add(StnPt); } Text text = nctextuiPaletteWindow.getText(); - if(nctextuiPaletteWindow.isReplaceText() == false){ - //APPEND mode - //List prevPickedStnLst = nctextuiPaletteWindow.getNctextuiResource().getPickedStnPt(); - List prevPickedStnLst = NctextuiResource.getNctextuiResource().getPickedStnPt(); - if(prevPickedStnLst.size() > 0){ - if(rtnStateStnLst.addAll(prevPickedStnLst) == false) { - //System.out.println("handleMouseUp : add picked stn failed"); + if (nctextuiPaletteWindow.isReplaceText() == false) { + // APPEND mode + // List prevPickedStnLst = + // nctextuiPaletteWindow.getNctextuiResource().getPickedStnPt(); + List prevPickedStnLst = NctextuiResource + .getNctextuiResource().getPickedStnPt(); + if (prevPickedStnLst.size() > 0) { + if (rtnStateStnLst.addAll(prevPickedStnLst) == false) { + // System.out.println("handleMouseUp : add picked stn failed"); return; } } - } - else { - //REPLACE mode + } else { + // REPLACE mode text.setText(""); } - //nctextuiPaletteWindow.getNctextuiResource().setPickedStnPt(rtnStateStnLst); - NctextuiResource.getNctextuiResource().setPickedStnPt(rtnStateStnLst); + // nctextuiPaletteWindow.getNctextuiResource().setPickedStnPt(rtnStateStnLst); + NctextuiResource.getNctextuiResource().setPickedStnPt( + rtnStateStnLst); mapEditor.refresh(); - //NctextuiModalTool.setModal(); - // QUERY DB now....Object[0] = Rawrecord text data, Object[1] = issuesite - List> rptLstList = query.getProductDataListList(nctextuiPaletteWindow.selectedGp,nctextuiPaletteWindow.getCurrentProductName(), StnPt, nctextuiPaletteWindow.getTimeCovered(), nctextuiPaletteWindow.isState(),null); - if(rptLstList.isEmpty()){ - if(nctextuiPaletteWindow.isState()) - text.append("--State " +StnPt.getState()+ "--" + nctextuiPaletteWindow.getCurrentProductName()+ - " Report (Station picked "+StnPt.getStnid()+")\n"); + // NctextuiModalTool.setModal(); + // QUERY DB now....Object[0] = Rawrecord text data, Object[1] = + // issuesite + List> rptLstList = query.getProductDataListList( + nctextuiPaletteWindow.selectedGp, + nctextuiPaletteWindow.getCurrentProductName(), StnPt, + nctextuiPaletteWindow.getTimeCovered(), + nctextuiPaletteWindow.isState(), null); + if (rptLstList.isEmpty()) { + if (nctextuiPaletteWindow.isState()) + text.append("--State " + StnPt.getState() + "--" + + nctextuiPaletteWindow.getCurrentProductName() + + " Report (Station picked " + StnPt.getStnid() + + ")\n"); else - text.append("--Text-- " + ": "+nctextuiPaletteWindow.getCurrentProductName()+": Reporting Station: ("+StnPt.getStnid()+") "+ - StnPt.getStnname()+"\n"); - if(nctextuiPaletteWindow.getTimeCovered().getTimeRange() == 0) + text.append("--Text-- " + ": " + + nctextuiPaletteWindow.getCurrentProductName() + + ": Reporting Station: (" + StnPt.getStnid() + + ") " + StnPt.getStnname() + "\n"); + if (nctextuiPaletteWindow.getTimeCovered().getTimeRange() == 0) text.append("Report unavailable in database.\n"); else - text.append("Report unavailable within "+nctextuiPaletteWindow.getTimeCovered().getTimeRange()+ " hour(s) range.\n"); + text.append("Report unavailable within " + + nctextuiPaletteWindow.getTimeCovered() + .getTimeRange() + " hour(s) range.\n"); nctextuiPaletteWindow.enablePrevBtn(false); - } - else { + } else { String textToDisp; String textRawStr; StringBuilder textStr; - if(nctextuiPaletteWindow.isState()){ - //SelectBy State mode - textStr = new StringBuilder("--State " +StnPt.getState()+ "--" + nctextuiPaletteWindow.getCurrentProductName()+" Report\n"); + if (nctextuiPaletteWindow.isState()) { + // SelectBy State mode + textStr = new StringBuilder("--State " + StnPt.getState() + + "--" + + nctextuiPaletteWindow.getCurrentProductName() + + " Report\n"); - for(List lstObj : rptLstList){ - textStr.append("--Station " + (String)(lstObj.get(0))[1] + "-- : "+nctextuiPaletteWindow.getCurrentProductName()+"\n"); - textRawStr = (String)(lstObj.get(0))[0]; + for (List lstObj : rptLstList) { + textStr.append("--Station " + + (String) (lstObj.get(0))[1] + "-- : " + + nctextuiPaletteWindow.getCurrentProductName() + + "\n"); + textRawStr = (String) (lstObj.get(0))[0]; // remove CR before displaying textToDisp = removeCR(textRawStr); - textStr.append(textToDisp+"\n"); + textStr.append(textToDisp + "\n"); } - //When put text string to Text display, use "setText" but not "append" method, so, the text will show from top - if(nctextuiPaletteWindow.isReplaceText() == false){ + // When put text string to Text display, use "setText" but + // not "append" method, so, the text will show from top + if (nctextuiPaletteWindow.isReplaceText() == false) { // get current text string from Text - StringBuilder textStr1 = new StringBuilder(text.getText()); + StringBuilder textStr1 = new StringBuilder( + text.getText()); textStr1.append(textStr.toString()); text.setText(textStr1.toString()); - } - else - text.setText(textStr.toString()); } - else { - //SelectBy Station mode + } else + text.setText(textStr.toString()); + } else { + // SelectBy Station mode // "----" used as text header delimiter - String textHeader = "--Text-- " + ": "+nctextuiPaletteWindow.getCurrentProductName()+": Reporting Station: ("+StnPt.getStnid()+") " - +StnPt.getStnname()+ "----"+"\n"; - nctextuiPaletteWindow.setCurrentTextReports(rptLstList.get(0)); + String textHeader = "--Text-- " + ": " + + nctextuiPaletteWindow.getCurrentProductName() + + ": Reporting Station: (" + StnPt.getStnid() + + ") " + StnPt.getStnname() + "----" + "\n"; + nctextuiPaletteWindow.setCurrentTextReports(rptLstList + .get(0)); int currentTextIndex = 0; nctextuiPaletteWindow.setCurrentTextIndex(currentTextIndex); - textRawStr = (String)(rptLstList.get(0).get(currentTextIndex))[0]; + textRawStr = (String) (rptLstList.get(0) + .get(currentTextIndex))[0]; // remove CR before displaying textToDisp = removeCR(textRawStr); - //When put text string to Text display, use "setText" but not "append" method, so, the text will show from top - if(nctextuiPaletteWindow.isReplaceText() == false){ - //Append mode: get current text string from Text - StringBuilder textStr1 = new StringBuilder(text.getText()); - textStr1.append(textHeader+textToDisp); + // When put text string to Text display, use "setText" but + // not "append" method, so, the text will show from top + if (nctextuiPaletteWindow.isReplaceText() == false) { + // Append mode: get current text string from Text + StringBuilder textStr1 = new StringBuilder( + text.getText()); + textStr1.append(textHeader + textToDisp); text.setText(textStr1.toString()); - } - else //Replace mode - text.setText(textHeader+textToDisp); - if((rptLstList.get(0).size() > 1 ) && (nctextuiPaletteWindow.isReplaceText() == true)){ - //System.out.println("debug 1 list size "+ rptLstList.get(0).size()); + } else + // Replace mode + text.setText(textHeader + textToDisp); + if ((rptLstList.get(0).size() > 1) + && (nctextuiPaletteWindow.isReplaceText() == true)) { + // System.out.println("debug 1 list size "+ + // rptLstList.get(0).size()); nctextuiPaletteWindow.enablePrevBtn(true); - } - else { + } else { nctextuiPaletteWindow.enablePrevBtn(false); } } diff --git a/ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/rsc/NctextuiMouseHandler.java b/ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/rsc/NctextuiMouseHandler.java index ab08cbe095..9a76586143 100644 --- a/ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/rsc/NctextuiMouseHandler.java +++ b/ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/rsc/NctextuiMouseHandler.java @@ -11,47 +11,49 @@ */ package gov.noaa.nws.ncep.ui.nctextui.rsc; +import gov.noaa.nws.ncep.ui.nctextui.dbutil.NctextDbQuery; +import gov.noaa.nws.ncep.ui.nctextui.dbutil.NctextStationInfo; +import gov.noaa.nws.ncep.ui.nctextui.palette.NctextuiPaletteWindow; +import gov.noaa.nws.ncep.ui.pgen.tools.InputHandlerDefaultImpl; +import gov.noaa.nws.ncep.viz.ui.display.NatlCntrsEditor; + import java.util.List; import org.geotools.referencing.GeodeticCalculator; -import com.raytheon.uf.viz.core.IDisplayPane; import com.raytheon.uf.viz.core.map.IMapDescriptor; import com.vividsolutions.jts.geom.Coordinate; -import gov.noaa.nws.ncep.ui.nctextui.dbutil.NctextDbQuery; -import gov.noaa.nws.ncep.ui.nctextui.dbutil.NctextStationInfo; -import gov.noaa.nws.ncep.ui.nctextui.palette.NctextuiPaletteWindow; -import gov.noaa.nws.ncep.ui.pgen.tools.*; -import gov.noaa.nws.ncep.viz.ui.display.NcEditorUtil; -import gov.noaa.nws.ncep.viz.ui.display.NatlCntrsEditor; - public class NctextuiMouseHandler extends InputHandlerDefaultImpl { private static int ASCII_CR_VAL = 13; + private static final double NctextuiPointMinDistance = 45000; + private int prevMouseX, prevMouseY; - static int textDispIndex =0; + + static int textDispIndex = 0; /** * Index of the selected point. */ protected int ptIndex = 0; + private NctextDbQuery query;// = NctextDbQuery.getAccess(); + /** * For single point element, the original location is needed for undo. */ - /* * (non-Javadoc) * - * @see com.raytheon.viz.ui.input.IInputHandler#handleMouseDown(int, - * int, int) + * @see com.raytheon.viz.ui.input.IInputHandler#handleMouseDown(int, int, + * int) */ @Override public boolean handleMouseDown(int x, int y, int button) { - //System.out.println("mouse down"); + // System.out.println("mouse down"); prevMouseX = x; prevMouseY = y; return false; @@ -67,35 +69,30 @@ public class NctextuiMouseHandler extends InputHandlerDefaultImpl { * (non-Javadoc) * * @see com.raytheon.viz.ui.input.IInputHandler#handleMouseDownMove(int, - * int, int) - * handle left button, so user be able to shift map while it is down + * int, int) handle left button, so user be able to shift map while it is + * down */ - /* @Override - public boolean handleMouseDownMove(int x, int y, int button) { - if (button == 1 ){ - NCMapEditor mapEditor = NctextuiResource.getMapEditor(); - if(mapEditor!= null){ - IDisplayPane[] panes = ( mapEditor.arePanesGeoSynced() ? - mapEditor.getDisplayPanes() : mapEditor.getSelectedPanes() ); - - for( IDisplayPane p : panes ) { - p.shiftExtent(new double[] { x, y }, new double[] { - prevMouseX, prevMouseY }); - } - - mapEditor.refresh(); - } - - prevMouseX = x; - prevMouseY = y; - - } - return false; - - }*/ - private String removeCR(String curStr){ + /* + * @Override public boolean handleMouseDownMove(int x, int y, int button) { + * if (button == 1 ){ NCMapEditor mapEditor = + * NctextuiResource.getMapEditor(); if(mapEditor!= null){ IDisplayPane[] + * panes = ( mapEditor.arePanesGeoSynced() ? mapEditor.getDisplayPanes() : + * mapEditor.getSelectedPanes() ); + * + * for( IDisplayPane p : panes ) { p.shiftExtent(new double[] { x, y }, new + * double[] { prevMouseX, prevMouseY }); } + * + * mapEditor.refresh(); } + * + * prevMouseX = x; prevMouseY = y; + * + * } return false; + * + * } + */ + private String removeCR(String curStr) { int i = ASCII_CR_VAL; - char asciiCr = (char)i; + char asciiCr = (char) i; String newStr = curStr.replace(asciiCr, ' '); return newStr; } @@ -103,152 +100,168 @@ public class NctextuiMouseHandler extends InputHandlerDefaultImpl { /* * (non-Javadoc) * - * @see com.raytheon.viz.ui.input.IInputHandler#handleMouseUp(int, int, - * int) + * @see com.raytheon.viz.ui.input.IInputHandler#handleMouseUp(int, int, int) * handle right button, so user be able to pick stn and print text report */ @Override public boolean handleMouseUp(int x, int y, int button) { - //System.out.println("NctextuiMouseHandler mouse up"); + // System.out.println("NctextuiMouseHandler mouse up"); + if (!NctextuiResource.getNctextuiResource().isEditable()) + return false; // button 1 is left mouse button - if (button == 1 ){ + if (button == 1) { NatlCntrsEditor mapEditor = NctextuiResource.getMapEditor(); - if(mapEditor!= null){ + if (mapEditor != null) { // Check if mouse is in geographic extent Coordinate loc = mapEditor.translateClick(x, y); - if ( loc == null ) + if (loc == null) return false; - NctextuiPaletteWindow nctextuiPaletteWindow = NctextuiPaletteWindow.getAccess(); - if(nctextuiPaletteWindow!=null){ - //get the stn (point) list - List points = nctextuiPaletteWindow.getPoints(); - if(points.isEmpty() == false){ + NctextuiPaletteWindow nctextuiPaletteWindow = NctextuiPaletteWindow + .getAccess(); + if (nctextuiPaletteWindow != null) { + // get the stn (point) list + List points = nctextuiPaletteWindow + .getPoints(); + if (points.isEmpty() == false) { - //get the stn close to loc "enough" and retrieve text report for it - NctextStationInfo StnPt = getPtWithinMinDist(points, loc); - - if(StnPt != null){ + // get the stn close to loc "enough" and retrieve text + // report for it + NctextStationInfo StnPt = getPtWithinMinDist(points, + loc); + + if (StnPt != null) { nctextuiPaletteWindow.displayProduct(StnPt); /* - //add RED "X" marker(s) on picked stn - List rtnStateStnLst = new ArrayList (); - if(nctextuiPaletteWindow.isState() == true) { - - List stateStnLst = - query.getStateStationInfoList(nctextuiPaletteWindow.getCurrentProductName()+StnPt.getState()); - //need to filter out those stns does not have reports in DB now, use points list for reference - for (NctextStationInfo stnInState : stateStnLst){ - for (NctextStationInfo stnHasRpt : points){ - if(stnInState.getStnid().equals(stnHasRpt.getStnid()) == true){ - rtnStateStnLst.add(stnInState); - break; - } - } - } + * //add RED "X" marker(s) on picked stn + * List rtnStateStnLst = new + * ArrayList (); + * if(nctextuiPaletteWindow.isState() == true) { + * + * List stateStnLst = + * query.getStateStationInfoList + * (nctextuiPaletteWindow + * .getCurrentProductName()+StnPt.getState()); + * //need to filter out those stns does not have + * reports in DB now, use points list for reference + * for (NctextStationInfo stnInState : stateStnLst){ + * for (NctextStationInfo stnHasRpt : points){ + * if(stnInState + * .getStnid().equals(stnHasRpt.getStnid()) == + * true){ rtnStateStnLst.add(stnInState); break; } } + * } } else{ rtnStateStnLst.add(StnPt); } Text text + * = nctextuiPaletteWindow.getText(); + * if(nctextuiPaletteWindow.isReplaceText() == + * false){ //APPEND mode //List + * prevPickedStnLst = + * nctextuiPaletteWindow.getNctextuiResource + * ().getPickedStnPt(); List + * prevPickedStnLst = + * NctextuiResource.getNctextuiResource + * ().getPickedStnPt(); if(prevPickedStnLst.size() > + * 0){ if(rtnStateStnLst.addAll(prevPickedStnLst) == + * false) { //System.out.println( + * "handleMouseUp : add picked stn failed"); return + * false; } } } else { //REPLACE mode + * text.setText(""); } + * //nctextuiPaletteWindow.getNctextuiResource + * ().setPickedStnPt(rtnStateStnLst); + * NctextuiResource + * .getNctextuiResource().setPickedStnPt + * (rtnStateStnLst); mapEditor.refresh(); + * NctextuiModalTool.setModal(); // QUERY DB + * now....Object[0] = Rawrecord text data, Object[1] + * = issuesite List> rptLstList = + * query + * .getProductDataListList(nctextuiPaletteWindow + * .getCurrentProductName(), StnPt, + * nctextuiPaletteWindow.getTimeCovered(), + * nctextuiPaletteWindow.isState(),null); + * if(rptLstList.isEmpty()){ + * if(nctextuiPaletteWindow.isState()) + * text.append("--State " +StnPt.getState()+ "--" + + * nctextuiPaletteWindow.getCurrentProductName()+ + * " Report (Station picked " + * +StnPt.getStnid()+")\n"); else + * text.append("--Text-- " + + * ": "+nctextuiPaletteWindow + * .getCurrentProductName() + * +": Reporting Station: ("+StnPt.getStnid()+") "+ + * StnPt.getStnname()+"\n"); + * if(nctextuiPaletteWindow + * .getTimeCovered().getTimeRange() == 0) + * text.append("Report unavailable in database.\n"); + * else text.append("Report unavailable within "+ + * nctextuiPaletteWindow + * .getTimeCovered().getTimeRange()+ + * " hour(s) range.\n"); + * + * } else { String textToDisp; String textRawStr; + * StringBuilder textStr; + * if(nctextuiPaletteWindow.isState()){ //SelectBy + * State mode textStr = new StringBuilder("--State " + * +StnPt.getState()+ "--" + + * nctextuiPaletteWindow.getCurrentProductName + * ()+" Report\n"); + * + * for(List lstObj : rptLstList){ + * textStr.append("--Station " + + * (String)(lstObj.get(0))[1] + + * "-- : "+nctextuiPaletteWindow + * .getCurrentProductName()+"\n"); textRawStr = + * (String)(lstObj.get(0))[0]; // remove CR before + * displaying textToDisp = removeCR(textRawStr); + * textStr.append(textToDisp+"\n"); } + * + * //When put text string to Text display, use + * "setText" but not "append" method, so, the text + * will show from top + * if(nctextuiPaletteWindow.isReplaceText() == + * false){ // get current text string from Text + * StringBuilder textStr1 = new + * StringBuilder(text.getText()); + * textStr1.append(textStr.toString()); + * text.setText(textStr1.toString()); } else + * text.setText(textStr.toString()); } else { + * //SelectBy Station mode // "----" used as text + * header delimiter String textHeader = "--Text-- " + * + + * ": "+nctextuiPaletteWindow.getCurrentProductName + * ()+": Reporting Station: ("+StnPt.getStnid()+") " + * +StnPt.getStnname()+ "----"+"\n"; + * nctextuiPaletteWindow + * .setCurrentTextReports(rptLstList.get(0)); + * + * int currentTextIndex = 0; + * nctextuiPaletteWindow.setCurrentTextIndex + * (currentTextIndex); textRawStr = + * (String)(rptLstList + * .get(0).get(currentTextIndex))[0]; // remove CR + * before displaying textToDisp = + * removeCR(textRawStr); //When put text string to + * Text display, use "setText" but not "append" + * method, so, the text will show from top + * if(nctextuiPaletteWindow.isReplaceText() == + * false){ //Append mode: get current text string + * from Text StringBuilder textStr1 = new + * StringBuilder(text.getText()); + * textStr1.append(textHeader+textToDisp); + * text.setText(textStr1.toString()); } else + * //Replace mode + * text.setText(textHeader+textToDisp); + * if((rptLstList.get(0).size() > 1 ) && + * (nctextuiPaletteWindow.isReplaceText() == true)){ + * //System.out.println("list size "+ + * rptLstList.get(0).size()); + * nctextuiPaletteWindow.enablePrevBtn(true); } else + * { nctextuiPaletteWindow.enablePrevBtn(false); } } + * } + */ + } else { // debug + // System.out.println("Mouse point too far from stn"); } - else{ - rtnStateStnLst.add(StnPt); - } - Text text = nctextuiPaletteWindow.getText(); - if(nctextuiPaletteWindow.isReplaceText() == false){ - //APPEND mode - //List prevPickedStnLst = nctextuiPaletteWindow.getNctextuiResource().getPickedStnPt(); - List prevPickedStnLst = NctextuiResource.getNctextuiResource().getPickedStnPt(); - if(prevPickedStnLst.size() > 0){ - if(rtnStateStnLst.addAll(prevPickedStnLst) == false) { - //System.out.println("handleMouseUp : add picked stn failed"); - return false; - } - } - } - else { - //REPLACE mode - text.setText(""); - } - //nctextuiPaletteWindow.getNctextuiResource().setPickedStnPt(rtnStateStnLst); - NctextuiResource.getNctextuiResource().setPickedStnPt(rtnStateStnLst); - mapEditor.refresh(); - NctextuiModalTool.setModal(); - // QUERY DB now....Object[0] = Rawrecord text data, Object[1] = issuesite - List> rptLstList = query.getProductDataListList(nctextuiPaletteWindow.getCurrentProductName(), StnPt, nctextuiPaletteWindow.getTimeCovered(), nctextuiPaletteWindow.isState(),null); - if(rptLstList.isEmpty()){ - if(nctextuiPaletteWindow.isState()) - text.append("--State " +StnPt.getState()+ "--" + nctextuiPaletteWindow.getCurrentProductName()+ - " Report (Station picked "+StnPt.getStnid()+")\n"); - else - text.append("--Text-- " + ": "+nctextuiPaletteWindow.getCurrentProductName()+": Reporting Station: ("+StnPt.getStnid()+") "+ - StnPt.getStnname()+"\n"); - if(nctextuiPaletteWindow.getTimeCovered().getTimeRange() == 0) - text.append("Report unavailable in database.\n"); - else - text.append("Report unavailable within "+nctextuiPaletteWindow.getTimeCovered().getTimeRange()+ " hour(s) range.\n"); - - } - else { - String textToDisp; - String textRawStr; - StringBuilder textStr; - if(nctextuiPaletteWindow.isState()){ - //SelectBy State mode - textStr = new StringBuilder("--State " +StnPt.getState()+ "--" + nctextuiPaletteWindow.getCurrentProductName()+" Report\n"); - - for(List lstObj : rptLstList){ - textStr.append("--Station " + (String)(lstObj.get(0))[1] + "-- : "+nctextuiPaletteWindow.getCurrentProductName()+"\n"); - textRawStr = (String)(lstObj.get(0))[0]; - // remove CR before displaying - textToDisp = removeCR(textRawStr); - textStr.append(textToDisp+"\n"); - } - - //When put text string to Text display, use "setText" but not "append" method, so, the text will show from top - if(nctextuiPaletteWindow.isReplaceText() == false){ - // get current text string from Text - StringBuilder textStr1 = new StringBuilder(text.getText()); - textStr1.append(textStr.toString()); - text.setText(textStr1.toString()); - } - else - text.setText(textStr.toString()); } - else { - //SelectBy Station mode - // "----" used as text header delimiter - String textHeader = "--Text-- " + ": "+nctextuiPaletteWindow.getCurrentProductName()+": Reporting Station: ("+StnPt.getStnid()+") " - +StnPt.getStnname()+ "----"+"\n"; - nctextuiPaletteWindow.setCurrentTextReports(rptLstList.get(0)); - - int currentTextIndex = 0; - nctextuiPaletteWindow.setCurrentTextIndex(currentTextIndex); - textRawStr = (String)(rptLstList.get(0).get(currentTextIndex))[0]; - // remove CR before displaying - textToDisp = removeCR(textRawStr); - //When put text string to Text display, use "setText" but not "append" method, so, the text will show from top - if(nctextuiPaletteWindow.isReplaceText() == false){ - //Append mode: get current text string from Text - StringBuilder textStr1 = new StringBuilder(text.getText()); - textStr1.append(textHeader+textToDisp); - text.setText(textStr1.toString()); - } - else //Replace mode - text.setText(textHeader+textToDisp); - if((rptLstList.get(0).size() > 1 ) && (nctextuiPaletteWindow.isReplaceText() == true)){ - //System.out.println("list size "+ rptLstList.get(0).size()); - nctextuiPaletteWindow.enablePrevBtn(true); - } - else { - nctextuiPaletteWindow.enablePrevBtn(false); - } - } - } */ - } - else - { //debug - //System.out.println("Mouse point too far from stn"); - } - } - else - { //debug - //System.out.println("points is null"); + } else { // debug + // System.out.println("points is null"); } } } @@ -258,43 +271,48 @@ public class NctextuiMouseHandler extends InputHandlerDefaultImpl { /** * Gets the nearest point of an selected element to the input point - * @param el element - * @param pt input point + * + * @param el + * element + * @param pt + * input point * @return */ - protected NctextStationInfo getPtWithinMinDist( List points , Coordinate pt ){ + protected NctextStationInfo getPtWithinMinDist( + List points, Coordinate pt) { NctextStationInfo thePoint = null; double minDistance = NctextuiPointMinDistance; GeodeticCalculator gc; NatlCntrsEditor mapEditor = NctextuiResource.getMapEditor(); - if(mapEditor != null ){ + if (mapEditor != null) { IMapDescriptor desc; - desc = (IMapDescriptor) mapEditor.getActiveDisplayPane().getRenderableDisplay().getDescriptor(); + desc = (IMapDescriptor) mapEditor.getActiveDisplayPane() + .getRenderableDisplay().getDescriptor(); gc = new GeodeticCalculator(desc.getCRS()); gc.setStartingGeographicPoint(pt.x, pt.y); - //int textDispIndex = 1;//debug - for ( NctextStationInfo point : points){ + // int textDispIndex = 1;//debug + for (NctextStationInfo point : points) { - gc.setDestinationGeographicPoint( point.getLongitude(),point.getLatitude()); + gc.setDestinationGeographicPoint(point.getLongitude(), + point.getLatitude()); double dist; - try{ + try { dist = gc.getOrthodromicDistance(); - //System.out.println("dist to point " + textDispIndex++ + " is " + dist); - if ( dist < minDistance ) { + // System.out.println("dist to point " + textDispIndex++ + + // " is " + dist); + if (dist < minDistance) { minDistance = dist; thePoint = point; } - } - catch (Exception e) { + } catch (Exception e) { - //e.printStackTrace(); - //System.out.println("getOrthodromicDistance exception happened!"); + // e.printStackTrace(); + // System.out.println("getOrthodromicDistance exception happened!"); } - } } return thePoint; @@ -302,4 +320,3 @@ public class NctextuiMouseHandler extends InputHandlerDefaultImpl { } } - diff --git a/ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/rsc/NctextuiResource.java b/ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/rsc/NctextuiResource.java index 8dc55c02e1..cb212a7bb2 100644 --- a/ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/rsc/NctextuiResource.java +++ b/ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/rsc/NctextuiResource.java @@ -18,73 +18,72 @@ */ package gov.noaa.nws.ncep.ui.nctextui.rsc; +import gov.noaa.nws.ncep.ui.nctextui.dbutil.NctextStationInfo; +import gov.noaa.nws.ncep.ui.nctextui.palette.NctextuiPaletteWindow; +import gov.noaa.nws.ncep.ui.pgen.display.DisplayElementFactory; +import gov.noaa.nws.ncep.ui.pgen.display.IDisplayable; +import gov.noaa.nws.ncep.ui.pgen.elements.SymbolLocationSet; +import gov.noaa.nws.ncep.viz.common.display.NcDisplayType; +import gov.noaa.nws.ncep.viz.resources.manager.ResourceBndlLoader; +import gov.noaa.nws.ncep.viz.ui.display.NatlCntrsEditor; +import gov.noaa.nws.ncep.viz.ui.display.NcDisplayMngr; +import gov.noaa.nws.ncep.viz.ui.display.NcEditorUtil; import java.awt.Color; -import java.io.File; -import java.util.List; import java.util.ArrayList; +import java.util.List; -import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IViewPart; -import org.eclipse.ui.IPerspectiveDescriptor; import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.opengis.referencing.crs.CoordinateReferenceSystem; -import com.vividsolutions.jts.geom.Coordinate; import com.raytheon.uf.viz.core.IGraphicsTarget; import com.raytheon.uf.viz.core.PixelExtent; import com.raytheon.uf.viz.core.VizApp; import com.raytheon.uf.viz.core.drawables.IFont; import com.raytheon.uf.viz.core.drawables.PaintProperties; +import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.uf.viz.core.map.IMapDescriptor; import com.raytheon.uf.viz.core.map.MapDescriptor; import com.raytheon.uf.viz.core.rsc.AbstractVizResource; import com.raytheon.uf.viz.core.rsc.IInputHandler; import com.raytheon.uf.viz.core.rsc.LoadProperties; import com.raytheon.uf.viz.core.rsc.ResourceProperties; -import com.raytheon.uf.viz.core.exception.VizException; -import com.raytheon.viz.ui.EditorUtil; +import com.raytheon.uf.viz.core.rsc.capabilities.EditableCapability; import com.raytheon.viz.ui.editor.AbstractEditor; +import com.raytheon.viz.ui.input.EditableManager; +import com.vividsolutions.jts.geom.Coordinate; -import gov.noaa.nws.ncep.ui.nctextui.dbutil.NctextStationInfo; -import gov.noaa.nws.ncep.ui.pgen.display.DisplayElementFactory; -import gov.noaa.nws.ncep.ui.pgen.display.IDisplayable; -import gov.noaa.nws.ncep.ui.pgen.elements.SymbolLocationSet; -import gov.noaa.nws.ncep.viz.common.display.NcDisplayType; -import gov.noaa.nws.ncep.viz.localization.NcPathManager; -import gov.noaa.nws.ncep.viz.localization.NcPathManager.NcPathConstants; -import gov.noaa.nws.ncep.viz.resources.manager.AbstractRBD; -import gov.noaa.nws.ncep.viz.resources.manager.NcMapRBD; -import gov.noaa.nws.ncep.viz.resources.manager.ResourceBndlLoader; -import gov.noaa.nws.ncep.viz.ui.display.AbstractNcEditor; -import gov.noaa.nws.ncep.viz.ui.display.NcEditorUtil; -import gov.noaa.nws.ncep.viz.ui.display.NatlCntrsEditor; -import gov.noaa.nws.ncep.viz.ui.display.NcDisplayMngr; -import gov.noaa.nws.ncep.ui.nctextui.palette.NctextuiPaletteWindow; +public class NctextuiResource extends + AbstractVizResource { -public class NctextuiResource extends AbstractVizResource { + private static NctextuiResourceData nctextuiResourceData; + + private static NctextuiResource nctextuiResource = null; - private NctextuiResourceData nctextuiResourceData; - private static NctextuiResource nctextuiResource=null; /** The set of symbols with similar attributes across many locations */ private SymbolLocationSet symbolSet = null; + private SymbolLocationSet pickedSymbolSet = null; - private static NatlCntrsEditor mapEditor=null; -// private static int mapEditorNum=0; + + private static NatlCntrsEditor mapEditor = null; + + // private static int mapEditorNum=0; private static NctextuiMouseHandler mouseHandler; - /*public static NCMapEditor getOrCreateMapEditor() { - if(mapEditor== null) - createMapEditor(); - return mapEditor; - }*/ + /* + * public static NCMapEditor getOrCreateMapEditor() { if(mapEditor== null) + * createMapEditor(); return mapEditor; } + */ public static NatlCntrsEditor getMapEditor() { return mapEditor; } private List points = new ArrayList(); + private List pickedStnPt = new ArrayList(); public List getPickedStnPt() { @@ -109,9 +108,9 @@ public class NctextuiResource extends AbstractVizResource elements = df.createDisplayElements(symbolSet, paintProps); - for (IDisplayable each : elements) - { + DisplayElementFactory df = new DisplayElementFactory(target, + this.descriptor); + ArrayList elements = df.createDisplayElements( + symbolSet, paintProps); + for (IDisplayable each : elements) { try { each.draw(target, paintProps); each.dispose(); - } - catch (Exception e) { + } catch (Exception e) { - //e.printStackTrace(); - //System.out.println("paintInternal caught draw exception!"); + // e.printStackTrace(); + // System.out.println("paintInternal caught draw exception!"); } } } - if (pickedSymbolSet != null) - { + if (pickedSymbolSet != null) { - - DisplayElementFactory df = new DisplayElementFactory (target, this.descriptor); - ArrayList elements = df.createDisplayElements(pickedSymbolSet, paintProps); - for (IDisplayable each : elements) - { + DisplayElementFactory df = new DisplayElementFactory(target, + this.descriptor); + ArrayList elements = df.createDisplayElements( + pickedSymbolSet, paintProps); + for (IDisplayable each : elements) { try { each.draw(target, paintProps); each.dispose(); - } - catch (Exception e) { + } catch (Exception e) { - //e.printStackTrace(); - //System.out.println("paintInternal caught draw exception on pickedSymbolSet!"); + // e.printStackTrace(); + // System.out.println("paintInternal caught draw exception on pickedSymbolSet!"); } } } font.dispose(); } - - - - /* (non-Javadoc) - * @see com.raytheon.viz.core.rsc.capabilities.IProjectableResource#isProjectable(org.opengis.referencing.crs.CoordinateReferenceSystem) + /* + * (non-Javadoc) + * + * @see + * com.raytheon.viz.core.rsc.capabilities.IProjectableResource#isProjectable + * (org.opengis.referencing.crs.CoordinateReferenceSystem) */ public boolean isProjectable(CoordinateReferenceSystem mapData) { @@ -464,16 +462,21 @@ public class NctextuiResource extends AbstractVizResource stnPtDataLineLst = getPtWithinMinDist(points, loc); - if(stnPtDataLineLst!= null && stnPtDataLineLst.size() > 0){ - //System.out.println("MapMouseHandler creating NsharpSkewTDisplay"); - //hash map, use stn display info as key + // get the stn close to loc "enough" and retrieve + // report for it + // Note::One stn may have more than one dataLine, if + // user picked multiple data time lines + List stnPtDataLineLst = getPtWithinMinDist( + points, loc); + if (stnPtDataLineLst != null + && stnPtDataLineLst.size() > 0) { + // System.out.println("MapMouseHandler creating NsharpSkewTDisplay"); + // hash map, use stn display info as key Map> soundingLysLstMap = new HashMap>(); - //String soundingType; - if(activeLoadType == NsharpLoadDialog.OBSER_SND){ + // String soundingType; + if (activeLoadType == NsharpLoadDialog.OBSER_SND) { NsharpMapResource.startWaitCursor(); - NsharpObservedSoundingQuery.getObservedSndData(stnPtDataLineLst,loadDia.getObsDialog().isRawData(),soundingLysLstMap); + NsharpObservedSoundingQuery + .getObservedSndData( + stnPtDataLineLst, loadDia + .getObsDialog() + .isRawData(), + soundingLysLstMap); NsharpMapResource.stopWaitCursor(); - } - else if (activeLoadType == NsharpLoadDialog.PFC_SND){ + } else if (activeLoadType == NsharpLoadDialog.PFC_SND) { NsharpMapResource.startWaitCursor(); - NsharpPfcSoundingQuery.getPfcSndDataBySndTmRange(stnPtDataLineLst,soundingLysLstMap); + NsharpPfcSoundingQuery + .getPfcSndDataBySndTmRange( + stnPtDataLineLst, + soundingLysLstMap); NsharpMapResource.stopWaitCursor(); - } - else + } else return false; - //System.out.println("MAP size/" +soundingLysLstMap.size()); - if(soundingLysLstMap.size() <=0){ - //win.setAndOpenMb("Invalid sounding data returned from DB for this station!"); - Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - MessageBox mb = new MessageBox(shell, SWT.ICON_WARNING - | SWT.OK); + // System.out.println("MAP size/" + // +soundingLysLstMap.size()); + if (soundingLysLstMap.size() <= 0) { + // win.setAndOpenMb("Invalid sounding data returned from DB for this station!"); + Shell shell = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow() + .getShell(); + MessageBox mb = new MessageBox(shell, + SWT.ICON_WARNING | SWT.OK); mb.setMessage("Invalid sounding data returned from DB for this station!!"); mb.open(); loadDia.closeDiaOnly(); @@ -194,47 +221,45 @@ public class NsharpMapMouseHandler extends InputHandlerDefaultImpl { } loadDia.closeDiaOnly(); - //NsharpResourceHandler skewRsc = skewtEdt.getRscHandler(); - //skewRsc.addRsc(soundingLysLstMap, stnPtDataLineLst.get(0)); - loadDataToNsharpResources(soundingLysLstMap, stnPtDataLineLst.get(0)); + // NsharpResourceHandler skewRsc = + // skewtEdt.getRscHandler(); + // skewRsc.addRsc(soundingLysLstMap, + // stnPtDataLineLst.get(0)); + loadDataToNsharpResources(soundingLysLstMap, + stnPtDataLineLst.get(0)); mapEditor = NsharpMapResource.getMapEditor(); if (mapEditor != null) { mapEditor.refresh(); } bringSkewTEdToTop(); + } else { + // System.out.println("Mouse point too far from stn"); } - else - { - //System.out.println("Mouse point too far from stn"); - } + } else { // debug + // System.out.println("points is null"); } - else - { //debug - //System.out.println("points is null"); } } } - } - - } - else if(button == 3){ - //NsharpEditor.bringSkewTEditorToTop(); + } else if (button == 3) { + // NsharpEditor.bringSkewTEditorToTop(); bringSkewTEdToTop(); } return false; } + /* - * Chin Note: If calling NsharpEditor.bringSkewTEditorToTop() directly in mouse handler API, e.g. - * handleMouseUp(), then handleMouseUp() will be called one more time by System. Do not know the root cause of it. - * To avoid handling such event twice (e.g. query sounding data twice), we will call NsharpEditor.bringSkewTEditorToTop() - * from another Job (thread). + * Chin Note: If calling NsharpEditor.bringSkewTEditorToTop() directly in + * mouse handler API, e.g. handleMouseUp(), then handleMouseUp() will be + * called one more time by System. Do not know the root cause of it. To + * avoid handling such event twice (e.g. query sounding data twice), we will + * call NsharpEditor.bringSkewTEditorToTop() from another Job (thread). */ - private void bringSkewTEdToTop(){ - Job uijob = new UIJob("clear source selection"){ //$NON-NLS-1$ - public IStatus runInUIThread( - IProgressMonitor monitor) { + private void bringSkewTEdToTop() { + Job uijob = new UIJob("clear source selection") { //$NON-NLS-1$ + public IStatus runInUIThread(IProgressMonitor monitor) { NsharpEditor.bringEditorToTop(); return Status.OK_STATUS; } @@ -243,14 +268,17 @@ public class NsharpMapMouseHandler extends InputHandlerDefaultImpl { uijob.setSystem(true); uijob.schedule(); } + /* * Same reason to use UIJob as bringSkewTEdToTop() */ - private void loadDataToNsharpResources(final Map> soundMap, final NsharpStationInfo stnInfo){ - Job uijob = new UIJob("clear source selection"){ //$NON-NLS-1$ - public IStatus runInUIThread( - IProgressMonitor monitor) { - NsharpResourceHandler rscHdr = NsharpEditor.createOrOpenEditor().getRscHandler(); + private void loadDataToNsharpResources( + final Map> soundMap, + final NsharpStationInfo stnInfo) { + Job uijob = new UIJob("clear source selection") { //$NON-NLS-1$ + public IStatus runInUIThread(IProgressMonitor monitor) { + NsharpResourceHandler rscHdr = NsharpEditor + .createOrOpenEditor().getRscHandler(); rscHdr.addRsc(soundMap, stnInfo); return Status.OK_STATUS; } @@ -259,13 +287,18 @@ public class NsharpMapMouseHandler extends InputHandlerDefaultImpl { uijob.setSystem(true); uijob.schedule(); } + /** * Gets the nearest point of an selected element to the input point - * @param el element - * @param pt input point + * + * @param el + * element + * @param pt + * input point * @return */ - private List getPtWithinMinDist( List points , Coordinate pt ){ + private List getPtWithinMinDist( + List points, Coordinate pt) { NsharpStationInfo thePoint = null; double minDistance = NctextuiPointMinDistance; @@ -273,43 +306,49 @@ public class NsharpMapMouseHandler extends InputHandlerDefaultImpl { List thePoints = new ArrayList(); // TODO : can't assume this is a map Editor/MapDescriptor NatlCntrsEditor mapEditor = NsharpMapResource.getMapEditor(); - if(mapEditor != null){ - IMapDescriptor desc = (IMapDescriptor) mapEditor.getActiveDisplayPane().getRenderableDisplay().getDescriptor(); + if (mapEditor != null) { + IMapDescriptor desc = (IMapDescriptor) mapEditor + .getActiveDisplayPane().getRenderableDisplay() + .getDescriptor(); gc = new GeodeticCalculator(desc.getCRS()); gc.setStartingGeographicPoint(pt.x, pt.y); - //int textDispIndex = 1;//debug - for ( NsharpStationInfo point : points){ + // int textDispIndex = 1;//debug + for (NsharpStationInfo point : points) { - gc.setDestinationGeographicPoint( point.getLongitude(),point.getLatitude()); + gc.setDestinationGeographicPoint(point.getLongitude(), + point.getLatitude()); double dist; - try{ + try { dist = gc.getOrthodromicDistance(); - //System.out.println("dist to point " + textDispIndex++ + " is " + dist); - if ( dist < minDistance ) { + // System.out.println("dist to point " + textDispIndex++ + + // " is " + dist); + if (dist < minDistance) { minDistance = dist; thePoint = point; } - } - catch (Exception e) { + } catch (Exception e) { - //e.printStackTrace(); - //System.out.println("getOrthodromicDistance exception happened!"); + // e.printStackTrace(); + // System.out.println("getOrthodromicDistance exception happened!"); } - } - // Chin, there may be more than one point for a selected stn. As user may selected more than one data time, - // For same stn, each data time will have one point to represent it. So, a stn may have more than one points - if(thePoint != null){ - for ( NsharpStationInfo point : points){ - if ((thePoint.getLatitude() == point.getLatitude())&& (thePoint.getLongitude() == point.getLongitude())){ + // Chin, there may be more than one point for a selected stn. As + // user may selected more than one data time, + // For same stn, each data time will have one point to represent it. + // So, a stn may have more than one points + if (thePoint != null) { + for (NsharpStationInfo point : points) { + if ((thePoint.getLatitude() == point.getLatitude()) + && (thePoint.getLongitude() == point.getLongitude())) { thePoints.add(point); } } - //marked X on selected point - NsharpMapResource.getOrCreateNsharpMapResource().setPickedPoint(thePoint); + // marked X on selected point + NsharpMapResource.getOrCreateNsharpMapResource() + .setPickedPoint(thePoint); } @@ -319,4 +358,3 @@ public class NsharpMapMouseHandler extends InputHandlerDefaultImpl { } } - diff --git a/ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/map/NsharpMapResource.java b/ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/map/NsharpMapResource.java index c45e668eff..2c34c45ff8 100644 --- a/ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/map/NsharpMapResource.java +++ b/ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/map/NsharpMapResource.java @@ -21,7 +21,6 @@ */ package gov.noaa.nws.ncep.ui.nsharp.display.map; - import gov.noaa.nws.ncep.ui.nsharp.NsharpConstants; import gov.noaa.nws.ncep.ui.nsharp.NsharpStationInfo; import gov.noaa.nws.ncep.ui.nsharp.view.NsharpPaletteWindow; @@ -65,27 +64,39 @@ import com.raytheon.viz.ui.editor.AbstractEditor; import com.raytheon.viz.ui.input.EditableManager; import com.vividsolutions.jts.geom.Coordinate; +public class NsharpMapResource extends + AbstractVizResource implements + RemoveListener { + private static NsharpMapResource mapRsc = null; + + private static NsharpMapResourceData mapRscData = null; + + private static NatlCntrsEditor mapEditor = null; -public class NsharpMapResource extends AbstractVizResource - implements RemoveListener{ - private static NsharpMapResource mapRsc=null; - private static NatlCntrsEditor mapEditor=null; private static NsharpMapMouseHandler mouseHandler; - private static Cursor waitCursor=null; + + private static Cursor waitCursor = null; + private static Control cursorControl; - private static boolean mouseHandlerRegistered=false; - public static void bringMapEditorToTop(){ - try{ - if(mapEditor!=null&& PlatformUI.getWorkbench()!=null && PlatformUI.getWorkbench().getActiveWorkbenchWindow()!=null - && PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()!=null){ - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().bringToTop(mapEditor); + + private static boolean mouseHandlerRegistered = false; + + public static void bringMapEditorToTop() { + try { + if (mapEditor != null + && PlatformUI.getWorkbench() != null + && PlatformUI.getWorkbench().getActiveWorkbenchWindow() != null + && PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getActivePage() != null) { + PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getActivePage().bringToTop(mapEditor); mapEditor.refresh(); } - } - catch (Exception e) { + } catch (Exception e) { } } + public static NatlCntrsEditor getMapEditor() { return mapEditor; } @@ -93,12 +104,18 @@ public class NsharpMapResource extends AbstractVizResource points = new ArrayList(); + private List pickedPoint = new ArrayList(); + public void setPickedPoint(NsharpStationInfo point) { this.pickedPoint.add(point); } @@ -108,13 +125,12 @@ public class NsharpMapResource extends AbstractVizResource points) { - if (points == null){ + if (points == null) { this.pickedPoint.clear(); - symbolToMark= null; - symbolSet=null; + symbolToMark = null; + symbolSet = null; this.points.clear(); - } - else{ + } else { this.points = points; } } @@ -130,128 +146,150 @@ public class NsharpMapResource extends AbstractVizResource elements = df.createDisplayElements(symbolSet, paintProps); - for (IDisplayable each : elements) - { + DisplayElementFactory df = new DisplayElementFactory(target, + this.descriptor); + if (symbolSet != null) { + ArrayList elements = df.createDisplayElements( + symbolSet, paintProps); + for (IDisplayable each : elements) { try { each.draw(target, paintProps); each.dispose(); - } - catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); - //System.out.println("paintInternal caught draw exception!"); + // System.out.println("paintInternal caught draw exception!"); } } } - if(symbolToMark != null){ - ArrayList elements = df.createDisplayElements(symbolToMark, paintProps); - for (IDisplayable each : elements) - { + if (symbolToMark != null) { + ArrayList elements = df.createDisplayElements( + symbolToMark, paintProps); + for (IDisplayable each : elements) { try { each.draw(target, paintProps); each.dispose(); - } - catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); - //System.out.println("paintInternal caught draw exception!"); + // System.out.println("paintInternal caught draw exception!"); } } } - //font.dispose(); + // font.dispose(); } - - - - /* (non-Javadoc) - * @see com.raytheon.viz.core.rsc.capabilities.IProjectableResource#isProjectable(org.opengis.referencing.crs.CoordinateReferenceSystem) + /* + * (non-Javadoc) + * + * @see + * com.raytheon.viz.core.rsc.capabilities.IProjectableResource#isProjectable + * (org.opengis.referencing.crs.CoordinateReferenceSystem) */ public boolean isProjectable(CoordinateReferenceSystem mapData) { @@ -468,21 +517,26 @@ public class NsharpMapResource extends AbstractVizResource deletingDataTimeList){ boolean curSndDeleted = false; for(String dataTmLine: deletingDataTimeList){ - if(curSndProfileProp.getElementDescription().equals(dataTmLine)){ + if(curSndProfileProp!=null && curSndProfileProp.getElementDescription().equals(dataTmLine)){ curSndDeleted = true; } //find deleting element from stnTimeSndTable and null it @@ -1404,7 +1404,7 @@ public class NsharpResourceHandler { refreshPane(); } -*/ + */ private void addRsc( boolean displayNewData,Map> soundMap, NsharpStationInfo stnInfo){ /* testing code diff --git a/ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java b/ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java index 0273eb9574..b8db6f923c 100644 --- a/ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java +++ b/ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java @@ -68,60 +68,100 @@ import com.raytheon.uf.viz.d2d.ui.perspectives.D2D5Pane; import com.raytheon.viz.ui.UiUtil; import com.raytheon.viz.ui.perspectives.VizPerspectiveListener; - public class NsharpPaletteWindow extends ViewPart implements SelectionListener, -DisposeListener, IPartListener{ - private MessageBox mb ; - protected Button loadBtn, unloadBtn, overlayBtn, interpBtn,dataEditBtn, - compareStnBtn,compareSndBtn,compareTmBtn, graphEditBtn,graphModeBtnSkew, graphModeBtnIcing, - graphModeBtnTurb, effBulkShearBtn, stpBtn, shipBtn, winterBtn, fireBtn,hailBtn,sarsBtn,cfgBtn; + DisposeListener, IPartListener { + private MessageBox mb; + + protected Button loadBtn, unloadBtn, overlayBtn, interpBtn, dataEditBtn, + compareStnBtn, compareSndBtn, compareTmBtn, graphEditBtn, + graphModeBtnSkew, graphModeBtnIcing, graphModeBtnTurb, + effBulkShearBtn, stpBtn, shipBtn, winterBtn, fireBtn, hailBtn, + sarsBtn, cfgBtn; + private Shell shell; + private Label spcGplbl; + private Composite parent; + private Group spcGp; - private boolean overlayIsOn=false, compareStnIsOn=false, compareSndIsOn=false,compareTmIsOn=false; - protected boolean interpolateIsOn=false, editGraphOn=false; + + private boolean overlayIsOn = false, compareStnIsOn = false, + compareSndIsOn = false, compareTmIsOn = false; + + protected boolean interpolateIsOn = false, editGraphOn = false; + private static String INTP_OFF = " Interp(off) "; + private static String INTP_ON = " Interp(on) "; - private static String COMP_STN_OFF= "CompStn(off)"; - private static String COMP_STN_ON= "CompStn(on) "; - private static String COMP_TM_OFF= "CompTm(off)"; - private static String COMP_TM_ON= "CompTm(on) "; - private static String COMP_SND_OFF= "CompSrc(off)"; - private static String COMP_SND_ON= "CompSrc(on) "; - private static String OVLY_OFF= "Ovrlay2(off) "; - private static String OVLY_ON= "Ovrlay2(on) "; - protected static String EDIT_GRAPH_OFF= "EditGraph(off)"; - protected static String EDIT_GRAPH_ON= "EditGraph(on) "; + + private static String COMP_STN_OFF = "CompStn(off)"; + + private static String COMP_STN_ON = "CompStn(on) "; + + private static String COMP_TM_OFF = "CompTm(off)"; + + private static String COMP_TM_ON = "CompTm(on) "; + + private static String COMP_SND_OFF = "CompSrc(off)"; + + private static String COMP_SND_ON = "CompSrc(on) "; + + private static String OVLY_OFF = "Ovrlay2(off) "; + + private static String OVLY_ON = "Ovrlay2(on) "; + + protected static String EDIT_GRAPH_OFF = "EditGraph(off)"; + + protected static String EDIT_GRAPH_ON = "EditGraph(on) "; + private IWorkbenchPage page; + private NsharpPrintHandle printHandle; - private Font newFont ; - private boolean isEditorVisible=true; - private static NsharpPaletteWindow instance=null; - //one instance per perspective. To avoid cross reference. - private static NsharpPaletteWindow ncpInstance=null; - private static NsharpPaletteWindow d2dInstance=null; - private int currentGraphMode= NsharpConstants.GRAPH_SKEWT; + + private Font newFont; + + private boolean isEditorVisible = true; + + private static NsharpPaletteWindow instance = null; + + // one instance per perspective. To avoid cross reference. + private static NsharpPaletteWindow ncpInstance = null; + + private static NsharpPaletteWindow d2dInstance = null; + + private int currentGraphMode = NsharpConstants.GRAPH_SKEWT; + private String paneConfigurationName; + private static NsharpConstants.SPCGraph leftGraph = NsharpConstants.SPCGraph.EBS; + private static NsharpConstants.SPCGraph rightGraph = NsharpConstants.SPCGraph.STP; + private boolean spcGpCreated = false; + public static NsharpPaletteWindow getInstance() { - if( VizPerspectiveListener.getCurrentPerspectiveManager()!= null){ - if(VizPerspectiveListener.getCurrentPerspectiveManager().getPerspectiveId().equals(D2D5Pane.ID_PERSPECTIVE)) + if (VizPerspectiveListener.getCurrentPerspectiveManager() != null) { + if (VizPerspectiveListener.getCurrentPerspectiveManager() + .getPerspectiveId().equals(D2D5Pane.ID_PERSPECTIVE)) return d2dInstance; - else if(VizPerspectiveListener.getCurrentPerspectiveManager().getPerspectiveId().equals(NmapCommon.NatlCntrsPerspectiveID)) + else if (VizPerspectiveListener.getCurrentPerspectiveManager() + .getPerspectiveId() + .equals(NmapCommon.NatlCntrsPerspectiveID)) return ncpInstance; } return instance; } + public int getCurrentGraphMode() { return currentGraphMode; } - public void restorePaletteWindow( String paneConfigurationName,int currentGraphMode, boolean interpolateIsOn, boolean overlayIsOn, boolean compareStnIsOn, - boolean compareTmIsOn, boolean editGraphOn, boolean compareSndIsOn) { - //System.out.println("restorePaletteWindow "+ this.toString()); + public void restorePaletteWindow(String paneConfigurationName, + int currentGraphMode, boolean interpolateIsOn, boolean overlayIsOn, + boolean compareStnIsOn, boolean compareTmIsOn, boolean editGraphOn, + boolean compareSndIsOn) { + // System.out.println("restorePaletteWindow "+ this.toString()); updateSpcGraphBtn(paneConfigurationName); this.currentGraphMode = currentGraphMode; this.interpolateIsOn = interpolateIsOn; @@ -133,16 +173,16 @@ DisposeListener, IPartListener{ graphModeBtnSkew.setEnabled(true); graphModeBtnIcing.setEnabled(true); graphModeBtnTurb.setEnabled(true); - if(currentGraphMode== NsharpConstants.GRAPH_SKEWT){ + if (currentGraphMode == NsharpConstants.GRAPH_SKEWT) { graphModeBtnSkew.setBackground(colorBlue); graphModeBtnTurb.setBackground(colorGrey); graphModeBtnIcing.setBackground(colorGrey); graphEditBtn.setEnabled(true); dataEditBtn.setEnabled(true); - compareTmBtn.setEnabled( true ); - compareSndBtn.setEnabled( true ); - compareStnBtn.setEnabled( true ); - overlayBtn.setEnabled( true ); + compareTmBtn.setEnabled(true); + compareSndBtn.setEnabled(true); + compareStnBtn.setEnabled(true); + overlayBtn.setEnabled(true); interpBtn.setEnabled(true); overlayBtn.setText(OVLY_OFF); interpBtn.setText(INTP_OFF); @@ -150,193 +190,197 @@ DisposeListener, IPartListener{ compareTmBtn.setText(COMP_TM_OFF); compareSndBtn.setText(COMP_SND_OFF); compareStnBtn.setText(COMP_STN_OFF); - if(interpolateIsOn) { + if (interpolateIsOn) { graphEditBtn.setEnabled(false); dataEditBtn.setEnabled(false); - compareTmBtn.setEnabled( false ); - compareSndBtn.setEnabled( false ); - compareStnBtn.setEnabled( false ); - overlayBtn.setEnabled( false ); + compareTmBtn.setEnabled(false); + compareSndBtn.setEnabled(false); + compareStnBtn.setEnabled(false); + overlayBtn.setEnabled(false); interpBtn.setText(INTP_ON); - } - else if(overlayIsOn){ + } else if (overlayIsOn) { overlayBtn.setText(OVLY_ON); graphEditBtn.setEnabled(false); dataEditBtn.setEnabled(false); - compareTmBtn.setEnabled( false ); - compareSndBtn.setEnabled( false ); - compareStnBtn.setEnabled( false ); + compareTmBtn.setEnabled(false); + compareSndBtn.setEnabled(false); + compareStnBtn.setEnabled(false); interpBtn.setEnabled(false); graphModeBtnIcing.setEnabled(false); graphModeBtnTurb.setEnabled(false); - } - else if(compareStnIsOn){ + } else if (compareStnIsOn) { compareStnBtn.setText(COMP_STN_ON); graphEditBtn.setEnabled(false); dataEditBtn.setEnabled(false); - compareTmBtn.setEnabled( false ); - compareSndBtn.setEnabled( false ); - overlayBtn.setEnabled( false ); + compareTmBtn.setEnabled(false); + compareSndBtn.setEnabled(false); + overlayBtn.setEnabled(false); interpBtn.setEnabled(false); graphModeBtnIcing.setEnabled(false); graphModeBtnTurb.setEnabled(false); - } - else if(compareSndIsOn){ + } else if (compareSndIsOn) { compareSndBtn.setText(COMP_SND_ON); graphEditBtn.setEnabled(false); dataEditBtn.setEnabled(false); - compareTmBtn.setEnabled( false ); - compareStnBtn.setEnabled( false ); - overlayBtn.setEnabled( false ); + compareTmBtn.setEnabled(false); + compareStnBtn.setEnabled(false); + overlayBtn.setEnabled(false); interpBtn.setEnabled(false); graphModeBtnIcing.setEnabled(false); graphModeBtnTurb.setEnabled(false); - } - else if(compareTmIsOn){ + } else if (compareTmIsOn) { compareTmBtn.setText(COMP_TM_ON); - compareSndBtn.setEnabled( false ); + compareSndBtn.setEnabled(false); graphEditBtn.setEnabled(false); dataEditBtn.setEnabled(false); - compareStnBtn.setEnabled( false ); - overlayBtn.setEnabled( false ); + compareStnBtn.setEnabled(false); + overlayBtn.setEnabled(false); interpBtn.setEnabled(false); graphModeBtnIcing.setEnabled(false); graphModeBtnTurb.setEnabled(false); - } - else if(editGraphOn){ + } else if (editGraphOn) { graphEditBtn.setText(EDIT_GRAPH_ON); dataEditBtn.setEnabled(false); - compareStnBtn.setEnabled( false ); - compareTmBtn.setEnabled( false ); - compareSndBtn.setEnabled( false ); - overlayBtn.setEnabled( false ); + compareStnBtn.setEnabled(false); + compareTmBtn.setEnabled(false); + compareSndBtn.setEnabled(false); + overlayBtn.setEnabled(false); interpBtn.setEnabled(false); graphModeBtnIcing.setEnabled(false); graphModeBtnTurb.setEnabled(false); } - } - else if(currentGraphMode== NsharpConstants.GRAPH_TURB){ + } else if (currentGraphMode == NsharpConstants.GRAPH_TURB) { graphModeBtnTurb.setBackground(colorBlue); graphModeBtnSkew.setBackground(colorGrey); graphModeBtnIcing.setBackground(colorGrey); graphEditBtn.setEnabled(false); dataEditBtn.setEnabled(false); - compareTmBtn.setEnabled( false ); - compareSndBtn.setEnabled( false ); - compareStnBtn.setEnabled( false ); - overlayBtn.setEnabled( false ); - if(interpolateIsOn) + compareTmBtn.setEnabled(false); + compareSndBtn.setEnabled(false); + compareStnBtn.setEnabled(false); + overlayBtn.setEnabled(false); + if (interpolateIsOn) interpBtn.setText(INTP_ON); else interpBtn.setText(INTP_OFF); - } - else if(currentGraphMode== NsharpConstants.GRAPH_ICING){ + } else if (currentGraphMode == NsharpConstants.GRAPH_ICING) { graphModeBtnIcing.setBackground(colorBlue); graphModeBtnSkew.setBackground(colorGrey); graphModeBtnTurb.setBackground(colorGrey); graphEditBtn.setEnabled(false); dataEditBtn.setEnabled(false); - compareTmBtn.setEnabled( false ); - compareSndBtn.setEnabled( false ); - compareStnBtn.setEnabled( false ); - overlayBtn.setEnabled( false ); - if(interpolateIsOn) + compareTmBtn.setEnabled(false); + compareSndBtn.setEnabled(false); + compareStnBtn.setEnabled(false); + overlayBtn.setEnabled(false); + if (interpolateIsOn) interpBtn.setText(INTP_ON); else interpBtn.setText(INTP_OFF); } } + public static NsharpConstants.SPCGraph getLeftGraph() { return leftGraph; } + public static NsharpConstants.SPCGraph getRightGraph() { return rightGraph; } - private Color colorGrey = new Color(Display.getDefault(), 211,211,211); - private Color colorBlue = new Color(Display.getDefault(),135,206,235); - //private Color colorButtonOriginalBg; // will be initialized later - private void updateSPCGraphs(){ - if(leftGraph == NsharpConstants.SPCGraph.EBS || rightGraph == NsharpConstants.SPCGraph.EBS){ + private Color colorGrey = new Color(Display.getDefault(), 211, 211, 211); + + private Color colorBlue = new Color(Display.getDefault(), 135, 206, 235); + + // private Color colorButtonOriginalBg; // will be initialized later + private void updateSPCGraphs() { + if (leftGraph == NsharpConstants.SPCGraph.EBS + || rightGraph == NsharpConstants.SPCGraph.EBS) { effBulkShearBtn.setBackground(colorBlue); - } - else { + } else { effBulkShearBtn.setBackground(colorGrey); } - if(leftGraph == NsharpConstants.SPCGraph.STP || rightGraph == NsharpConstants.SPCGraph.STP){ + if (leftGraph == NsharpConstants.SPCGraph.STP + || rightGraph == NsharpConstants.SPCGraph.STP) { stpBtn.setBackground(colorBlue); - } - else { + } else { stpBtn.setBackground(colorGrey); } - if(leftGraph == NsharpConstants.SPCGraph.SHIP || rightGraph == NsharpConstants.SPCGraph.SHIP){ + if (leftGraph == NsharpConstants.SPCGraph.SHIP + || rightGraph == NsharpConstants.SPCGraph.SHIP) { shipBtn.setBackground(colorBlue); - } - else { + } else { shipBtn.setBackground(colorGrey); } - if(leftGraph == NsharpConstants.SPCGraph.WINTER || rightGraph == NsharpConstants.SPCGraph.WINTER){ + if (leftGraph == NsharpConstants.SPCGraph.WINTER + || rightGraph == NsharpConstants.SPCGraph.WINTER) { winterBtn.setBackground(colorBlue); - } - else { + } else { winterBtn.setBackground(colorGrey); } - if(leftGraph == NsharpConstants.SPCGraph.FIRE || rightGraph == NsharpConstants.SPCGraph.FIRE){ + if (leftGraph == NsharpConstants.SPCGraph.FIRE + || rightGraph == NsharpConstants.SPCGraph.FIRE) { fireBtn.setBackground(colorBlue); - } - else { + } else { fireBtn.setBackground(colorGrey); } - if(leftGraph == NsharpConstants.SPCGraph.HAIL || rightGraph == NsharpConstants.SPCGraph.HAIL){ + if (leftGraph == NsharpConstants.SPCGraph.HAIL + || rightGraph == NsharpConstants.SPCGraph.HAIL) { hailBtn.setBackground(colorBlue); - } - else { + } else { hailBtn.setBackground(colorGrey); } - if(leftGraph == NsharpConstants.SPCGraph.SARS || rightGraph == NsharpConstants.SPCGraph.SARS){ + if (leftGraph == NsharpConstants.SPCGraph.SARS + || rightGraph == NsharpConstants.SPCGraph.SARS) { sarsBtn.setBackground(colorBlue); - } - else { + } else { sarsBtn.setBackground(colorGrey); } NsharpResourceHandler rsc = getRscHandler(); - if(rsc!= null && rsc.getSpcGraphsPaneRsc()!=null) { + if (rsc != null && rsc.getSpcGraphsPaneRsc() != null) { rsc.getSpcGraphsPaneRsc().setGraphs(leftGraph, rightGraph); } } + public void setAndOpenMb(String msg) { if (mb != null) { mb.setMessage(msg); try { mb.open(); - }catch (Exception e) { + } catch (Exception e) { - //e.printStackTrace(); + // e.printStackTrace(); } } } + public NsharpPaletteWindow() { super(); instance = this; - if( VizPerspectiveListener.getCurrentPerspectiveManager()!= null){ - if(VizPerspectiveListener.getCurrentPerspectiveManager().getPerspectiveId().equals(D2D5Pane.ID_PERSPECTIVE)) + if (VizPerspectiveListener.getCurrentPerspectiveManager() != null) { + if (VizPerspectiveListener.getCurrentPerspectiveManager() + .getPerspectiveId().equals(D2D5Pane.ID_PERSPECTIVE)) d2dInstance = this; - else if(VizPerspectiveListener.getCurrentPerspectiveManager().getPerspectiveId().equals(NmapCommon.NatlCntrsPerspectiveID)) + else if (VizPerspectiveListener.getCurrentPerspectiveManager() + .getPerspectiveId() + .equals(NmapCommon.NatlCntrsPerspectiveID)) ncpInstance = this; } - //System.out.println("view NsharpPaletteWindow constructed!! "+ this.toString()); + // System.out.println("view NsharpPaletteWindow constructed!! "+ + // this.toString()); printHandle = NsharpPrintHandle.getPrintHandle(); shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - mb = new MessageBox(shell, SWT.ICON_WARNING - | SWT.OK ); - mb.setMessage( "Data is not loaded yet!"); + mb = new MessageBox(shell, SWT.ICON_WARNING | SWT.OK); + mb.setMessage("Data is not loaded yet!"); NsharpConfigManager configMgr = NsharpConfigManager.getInstance(); - NsharpConfigStore configStore = configMgr.retrieveNsharpConfigStoreFromFs(); - NsharpGraphProperty graphConfigProperty = configStore.getGraphProperty(); + NsharpConfigStore configStore = configMgr + .retrieveNsharpConfigStoreFromFs(); + NsharpGraphProperty graphConfigProperty = configStore + .getGraphProperty(); paneConfigurationName = graphConfigProperty.getPaneConfigurationName(); try { NsharpGridInventory.getInstance().initInventory(false); @@ -350,13 +394,13 @@ DisposeListener, IPartListener{ /** * Invoked by the workbench to initialize this View. */ - public void init( IViewSite site ) { - //System.out.println("NsharpPaletteWindow inited!!"+ this.toString()); + public void init(IViewSite site) { + // System.out.println("NsharpPaletteWindow inited!!"+ this.toString()); try { - super.init( site ); + super.init(site); - } catch ( PartInitException pie ) { + } catch (PartInitException pie) { pie.printStackTrace(); @@ -366,12 +410,14 @@ DisposeListener, IPartListener{ page.addPartListener(this); NsharpMapResource.registerMouseHandler(); - //Chin : to fix Ticket#11034:::: - //get several control information back from SkewT resource, in the case that - //NsharpPaletteWindow view was disposed and re-constructed while SkewT resource is still alive. - //This case applied to D2D implementation. + // Chin : to fix Ticket#11034:::: + // get several control information back from SkewT resource, in the case + // that + // NsharpPaletteWindow view was disposed and re-constructed while SkewT + // resource is still alive. + // This case applied to D2D implementation. NsharpResourceHandler rsc = getRscHandler(); - if(rsc!= null) { + if (rsc != null) { interpolateIsOn = rsc.isInterpolateIsOn(); overlayIsOn = rsc.isOverlayIsOn(); compareStnIsOn = rsc.isCompareStnIsOn(); @@ -386,57 +432,64 @@ DisposeListener, IPartListener{ * Disposes resource. invoked by the workbench */ public void dispose() { - //System.out.println("NsharpPaletteWindow "+this.toString()+" dispose() called!! isEditorVisible="+ isEditorVisible); - if ( ! isEditorVisible ) { + // System.out.println("NsharpPaletteWindow "+this.toString()+" dispose() called!! isEditorVisible="+ + // isEditorVisible); + if (!isEditorVisible) { NsharpMapResource.unregisterMouseHandler(); instance = null; d2dInstance = null; ncpInstance = null; return; - } - else { + } else { super.dispose(); - currentGraphMode= NsharpConstants.GRAPH_SKEWT; + currentGraphMode = NsharpConstants.GRAPH_SKEWT; isEditorVisible = false; NatlCntrsEditor editor = NsharpMapResource.getMapEditor(); - if(editor!=null){ - for ( IRenderableDisplay display : UiUtil.getDisplaysFromContainer(editor) ) { -// NsharpMapResource mrsc = (NsharpMapResource)NcDisplayMngr.findAllResources( NsharpMapResource.class, editor ); -// if( mrsc != null ) { -// mrsc.unload(); -// display.getDescriptor().getResourceList().removePreRemoveListener(mrsc); -// } - //System.out.println("display " + display.toString()); - for ( ResourcePair rp : display.getDescriptor().getResourceList() ) { - if ( rp.getResource() instanceof NsharpMapResource ) { - NsharpMapResource rsc = (NsharpMapResource)rp.getResource(); + if (editor != null) { + for (IRenderableDisplay display : UiUtil + .getDisplaysFromContainer(editor)) { + // NsharpMapResource mrsc = + // (NsharpMapResource)NcDisplayMngr.findAllResources( + // NsharpMapResource.class, editor ); + // if( mrsc != null ) { + // mrsc.unload(); + // display.getDescriptor().getResourceList().removePreRemoveListener(mrsc); + // } + // System.out.println("display " + display.toString()); + for (ResourcePair rp : display.getDescriptor() + .getResourceList()) { + if (rp.getResource() instanceof NsharpMapResource) { + NsharpMapResource rsc = (NsharpMapResource) rp + .getResource(); rsc.unload(); - display.getDescriptor().getResourceList().removePreRemoveListener(rsc); + display.getDescriptor().getResourceList() + .removePreRemoveListener(rsc); } } } } - if(newFont!= null){ + if (newFont != null) { newFont.dispose(); - newFont=null; + newFont = null; } /* * remove the workbench part listener */ page.removePartListener(this); - try{ - if(NsharpLoadDialog.getAccess()!= null){ + try { + if (NsharpLoadDialog.getAccess() != null) { NsharpLoadDialog.getAccess().close(); } - }catch (Exception e) { + } catch (Exception e) { } - instance= null; + instance = null; d2dInstance = null; ncpInstance = null; } } + protected boolean checkLoadedData() { NsharpEditor editor = NsharpEditor.getActiveNsharpEditor(); if (editor == null) { @@ -444,13 +497,14 @@ DisposeListener, IPartListener{ return false; } NsharpResourceHandler rsc = editor.getRscHandler(); - if (rsc == null ) { + if (rsc == null) { mb.open(); return false; } return true; } - protected NsharpResourceHandler getRscHandler(){ + + protected NsharpResourceHandler getRscHandler() { NsharpEditor editor = NsharpEditor.getActiveNsharpEditor(); if (editor == null) { @@ -463,102 +517,108 @@ DisposeListener, IPartListener{ return rsc; } - public void createDataControlGp(Composite parent){ + public void createDataControlGp(Composite parent) { this.parent = parent; - Group textModeGp = new Group(parent,SWT.SHADOW_OUT); - textModeGp.setLayout( new RowLayout(SWT.HORIZONTAL) ); - textModeGp.setLayoutData( new GridData(GridData.FILL_HORIZONTAL) ); + Group textModeGp = new Group(parent, SWT.SHADOW_OUT); + textModeGp.setLayout(new RowLayout(SWT.HORIZONTAL)); + textModeGp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); Font font = textModeGp.getFont(); FontData[] fontData = font.getFontData(); for (int i = 0; i < fontData.length; i++) { fontData[i].setHeight(7); - //fontData[i].setName("courier"); + // fontData[i].setName("courier"); } newFont = new Font(font.getDevice(), fontData); loadBtn = new Button(textModeGp, SWT.PUSH); loadBtn.setFont(newFont); loadBtn.setText(" Load "); - loadBtn.setEnabled( true ); - //loadBtn.setSize(btnWidth,pushbtnHeight); - loadBtn.addListener( SWT.MouseUp, new Listener() { + loadBtn.setEnabled(true); + // loadBtn.setSize(btnWidth,pushbtnHeight); + loadBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); + Shell shell = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getShell(); NsharpLoadDialog loadDia = NsharpLoadDialog.getInstance(shell); - if ( loadDia != null ) { - //System.out.println("Load Button is calling dialog open()"); + if (loadDia != null) { + // System.out.println("Load Button is calling dialog open()"); loadDia.open(); } } - } ); + }); unloadBtn = new Button(textModeGp, SWT.PUSH); unloadBtn.setFont(newFont); unloadBtn.setText(" UnLoad "); - unloadBtn.setEnabled( true ); - //loadBtn.setSize(btnWidth,pushbtnHeight); - unloadBtn.addListener( SWT.MouseUp, new Listener() { - public void handleEvent(Event event) { - if(checkLoadedData()) { - Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); + unloadBtn.setEnabled(true); + // loadBtn.setSize(btnWidth,pushbtnHeight); + unloadBtn.addListener(SWT.MouseUp, new Listener() { + public void handleEvent(Event event) { + if (checkLoadedData()) { + Shell shell = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getShell(); - NsharpUnloadDialog unloadDia = NsharpUnloadDialog.getInstance(shell); + NsharpUnloadDialog unloadDia = NsharpUnloadDialog + .getInstance(shell); - if ( unloadDia != null ) { - //System.out.println("Load Button is calling dialog open()"); + if (unloadDia != null) { + // System.out.println("Load Button is calling dialog open()"); unloadDia.open(); } } } - } ); + }); // Push buttons for SAVE Button saveBtn = new Button(textModeGp, SWT.PUSH); saveBtn.setFont(newFont); saveBtn.setText(" Save "); - saveBtn.setEnabled( true ); - //saveBtn.setSize(btnWidth,pushbtnHeight); - saveBtn.addListener( SWT.MouseUp, new Listener() { + saveBtn.setEnabled(true); + // saveBtn.setSize(btnWidth,pushbtnHeight); + saveBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - if(checkLoadedData()) { + if (checkLoadedData()) { // Action to save text report NsharpSaveHandle.saveFile(shell); } } - } ); + }); // Push buttons for CONFIGURE cfgBtn = new Button(textModeGp, SWT.PUSH); cfgBtn.setFont(newFont); cfgBtn.setText(" Configure "); cfgBtn.setEnabled(true); - //cfgBtn.setSize(btnWidth,pushbtnHeight); - cfgBtn.addListener( SWT.MouseUp, new Listener() { + // cfgBtn.setSize(btnWidth,pushbtnHeight); + cfgBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - //CHin, new develop if(checkLoadedData()) { - //NsharpParametersSelectionConfigDialog dia = NsharpParametersSelectionConfigDialog.getInstance(shell); + Shell shell = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getShell(); + // CHin, new develop if(checkLoadedData()) { + // NsharpParametersSelectionConfigDialog dia = + // NsharpParametersSelectionConfigDialog.getInstance(shell); NsharpConfigDialog dia = NsharpConfigDialog.getInstance(shell); - if ( dia != null ) { + if (dia != null) { dia.open(); } - //} + // } } - } ); + }); Button resetBtn = new Button(textModeGp, SWT.PUSH); resetBtn.setFont(newFont); resetBtn.setText(" Reset "); - resetBtn.setEnabled( true ); - resetBtn.addListener( SWT.MouseUp, new Listener() { + resetBtn.setEnabled(true); + resetBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - //RESET should turn off everything... - shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); + // RESET should turn off everything... + shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getShell(); cfgBtn.setEnabled(true); overlayIsOn = false; overlayBtn.setText(OVLY_OFF); @@ -581,37 +641,44 @@ DisposeListener, IPartListener{ graphModeBtnIcing.setEnabled(true); graphModeBtnTurb.setEnabled(true); graphEditBtn.setText(EDIT_GRAPH_OFF); - currentGraphMode= NsharpConstants.GRAPH_SKEWT; + currentGraphMode = NsharpConstants.GRAPH_SKEWT; NsharpEditor editor = NsharpEditor.getActiveNsharpEditor(); - if(editor != null && editor.getRscHandler()!=null){ - //note: resetRsc will reset currentPage, overlay, compare, interpolate flag in Resource + if (editor != null && editor.getRscHandler() != null) { + // note: resetRsc will reset currentPage, overlay, compare, + // interpolate flag in Resource editor.getRscHandler().resetRsc(); - //issue#18 - issue list - if(editor.getRscHandler().getDataPaneRsc()!=null){ - editor.getRscHandler().getDataPaneRsc().resetCurrentParcel(); - } - NsharpParcelDialog parcelDia = NsharpParcelDialog.getInstance(shell); - if ( parcelDia != null ) { + // issue#18 - issue list + if (editor.getRscHandler().getDataPaneRsc() != null) { + editor.getRscHandler().getDataPaneRsc() + .resetCurrentParcel(); + } + NsharpParcelDialog parcelDia = NsharpParcelDialog + .getInstance(shell); + if (parcelDia != null) { parcelDia.reset(); } - //editor.getNsharpSkewTDescriptor().getSkewtResource().resetRsc();// need to called it twice to make refresh worked...dont know why - //know that current editor is NsharpSkewT editor, refresh it. + // editor.getNsharpSkewTDescriptor().getSkewtResource().resetRsc();// + // need to called it twice to make refresh worked...dont + // know why + // know that current editor is NsharpSkewT editor, refresh + // it. editor.refresh(); - NsharpShowTextDialog textarea = NsharpShowTextDialog.getAccess(); - if(textarea != null){ + NsharpShowTextDialog textarea = NsharpShowTextDialog + .getAccess(); + if (textarea != null) { textarea.refreshTextData(); } } - if(NsharpParcelDialog.getAccess() != null){ + if (NsharpParcelDialog.getAccess() != null) { NsharpParcelDialog.getAccess().resetUserDefParcel(); } } - } ); + }); Button resetGfBtn = new Button(textModeGp, SWT.PUSH); resetGfBtn.setFont(newFont); resetGfBtn.setText("Reset Display"); - resetGfBtn.setEnabled( true ); - resetGfBtn.addListener( SWT.MouseUp, new Listener() { + resetGfBtn.setEnabled(true); + resetGfBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { NsharpEditor editor = NsharpEditor.getActiveNsharpEditor(); editor.resetGraph(); @@ -621,137 +688,146 @@ DisposeListener, IPartListener{ Button parcelBtn = new Button(textModeGp, SWT.PUSH); parcelBtn.setFont(newFont); parcelBtn.setText(" Parcel "); - parcelBtn.setEnabled( true ); - //parcelBtn.setSize(btnWidth,pushbtnHeight); - parcelBtn.addListener( SWT.MouseUp, new Listener() { - public void handleEvent(Event event) { - Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - if(checkLoadedData()) { - NsharpParcelDialog parcelDia = NsharpParcelDialog.getInstance(shell); + parcelBtn.setEnabled(true); + // parcelBtn.setSize(btnWidth,pushbtnHeight); + parcelBtn.addListener(SWT.MouseUp, new Listener() { + public void handleEvent(Event event) { + Shell shell = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getShell(); + if (checkLoadedData()) { + NsharpParcelDialog parcelDia = NsharpParcelDialog + .getInstance(shell); - if ( parcelDia != null ) { - //System.out.println("calling parcel dialog open()"); + if (parcelDia != null) { + // System.out.println("calling parcel dialog open()"); parcelDia.open(); } } } - } ); + }); // Push buttons for NEXT PAGE info Button nextpageBtn = new Button(textModeGp, SWT.PUSH); nextpageBtn.setFont(newFont); nextpageBtn.setText(" Next Data "); nextpageBtn.setEnabled(true); - nextpageBtn.addListener( SWT.MouseUp, new Listener() { + nextpageBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - if(checkLoadedData()) { + shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getShell(); + if (checkLoadedData()) { NsharpResourceHandler rsc = getRscHandler(); - if(rsc!= null){ + if (rsc != null) { rsc.setNextTextChapter(); rsc.refreshPane(); } } } - } ); + }); // Push buttons for NEXT INSET PAGE info Button nextInsetBtn = new Button(textModeGp, SWT.PUSH); nextInsetBtn.setFont(newFont); nextInsetBtn.setText(" Next Inset "); nextInsetBtn.setEnabled(true); - nextInsetBtn.addListener( SWT.MouseUp, new Listener() { + nextInsetBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - if(checkLoadedData()) { + shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getShell(); + if (checkLoadedData()) { NsharpResourceHandler rsc = getRscHandler(); - if(rsc!= null){ + if (rsc != null) { rsc.setNextInsetPage(); rsc.refreshPane(); } } } - } ); - + }); // Push buttons for interpolate interpBtn = new Button(textModeGp, SWT.PUSH); interpBtn.setFont(newFont); - interpBtn.setEnabled( true ); - if(interpolateIsOn) { + interpBtn.setEnabled(true); + if (interpolateIsOn) { interpBtn.setText(INTP_ON); - } - else{ + } else { interpBtn.setText(INTP_OFF); } - interpBtn.addListener( SWT.MouseUp, new Listener() { + interpBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - if(checkLoadedData()) { - if(interpolateIsOn == false){ + shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getShell(); + if (checkLoadedData()) { + if (interpolateIsOn == false) { interpolateIsOn = true; interpBtn.setText(INTP_ON); graphEditBtn.setEnabled(false); dataEditBtn.setEnabled(false); - compareTmBtn.setEnabled( false ); - compareSndBtn.setEnabled( false ); - compareStnBtn.setEnabled( false ); - overlayBtn.setEnabled( false ); - } - else { + compareTmBtn.setEnabled(false); + compareSndBtn.setEnabled(false); + compareStnBtn.setEnabled(false); + overlayBtn.setEnabled(false); + } else { interpolateIsOn = false; interpBtn.setText(INTP_OFF); - if(currentGraphMode == NsharpConstants.GRAPH_SKEWT){ + if (currentGraphMode == NsharpConstants.GRAPH_SKEWT) { graphEditBtn.setEnabled(true); dataEditBtn.setEnabled(true); - compareTmBtn.setEnabled( true ); - compareSndBtn.setEnabled( true ); - compareStnBtn.setEnabled( true ); - overlayBtn.setEnabled( true ); + compareTmBtn.setEnabled(true); + compareSndBtn.setEnabled(true); + compareStnBtn.setEnabled(true); + overlayBtn.setEnabled(true); } } - //note:call resetInfoOnInterpolate() and pass interpolate flag to Resource + // note:call resetInfoOnInterpolate() and pass interpolate + // flag to Resource NsharpEditor editor = NsharpEditor.getActiveNsharpEditor(); - if(editor != null){ + if (editor != null) { try { - editor.getRscHandler().resetInfoOnInterpolate(interpolateIsOn); + editor.getRscHandler().resetInfoOnInterpolate( + interpolateIsOn); } catch (CloneNotSupportedException e) { e.printStackTrace(); } - //know that current editor is NsharpSkewT editor, refresh it. + // know that current editor is NsharpSkewT editor, + // refresh it. editor.refresh(); - NsharpShowTextDialog textarea = NsharpShowTextDialog.getAccess(); - if(textarea != null){ + NsharpShowTextDialog textarea = NsharpShowTextDialog + .getAccess(); + if (textarea != null) { textarea.refreshTextData(); } } } } - } ); + }); NsharpResourceHandler rscHandler = getRscHandler(); // Push buttons for OVERLAY info overlayBtn = new Button(textModeGp, SWT.PUSH); overlayBtn.setFont(newFont); - if(overlayIsOn){ + if (overlayIsOn) { overlayBtn.setText(OVLY_ON); - overlayBtn.setEnabled( true ); - } - else{ + overlayBtn.setEnabled(true); + } else { overlayBtn.setText(OVLY_OFF); - //comparison and overlay is mutual exclusive - if((rscHandler!= null) && (rscHandler.isCompareStnIsOn() || rscHandler.isCompareTmIsOn()|| rscHandler.isCompareSndIsOn())) - overlayBtn.setEnabled( false ); + // comparison and overlay is mutual exclusive + if ((rscHandler != null) + && (rscHandler.isCompareStnIsOn() + || rscHandler.isCompareTmIsOn() || rscHandler + .isCompareSndIsOn())) + overlayBtn.setEnabled(false); else - overlayBtn.setEnabled( true ); + overlayBtn.setEnabled(true); } - overlayBtn.addListener( SWT.MouseUp, new Listener() { + overlayBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - if(overlayIsOn == false){ + shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getShell(); + if (overlayIsOn == false) { overlayIsOn = true; overlayBtn.setText(OVLY_ON); @@ -760,12 +836,11 @@ DisposeListener, IPartListener{ compareSndBtn.setEnabled(false); graphEditBtn.setEnabled(false); dataEditBtn.setEnabled(false); - graphModeBtnTurb.setEnabled( false ); - graphModeBtnIcing.setEnabled( false ); - interpBtn.setEnabled( false ); - cfgBtn.setEnabled( false ); - } - else { + graphModeBtnTurb.setEnabled(false); + graphModeBtnIcing.setEnabled(false); + interpBtn.setEnabled(false); + cfgBtn.setEnabled(false); + } else { overlayIsOn = false; overlayBtn.setText(OVLY_OFF); compareStnBtn.setEnabled(true); @@ -773,379 +848,382 @@ DisposeListener, IPartListener{ compareSndBtn.setEnabled(true); graphEditBtn.setEnabled(true); dataEditBtn.setEnabled(true); - graphModeBtnTurb.setEnabled( true ); - graphModeBtnIcing.setEnabled( true ); - interpBtn.setEnabled( true ); - cfgBtn.setEnabled( true ); + graphModeBtnTurb.setEnabled(true); + graphModeBtnIcing.setEnabled(true); + interpBtn.setEnabled(true); + cfgBtn.setEnabled(true); } NsharpResourceHandler rsc = getRscHandler(); - if(rsc!= null){ + if (rsc != null) { rsc.setOverlayIsOn(overlayIsOn); rsc.refreshPane(); } } - } ); + }); // Push buttons for CompByStn info compareStnBtn = new Button(textModeGp, SWT.PUSH); compareStnBtn.setFont(newFont); - if(compareStnIsOn){ + if (compareStnIsOn) { compareStnBtn.setText(COMP_STN_ON); - compareStnBtn.setEnabled( true ); - } - else{ - //comparison and overlay is mutual exclusive + compareStnBtn.setEnabled(true); + } else { + // comparison and overlay is mutual exclusive compareStnBtn.setText(COMP_STN_OFF); - if((rscHandler!= null) && (rscHandler.isOverlayIsOn() || rscHandler.isCompareTmIsOn()|| rscHandler.isCompareSndIsOn())) - compareStnBtn.setEnabled( false ); + if ((rscHandler != null) + && (rscHandler.isOverlayIsOn() + || rscHandler.isCompareTmIsOn() || rscHandler + .isCompareSndIsOn())) + compareStnBtn.setEnabled(false); else - compareStnBtn.setEnabled( true ); + compareStnBtn.setEnabled(true); } - compareStnBtn.addListener( SWT.MouseUp, new Listener() { + compareStnBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - if(compareStnIsOn == false){ + shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getShell(); + if (compareStnIsOn == false) { compareStnIsOn = true; compareStnBtn.setText(COMP_STN_ON); overlayBtn.setEnabled(false); - compareTmBtn.setEnabled( false ); + compareTmBtn.setEnabled(false); compareSndBtn.setEnabled(false); graphEditBtn.setEnabled(false); dataEditBtn.setEnabled(false); - graphModeBtnTurb.setEnabled( false ); - graphModeBtnIcing.setEnabled( false ); - interpBtn.setEnabled( false ); - cfgBtn.setEnabled( false ); - } - else { + graphModeBtnTurb.setEnabled(false); + graphModeBtnIcing.setEnabled(false); + interpBtn.setEnabled(false); + cfgBtn.setEnabled(false); + } else { compareStnIsOn = false; compareStnBtn.setText(COMP_STN_OFF); overlayBtn.setEnabled(true); - compareTmBtn.setEnabled( true ); + compareTmBtn.setEnabled(true); compareSndBtn.setEnabled(true); graphEditBtn.setEnabled(true); dataEditBtn.setEnabled(true); - graphModeBtnTurb.setEnabled( true ); - graphModeBtnIcing.setEnabled( true ); - interpBtn.setEnabled( true ); - cfgBtn.setEnabled( true ); + graphModeBtnTurb.setEnabled(true); + graphModeBtnIcing.setEnabled(true); + interpBtn.setEnabled(true); + cfgBtn.setEnabled(true); } NsharpResourceHandler rsc = getRscHandler(); - if(rsc!= null){ + if (rsc != null) { rsc.setCompareStnIsOn(compareStnIsOn); rsc.refreshPane(); } } - } ); + }); // Push buttons for CompByTm info compareTmBtn = new Button(textModeGp, SWT.PUSH); compareTmBtn.setFont(newFont); - if(compareTmIsOn){ + if (compareTmIsOn) { compareTmBtn.setText(COMP_TM_ON); - compareTmBtn.setEnabled( true ); - } - else{ - //comparison and overlay is mutual exclusive + compareTmBtn.setEnabled(true); + } else { + // comparison and overlay is mutual exclusive compareTmBtn.setText(COMP_TM_OFF); - if((rscHandler!= null) && (rscHandler.isOverlayIsOn() || rscHandler.isCompareStnIsOn() || rscHandler.isCompareSndIsOn())) - compareTmBtn.setEnabled( false ); + if ((rscHandler != null) + && (rscHandler.isOverlayIsOn() + || rscHandler.isCompareStnIsOn() || rscHandler + .isCompareSndIsOn())) + compareTmBtn.setEnabled(false); else - compareTmBtn.setEnabled( true ); + compareTmBtn.setEnabled(true); } - compareTmBtn.addListener( SWT.MouseUp, new Listener() { + compareTmBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - if(compareTmIsOn == false){ + shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getShell(); + if (compareTmIsOn == false) { compareTmIsOn = true; compareTmBtn.setText(COMP_TM_ON); compareSndBtn.setEnabled(false); overlayBtn.setEnabled(false); - compareStnBtn.setEnabled( false ); + compareStnBtn.setEnabled(false); graphEditBtn.setEnabled(false); dataEditBtn.setEnabled(false); - graphModeBtnTurb.setEnabled( false ); - graphModeBtnIcing.setEnabled( false ); - interpBtn.setEnabled( false ); - cfgBtn.setEnabled( false ); - } - else { + graphModeBtnTurb.setEnabled(false); + graphModeBtnIcing.setEnabled(false); + interpBtn.setEnabled(false); + cfgBtn.setEnabled(false); + } else { compareTmIsOn = false; compareTmBtn.setText(COMP_TM_OFF); compareSndBtn.setEnabled(true); overlayBtn.setEnabled(true); - compareStnBtn.setEnabled( true ); + compareStnBtn.setEnabled(true); graphEditBtn.setEnabled(true); dataEditBtn.setEnabled(true); - graphModeBtnTurb.setEnabled( true ); - graphModeBtnIcing.setEnabled( true ); - interpBtn.setEnabled( true ); - cfgBtn.setEnabled( true ); + graphModeBtnTurb.setEnabled(true); + graphModeBtnIcing.setEnabled(true); + interpBtn.setEnabled(true); + cfgBtn.setEnabled(true); } NsharpResourceHandler rsc = getRscHandler(); - if(rsc!= null){ + if (rsc != null) { rsc.setCompareTmIsOn(compareTmIsOn); rsc.refreshPane(); } } - } ); + }); // Push buttons for CompBySrc info compareSndBtn = new Button(textModeGp, SWT.PUSH); compareSndBtn.setFont(newFont); - if(compareSndIsOn){ + if (compareSndIsOn) { compareSndBtn.setText(COMP_SND_ON); - compareSndBtn.setEnabled( true ); - } - else{ - //comparison and overlay is mutual exclusive + compareSndBtn.setEnabled(true); + } else { + // comparison and overlay is mutual exclusive compareSndBtn.setText(COMP_SND_OFF); - if((rscHandler!= null) && (rscHandler.isOverlayIsOn() || rscHandler.isCompareStnIsOn() || rscHandler.isCompareTmIsOn())) - compareSndBtn.setEnabled( false ); + if ((rscHandler != null) + && (rscHandler.isOverlayIsOn() + || rscHandler.isCompareStnIsOn() || rscHandler + .isCompareTmIsOn())) + compareSndBtn.setEnabled(false); else - compareSndBtn.setEnabled( true ); + compareSndBtn.setEnabled(true); } - compareSndBtn.addListener( SWT.MouseUp, new Listener() { + compareSndBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - if(compareSndIsOn == false){ + shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getShell(); + if (compareSndIsOn == false) { compareSndIsOn = true; compareSndBtn.setText(COMP_SND_ON); overlayBtn.setEnabled(false); - compareStnBtn.setEnabled( false ); - compareTmBtn.setEnabled( false ); + compareStnBtn.setEnabled(false); + compareTmBtn.setEnabled(false); graphEditBtn.setEnabled(false); dataEditBtn.setEnabled(false); - graphModeBtnTurb.setEnabled( false ); - graphModeBtnIcing.setEnabled( false ); - interpBtn.setEnabled( false ); - cfgBtn.setEnabled( false ); - } - else { + graphModeBtnTurb.setEnabled(false); + graphModeBtnIcing.setEnabled(false); + interpBtn.setEnabled(false); + cfgBtn.setEnabled(false); + } else { compareSndIsOn = false; compareSndBtn.setText(COMP_SND_OFF); overlayBtn.setEnabled(true); - compareStnBtn.setEnabled( true ); - compareTmBtn.setEnabled( true ); + compareStnBtn.setEnabled(true); + compareTmBtn.setEnabled(true); graphEditBtn.setEnabled(true); dataEditBtn.setEnabled(true); - graphModeBtnTurb.setEnabled( true ); - graphModeBtnIcing.setEnabled( true ); - interpBtn.setEnabled( true ); - cfgBtn.setEnabled( true ); + graphModeBtnTurb.setEnabled(true); + graphModeBtnIcing.setEnabled(true); + interpBtn.setEnabled(true); + cfgBtn.setEnabled(true); } NsharpResourceHandler rsc = getRscHandler(); - if(rsc!= null){ + if (rsc != null) { rsc.setCompareSndIsOn(compareSndIsOn); rsc.refreshPane(); } } - } ); + }); dataEditBtn = new Button(textModeGp, SWT.PUSH); dataEditBtn.setFont(newFont); dataEditBtn.setText(" Edit Data "); - if(interpolateIsOn || editGraphOn) - dataEditBtn.setEnabled( false ); + if (interpolateIsOn || editGraphOn) + dataEditBtn.setEnabled(false); else - dataEditBtn.setEnabled( true ); - dataEditBtn.addListener( SWT.MouseUp, new Listener() { + dataEditBtn.setEnabled(true); + dataEditBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - if(checkLoadedData() ) { - Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - NsharpEditDataDialog editDia = NsharpEditDataDialog.getInstance(shell); - if ( editDia != null ) { + if (checkLoadedData()) { + Shell shell = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getShell(); + NsharpEditDataDialog editDia = NsharpEditDataDialog + .getInstance(shell); + if (editDia != null) { editDia.open(); } } } - } ); + }); graphEditBtn = new Button(textModeGp, SWT.PUSH); graphEditBtn.setFont(newFont); - graphEditBtn.setEnabled( true ); - if(editGraphOn) { + graphEditBtn.setEnabled(true); + if (editGraphOn) { graphEditBtn.setText(EDIT_GRAPH_ON); dataEditBtn.setEnabled(false); - interpBtn.setEnabled( false ); - } - else{ + interpBtn.setEnabled(false); + } else { graphEditBtn.setText(EDIT_GRAPH_OFF); dataEditBtn.setEnabled(true); - interpBtn.setEnabled( true ); + interpBtn.setEnabled(true); } - graphEditBtn.addListener( SWT.MouseUp, new Listener() { + graphEditBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - if(checkLoadedData()) { - if(editGraphOn){ - editGraphOn=false; + if (checkLoadedData()) { + if (editGraphOn) { + editGraphOn = false; graphEditBtn.setText(EDIT_GRAPH_OFF); graphModeBtnIcing.setEnabled(true); graphModeBtnTurb.setEnabled(true); - dataEditBtn.setEnabled( true ); - interpBtn.setEnabled( true ); - compareTmBtn.setEnabled( true ); - compareSndBtn.setEnabled( true ); - compareStnBtn.setEnabled( true ); - overlayBtn.setEnabled( true ); - } - else{ - editGraphOn= true; + dataEditBtn.setEnabled(true); + interpBtn.setEnabled(true); + compareTmBtn.setEnabled(true); + compareSndBtn.setEnabled(true); + compareStnBtn.setEnabled(true); + overlayBtn.setEnabled(true); + } else { + editGraphOn = true; graphEditBtn.setText(EDIT_GRAPH_ON); graphModeBtnIcing.setEnabled(false); graphModeBtnTurb.setEnabled(false); - dataEditBtn.setEnabled( false ); - interpBtn.setEnabled( false ); - compareTmBtn.setEnabled( false ); - compareSndBtn.setEnabled( false ); - compareStnBtn.setEnabled( false ); - overlayBtn.setEnabled( false ); + dataEditBtn.setEnabled(false); + interpBtn.setEnabled(false); + compareTmBtn.setEnabled(false); + compareSndBtn.setEnabled(false); + compareStnBtn.setEnabled(false); + overlayBtn.setEnabled(false); } NsharpResourceHandler rsc = getRscHandler(); - if(rsc!= null) { + if (rsc != null) { rsc.setEditGraphOn(editGraphOn); rsc.refreshPane(); } } } - } ); - /*Button bndryMotionBtn = new Button(textModeGp, SWT.PUSH); - bndryMotionBtn.setText("BoundaryMotion"); - bndryMotionBtn.setEnabled( true ); - bndryMotionBtn.addListener( SWT.MouseUp, new Listener() { - public void handleEvent(Event event) { - shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - if(checkLoadedData()) { - NsharpShowTextDialog osDia = NsharpShowTextDialog.getInstance( shell ); - if(osDia != null) - osDia.open(); - } - } - } );*/ + }); + /* + * Button bndryMotionBtn = new Button(textModeGp, SWT.PUSH); + * bndryMotionBtn.setText("BoundaryMotion"); bndryMotionBtn.setEnabled( + * true ); bndryMotionBtn.addListener( SWT.MouseUp, new Listener() { + * public void handleEvent(Event event) { shell = + * PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); + * if(checkLoadedData()) { NsharpShowTextDialog osDia = + * NsharpShowTextDialog.getInstance( shell ); if(osDia != null) + * osDia.open(); } } } ); + */ // Push buttons for show text info Button showtextBtn = new Button(textModeGp, SWT.PUSH); showtextBtn.setFont(newFont); showtextBtn.setText(" Show Text "); - showtextBtn.setEnabled( true ); - showtextBtn.addListener( SWT.MouseUp, new Listener() { + showtextBtn.setEnabled(true); + showtextBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - if(checkLoadedData()) { - NsharpShowTextDialog osDia = NsharpShowTextDialog.getInstance( shell ); - if(osDia != null) + shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getShell(); + if (checkLoadedData()) { + NsharpShowTextDialog osDia = NsharpShowTextDialog + .getInstance(shell); + if (osDia != null) osDia.open(); } } - } ); - Group graphModeGp = new Group(textModeGp,SWT.SHADOW_ETCHED_IN); - graphModeGp.setLayout(new RowLayout(SWT.HORIZONTAL) );//new GridLayout( 2, false ) ); + }); + Group graphModeGp = new Group(textModeGp, SWT.SHADOW_ETCHED_IN); + graphModeGp.setLayout(new RowLayout(SWT.HORIZONTAL));// new GridLayout( + // 2, false ) ); // Push buttons for graphMode - graphModeBtnSkew = new Button(graphModeGp, SWT.PUSH ); + graphModeBtnSkew = new Button(graphModeGp, SWT.PUSH); graphModeBtnSkew.setFont(newFont); graphModeBtnSkew.setText("S"); - graphModeBtnSkew.setEnabled( true ); - //colorButtonOriginalBg= graphModeBtnSkew.getBackground(); + graphModeBtnSkew.setEnabled(true); + // colorButtonOriginalBg= graphModeBtnSkew.getBackground(); rscHandler = getRscHandler(); - if(rscHandler!= null ){ + if (rscHandler != null) { currentGraphMode = rscHandler.getCurrentGraphMode(); } - graphModeBtnSkew.addListener( SWT.MouseUp, new Listener() { + graphModeBtnSkew.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - if(currentGraphMode!= NsharpConstants.GRAPH_SKEWT){ - currentGraphMode= NsharpConstants.GRAPH_SKEWT; + if (currentGraphMode != NsharpConstants.GRAPH_SKEWT) { + currentGraphMode = NsharpConstants.GRAPH_SKEWT; graphModeBtnSkew.setBackground(colorBlue); graphModeBtnTurb.setBackground(colorGrey); graphModeBtnIcing.setBackground(colorGrey); - if(!interpolateIsOn) { + if (!interpolateIsOn) { graphEditBtn.setEnabled(true); dataEditBtn.setEnabled(true); - compareTmBtn.setEnabled( true ); - compareSndBtn.setEnabled( true ); - compareStnBtn.setEnabled( true ); - overlayBtn.setEnabled( true ); - } - else { + compareTmBtn.setEnabled(true); + compareSndBtn.setEnabled(true); + compareStnBtn.setEnabled(true); + overlayBtn.setEnabled(true); + } else { graphEditBtn.setEnabled(false); dataEditBtn.setEnabled(false); - compareTmBtn.setEnabled( false ); - compareSndBtn.setEnabled( false ); - compareStnBtn.setEnabled( false ); - overlayBtn.setEnabled( false ); + compareTmBtn.setEnabled(false); + compareSndBtn.setEnabled(false); + compareStnBtn.setEnabled(false); + overlayBtn.setEnabled(false); } NsharpResourceHandler rsc = getRscHandler(); - if(rsc!= null ) { + if (rsc != null) { rsc.setCurrentGraphMode(currentGraphMode); - //rsc.getSkewtPaneRsc().handleResize(); + // rsc.getSkewtPaneRsc().handleResize(); } } } - } ); + }); graphModeBtnTurb = new Button(graphModeGp, SWT.PUSH); graphModeBtnTurb.setFont(newFont); graphModeBtnTurb.setText("T"); - graphModeBtnTurb.setEnabled( true ); - graphModeBtnTurb.addListener( SWT.MouseUp, new Listener() { + graphModeBtnTurb.setEnabled(true); + graphModeBtnTurb.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - if(currentGraphMode != NsharpConstants.GRAPH_TURB){ - currentGraphMode= NsharpConstants.GRAPH_TURB; + if (currentGraphMode != NsharpConstants.GRAPH_TURB) { + currentGraphMode = NsharpConstants.GRAPH_TURB; graphModeBtnTurb.setBackground(colorBlue); graphModeBtnSkew.setBackground(colorGrey); graphModeBtnIcing.setBackground(colorGrey); graphEditBtn.setEnabled(false); dataEditBtn.setEnabled(false); - compareTmBtn.setEnabled( false ); - compareSndBtn.setEnabled( false ); - compareStnBtn.setEnabled( false ); - overlayBtn.setEnabled( false ); + compareTmBtn.setEnabled(false); + compareSndBtn.setEnabled(false); + compareStnBtn.setEnabled(false); + overlayBtn.setEnabled(false); NsharpResourceHandler rsc = getRscHandler(); - if(rsc!= null ) { + if (rsc != null) { rsc.setCurrentGraphMode(currentGraphMode); rsc.getSkewtPaneRsc().handleResize(); } } } - } ); + }); graphModeBtnIcing = new Button(graphModeGp, SWT.PUSH); graphModeBtnIcing.setFont(newFont); graphModeBtnIcing.setText("I"); - graphModeBtnIcing.setEnabled( true ); - graphModeBtnIcing.addListener( SWT.MouseUp, new Listener() { + graphModeBtnIcing.setEnabled(true); + graphModeBtnIcing.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - if(currentGraphMode != NsharpConstants.GRAPH_ICING){ - currentGraphMode= NsharpConstants.GRAPH_ICING; + if (currentGraphMode != NsharpConstants.GRAPH_ICING) { + currentGraphMode = NsharpConstants.GRAPH_ICING; graphModeBtnIcing.setBackground(colorBlue); graphModeBtnSkew.setBackground(colorGrey); graphModeBtnTurb.setBackground(colorGrey); graphEditBtn.setEnabled(false); dataEditBtn.setEnabled(false); - compareTmBtn.setEnabled( false ); - compareSndBtn.setEnabled( false ); - compareStnBtn.setEnabled( false ); - overlayBtn.setEnabled( false ); + compareTmBtn.setEnabled(false); + compareSndBtn.setEnabled(false); + compareStnBtn.setEnabled(false); + overlayBtn.setEnabled(false); NsharpResourceHandler rsc = getRscHandler(); - if(rsc!= null ) { + if (rsc != null) { rsc.setCurrentGraphMode(currentGraphMode); rsc.getSkewtPaneRsc().handleResize(); } } } - } ); - if(currentGraphMode== NsharpConstants.GRAPH_SKEWT){ + }); + if (currentGraphMode == NsharpConstants.GRAPH_SKEWT) { graphModeBtnSkew.setBackground(colorBlue); graphModeBtnTurb.setBackground(colorGrey); graphModeBtnIcing.setBackground(colorGrey); - } - else if(currentGraphMode== NsharpConstants.GRAPH_TURB){ + } else if (currentGraphMode == NsharpConstants.GRAPH_TURB) { graphModeBtnTurb.setBackground(colorBlue); graphModeBtnSkew.setBackground(colorGrey); graphModeBtnIcing.setBackground(colorGrey); - } - else if(currentGraphMode== NsharpConstants.GRAPH_ICING){ + } else if (currentGraphMode == NsharpConstants.GRAPH_ICING) { graphModeBtnIcing.setBackground(colorBlue); graphModeBtnSkew.setBackground(colorGrey); graphModeBtnTurb.setBackground(colorGrey); @@ -1155,175 +1233,178 @@ DisposeListener, IPartListener{ Button printBtn = new Button(textModeGp, SWT.PUSH); printBtn.setFont(newFont); printBtn.setText(" Print "); - printBtn.setEnabled( true ); - printBtn.addListener( SWT.MouseUp, new Listener() { + printBtn.setEnabled(true); + printBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - //12.7.1 testing if(checkLoadedData()) { - if(true){ + shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getShell(); + // 12.7.1 testing if(checkLoadedData()) { + if (true) { printHandle.handlePrint(""); } } - } ); + }); - if(paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)) + if (paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)) createSPCGp(); - - if(rscHandler!= null){ - restorePaletteWindow(paneConfigurationName, rscHandler.getCurrentGraphMode(), + if (rscHandler != null) { + restorePaletteWindow(paneConfigurationName, + rscHandler.getCurrentGraphMode(), rscHandler.isInterpolateIsOn(), rscHandler.isOverlayIsOn(), - rscHandler.isCompareStnIsOn(),rscHandler.isCompareTmIsOn(),rscHandler.isEditGraphOn(),rscHandler.isCompareSndIsOn()); + rscHandler.isCompareStnIsOn(), + rscHandler.isCompareTmIsOn(), rscHandler.isEditGraphOn(), + rscHandler.isCompareSndIsOn()); } parent.redraw(); } - private void createSPCGp(){ - //System.out.println("createSPCGp.........................................."); - spcGp = new Group(parent,SWT.SHADOW_OUT); - spcGp.setLayout( new RowLayout(SWT.HORIZONTAL) ); - spcGp.setLayoutData( new GridData(GridData.FILL_HORIZONTAL) ); + private void createSPCGp() { + // System.out.println("createSPCGp.........................................."); + spcGp = new Group(parent, SWT.SHADOW_OUT); + spcGp.setLayout(new RowLayout(SWT.HORIZONTAL)); + spcGp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); spcGplbl = new Label(spcGp, SWT.NO); spcGplbl.setText("SPC Graphs"); - if(paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)){ - spcGplbl.setEnabled( true ); - } - else{ - spcGplbl.setEnabled( false ); + if (paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)) { + spcGplbl.setEnabled(true); + } else { + spcGplbl.setEnabled(false); } effBulkShearBtn = new Button(spcGp, SWT.PUSH); effBulkShearBtn.setFont(newFont); effBulkShearBtn.setText("EBS Stats "); - if(paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)){ - effBulkShearBtn.setEnabled( true ); + if (paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)) { + effBulkShearBtn.setEnabled(true); + } else { + effBulkShearBtn.setEnabled(false); } - else{ - effBulkShearBtn.setEnabled( false ); - } - effBulkShearBtn.addListener( SWT.MouseUp, new Listener() { + effBulkShearBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - if(leftGraph != NsharpConstants.SPCGraph.EBS && rightGraph != NsharpConstants.SPCGraph.EBS){ + if (leftGraph != NsharpConstants.SPCGraph.EBS + && rightGraph != NsharpConstants.SPCGraph.EBS) { rightGraph = leftGraph; leftGraph = NsharpConstants.SPCGraph.EBS; updateSPCGraphs(); } } - } ); + }); stpBtn = new Button(spcGp, SWT.PUSH); stpBtn.setFont(newFont); stpBtn.setText("STP Stats "); - if(paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)){ - stpBtn.setEnabled( true ); + if (paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)) { + stpBtn.setEnabled(true); + } else { + stpBtn.setEnabled(false); } - else{ - stpBtn.setEnabled( false ); - } - stpBtn.addListener( SWT.MouseUp, new Listener() { + stpBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - if(leftGraph != NsharpConstants.SPCGraph.STP && rightGraph != NsharpConstants.SPCGraph.STP){ + if (leftGraph != NsharpConstants.SPCGraph.STP + && rightGraph != NsharpConstants.SPCGraph.STP) { rightGraph = leftGraph; leftGraph = NsharpConstants.SPCGraph.STP; updateSPCGraphs(); } } - } ); + }); shipBtn = new Button(spcGp, SWT.PUSH); shipBtn.setFont(newFont); shipBtn.setText("SHIP Stats"); - if(paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)){ - shipBtn.setEnabled( true ); + if (paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)) { + shipBtn.setEnabled(true); + } else { + shipBtn.setEnabled(false); } - else{ - shipBtn.setEnabled( false ); - } - shipBtn.addListener( SWT.MouseUp, new Listener() { + shipBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - if(leftGraph != NsharpConstants.SPCGraph.SHIP && rightGraph != NsharpConstants.SPCGraph.SHIP){ + if (leftGraph != NsharpConstants.SPCGraph.SHIP + && rightGraph != NsharpConstants.SPCGraph.SHIP) { rightGraph = leftGraph; leftGraph = NsharpConstants.SPCGraph.SHIP; updateSPCGraphs(); } } - } ); + }); winterBtn = new Button(spcGp, SWT.PUSH); winterBtn.setFont(newFont); winterBtn.setText(" WINTER "); - if(paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)){ - winterBtn.setEnabled( true ); + if (paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)) { + winterBtn.setEnabled(true); + } else { + winterBtn.setEnabled(false); } - else{ - winterBtn.setEnabled( false ); - } - winterBtn.addListener( SWT.MouseUp, new Listener() { + winterBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - if(leftGraph != NsharpConstants.SPCGraph.WINTER && rightGraph != NsharpConstants.SPCGraph.WINTER){ + if (leftGraph != NsharpConstants.SPCGraph.WINTER + && rightGraph != NsharpConstants.SPCGraph.WINTER) { rightGraph = leftGraph; leftGraph = NsharpConstants.SPCGraph.WINTER; updateSPCGraphs(); } } - } ); + }); fireBtn = new Button(spcGp, SWT.PUSH); fireBtn.setFont(newFont); fireBtn.setText(" FIRE "); - if(paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)){ - fireBtn.setEnabled( true ); + if (paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)) { + fireBtn.setEnabled(true); + } else { + fireBtn.setEnabled(false); } - else{ - fireBtn.setEnabled( false ); - } - fireBtn.addListener( SWT.MouseUp, new Listener() { + fireBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - if(leftGraph != NsharpConstants.SPCGraph.FIRE && rightGraph != NsharpConstants.SPCGraph.FIRE){ + if (leftGraph != NsharpConstants.SPCGraph.FIRE + && rightGraph != NsharpConstants.SPCGraph.FIRE) { rightGraph = leftGraph; leftGraph = NsharpConstants.SPCGraph.FIRE; updateSPCGraphs(); } } - } ); + }); hailBtn = new Button(spcGp, SWT.PUSH); hailBtn.setFont(newFont); hailBtn.setText(" HAIL "); - if(paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)){ - hailBtn.setEnabled( true ); + if (paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)) { + hailBtn.setEnabled(true); + } else { + hailBtn.setEnabled(false); } - else{ - hailBtn.setEnabled( false ); - } - hailBtn.addListener( SWT.MouseUp, new Listener() { + hailBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - if(leftGraph != NsharpConstants.SPCGraph.HAIL && rightGraph != NsharpConstants.SPCGraph.HAIL){ + if (leftGraph != NsharpConstants.SPCGraph.HAIL + && rightGraph != NsharpConstants.SPCGraph.HAIL) { rightGraph = leftGraph; leftGraph = NsharpConstants.SPCGraph.HAIL; updateSPCGraphs(); } } - } ); + }); sarsBtn = new Button(spcGp, SWT.PUSH); sarsBtn.setFont(newFont); sarsBtn.setText(" SARS "); - if(paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)){ - sarsBtn.setEnabled( true ); + if (paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)) { + sarsBtn.setEnabled(true); + } else { + sarsBtn.setEnabled(false); } - else{ - sarsBtn.setEnabled( false ); - } - sarsBtn.addListener( SWT.MouseUp, new Listener() { + sarsBtn.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event event) { - if(leftGraph != NsharpConstants.SPCGraph.SARS && rightGraph != NsharpConstants.SPCGraph.SARS){ + if (leftGraph != NsharpConstants.SPCGraph.SARS + && rightGraph != NsharpConstants.SPCGraph.SARS) { rightGraph = leftGraph; leftGraph = NsharpConstants.SPCGraph.SARS; updateSPCGraphs(); } } - } ); + }); updateSPCGraphs(); spcGpCreated = true; parent.layout(); } - private void disposeSpcGp(){ + + private void disposeSpcGp() { spcGplbl.dispose(); effBulkShearBtn.dispose(); stpBtn.dispose(); @@ -1344,24 +1425,25 @@ DisposeListener, IPartListener{ sarsBtn = null; spcGp = null; } + public boolean isEditorVisible() { return isEditorVisible; } + public void setEditorVisible(boolean isEditorVisible) { this.isEditorVisible = isEditorVisible; } - public void updateSpcGraphBtn( String paneConfigurationName) { + public void updateSpcGraphBtn(String paneConfigurationName) { this.paneConfigurationName = paneConfigurationName; - if(paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)){ - if(spcGpCreated== false){ + if (paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)) { + if (spcGpCreated == false) { createSPCGp(); } - } - else{ - if(spcGpCreated){ + } else { + if (spcGpCreated) { spcGpCreated = false; - if(spcGp!= null){ + if (spcGp != null) { disposeSpcGp(); parent.layout(); } @@ -1372,13 +1454,14 @@ DisposeListener, IPartListener{ } /** - * Invoked by the workbench, this method sets up the SWT controls for the nsharp palette + * Invoked by the workbench, this method sets up the SWT controls for the + * nsharp palette */ @Override public void createPartControl(Composite parent) { - //System.out.println("nlist @"+NsharpConstants.getNlistFile()); - parent.setLayout( new GridLayout( 1, true ) ); + // System.out.println("nlist @"+NsharpConstants.getNlistFile()); + parent.setLayout(new GridLayout(1, true)); createDataControlGp(parent); } @@ -1387,34 +1470,47 @@ DisposeListener, IPartListener{ // TODO Auto-generated method stub } + @Override public void widgetSelected(SelectionEvent e) { // TODO Auto-generated method stub } + @Override public void widgetDisposed(DisposeEvent e) { - } + private IContextActivation context; + @Override public void partActivated(IWorkbenchPart part) { - if(context==null){ + if (context == null) { IContextService ctxSvc = (IContextService) PlatformUI .getWorkbench().getService(IContextService.class); - context = ctxSvc.activateContext("gov.noaa.nws.ncep.ui.nsharp.nsharpContext"); - //System.out.println("Activated " + context.getContextId()); + context = ctxSvc + .activateContext("gov.noaa.nws.ncep.ui.nsharp.nsharpContext"); + // System.out.println("Activated " + context.getContextId()); + } + if (part instanceof NsharpPaletteWindow) { + NsharpMapResource rsc = NsharpMapResource.getMapRsc(); + if (rsc != null) { + rsc.setEditable(true); } } + } + @Override public void partBroughtToTop(IWorkbenchPart part) { // TODO Auto-generated method stub } + @Override public void partClosed(IWorkbenchPart part) { } + @Override public void partDeactivated(IWorkbenchPart part) { if (context != null) { @@ -1422,16 +1518,18 @@ DisposeListener, IPartListener{ IContextService ctxSvc = (IContextService) PlatformUI .getWorkbench().getService(IContextService.class); ctxSvc.deactivateContext(context); - //System.out.println("Deactivated " + context.getContextId()); + // System.out.println("Deactivated " + context.getContextId()); context = null; } } + @Override public void partOpened(IWorkbenchPart part) { // TODO Auto-generated method stub } + @Override public void setFocus() { // TODO Auto-generated method stub diff --git a/ncep/gov.noaa.nws.ncep.ui.pgen/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.ui.pgen/META-INF/MANIFEST.MF index 21b0ea5edc..8e814e0302 100644 --- a/ncep/gov.noaa.nws.ncep.ui.pgen/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.ui.pgen/META-INF/MANIFEST.MF @@ -38,6 +38,7 @@ Export-Package: gov.noaa.nws.ncep.ui.pgen, gov.noaa.nws.ncep.ui.pgen.gfa, gov.noaa.nws.ncep.ui.pgen.rsc, gov.noaa.nws.ncep.ui.pgen.sigmet, + gov.noaa.nws.ncep.ui.pgen.store, gov.noaa.nws.ncep.ui.pgen.tca, gov.noaa.nws.ncep.ui.pgen.tools Import-Package: com.raytheon.edex.meteoLib, diff --git a/ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/TCAinfo.xml b/ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/TCAinfo.xml index eaf49b8d75..33367c9117 100644 --- a/ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/TCAinfo.xml +++ b/ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/TCAinfo.xml @@ -12,6 +12,7 @@ Tropical Depression Subtropical Storm Subtropical Depression + Post-Tropical Cyclone Atlantic diff --git a/ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/outlooksettings.xml b/ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/outlooksettings.xml index 28aee59ee8..4bdb92bad8 100644 --- a/ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/outlooksettings.xml +++ b/ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/outlooksettings.xml @@ -109,7 +109,7 @@ - + TSTM @@ -125,7 +125,7 @@ - + SLGT @@ -141,7 +141,7 @@ - + MDT @@ -157,7 +157,7 @@ - + HIGH @@ -173,7 +173,7 @@ - + 2% @@ -189,7 +189,7 @@ - + 5% @@ -205,7 +205,7 @@ - + 10% @@ -221,7 +221,7 @@ - + 15% @@ -237,7 +237,7 @@ - + 30% @@ -253,7 +253,7 @@ - + 40% @@ -269,7 +269,7 @@ - + 45% @@ -285,7 +285,7 @@ - + 60% @@ -301,7 +301,7 @@ - + 70% @@ -318,7 +318,7 @@ - + SIG @@ -336,7 +336,7 @@ - + 1 @@ -352,7 +352,7 @@ - + 2 @@ -368,7 +368,7 @@ - + 3 @@ -384,7 +384,7 @@ - + 4 @@ -400,7 +400,7 @@ - + 5 @@ -416,7 +416,7 @@ - + 6 @@ -432,7 +432,7 @@ - + 7 @@ -448,7 +448,7 @@ - + 8 @@ -464,7 +464,7 @@ - + 9 @@ -480,7 +480,7 @@ - + 10 @@ -498,7 +498,7 @@ - + 5% @@ -514,7 +514,7 @@ - + 10% @@ -530,7 +530,7 @@ - + 15% @@ -546,7 +546,7 @@ - + 30% @@ -562,7 +562,7 @@ - + 45% @@ -578,7 +578,7 @@ - + 60% @@ -594,7 +594,7 @@ - + SIG @@ -612,7 +612,7 @@ - + 2% @@ -628,7 +628,7 @@ - + 5% @@ -644,7 +644,7 @@ - + 10% @@ -660,7 +660,7 @@ - + 15% @@ -676,7 +676,7 @@ - + 30% @@ -692,7 +692,7 @@ - + 45% @@ -708,7 +708,7 @@ - + 60% @@ -724,7 +724,7 @@ - + SIG @@ -742,7 +742,7 @@ - + 5% @@ -758,7 +758,7 @@ - + 15% @@ -774,7 +774,7 @@ - + 30% @@ -790,7 +790,7 @@ - + 45% @@ -806,7 +806,7 @@ - + 60% @@ -822,7 +822,7 @@ - + SIG @@ -840,7 +840,7 @@ - + 5% @@ -856,7 +856,7 @@ - + 15% @@ -872,7 +872,7 @@ - + 30% @@ -888,7 +888,7 @@ - + 45% @@ -904,7 +904,7 @@ - + 60% @@ -920,7 +920,7 @@ - + SIG @@ -938,7 +938,7 @@ - + CRITICAL @@ -954,7 +954,7 @@ - + EXTREME @@ -970,7 +970,7 @@ - + DRY TSTM @@ -986,7 +986,7 @@ - + ISOLD DRY-T @@ -1002,13 +1002,45 @@ - + SCT DRY-T + + + + + + + + + + + + + 40% + + + + + + + + + + + + + + + + 10% + + + @@ -1018,7 +1050,7 @@ - + ELEVATED @@ -1036,7 +1068,7 @@ - + SLGT @@ -1052,7 +1084,7 @@ - + MDT @@ -1068,7 +1100,7 @@ - + HIGH @@ -1087,7 +1119,7 @@ - + CNVTV @@ -1104,7 +1136,7 @@ - + SVRUK @@ -1121,7 +1153,7 @@ - + SVRRED @@ -1138,7 +1170,7 @@ - + SVRBLUE @@ -1155,7 +1187,7 @@ - + HVYRA @@ -1172,7 +1204,7 @@ - + HVYSN @@ -1189,7 +1221,7 @@ - + FZRA @@ -1207,13 +1239,29 @@ - + 5% + + + + + + + + + + + + + 10% + + + @@ -1223,7 +1271,7 @@ - + 15% @@ -1239,13 +1287,29 @@ - + 30% + + + + + + + + + + + + + 40% + + + @@ -1255,7 +1319,7 @@ - + 45% @@ -1271,7 +1335,7 @@ - + 60% @@ -1287,7 +1351,7 @@ - + SIG @@ -1305,7 +1369,7 @@ - + D4 @@ -1321,7 +1385,7 @@ - + D5 @@ -1337,7 +1401,7 @@ - + D6 @@ -1353,7 +1417,7 @@ - + D7 @@ -1369,7 +1433,7 @@ - + D8 @@ -1385,7 +1449,7 @@ - + D4-5 @@ -1401,7 +1465,7 @@ - + D4-6 @@ -1417,7 +1481,7 @@ - + D4-7 @@ -1433,7 +1497,7 @@ - + D4-8 @@ -1449,7 +1513,7 @@ - + D5-6 @@ -1465,7 +1529,7 @@ - + D5-7 @@ -1481,7 +1545,7 @@ - + D5-8 @@ -1497,7 +1561,7 @@ - + D6-7 @@ -1513,7 +1577,7 @@ - + D6-8 @@ -1529,7 +1593,7 @@ - + D7-8 @@ -1547,7 +1611,7 @@ - + D3 @@ -1563,7 +1627,7 @@ - + D4 @@ -1579,7 +1643,7 @@ - + D5 @@ -1595,7 +1659,7 @@ - + D6 @@ -1611,7 +1675,7 @@ - + D7 @@ -1627,7 +1691,7 @@ - + D8 @@ -1643,7 +1707,7 @@ - + D3-4 @@ -1659,7 +1723,7 @@ - + D3-5 @@ -1675,7 +1739,7 @@ - + D3-6 @@ -1691,7 +1755,7 @@ - + D3-7 @@ -1707,7 +1771,7 @@ - + D3-8 @@ -1723,7 +1787,7 @@ - + D4-5 @@ -1739,7 +1803,7 @@ - + D4-6 @@ -1755,7 +1819,7 @@ - + D4-7 @@ -1771,7 +1835,7 @@ - + D4-8 @@ -1787,7 +1851,7 @@ - + D5-6 @@ -1803,7 +1867,7 @@ - + D5-7 @@ -1819,7 +1883,7 @@ - + D5-8 @@ -1835,7 +1899,7 @@ - + D6-7 @@ -1851,7 +1915,7 @@ - + D6-8 @@ -1867,7 +1931,7 @@ - + D7-8 @@ -1885,7 +1949,7 @@ - + 10% @@ -1901,7 +1965,7 @@ - + 40% @@ -1917,7 +1981,7 @@ - + 70% @@ -1935,7 +1999,7 @@ - + 10% @@ -1951,7 +2015,7 @@ - + 40% @@ -1967,7 +2031,7 @@ - + 70% @@ -1985,7 +2049,7 @@ - + 70% @@ -2001,7 +2065,7 @@ - + 40% @@ -2017,7 +2081,7 @@ - + 10% @@ -2035,7 +2099,7 @@ - + 10% @@ -2051,7 +2115,7 @@ - + 40% @@ -2067,7 +2131,7 @@ - + 70% @@ -2085,7 +2149,7 @@ - + 70% @@ -2101,7 +2165,7 @@ - + 40% @@ -2117,7 +2181,7 @@ - + 10% @@ -2185,7 +2249,7 @@ - + Likely @@ -2201,7 +2265,7 @@ - + Possible @@ -2217,7 +2281,7 @@ - + Imminent diff --git a/ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/outlooktimes.xml b/ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/outlooktimes.xml index 579bc9d52f..6a2d44a506 100644 --- a/ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/outlooktimes.xml +++ b/ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/outlooktimes.xml @@ -7,7 +7,7 @@ - + @@ -36,7 +36,7 @@ - + diff --git a/ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/outlooktype.xml b/ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/outlooktype.xml index 563a0c26f1..ba7252caad 100644 --- a/ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/outlooktype.xml +++ b/ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/outlooktype.xml @@ -5,10 +5,10 @@ --> - - + @@ -122,8 +124,10 @@ - +