diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/ENSEMBLE/GEFS_ENS.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/ENSEMBLE/GEFS_ENS.xml index 0caf0859bb..4bbfc9326b 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/ENSEMBLE/GEFS_ENS.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/ENSEMBLE/GEFS_ENS.xml @@ -7,7 +7,7 @@ primaryModel=gefs availableModels=gefs:01,02;gfs;nam12 -pluginName=grid +pluginName=ncgrib Forecast,Global,Ensemble EnsembleFcstGridContours diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/ENSEMBLE/GFS_ENS.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/ENSEMBLE/GFS_ENS.xml index 9babedc824..8d1dc479e3 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/ENSEMBLE/GFS_ENS.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/ENSEMBLE/GFS_ENS.xml @@ -7,7 +7,7 @@ primaryModel=gfs availableModels=gfs -pluginName=grid +pluginName=ncgrib Forecast,Global,Ensemble EnsembleFcstGridContours diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/ENSEMBLE/NAM_00.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/ENSEMBLE/NAM_00.xml index 875d5a1a0c..5184859ff8 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/ENSEMBLE/NAM_00.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/ENSEMBLE/NAM_00.xml @@ -7,7 +7,7 @@ primaryModel=nam availableModels=nam;gefs:01,02,03,04,05,07,09;gfs;ruc80 -pluginName=grid +pluginName=ncgrib Forecast,Ensemble EnsembleFcstGridContours diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/CMC/CMC.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/CMC/CMC.xml index 901ab27561..a2289715d6 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/CMC/CMC.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/CMC/CMC.xml @@ -6,8 +6,8 @@ GRID GDFILE=cmc -pluginName=grid -info.secondaryId=% +pluginName=ncgrib +eventName=% Forecast,Global ModelFcstGridContours diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/ECMWFG/ECMWFG.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/ECMWFG/ECMWFG.xml index f715a443d5..8c4fdb2b1c 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/ECMWFG/ECMWFG.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/ECMWFG/ECMWFG.xml @@ -6,8 +6,8 @@ GRID GDFILE=ecmwfg -pluginName=grid -info.secondaryId=% +pluginName=ncgrib +eventName=% Forecast,Global ModelFcstGridContours diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/ECMWFT/ECMWFT.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/ECMWFT/ECMWFT.xml index 705a88b9d3..85d49aa33e 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/ECMWFT/ECMWFT.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/ECMWFT/ECMWFT.xml @@ -6,8 +6,8 @@ GRID GDFILE=ecmwft -pluginName=grid -info.secondaryId=% +pluginName=ncgrib +eventName=% Forecast,Global ModelFcstGridContours diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/FNMOCWAVE/FNMOCWAVE.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/FNMOCWAVE/FNMOCWAVE.xml index 61cb7871df..677259dd5a 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/FNMOCWAVE/FNMOCWAVE.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/FNMOCWAVE/FNMOCWAVE.xml @@ -6,8 +6,8 @@ GRID GDFILE=fnmocwave -pluginName=grid -info.secondaryId=% +pluginName=ncgrib +eventName=% Forecast,Global ModelFcstGridContours diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/NOGAPS/NOGAPS.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/NOGAPS/NOGAPS.xml index 262c020ac8..6de101713d 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/NOGAPS/NOGAPS.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/NOGAPS/NOGAPS.xml @@ -6,8 +6,8 @@ GRID GDFILE=nogaps -pluginName=grid -info.secondaryId=% +pluginName=ncgrib +eventName=% Forecast,Global ModelFcstGridContours diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/NWW3/NWW3.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/NWW3/NWW3.xml index e9822aa96a..ff3062a052 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/NWW3/NWW3.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/NWW3/NWW3.xml @@ -6,8 +6,8 @@ GRID GDFILE=nww3 -pluginName=grid -info.secondaryId=% +pluginName=ncgrib +eventName=% Forecast,Global ModelFcstGridContours diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/RAP/RAP.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/RAP/RAP.xml index 880992793a..ef7242a1ac 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/RAP/RAP.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/RAP/RAP.xml @@ -5,8 +5,8 @@ GRID GDFILE=rap -pluginName=grid -info.secondaryId=% +pluginName=ncgrib +eventName=% Forecast,Regional ModelFcstGridContours diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java index b63d3dc5df..f84e2505e8 100644 --- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java +++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java @@ -131,6 +131,8 @@ import com.raytheon.viz.hydrocommon.util.DbUtils; * 06 Nov 2012 15400 lbousaidi Changed logic in buildPointString routine, added discharge2stage * to display stage value, also added checking for rating curve for both * stage and discharge. + * 13 Nov 2012 15416 lbousaidi added a check when the colorname is null and a call to + * getGroupModeColor * @author lvenable * @version 1.0 * @@ -906,14 +908,15 @@ public class TimeSeriesDisplayCanvas extends TimeSeriesGraphCanvas implements } /* Top left point of bar */ - int x = pointArray[i].getPixelX() + GRAPHBORDER;// - 20; + int x = pointArray[i].getPixelX() + GRAPHBORDER_LEFT;// - 20; if ((x < GRAPHBORDER_LEFT) || (x > GRAPHBORDER_LEFT + graphAreaWidth)) { continue; } - int x2 = x2pixel(graphData, pointArray[i].getX() - .getTime() + 3600000) + int x2 = x; + x = x2pixel(graphData, pointArray[i].getX() + .getTime() - 3600000) + GRAPHBORDER_LEFT;// - 20; int y = pointArray[i].getPixelY() + GRAPHBORDER; ia[0] = x; @@ -2495,8 +2498,13 @@ public class TimeSeriesDisplayCanvas extends TimeSeriesGraphCanvas implements gc.setBackground(new Color(parentComp.getDisplay(), HydroUtils .getColor(traceIndex))); } else if (groupMode) { - gc.setBackground(new Color(parentComp.getDisplay(), HydroUtils - .getColor(td.getColorName()))); + if (td.getColorName() != null && HydroUtils.getColor(td.getColorName()) != null) { + gc.setBackground(new Color(parentComp.getDisplay(), HydroUtils + .getColor(td.getColorName()))); + } else { + gc.setBackground(new Color(parentComp.getDisplay(), + HydroUtils.getGroupModeColor(traceIndex))); + } } } } diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java index eab564312b..44896a2401 100644 --- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java +++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java @@ -689,6 +689,13 @@ public class SaveLevel2Data { gm.get(Calendar.MONTH) + 1, gm.get(Calendar.DAY_OF_MONTH)); + //copy DailyQcUtils.pcp.value to datavals + for (int h = 0; h < hrap_grid.maxj; h++) { + for (int i = 0; i < hrap_grid.maxi; i++) { + datavals[i][h] = (DailyQcUtils.pcp.value[i][h] / 100.f); + } + } + /* output grid to file in ascii xmrg format */ WriteQPFGrids wqg = new WriteQPFGrids(); wqg.write_qpf_grids(dbuf); diff --git a/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/AutoDailyQC.java b/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/AutoDailyQC.java index 60d2a9c946..76a1656edf 100644 --- a/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/AutoDailyQC.java +++ b/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/AutoDailyQC.java @@ -186,7 +186,7 @@ public class AutoDailyQC { * 0 represents the time frame 12 - 18, 1 represents time frame 18-00, 2 * represents time frame 00-06Z, 3 represents time frame 06-12z */ - if (precip_flag == true) { + /*if (precip_flag == true) { if (DailyQcUtils.curHr18_00 == 1) { DailyQcUtils.pdata[0].used[1] = 0; DailyQcUtils.pdata[0].used[2] = 0; @@ -200,7 +200,7 @@ public class AutoDailyQC { DailyQcUtils.pdata[0].used[3] = 0; DailyQcUtils.pdata[0].used[4] = 0; } - } else if (freezingl_flag == true) { + } else*/ if (freezingl_flag == true) { if (DailyQcUtils.curHr18_00 == 1) { DailyQcUtils.zdata[0].used[1] = 0; DailyQcUtils.zdata[0].used[2] = 0; @@ -345,6 +345,13 @@ public class AutoDailyQC { WriteQPFGrids wq = new WriteQPFGrids(); wq.write_qpf_grids(dbuf); + //copy data from DailyQcUtils.pcp.value to datavals + for (int y = 0; y < hrap_grid.maxj; y++) { + for (int x = 0; x < hrap_grid.maxi; x++) { + datavals[x][y] = (DailyQcUtils.pcp.value[x][y] / 100.f); + } + } + /* output grid to file in grib format */ // create netCDF file from data, write it out then call diff --git a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/RadarResourceData.java b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/RadarResourceData.java index 7dbe8630ee..ca815160d2 100644 --- a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/RadarResourceData.java +++ b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/RadarResourceData.java @@ -35,12 +35,12 @@ import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus.Priority; import com.raytheon.uf.common.time.DataTime; +import com.raytheon.uf.viz.core.alerts.AlertMessage; import com.raytheon.uf.viz.core.exception.NoDataAvailableException; import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData; import com.raytheon.uf.viz.core.rsc.AbstractVizResource; import com.raytheon.uf.viz.core.rsc.LoadProperties; -import com.raytheon.uf.viz.core.status.StatusConstants; import com.raytheon.viz.radar.interrogators.IRadarInterrogator; /** @@ -60,7 +60,8 @@ import com.raytheon.viz.radar.interrogators.IRadarInterrogator; */ @XmlAccessorType(XmlAccessType.NONE) public class RadarResourceData extends AbstractRequestableResourceData { - private static final transient IUFStatusHandler statusHandler = UFStatus.getHandler(RadarResourceData.class); + private static final transient IUFStatusHandler statusHandler = UFStatus + .getHandler(RadarResourceData.class); @XmlAttribute protected String pointID = ""; @@ -228,4 +229,19 @@ public class RadarResourceData extends AbstractRequestableResourceData { return all; } + @Override + public void update(AlertMessage... messages) { + for (AlertMessage message : messages) { + // since radar dataTimes are expected to set the level value, + // need to do that here. + Object timeObj = message.decodedAlert.get("dataTime"); + if (timeObj instanceof DataTime) { + DataTime time = (DataTime) timeObj; + time.setLevelValue(((Number) message.decodedAlert + .get("primaryElevationAngle")).doubleValue()); + } + } + super.update(messages); + } + } diff --git a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBestResResourceData.java b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBestResResourceData.java index 5b0184201e..def4e8f333 100644 --- a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBestResResourceData.java +++ b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBestResResourceData.java @@ -68,6 +68,7 @@ import com.vividsolutions.jts.geom.Polygon; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Jul 30, 2010 mschenke Initial creation + * Oct 31, 2012 DR 15287 D. Friedman Fix overlap calculation * Nov 06, 2012 DR 15157 D. Friedman Allow configured inclusion percentage * * @@ -341,7 +342,7 @@ public class SatBestResResourceData extends AbstractRequestableResourceData { for (Polygon last : prevs) { // Don't want to double include percentage areas - totalPercentage -= last.intersection(polygon) + totalPercentage -= last.intersection(polygon).intersection(extent) .getArea() / extent.getArea(); } } diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java index 2dd146da63..1ce3e3d2da 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java @@ -143,6 +143,7 @@ import com.vividsolutions.jts.io.WKTReader; * 11/02/2012 DR 15455 Qinglu Lin Added setWarningAction(), called redrawBoxFromTrack() while * warningAction is neither null nor WarningAction.NEW, removed * some code from redrawBoxFromHatched(). + * 11/15/2012 DR 15430 D. Friedman Use correct county/zone in createGeometryForWatches. * * * @@ -975,7 +976,7 @@ public class WarngenLayer extends AbstractStormTrackResource { Geometry area = buildArea(polygon); for (ActiveTableRecord activeTableRecord : records) { Map countyMap = FipsUtil - .parseCountyHeader(activeTableRecord.getCountyheader()); + .parseCountyHeader(activeTableRecord.getUgcZone()); // get area with precalculated area activeTableRecord.setGeometry(getArea(area, countyMap)); } diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java index d56029b705..7e60b53a88 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java @@ -921,10 +921,7 @@ public class TemplateRunner { System.out.println("getWatches.createWatchGeometry time: " + (t1 - t0)); - t0 = System.currentTimeMillis(); rval = processATEntries(activeTable, warngenLayer); - System.out.println("getWatches.createPoritions time: " - + (t1 - t0)); } } @@ -1007,6 +1004,10 @@ public class TemplateRunner { if (!ar.getGeometry().isEmpty()) work.valid = true; + /* TODO: Currently adding all zones to the list even if they + * are not in the CWA. Validation is currently done in + * determineAffectedPortions to avoid redundant work. + */ work.ugcZone.add(ar.getUgcZone()); } @@ -1017,7 +1018,7 @@ public class TemplateRunner { */ if (!work.valid) continue; - if (determineAffectedPortions(work.ugcZone, asc, geoData, work.waw)); + if (determineAffectedPortions(work.ugcZone, asc, geoData, work.waw)) rval.addWaw(work.waw); } @@ -1026,7 +1027,8 @@ public class TemplateRunner { /** * Given the list of counties in a watch, fill out the "portions" part of - * the given WeatherAdvisoryWatch + * the given WeatherAdvisoryWatch. Also checks if the given counties are + * actually in the CWA. * * @param ugcs * @param asc @@ -1041,25 +1043,36 @@ public class TemplateRunner { HashMap> map = new HashMap>(); for (String ugc : ugcs) { - for (Entry e : FipsUtil.parseCountyHeader(ugc).entrySet()) { - String stateAbbrev = e.getKey(); - if (e.getValue().length != 1) // either zero or more than one - // would be wrong - statusHandler.handle(Priority.ERROR, - "Invalid ugczone in active table entry"); - Set feAreas = map.get(stateAbbrev); - if (feAreas == null) { - feAreas = new HashSet(); - map.put(stateAbbrev, feAreas); - } - try { - feAreas.add(getFeArea(stateAbbrev, e.getValue()[0], asc, - geoData)); - } catch (RuntimeException exc) { - statusHandler.handle(Priority.ERROR, "Error generating included watches.", exc); - return false; - } + Map parsed = FipsUtil.parseCountyHeader(ugc); + Entry e = null; + + // Either zero or more than one sates/counties would be wrong + if (parsed.size() != 1 + || (e = parsed.entrySet().iterator().next()).getValue().length != 1) { + statusHandler.handle(Priority.ERROR, + "Invalid ugczone in active table entry: " + ugc); + continue; } + + String stateAbbrev = e.getKey(); + String feArea = null; + try { + feArea = getFeArea(stateAbbrev, e.getValue()[0], asc, + geoData); + } catch (RuntimeException exc) { + statusHandler.handle(Priority.ERROR, "Error generating included watches.", exc); + return false; + } + if (feArea == NOT_IN_CWA) + continue; + + Set feAreas = map.get(stateAbbrev); + if (feAreas == null) { + feAreas = new HashSet(); + map.put(stateAbbrev, feAreas); + } + if (feArea != null) + feAreas.add(feArea); } ArrayList portions = new ArrayList(map.size()); @@ -1074,8 +1087,6 @@ public class TemplateRunner { } portion.partOfParentRegion = Area .converFeAreaToPartList(mungeFeAreas(e.getValue())); - System.out.format("Munged %s to %s (%s)\n", e.getValue(), - mungeFeAreas(e.getValue()), portion.partOfParentRegion); portions.add(portion); } waw.setPortions(portions); @@ -1196,7 +1207,17 @@ public class TemplateRunner { } return null; } + + private static String NOT_IN_CWA = new String("NOT_IN_CWA"); + /** Determines if the given UGC is in the CWA and if it is, returns + * the portion of the CWA. + * @param stateAbbrev + * @param ugc + * @param asc + * @param geoData + * @return + */ private static String getFeArea(String stateAbbrev, String ugc, AreaSourceConfiguration asc, GeospatialData[] geoData) { for (GeospatialData g : geoData) { @@ -1206,7 +1227,8 @@ public class TemplateRunner { return (String) g.attributes.get(asc.getFeAreaField()); } - return null; + // TODO: Is this the correct way to determine if the county is in the CWA? + return NOT_IN_CWA; } } diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcGridSoundingInventory.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcGridSoundingInventory.xml index dde5030b14..d9eca31919 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcGridSoundingInventory.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcGridSoundingInventory.xml @@ -6,7 +6,7 @@ pluginName,modelName,eventName,dataTime - + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/ecmwf.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/ecmwf.xml index 86e431ec4d..95007e3a7d 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/ecmwf.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/ecmwf.xml @@ -2,26 +2,46 @@ 0 + 21600 43200 + 64800 86400 + 108000 129600 + 151200 172800 + 194400 216000 + 237600 259200 + 280800 302400 + 324000 345600 + 367200 388800 + 410400 432000 + 453600 475200 + 496800 518400 + 540000 561600 + 583200 604800 + 626400 648000 + 669600 691200 + 712800 734400 + 756000 777600 + 799200 820800 - 864000 + 842400 + 864000 staticXspacing diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpc_qpf218.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpc_qpf218.xml index e3f2de13d0..db70a0b28c 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpc_qpf218.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpc_qpf218.xml @@ -16,7 +16,7 @@ 259200 - tp_HPC + tpHPC 6 hr Total Precip mm millimeter diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.vaa/utility/common_static/base/purge/vaaPurgeRules.xml b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/utility/common_static/base/purge/vaaPurgeRules.xml index 1182b36c71..4d78875fb9 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.vaa/utility/common_static/base/purge/vaaPurgeRules.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/utility/common_static/base/purge/vaaPurgeRules.xml @@ -2,7 +2,5 @@ 24 - =00-01:00:00 - 00-01:00:00 diff --git a/export10-12.tar b/export10-12.tar new file mode 100644 index 0000000000..f85176948d Binary files /dev/null and b/export10-12.tar differ diff --git a/export10-12.txt b/export10-12.txt new file mode 100644 index 0000000000..24465bf619 --- /dev/null +++ b/export10-12.txt @@ -0,0 +1,13 @@ +edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/type/Pair.java +cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ShuffleZoneGroupsDialog.java +edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java +edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/GridDatabase.java +edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java +edexOsgi/com.raytheon.uf.common.dataplugin.gfe/META-INF/MANIFEST.MF +edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/util/GfeUtil.java +edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java +edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/NetCDFGridDatabase.java +edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/NetCDFUtils.java +edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java +cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java +cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribPathProvider.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribPathProvider.java index 8eb35afdc1..fe2a0bc58f 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribPathProvider.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribPathProvider.java @@ -77,7 +77,7 @@ public class NcgribPathProvider extends DefaultPathProvider { @Override public String getHDFFileName(String pluginName, IPersistable persistable) { - Integer partition = persistable.getHdfFileId(); +// Integer partition = persistable.getHdfFileId(); if (persistable == null) { throw new IllegalArgumentException( @@ -89,18 +89,22 @@ public class NcgribPathProvider extends DefaultPathProvider { "Argument persistable is of wrong type. Expected " + NcgribRecord.class + " but got " + persistable.getClass()); - } - - if (partition == null) { - throw new IllegalArgumentException( - "Expected argument hdfFileId not set on object " - + persistable.toString()); } else if (pluginName == null) { throw new IllegalArgumentException( "Expected argument pluginName not set on object " + persistable.toString()); } +// if (partition == null) { +// throw new IllegalArgumentException( +// "Expected argument hdfFileId not set on object " +// + persistable.toString()); +// } else if (pluginName == null) { +// throw new IllegalArgumentException( +// "Expected argument pluginName not set on object " +// + persistable.toString()); +// } + NcgribRecord pdo = (NcgribRecord) persistable; StringBuffer sb = new StringBuffer(); diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/plugin.xml b/ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/plugin.xml index 6b0e4bc4e7..de840f6837 100644 --- a/ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/plugin.xml +++ b/ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/plugin.xml @@ -402,7 +402,7 @@ class="gov.noaa.nws.ncep.viz.rsc.ncgrid.NcgribLoggerPreferences" id="gov.noaa.nws.ncep.viz.rsc.ncgrid.NcgribLoggerPreferences" name="Ncgrid Logger" - category="org.eclipse.jface.Prerences"> + category="gov.noaa.nws.ncep.viz.common.nceppreferences"> diff --git a/rpms/awips2.core/Installer.ldm/component.spec b/rpms/awips2.core/Installer.ldm/component.spec index 536a480d9a..b6748e7682 100644 --- a/rpms/awips2.core/Installer.ldm/component.spec +++ b/rpms/awips2.core/Installer.ldm/component.spec @@ -5,7 +5,7 @@ Name: awips2-ldm Summary: AWIPS II LDM Distribution Version: 6.8.1 -Release: 24 +Release: 25 Group: AWIPSII BuildRoot: /tmp URL: N/A diff --git a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template index fd895b2376..eb08430671 100644 --- a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template +++ b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template @@ -244,11 +244,11 @@ NGRID ^(LAMA98) (KNES) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0 HDS ^([LM].Z.{1,3}) KWBX (..)(..)(..) PIPE -close /usr/local/ldm/decoders/decrypt_file - /data_store/grib2/(\2:yyyy)(\2:mm)\2/\3/ECMWF_HiRes/\1_KWBX_\2\3\4_(seq).grib2.%Y%m%d%H + /data_store/grib2/(\2:yyyy)(\2:mm)\2/\3/ECMWF_HiRes/ecmwf_decrypted_\1_KWBX_\2\3\4_(seq).grib2.%Y%m%d%H -EXP ^/data_store/grib2/ECMWF_HiRes/ecmwf_raw/(ecmwf_decrypted.*) - FILE -overwrite -log -close -edex /data_store/grib2/(\2:yyyy)(\2:mm)\2/\3/ECMWF_HiRes/\1_KWBX_\2\3\4_(seq).grib2.%Y%m%d%H +EXP (.*ecmwf_decrypted.*) + FILE -overwrite -log -close -edex \1 # AWIPS1: GRID ^E.[ABCGHI].*KWBJ /Grid/SBN/rawGrib2 # EWAW88 KWBJ 021200 !grib2/ncep/GMGWM/#255/201102021200F180/WSTP/0 - NONE