diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseAlaska.xml b/cave/build/static/common/cave/etc/menus/upperair/baseAlaska.xml index daa46844e2..019d9de459 100644 --- a/cave/build/static/common/cave/etc/menus/upperair/baseAlaska.xml +++ b/cave/build/static/common/cave/etc/menus/upperair/baseAlaska.xml @@ -20,7 +20,7 @@ --> diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseCanadaEastern.xml b/cave/build/static/common/cave/etc/menus/upperair/baseCanadaEastern.xml index b032982927..47048c0dec 100644 --- a/cave/build/static/common/cave/etc/menus/upperair/baseCanadaEastern.xml +++ b/cave/build/static/common/cave/etc/menus/upperair/baseCanadaEastern.xml @@ -65,7 +65,7 @@ diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseCanadaNorth.xml b/cave/build/static/common/cave/etc/menus/upperair/baseCanadaNorth.xml index 6c3d0eccba..4bc4ebf133 100644 --- a/cave/build/static/common/cave/etc/menus/upperair/baseCanadaNorth.xml +++ b/cave/build/static/common/cave/etc/menus/upperair/baseCanadaNorth.xml @@ -20,7 +20,7 @@ --> diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseEastNPN.xml b/cave/build/static/common/cave/etc/menus/upperair/baseEastNPN.xml index c82cdb053e..01d6023e72 100644 --- a/cave/build/static/common/cave/etc/menus/upperair/baseEastNPN.xml +++ b/cave/build/static/common/cave/etc/menus/upperair/baseEastNPN.xml @@ -41,7 +41,7 @@ /profiler/%/3000/74752/% @@ -55,7 +55,7 @@ /profiler/%/3000/74648/% @@ -118,7 +118,7 @@ /profiler/%/3000/74556/% diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseJapan.xml b/cave/build/static/common/cave/etc/menus/upperair/baseJapan.xml index 5059c2c680..1278ee935b 100644 --- a/cave/build/static/common/cave/etc/menus/upperair/baseJapan.xml +++ b/cave/build/static/common/cave/etc/menus/upperair/baseJapan.xml @@ -30,9 +30,9 @@ - + @@ -158,12 +158,12 @@ diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseMexico.xml b/cave/build/static/common/cave/etc/menus/upperair/baseMexico.xml index 6a73a1b55b..01b6a6b107 100644 --- a/cave/build/static/common/cave/etc/menus/upperair/baseMexico.xml +++ b/cave/build/static/common/cave/etc/menus/upperair/baseMexico.xml @@ -82,7 +82,7 @@ - + diff --git a/cave/build/static/common/cave/etc/menus/upperair/basePacificWest.xml b/cave/build/static/common/cave/etc/menus/upperair/basePacificWest.xml index 31857a57ca..6e030771ab 100644 --- a/cave/build/static/common/cave/etc/menus/upperair/basePacificWest.xml +++ b/cave/build/static/common/cave/etc/menus/upperair/basePacificWest.xml @@ -27,7 +27,7 @@ - + @@ -75,7 +75,7 @@ @@ -90,7 +90,7 @@ @@ -100,7 +100,7 @@ @@ -115,9 +115,9 @@ - + @@ -110,7 +110,7 @@ diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseUSWestern.xml b/cave/build/static/common/cave/etc/menus/upperair/baseUSWestern.xml index 0b8403fd01..6c2a17173d 100644 --- a/cave/build/static/common/cave/etc/menus/upperair/baseUSWestern.xml +++ b/cave/build/static/common/cave/etc/menus/upperair/baseUSWestern.xml @@ -40,7 +40,7 @@ diff --git a/cave/build/static/common/cave/etc/menus/upperair/index.xml b/cave/build/static/common/cave/etc/menus/upperair/index.xml index 2fa24f57ed..75ccaa69bf 100644 --- a/cave/build/static/common/cave/etc/menus/upperair/index.xml +++ b/cave/build/static/common/cave/etc/menus/upperair/index.xml @@ -21,7 +21,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.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java index 11d2356b4e..43ca8f3a26 100644 --- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java +++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java @@ -130,8 +130,6 @@ public class LocalizationManager implements IPropertyChangeListener { /** The current localization site */ private String currentSite; - private boolean nationalCenter; - private boolean overrideSite; /** Was the alert server launched within cave? */ @@ -396,12 +394,6 @@ public class LocalizationManager implements IPropertyChangeListener { .getString("-site").toUpperCase(); this.overrideSite = true; } - - this.nationalCenter = false; - - if (ProgramArguments.getInstance().getString("-nc") != null) { - this.nationalCenter = true; - } } private void checkForServerOverride() { @@ -959,8 +951,4 @@ public class LocalizationManager implements IPropertyChangeListener { public boolean isOverrideSite() { return overrideSite; } - - public boolean isNationalCenter() { - return nationalCenter; - } } diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/SideView.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/SideView.java index b7952fcaca..8326b0ff29 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/SideView.java +++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/SideView.java @@ -93,6 +93,8 @@ import com.vividsolutions.jts.geom.Coordinate; * Oct 22, 2009 #3348 bsteffen limit number of frames in sidepane rather than reseting * Jul 1, 2010 #6146 bkowal Updates the legend mode so that smaller panes will * now include a legend + * Nov 20, 2012 DR 15524 M.Porricelli Changed so interactive screens still editable when + * swapped to side panel * * * @@ -602,11 +604,12 @@ public class SideView extends ViewPart implements IMultiPaneEditor, if (editableResource != null) { EditableManager.makeEditable(editableResource, false); } + + this.editableResource = editableResource; if (this.editableResource != null) { EditableManager.makeEditable(this.editableResource, true); } - this.editableResource = editableResource; - + theEditor.getBackgroundColor().setColor(BGColorMode.EDITOR, myRenderables[0].getBackgroundColor()); diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP6hr.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP6hr.xml index 454959cbb7..c93d707390 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP6hr.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP6hr.xml @@ -22,8 +22,11 @@ - - + + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/WD.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/WD.xml index 9682239ceb..ae575d5d3c 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/WD.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/WD.xml @@ -18,7 +18,7 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - + diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java index cb1eb40bdf..51b21c90c5 100644 --- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java +++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java @@ -53,7 +53,7 @@ import org.eclipse.ui.actions.ActionFactory; import com.raytheon.uf.common.localization.IPathManager; import com.raytheon.uf.common.localization.PathManagerFactory; import com.raytheon.viz.alerts.observers.ProductAlertObserver; -import com.raytheon.viz.aviation.cachedata.PythonCacheGuidanceJob; +// import com.raytheon.viz.aviation.cachedata.PythonCacheGuidanceJob; import com.raytheon.viz.aviation.climatology.ClimateMenuDlg; import com.raytheon.viz.aviation.climatology.WeatherPlotDialog; import com.raytheon.viz.aviation.editor.ITafSettable; @@ -141,7 +141,6 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback; * 10/11/2012 1229 jkorman Changes for BackupDialog to support non-blocking. * 10/11/2012 1229 rferrel Changes for non-blocking TafViewerEditorDlg. * 10/15/2012 1229 rferrel Changes for non-blocking HelpUsageDlg. - * 11/26/2012 1298 rferrel Non-blocking dialog cleanup. * 11/28/2012 1363 rferrel Dispose of PythonGuidanceJob when closing. * * @@ -896,7 +895,7 @@ public class TafMonitorDlg extends CaveSWTDialog { } tveDlg.disposeDialog(); - PythonCacheGuidanceJob.dispose(); + // PythonCacheGuidanceJob.dispose(); PythonGuidanceJob.dispose(); return close(); } diff --git a/cave/com.raytheon.viz.gfe/help/GFEStartup.html b/cave/com.raytheon.viz.gfe/help/GFEStartup.html index 4924da4858..a6c0052491 100644 --- a/cave/com.raytheon.viz.gfe/help/GFEStartup.html +++ b/cave/com.raytheon.viz.gfe/help/GFEStartup.html @@ -23,7 +23,7 @@ Table of Contents


cave.sh [-server hostname:port/services] [-mode TEST|PRACTICE|OPERATIONAL] [-site xxx] [-u user] [-component componentName] [-perspective perspecitiveName] [-noredirect] -[-consoleLog] [-nc TRUE]
+[-consoleLog]

@@ -77,15 +77,6 @@ Table of Contents
- - - - -
Causes the CAVE log to be output to the console for monitoring/debugging.
-ncYESThis option is only used by Service backup. It is used to indicate that the site is - a national center, consequently a non-primary site gets special permission to export - site configuration to the central server via the Service Backup GUI. This option should - be set to 'true', i.e., -nc true. -

diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java index 20e4ac8abd..1aad753eaf 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java @@ -57,6 +57,8 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog; * 02/22/2008 Eric Babin Initial Creation * 04/17/2009 #2282 rjpeter Added confirmation message on delete. * 11/14/2012 #1298 rferrel Changes for non-blocking dialog. + * 11/20/2012 DR 15532 jzeng Added popup dialog to make sure group saved with + * valid characters * * * @author ebabin diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/CheckPermissions.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/CheckPermissions.java index 0a326b07f4..9c8b1f5a81 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/CheckPermissions.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/CheckPermissions.java @@ -21,6 +21,7 @@ package com.raytheon.viz.gfe.dialogs.sbu; import com.raytheon.uf.common.auth.user.IUser; import com.raytheon.uf.common.dataplugin.gfe.request.CheckPermissionsRequest; +import com.raytheon.uf.common.dataplugin.gfe.request.NcCheckRequest; import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse; import com.raytheon.uf.common.site.requests.GetPrimarySiteRequest; import com.raytheon.uf.common.status.IUFStatusHandler; @@ -40,6 +41,7 @@ import com.raytheon.uf.viz.core.requests.ThriftClient; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Aug 11, 2011 bphillip Initial creation + * Nov 14, 2012 jdynina Added check for national center * * * @@ -72,6 +74,25 @@ public class CheckPermissions { } return authorized; } + + @SuppressWarnings("unchecked") + public static boolean isNationalCenter() { + boolean isNationalCenter = false; + NcCheckRequest request = new NcCheckRequest(); + try { + ServerResponse obj = (ServerResponse) ThriftClient + .sendRequest(request); + if (obj.isOkay()) { + isNationalCenter = true; + } else { + isNationalCenter = false; + } + } catch (VizException e) { + statusHandler.error("Error checking site type!", e); + isNationalCenter = false; + } + return isNationalCenter; + } public static boolean runningAsPrimary() { boolean isPrimary = false; diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java index 3b02517223..4f03ab588e 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java @@ -88,8 +88,9 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Aug 4, 2011 randerso Initial creation - * Sep 19, 2011 10955 rferrel Use RunProcess + * Sep 19,2011 10955 rferrel Use RunProcess * Oct 25, 2012 1287 rferrel Code clean up for non-blocking dialog. + * Nov 15,2012 15614 jdynina Added check for national center * * * @@ -155,6 +156,8 @@ public class ServiceBackupDlg extends CaveJFACEDialog { private Job updateJob; private boolean authorized; + + private boolean nationalCenter; private SVCBU_OP currentOperation = SVCBU_OP.no_backup; @@ -165,6 +168,7 @@ public class ServiceBackupDlg extends CaveJFACEDialog { super(parentShell); authorized = CheckPermissions.getAuthorization(); this.site = LocalizationManager.getInstance().getCurrentSite(); + this.nationalCenter = CheckPermissions.isNationalCenter(); this.runningAsPrimary = CheckPermissions.runningAsPrimary(); if (!ServiceBackupJobManager.getInstance().isRunning()) { ServiceBackupJobManager.getInstance().start(); @@ -1199,8 +1203,7 @@ public class ServiceBackupDlg extends CaveJFACEDialog { + UserController.getUserObject().uniqueId()); } - if ((!runningAsPrimary) - && (!LocalizationManager.getInstance().isNationalCenter())) { + if ((!runningAsPrimary) & (!nationalCenter)) { doExCon.setEnabled(false); } } diff --git a/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseHPCStation.xml b/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseHPCStation.xml index abdc1430db..9665c2e9b6 100644 --- a/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseHPCStation.xml +++ b/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseHPCStation.xml @@ -24,7 +24,7 @@ menuText="MaxT/MinT" id="HPCmaxTminT" > - + 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.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/AddModifyLocationDlg.java b/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/AddModifyLocationDlg.java index 300697e8f4..222d3cd4b1 100644 --- a/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/AddModifyLocationDlg.java +++ b/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/AddModifyLocationDlg.java @@ -77,6 +77,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog; * case in Location box. * 10 May 2011 9309 djingtao the elevation fields should be defaults as 0.0 when user * wipe out the field (e.g. blank) + * 26 Nov 2012 15440 lbousaidi display lat/lon in the GUI in decimal degrees * * * @@ -817,7 +818,7 @@ public class AddModifyLocationDlg extends CaveSWTDialog implements Group stationGroup = new Group(parentComp, SWT.NONE); stationGroup.setLayout(new GridLayout(3, false)); stationGroup.setLayoutData(gd); - stationGroup.setText(" Station Characteritics (View-Only) "); + stationGroup.setText(" Station Characteristics (View-Only) "); // ----------------------------------------------- // Create Station Type controls @@ -1322,13 +1323,12 @@ public class AddModifyLocationDlg extends CaveSWTDialog implements basinTF.setText(locData.getRiverBasin()); // Only Display Lat/Lon if not missing - latTF.setText((locData.getLatitude() != HydroConstants.MISSING_VALUE) ? GeoUtil - .getInstance().cvt_latlon_from_double(locData.getLatitude()) - : ""); - lonTF.setText((locData.getLongitude() != HydroConstants.MISSING_VALUE) ? GeoUtil - .getInstance().cvt_latlon_from_double(locData.getLongitude()) - : ""); - + + latTF.setText((locData.getLatitude() != HydroConstants.MISSING_VALUE) ? + String.valueOf(locData.getLatitude()): ""); + lonTF.setText((locData.getLongitude() != HydroConstants.MISSING_VALUE) ? + String.valueOf(locData.getLongitude()): ""); + // Only display elevation if it isn't missing, i.e. null in DB elevationTF .setText((locData.getElevation() != HydroConstants.MISSING_VALUE) ? String 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/util/GraphicDataUtil.java b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/util/GraphicDataUtil.java index 0ba93ac697..8a7564106d 100644 --- a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/util/GraphicDataUtil.java +++ b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/util/GraphicDataUtil.java @@ -50,6 +50,8 @@ import com.vividsolutions.jts.geom.Envelope; * Jun 04 2012 14710 Xiaochuan The rank value should take * from STRENGTH_RANK instead * of 2D_STRENGTH_RANK. + * Nov 09 2012 15586 Xiaochuan In dataRowFormat, set MSI maximum + * size to 5. * * * @@ -135,7 +137,7 @@ public class GraphicDataUtil { RadarDataPoint currPoint = symbologyData.get(key); if (currPoint.isVisible() || !checkVisibility) { - String dataRowFormat = " %4.4s %7.7s@%3.3s %9.9s %7.7s r%-2.2s %4.4s %8.8s %8.8s %8.8s %8.8s"; + String dataRowFormat = " %4.4s %7.7s@%3.3s %9.9s %7.7s r%-2.2s %5.5s %8.8s %8.8s %8.8s %8.8s"; AreaComponent currFeature; HashMap> currPointData = currPoint 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.bufrua/utility/edex_static/base/distribution/bufrua.xml b/edexOsgi/com.raytheon.edex.plugin.bufrua/utility/edex_static/base/distribution/bufrua.xml index c92a6d18ae..6911ea7a87 100644 --- a/edexOsgi/com.raytheon.edex.plugin.bufrua/utility/edex_static/base/distribution/bufrua.xml +++ b/edexOsgi/com.raytheon.edex.plugin.bufrua/utility/edex_static/base/distribution/bufrua.xml @@ -19,6 +19,6 @@ further_licensing_information. --> - ^IUSZ[4-9][123468].* + ^IUSZ[0-9][123468].* ^IUSY4[123468].* diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml index ecc5fa2616..1520e2c58d 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml @@ -349,6 +349,14 @@ value="com.raytheon.uf.common.dataplugin.gfe.request.CheckPermissionsRequest" /> + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/svcbu/NcCheckRequestHandler.java similarity index 50% rename from edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java rename to edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/svcbu/NcCheckRequestHandler.java index 587e4953ca..4e91db9024 100644 --- a/edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/svcbu/NcCheckRequestHandler.java @@ -17,13 +17,15 @@ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for * further licensing information. **/ -package com.raytheon.uf.common.geospatial.interpolation.data; +package com.raytheon.edex.plugin.gfe.server.handler.svcbu; -import javax.measure.converter.UnitConverter; +import com.raytheon.edex.plugin.gfe.svcbackup.SvcBackupUtil; +import com.raytheon.uf.common.dataplugin.gfe.request.NcCheckRequest; +import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse; +import com.raytheon.uf.common.serialization.comm.IRequestHandler; /** - * A data source that converts requested values to a unit with the specified - * converter. + * TODO Add Description * * 
  * 
@@ -31,37 +33,26 @@ import javax.measure.converter.UnitConverter;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Nov 12, 2012            njensen     Initial creation
+ * Nov 14, 2012            jdynina     Initial creation
  * 
  *
* - * @author njensen + * @author jdynina * @version 1.0 */ -public class UnitConvertingDataSource implements DataSource { +public class NcCheckRequestHandler implements IRequestHandler{ - protected UnitConverter unitConverter; - - protected DataSource wrappedSource; - - /** - * Constructor - * - * @param converter - * the unit converter to apply when getting the values in the - * data source - * @param source - * the source to get values from - */ - public UnitConvertingDataSource(UnitConverter converter, DataSource source) { - this.unitConverter = converter; - this.wrappedSource = source; + public Object handleRequest(NcCheckRequest request) + throws Exception { + ServerResponse sr = new ServerResponse(); + if (!isNationalCenter()) { + sr.addMessage("Site is not a national center."); + } + return sr; } - @Override - public double getDataValue(int x, int y) { - return unitConverter.convert(wrappedSource.getDataValue(x, y)); + public boolean isNationalCenter() { + return SvcBackupUtil.ncCheck(); } - } diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java index 2bab561d3d..184bd69d71 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java @@ -56,6 +56,7 @@ import com.raytheon.uf.edex.core.props.PropertiesFactory; * Oct 09, 2009 bphillip Initial creation * Sep 19, 2011 10955 rferrel make sure process destroy is called. * Jun 12, 2012 00609 djohnson Use EDEXUtil for EDEX_HOME. + * Nov 15,2012 15614 jdynina Added check for national center * * * @@ -263,4 +264,13 @@ IUser user, + roleId); } + + public static boolean ncCheck() { + String nationalCenter = SvcBackupUtil.getSvcBackupProperties() + .getProperty("NATIONAL_CENTER"); + if (nationalCenter.equals("1")) { + return true; + } + return false; + } } 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..bf1cd78b0a 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 @@ -90,7 +110,7 @@ - tp_ecmwf + tp6hr total precipitation mm millimeter 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.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java index e2bd6aaabf..a632a54ae7 100644 --- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java +++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java @@ -47,6 +47,8 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools; * ------------ ---------- ----------- -------------------------- * 9/22 #1553 mnash Initial implementation of GagePP * 6/1/09 #2432 jsanchez Updated value magnitude for hourlypp/pc. + * 26 Nov 2012 #15554 lbousaidi used obstime instead of system time in isNear12Z + * routine. * * * @author mnash @@ -621,7 +623,7 @@ public class GagePP { timeTObs.setTime(yearsec_ansi); // Create a 12Z object - Calendar pStructTm = TimeTools.getSystemCalendar(); + Calendar pStructTm = TimeTools.newCalendar(yearsec_ansi.getTime()); pStructTm.set(Calendar.HOUR_OF_DAY, 12); pStructTm.set(Calendar.MINUTE, 0); pStructTm.set(Calendar.SECOND, 0); diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java index 14c17a2ce5..61c13dad69 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java @@ -97,7 +97,7 @@ public class GFERecord extends PluginDataObject { }; /** The name of the parm parameter */ - @Column(length = 32) + @Column(length = 100) @XmlAttribute @DynamicSerializeElement private String parmName; diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java new file mode 100644 index 0000000000..d3a6bf38af --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java @@ -0,0 +1,47 @@ +/** + * This software was developed and / or modified by Raytheon Company, + * pursuant to Contract DG133W-05-CQ-1067 with the US Government. + * + * U.S. EXPORT CONTROLLED TECHNICAL DATA + * This software product contains export-restricted data whose + * export/transfer/disclosure is restricted by U.S. law. Dissemination + * to non-U.S. persons whether in the United States or abroad requires + * an export license or other authorization. + * + * Contractor Name: Raytheon Company + * Contractor Address: 6825 Pine Street, Suite 340 + * Mail Stop B8 + * Omaha, NE 68106 + * 402.291.0100 + * + * See the AWIPS II Master Rights File ("Master Rights File.pdf") for + * further licensing information. + **/ +package com.raytheon.uf.common.dataplugin.gfe.request; + +import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; + +/** + * TODO Add Description + * + * 
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Nov 14, 2012            jdynina     Initial creation
+ * 
+ *
+ * + * @author jdynina + * @version 1.0 + */ + +@DynamicSerialize +public class NcCheckRequest extends AbstractGfeRequest { + + public NcCheckRequest() { + } + +} diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/CompositeReflectivityProduct.java b/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/CompositeReflectivityProduct.java index 64264f0506..fc6662cb58 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/CompositeReflectivityProduct.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/CompositeReflectivityProduct.java @@ -65,12 +65,14 @@ import com.raytheon.uf.edex.core.EDEXUtil; * 
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * 05/07/2009   2037      dhladky    Initial Creation.
- * 02/22/2012	DR14414	  mgamazay   Added initializing the ScanTableData table
- * 									 to an empty map if no features are present.
- * 09/06/2012	14727	  Xiaochuan	 setIsNew(false) for the storm id should based  	
- * 									 on FCSTRAN, FCSTDIR values.	 
+ * ------------ --------- ---------- --------------------------
+ * 05/07/2009   2037      dhladky     Initial Creation.
+ * 02/22/2012	DR14414	  mgamazay    Added initializing the ScanTableData table
+ * 									  to an empty map if no features are present.
+ * 09/06/2012	14727	  Xiaochuan	  setIsNew(false) for the storm id should based  	
+ * 									  on FCSTRAN, FCSTDIR values.
+ * 11/13/2012	14368	  Xiaochuan	  Required to set alarm time in a quiet time period 
+ * 									  from the last event to new event (new storm come in).
  * 
  *
* @@ -216,7 +218,7 @@ public class CompositeReflectivityProduct extends RadarProduct { if (previousTime == null) { previousTime = rec.getDataTime().getRefTime(); } - + if (alarms != null && newIds.size() > 0 && previousTime != null) { if (((alarms.getCellAlarmTime() * 60 * 1000) <= (rec .getDataTime().getRefTime().getTime() - previousTime @@ -227,8 +229,8 @@ public class CompositeReflectivityProduct extends RadarProduct { alarmString.append("NEW cell for " + filter.icao + " over the last " + alarms.getCellAlarmTime() + " minutes."); - previousTime = rec.getDataTime().getRefTime(); } + previousTime = rec.getDataTime().getRefTime(); } // add new rows last for (String id : newIds) { diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/DigitalMesoCycloneTabularProduct.java b/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/DigitalMesoCycloneTabularProduct.java index 93f92a3b72..9ff0131ee6 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/DigitalMesoCycloneTabularProduct.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/DigitalMesoCycloneTabularProduct.java @@ -55,8 +55,11 @@ import com.raytheon.uf.edex.core.EDEXUtil; * 
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * 05/07/2009   2037      dhladky    Initial Creation.
+ * ------------ -------- ----------  --------------------------
+ * 05/07/2009   2037      dhladky     Initial Creation.
+ * 11/13/2012	14368	  Xiaochuan	  Required to set alarm time in a quiet time period 
+ * 									  from the last event to new event (new storm come in).
+ * 
  * 
  *
* @@ -144,13 +147,12 @@ public class DigitalMesoCycloneTabularProduct extends RadarProduct { } else { for (String fid : getDeletions(dmdKeys, table)) { table.removeRow(fid); - // System.out.println("Removed DMD fid: " + fid); } for (String fid : getUpdates(dmdKeys, table)) { table.updateRow(fid, write(table.getRow(fid), rec, fid)); - // System.out.println("Updating DMD fid: " + fid); + } } } @@ -173,8 +175,8 @@ public class DigitalMesoCycloneTabularProduct extends RadarProduct { alarmString.append("NEW DMDcirculation for " + filter.icao + " over the last " + alarms.getDmdAlarmTime() + " minutes."); - previousTime = rec.getDataTime().getRefTime(); } + previousTime = rec.getDataTime().getRefTime(); } for (String fid : newIds) { diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/MesoCycloneTabularProduct.java b/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/MesoCycloneTabularProduct.java index b8e1fc7b7e..3c4ae305ce 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/MesoCycloneTabularProduct.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/MesoCycloneTabularProduct.java @@ -55,13 +55,14 @@ import com.vividsolutions.jts.geom.Coordinate; * 
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * 05/07/2009   2037       dhladky      Initial Creation.
- * 02/23/2012	14536	   Xiaochuan	Add method getIdsFromGraphicBlock() to 
- * 										hold the ids that have the same order   
- * 										as the ids in source file.
- *
- *
+ * ------------ -------- ----------- --------------------------
+ * 05/07/2009   2037     dhladky     Initial Creation.
+ * 02/23/2012	14536	 Xiaochuan	 Add method getIdsFromGraphicBlock() to 
+ * 									 hold the ids that have the same order   
+ * 									 as the ids in source file.
+ * 11/13/2012	14368	 Xiaochuan	 Required to set alarm time in a quiet time period 
+ * 									 from the last event to new event (new storm come in).
+ * 
  *
* * @author dhladky @@ -132,12 +133,12 @@ public class MesoCycloneTabularProduct extends RadarProduct { + " over the last " + alarms.getMesoAlarmTime() + " minutes."); - previousTime = rec.getDataTime().getRefTime(); - EDEXUtil.sendMessageAlertViz(Priority.SIGNIFICANT, RadarConstants.PLUGIN_ID, SCAN, "RADAR", alarmString.toString(), null, null); } + previousTime = rec.getDataTime().getRefTime(); + } } diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/TVSTabularProduct.java b/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/TVSTabularProduct.java index 7b125659d4..1f324cabae 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/TVSTabularProduct.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/TVSTabularProduct.java @@ -49,8 +49,10 @@ import com.raytheon.uf.edex.core.EDEXUtil; * 
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * 05/07/2009   2037      dhladky    Initial Creation.
+ * ------------ -------- ----------  --------------------------
+ * 05/07/2009   2037     dhladky      Initial Creation.
+ * 11/13/2012	14368	 Xiaochuan	  Required to set alarm time in a quiet time period 
+ * 									  from the last event to new event (new storm come in).
  * 
  *
* @@ -138,9 +140,9 @@ public class TVSTabularProduct extends RadarProduct { EDEXUtil.sendMessageAlertViz(Priority.CRITICAL, RadarConstants.PLUGIN_ID, SCAN, "RADAR", alarmString.toString(), null, null); - - previousTime = rec.getDataTime().getRefTime(); + } + previousTime = rec.getDataTime().getRefTime(); } } 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/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/export_grids b/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/export_grids index b8c878c9b3..d6efe8102a 100644 --- a/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/export_grids +++ b/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/export_grids @@ -118,13 +118,18 @@ perform_export() { #check if the netcdf file is there;if not,exit if [ $? -ne 0 ] then - $LOGGER "ifpnetCDF failed. Export exits." - rm -f ${lockFile} - $LOGGER 100 NETCDF_SUCCESS=0 if [ $NATIONAL_CENTER != 1 ] && [ "$1" != "-c" ] then - exit 1 + netcdf_error=`grep "Some of the requested time ranges are not in the inventory" $logfile` + if [ "$netcdf_error" != "" ]; then + NETCDF_SUCCESS=1 + else + $LOGGER "ifpnetCDF failed. Export exits." + rm -f ${lockFile} + $LOGGER 100 + exit 1 + fi fi fi else @@ -136,13 +141,18 @@ perform_export() { #check if the netcdf file is there;if not,exit if [ $? -ne 0 ] then - $LOGGER "ifpnetCDF failed. Export exits." - rm -f ${lockFile} - $LOGGER 100 NETCDF_SUCCESS=0 if [ $NATIONAL_CENTER != 1 ] && [ "$1" != "-c" ] - then - exit 1 + then + netcdf_error=`grep "Some of the requested time ranges are not in the inventory" $logfile` + if [ "$netcdf_error" != "" ]; then + NETCDF_SUCCESS=1 + else + $LOGGER "ifpnetCDF failed. Export exits." + rm -f ${lockFile} + $LOGGER 100 + exit 1 + fi fi fi fi @@ -153,14 +163,19 @@ perform_export() { #check if the netcdf file is there;if not,exit before we call msg_send if [ $? -ne 0 ] then - $LOGGER ifpnetCDF failed. - rm -f ${lockFile} - $LOGGER 100 - NETCDF_SUCCESS=0 - if [ $NATIONAL_CENTER != 1 ] && [ "$1" != "-c" ] - then - exit 1 - fi + NETCDF_SUCCESS=0 + if [ $NATIONAL_CENTER != 1 ] && [ "$1" != "-c" ] + then + netcdf_error=`grep "Some of the requested time ranges are not in the inventory" $logfile` + if [ "$netcdf_error" != "" ]; then + NETCDF_SUCCESS=1 + else + $LOGGER "ifpnetCDF failed." + rm -f ${lockFile} + $LOGGER 100 + exit 1 + fi + fi fi fi diff --git a/nativeLib/.project b/nativeLib/.project new file mode 100644 index 0000000000..113b488e81 --- /dev/null +++ b/nativeLib/.project @@ -0,0 +1,11 @@ + + + nativeLib + + + + + + + + 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..1649a25145 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: 26 Group: AWIPSII BuildRoot: /tmp URL: N/A diff --git a/rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.gum b/rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.gum index 74ceead833..36cf110014 100644 --- a/rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.gum +++ b/rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.gum @@ -135,6 +135,7 @@ ALLOW NIMAGE ^.* .* TIT[EQ].* ALLOW HDS ^.* .* [IJ]UTX0[0-689].*|JUSX4[0-689].* ALLOW EXP ^.* .* ALLOW IDS|DDPLUS ^.* .* SXUS2[03-9].KWOH|SXUS[3-9].KWOH|SXUS8[0-3].KWOH|SRUS[2-8].KWOH +ALLOW NOTHER ^.* .* # # Give permission to the Unidata Program Center ALLOW ANY ^[a-z].*\.unidata\.ucar\.edu\.?$ .* diff --git a/rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.hfo b/rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.hfo index 74ceead833..36cf110014 100644 --- a/rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.hfo +++ b/rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.hfo @@ -135,6 +135,7 @@ ALLOW NIMAGE ^.* .* TIT[EQ].* ALLOW HDS ^.* .* [IJ]UTX0[0-689].*|JUSX4[0-689].* ALLOW EXP ^.* .* ALLOW IDS|DDPLUS ^.* .* SXUS2[03-9].KWOH|SXUS[3-9].KWOH|SXUS8[0-3].KWOH|SRUS[2-8].KWOH +ALLOW NOTHER ^.* .* # # Give permission to the Unidata Program Center ALLOW ANY ^[a-z].*\.unidata\.ucar\.edu\.?$ .* diff --git a/rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.pbp b/rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.pbp index 74ceead833..36cf110014 100644 --- a/rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.pbp +++ b/rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.pbp @@ -135,6 +135,7 @@ ALLOW NIMAGE ^.* .* TIT[EQ].* ALLOW HDS ^.* .* [IJ]UTX0[0-689].*|JUSX4[0-689].* ALLOW EXP ^.* .* ALLOW IDS|DDPLUS ^.* .* SXUS2[03-9].KWOH|SXUS[3-9].KWOH|SXUS8[0-3].KWOH|SRUS[2-8].KWOH +ALLOW NOTHER ^.* .* # # Give permission to the Unidata Program Center ALLOW ANY ^[a-z].*\.unidata\.ucar\.edu\.?$ .* diff --git a/rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.vrh b/rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.vrh index 42da2e133d..64b763ce6d 100644 --- a/rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.vrh +++ b/rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.vrh @@ -142,6 +142,8 @@ ALLOW EXP ^.* .* ALLOW IDS|DDPLUS ^.* .* SXUS2[03-9].KWOH|SXUS[3-9].KWOH|SXUS8[0-3].KWOH|SRUS[2-8].KWOH +ALLOW NOTHER ^.* .* + # # Give permission to the Unidata Program Center ALLOW ANY ^[a-z].*\.unidata\.ucar\.edu\.?$ .* 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..42e800b6e4 100755 --- a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template +++ b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template @@ -164,15 +164,17 @@ HDS ^(YVW[ABCDGJM][0-9][0-9]) KKCI (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/ FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KKCI_\2\3\4_(seq).\5.%Y%m%d%H # AWIPS1: GRID ^[LM].[ABDHMNRSTU].*KWB.* /Grid/SBN/rawGrib2 +# AWIPS1 OCONUS: GRID ^[LM].[ABCDGHMNORSTUVX].*KWB.* /Grid/SBN/rawGrib2 # LTHO70 KWBC 011800 !grib2/ncep/GFS/#213/201102011800F120/TMPK/700 hPa PRES -NGRID ^([LM].[ABDHMNRSTU].{1,3}) (KWB.) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) +NGRID ^([LM].[ABCDGHMNORSTUVX].{1,3}) (KWB.) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H # MosGuidance, perhaps others? # LVUC00 KWBQ 271200 !grib2/ncep/GFS/#197/FHRS//LVL # Maint : fixed pattern at F... -HDS ^([LM].[ABDHMNRSTU].{1,3}) (KWB.) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) +# OCONUS: Added CEFG +HDS ^([LM].[ABCDEFGHMNRSTU].{1,3}) (KWB.) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H # AWIPS1: GRID ^[LM].[MN].98.*KWNH /Grid/SBN/rawGrib2 @@ -183,9 +185,15 @@ NGRID ^([LM].[MN].98) (KWNH) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/] HDS ^([LM].[MN].98) (KWNH) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H +# AWIPS1 OCONUS: GRID ^L.R....*KWNH /Grid/SBN/rawGrib2 + +NGRID ^(L.R...) (KWNH) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + # AWIPS1: GRID ^[LM].E.*KWBD* /Grid/SBN/rawGrib2 +# AWIPS1 OCONUS: GRID ^[LM].[EF].*KWBD* /Grid/SBN/rawGrib2 # MUEU98 KWBD 020600 !grib2/ncep/DGEX_115/#185/201102020600F090/UREL/10 m HGHT -NGRID ^([LM].E.{1,3}) (KWBD) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) +NGRID ^([LM].[EF].{1,3}) (KWBD) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H # AWIPS1: GRID ^L.U.*KWBN* /Grid/SBN/rawGrib2 @@ -244,22 +252,24 @@ 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 +# AWIPS1 OCONUS: GRID ^E.[ABCDEFGHI].*KWBJ /Grid/SBN/rawGrib2 # EWAW88 KWBJ 021200 !grib2/ncep/GMGWM/#255/201102021200F180/WSTP/0 - NONE -NGRID ^(E.[ABCGHI].{1,3}) (KWBJ) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) +NGRID ^(E.[ABCDEFGHI].{1,3}) (KWBJ) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H # AWIPS1: GRID ^[LM].[AB].*KWBS* /Grid/SBN/rawGrib2 +# AWIPS1 OCONUS: GRID ^[LM].[ABCDE].*KWBS* /Grid/SBN/rawGrib2 # LMDA98 KWBS 160000 !grib2/ncep/WRF_EM/#130/201012160000F000/WXTZ/0 - NONE -ANY ^([LM].[AB].{1,3}) (KWBS) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) +ANY ^([LM].[ABCDE].{1,3}) (KWBS) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H # AWIPS1: GRID ^LGXT[0-2][0-9].*KNHC /Grid/SBN/rawGrib2 @@ -302,11 +312,12 @@ HDS ^(IUPT0[1-4]|IUPT40|IUAK01) (.{4}) (..)(..)(..) FILE -overwrite -log -close -edex /data_store/profiler/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H # AWIPS1: POINT ^IUSZ[4-9][0-9].* /ispan/bufr/raob +# AWIPS1 OCONUS: POINT ^IUSZ[0-9][0-9].* /ispan/bufr/raob # IUSZ53 KWBC 020205 # AWIPS1: POINT ^IUSY[4][0-9].* /ispan/bufr/raob # IUSY41 KWBC 020030 -HDS ^(IUS(Z[4-9]|Y4)[0-9]) ([A-Z]{4}) (..)(..)(..) +HDS ^(IUS(Z[0-9]|Y4)[0-9]) ([A-Z]{4}) (..)(..)(..) FILE -overwrite -log -close -edex /data_store/bufrua/(\4:yyyy)(\4:mm)\4/\5/\1_\3_\4\5\6_(seq).bufr.%Y%m%d%H # AWIPS1: TEXT ^SFUS41.* /ispan/binLightning @@ -545,8 +556,9 @@ IDS|DDPLUS ^(W[CSV]PN0[1-6]) (KKCI) (..)(..)(..) # JSML30 KWNO 021800 # AWIPS1: POINT ^JSMF1[1-6].KWNO.* /ispan/bufr/GFSLAMP +# AWIPS1 OCONUS: POINT ^JSMF1[0-7].KWNO.* /ispan/bufr/GFSLAMP # JSMF12 KWNO 022200 -HDS ^(JSM([TL]..|F1[1-6])) (....) (..)(..)(..) +HDS ^(JSM([TL]..|F1[0-7])) (....) (..)(..)(..) FILE -overwrite -log -close -edex /data_store/bufrmos/(\4:yyyy)(\4:mm)\4/\5/\1_\3_\4\5\6_(seq).bufr.%Y%m%d%H # AWIPS1: POINT ^IUAX0[12].* /ispan/bufr/acars @@ -625,3 +637,7 @@ HDS ^(JSXX(0[1-9]|10)) (.{4}) (..)(..)(..) # AWIPS2 distribution file bufrmthdw.xml: ^JUTX(([2-4]1)|53).* HDS ^(JUTX(([2-4]1)|53)) (.{4}) (..)(..)(..) FILE -overwrite -log -close -edex /data_store/bufrmthdw/(\5:yyyy)(\5:mm)\5/\6/\1_\4_\5\6\7_(seq).bufr.%Y%m%d%H + +# New NPP/VIIRS data +NOTHER ^(TIP...) (KNES) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/sat/%Y%m\(3)/\(4)/VIIRS/\1_\2_\3\4\5_(seq).%Y%m%d