xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'ss_builds' (12.12.1-12) into development

Browse source 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: f6988eefff [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]
Former-commit-id: 43ddfe98c4
Former-commit-id: 4d4771ee3a
This commit is contained in:
Steve Harris 2012-12-06 11:25:49 -06:00
parent b02c667e72
commit d27c5237c3
65 changed files with 409 additions and 217 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cave/build/static/common/cave/etc/menus/upperair/baseAlaska.xml
View file

@ -20,7 +20,7 @@
-->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Adark/Davis AFB, AK (70454)" id="raobDavisAFB_AK"
menuText="Adak/Davis AFB, AK (70454)" id="raobDavisAFB_AK"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="70454"/>
</contribute>

2
cave/build/static/common/cave/etc/menus/upperair/baseCanadaEastern.xml
View file

@ -65,7 +65,7 @@
<substitute key="stationId" value="71815"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Inoucdjouac, QC (CYPH)" id="raobInoucdjouac_QC"
menuText="Inoucdjouac, QB (CYPH)" id="raobInoucdjouac_QC"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="71907"/>
</contribute>

2
cave/build/static/common/cave/etc/menus/upperair/baseCanadaNorth.xml
View file

@ -20,7 +20,7 @@
-->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Eueka, NW (CWEU)" id="raobEueka_NW"
menuText="Eureka, NW (CWEU)" id="raobEueka_NW"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="71917"/>
</contribute>

6
cave/build/static/common/cave/etc/menus/upperair/baseEastNPN.xml
View file

@ -41,7 +41,7 @@
<substitute key="productURI" value="/profiler/%/3000/74550/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="De Queen AR (DQUA4)" id="profDeQueen_AR"
menuText="DeQueen AR (DQUA4)" id="profDeQueen_AR"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<dataURI>/profiler/%/3000/74752/%</dataURI>
<substitute key="wmoid" value="74752"/>
@ -55,7 +55,7 @@
<substitute key="productURI" value="/profiler/%/3000/74440/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Haskell OK (LMN02)" id="profHaskell_OK"
menuText="Haskell OK (HKL02)" id="profHaskell_OK"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<dataURI>/profiler/%/3000/74648/%</dataURI>
<substitute key="wmoid" value="74648"/>
@ -118,7 +118,7 @@
<substitute key="productURI" value="/profiler/%/3000/74379/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Winchester IL (WNFL1)" id="profWinchester_IL"
menuText="Winchester IL (WNCI2)" id="profWinchester_IL"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<dataURI>/profiler/%/3000/74556/%</dataURI>
<substitute key="wmoid" value="74556"/>

10
cave/build/static/common/cave/etc/menus/upperair/baseJapan.xml
View file

@ -30,9 +30,9 @@
<substitute key="stationId" value="47646"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Shionomisaki (47776)" id="raobShionomisaki"
menuText="Shionomisaki (47778)" id="raobShionomisaki"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="47776"/>
<substitute key="stationId" value="47778"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Fukuoka (47807)" id="raobFukuoka"
@ -71,7 +71,7 @@
<substitute key="stationId" value="589680"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Chichi Jima (RJAO)" id="raobChichijima"
menuText="Chichijima (RJAO)" id="raobChichijima"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="47971"/>
</contribute>
@ -158,12 +158,12 @@
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Ishigaki Jima (ROIG)" id="raobIshigakijima "
menuText="Ishigakijima (ROIG)" id="raobIshigakijima "
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="47918"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Minamidaito Jima (ROMD)" id="raobMinamidaltojima"
menuText="Minamidaitojima (ROMD)" id="raobMinamidaltojima"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="47945"/>
</contribute>

2
cave/build/static/common/cave/etc/menus/upperair/baseMexico.xml
View file

@ -82,7 +82,7 @@
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Guadalajara, MX (MMGL)" id="raobGuadalajara_MX"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="72226"/>
<substitute key="stationId" value="76612"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Guaymas (MMGM)" id="raobGuaymas"

2
cave/build/static/common/cave/etc/menus/upperair/basePacificEast.xml
View file

@ -81,7 +81,7 @@
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Midway Island (Nayv) (PMDY)" id="raobPortland_ME"
menuText="Midway Island (Navy) (PMDY)" id="raobPortland_ME"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="91066"/>
</contribute>

2
cave/build/static/common/cave/etc/menus/upperair/basePacificWest.xml
View file

@ -27,7 +27,7 @@
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Honiara (AGGH)" id="raobHonlara"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="91520"/>
<substitute key="stationId" value="91517"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"

12
cave/build/static/common/cave/etc/menus/upperair/baseRussia.xml
View file

@ -40,7 +40,7 @@
<substitute key="stationId" value="31168"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Nikolayevsk-n Amur (31369)" id="raobNikolayevsk-nAmur"
menuText="Nikolayevsk-na Amur (31369)" id="raobNikolayevsk-nAmur"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="31369"/>
</contribute>
@ -75,7 +75,7 @@
<substitute key="stationId" value="31873"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Ternej (31909)" id="raobTernej"
menuText="Terney (31909)" id="raobTernej"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="31909"/>
</contribute>
@ -90,7 +90,7 @@
<substitute key="stationId" value="32098"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Juzhno-Kurilsk (32165)" id="raobJuzhno-Kurilsk"
menuText="Yuzhno-Kuril'SK (32165)" id="raobJuzhno-Kurilsk"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="32165"/>
</contribute>
@ -100,7 +100,7 @@
<substitute key="stationId" value="32186"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Yuzhno-Kuril'SK (32217)" id="raobYuzhno-KurilSK"
menuText="Severo-Kuril'SK (32217)" id="raobYuzhno-KurilSK"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="32217"/>
</contribute>
@ -115,9 +115,9 @@
<substitute key="stationId" value="32477"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Nikol'skoye (32616)" id="raobNikol'skoye"
menuText="Nikol'skoye (32618)" id="raobNikol'skoye"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="32616"/>
<substitute key="stationId" value="32618"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Khabarovsk (RUHB)" id="raobKhabarovsk"

4
cave/build/static/common/cave/etc/menus/upperair/baseUSEastern.xml
View file

@ -65,7 +65,7 @@
<substitute key="stationId" value="72632"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Key West, FL (KEYW)" id="raobKeyWest_FL"
menuText="Key West, FL (KKEY)" id="raobKeyWest_FL"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="72201"/>
</contribute>
@ -110,7 +110,7 @@
<substitute key="stationId" value="72233"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Wash-Dulles, VA (KIAD)" id="raobWash-Dulles"
menuText="Wash-Dulles, VA (KLWX)" id="raobWash-Dulles"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="72403"/>
</contribute>

2
cave/build/static/common/cave/etc/menus/upperair/baseUSWestern.xml
View file

@ -40,7 +40,7 @@
<substitute key="stationId" value="74005"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Yuma PG Site 2, AZ (K1Y9)" id="raobYuma_AZ"
menuText="Yuma PG Site 3, AZ (K1Y9)" id="raobYuma_AZ"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="74006"/>
</contribute>

2
cave/build/static/common/cave/etc/menus/upperair/index.xml
View file

@ -21,7 +21,7 @@
<menuContributionFile>
<include installTo="menu:upperAir?before=PROFILER" fileName="menus/upperair/baseUpperAir.xml" />
<include subMenu="Alaska NPN time-heigh" installTo="menu:upperAir?after=PROFILER" fileName="menus/upperair/baseAlaskaNPN.xml" />
<include subMenu="Alaska NPN time-height" installTo="menu:upperAir?after=PROFILER" fileName="menus/upperair/baseAlaskaNPN.xml" />
<include subMenu="West NPN time-height" installTo="menu:upperAir?before=ProfilerMenuEnd"
fileName="menus/upperair/baseWestNPN.xml" />
<include subMenu="East NPN time-height" installTo="menu:upperAir?before=ProfilerMenuEnd"

2
cave/build/static/common/cave/etc/ncep/ResourceDefns/ENSEMBLE/GEFS_ENS.xml
View file

@ -7,7 +7,7 @@
<resourceParameters>
primaryModel=gefs
availableModels=gefs:01,02;gfs;nam12
pluginName=grid
pluginName=ncgrib
</resourceParameters>
<filterLabels>Forecast,Global,Ensemble</filterLabels>
<rscImplementation>EnsembleFcstGridContours</rscImplementation>

2
cave/build/static/common/cave/etc/ncep/ResourceDefns/ENSEMBLE/GFS_ENS.xml
View file

@ -7,7 +7,7 @@
<resourceParameters>
primaryModel=gfs
availableModels=gfs
pluginName=grid
pluginName=ncgrib
</resourceParameters>
<filterLabels>Forecast,Global,Ensemble</filterLabels>
<rscImplementation>EnsembleFcstGridContours</rscImplementation>

2
cave/build/static/common/cave/etc/ncep/ResourceDefns/ENSEMBLE/NAM_00.xml
View file

@ -7,7 +7,7 @@
<resourceParameters>
primaryModel=nam
availableModels=nam;gefs:01,02,03,04,05,07,09;gfs;ruc80
pluginName=grid
pluginName=ncgrib
</resourceParameters>
<filterLabels>Forecast,Ensemble</filterLabels>
<rscImplementation>EnsembleFcstGridContours</rscImplementation>

4
cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/CMC/CMC.xml
View file

@ -6,8 +6,8 @@
<resourceCategory>GRID</resourceCategory>
<resourceParameters>
GDFILE=cmc
pluginName=grid
info.secondaryId=%
pluginName=ncgrib
eventName=%
</resourceParameters>
<filterLabels>Forecast,Global</filterLabels>
<rscImplementation>ModelFcstGridContours</rscImplementation>

4
cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/ECMWFG/ECMWFG.xml
View file

@ -6,8 +6,8 @@
<resourceCategory>GRID</resourceCategory>
<resourceParameters>
GDFILE=ecmwfg
pluginName=grid
info.secondaryId=%
pluginName=ncgrib
eventName=%
</resourceParameters>
<filterLabels>Forecast,Global</filterLabels>
<rscImplementation>ModelFcstGridContours</rscImplementation>

4
cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/ECMWFT/ECMWFT.xml
View file

@ -6,8 +6,8 @@
<resourceCategory>GRID</resourceCategory>
<resourceParameters>
GDFILE=ecmwft
pluginName=grid
info.secondaryId=%
pluginName=ncgrib
eventName=%
</resourceParameters>
<filterLabels>Forecast,Global</filterLabels>
<rscImplementation>ModelFcstGridContours</rscImplementation>

4
cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/FNMOCWAVE/FNMOCWAVE.xml
View file

@ -6,8 +6,8 @@
<resourceCategory>GRID</resourceCategory>
<resourceParameters>
GDFILE=fnmocwave
pluginName=grid
info.secondaryId=%
pluginName=ncgrib
eventName=%
</resourceParameters>
<filterLabels>Forecast,Global</filterLabels>
<rscImplementation>ModelFcstGridContours</rscImplementation>

4
cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/NOGAPS/NOGAPS.xml
View file

@ -6,8 +6,8 @@
<resourceCategory>GRID</resourceCategory>
<resourceParameters>
GDFILE=nogaps
pluginName=grid
info.secondaryId=%
pluginName=ncgrib
eventName=%
</resourceParameters>
<filterLabels>Forecast,Global</filterLabels>
<rscImplementation>ModelFcstGridContours</rscImplementation>

4
cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/NWW3/NWW3.xml
View file

@ -6,8 +6,8 @@
<resourceCategory>GRID</resourceCategory>
<resourceParameters>
GDFILE=nww3
pluginName=grid
info.secondaryId=%
pluginName=ncgrib
eventName=%
</resourceParameters>
<filterLabels>Forecast,Global</filterLabels>
<rscImplementation>ModelFcstGridContours</rscImplementation>

4
cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/RAP/RAP.xml
View file

@ -5,8 +5,8 @@
<resourceCategory>GRID</resourceCategory>
<resourceParameters>
GDFILE=rap
pluginName=grid
info.secondaryId=%
pluginName=ncgrib
eventName=%
</resourceParameters>
<filterLabels>Forecast,Regional</filterLabels>
<rscImplementation>ModelFcstGridContours</rscImplementation>

12
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
View file

@ -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;
}
}

7
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/SideView.java
View file

@ -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
*
* </pre>
*
@ -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());

7
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP6hr.xml
View file

@ -22,8 +22,11 @@
<Method models="SREF212" name="Alias">
<Field abbreviation="TP6mean"/>
</Method>
<Method name="Alias" models="RFCqpf">
<Field abbreviation="tpHPC"/>
<Method name="Alias" models="RFCqpf HPCqpf">
<Field abbreviation="tpHPC"/>
</Method>
<Method name="Alias" models="HPCqpfNDFD">
<Field abbreviation="tpHPCndfd"/>
</Method>
<Method name="Alias">
<Field abbreviation="QPE06"/>

2
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/WD.xml
View file

@ -18,7 +18,7 @@
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<DerivedParameter abbreviation="WD" name="Wind directionn" unit="deg">
<DerivedParameter abbreviation="WD" name="Wind direction" unit="deg">
<Method name="RaobParam" models="bufrua">
<Field abbreviation="Raob"/>
<ConstantField value="5"/>

5
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
View file

@ -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.
* </pre>
*
@ -896,7 +895,7 @@ public class TafMonitorDlg extends CaveSWTDialog {
}
tveDlg.disposeDialog();
PythonCacheGuidanceJob.dispose();
// PythonCacheGuidanceJob.dispose();
PythonGuidanceJob.dispose();
return close();
}

11
cave/com.raytheon.viz.gfe/help/GFEStartup.html
View file

@ -23,7 +23,7 @@ Table of Contents<br>
<p><br>
<tt>cave.sh [-server hostname:port/services] [-mode TEST|PRACTICE|OPERATIONAL] [-site xxx]
[-u user] [-component componentName] [-perspective perspecitiveName] [-noredirect]
[-consoleLog] [-nc TRUE]<br>
[-consoleLog]<br>
<br>
<table nosave="" border="1" width="100%">
<tbody>
@ -77,15 +77,6 @@ Table of Contents<br>
<td>Causes the CAVE log to be output to the console for monitoring/debugging.
</td>
</tr>
<tr>
<td>-nc</td>
<td>YES</td>
<td>This 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.
</td>
</tr>
</tbody>
</table>
</p>

2
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
View file

@ -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
* </pre>
*
* @author ebabin

21
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/CheckPermissions.java
View file

@ -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
*
* </pre>
*
@ -72,6 +74,25 @@ public class CheckPermissions {
}
return authorized;
}
@SuppressWarnings("unchecked")
public static boolean isNationalCenter() {
boolean isNationalCenter = false;
NcCheckRequest request = new NcCheckRequest();
try {
ServerResponse<String> obj = (ServerResponse<String>) 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;

9
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
View file

@ -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
*
* </pre>
*
@ -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);
}
}

2
cave/com.raytheon.viz.hydro/localization/menus/hydro/baseHPCStation.xml
View file

@ -24,7 +24,7 @@
menuText="MaxT/MinT" id="HPCmaxTminT" >
<substitute key="model" value="HPC"/>
<substitute key="plotModel" value="bufrmos/maxmin.svg"/>
<substitute key="title" value="HPC MaxT/MinT"/>
<substitute key="title" value="HPC MaxT/MinT ( F )"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml"
menuText="POP 24hr" id="HPCpop24hr" >

18
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
View file

@ -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)));
}
}
}
}

16
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/AddModifyLocationDlg.java
View file

@ -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
*
*
* </pre>
@ -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

7
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java
View file

@ -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);

11
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/AutoDailyQC.java
View file

@ -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

4
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/util/GraphicDataUtil.java
View file

@ -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.
*
* </pre>
*
@ -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<Integer, HashMap<Integer, GenericDataComponent>> currPointData = currPoint

3
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBestResResourceData.java
View file

@ -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
*
* </pre>
@ -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();
}
}

3
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
View file

@ -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.
*
* </pre>
*
@ -975,7 +976,7 @@ public class WarngenLayer extends AbstractStormTrackResource {
Geometry area = buildArea(polygon);
for (ActiveTableRecord activeTableRecord : records) {
Map<String, String[]> countyMap = FipsUtil
.parseCountyHeader(activeTableRecord.getCountyheader());
.parseCountyHeader(activeTableRecord.getUgcZone());
// get area with precalculated area
activeTableRecord.setGeometry(getArea(area, countyMap));
}

74
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
View file

@ -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<String, Set<String>> map = new HashMap<String, Set<String>>();
for (String ugc : ugcs) {
for (Entry<String, String[]> 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<String> feAreas = map.get(stateAbbrev);
if (feAreas == null) {
feAreas = new HashSet<String>();
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<String, String[]> parsed = FipsUtil.parseCountyHeader(ugc);
Entry<String, String[]> 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<String> feAreas = map.get(stateAbbrev);
if (feAreas == null) {
feAreas = new HashSet<String>();
map.put(stateAbbrev, feAreas);
}
if (feArea != null)
feAreas.add(feArea);
}
ArrayList<Portion> portions = new ArrayList<Portion>(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;
}
}

2
edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcGridSoundingInventory.xml
View file

@ -6,7 +6,7 @@
<inventoryParameters>pluginName,modelName,eventName,dataTime</inventoryParameters>
<baseConstraints>
<mapping key="pluginName">
<constraint constraintValue="ncgribxxx" constraintType="EQUALS"/>
<constraint constraintValue="ncgrib" constraintType="EQUALS"/>
</mapping>
<!-- any other needed constraints. ie parameters, levels.... -->
</baseConstraints>

2
edexOsgi/com.raytheon.edex.plugin.bufrua/utility/edex_static/base/distribution/bufrua.xml
View file

@ -19,6 +19,6 @@
further_licensing_information.
-->
<requestPatterns xmlns:ns2="group">
<regex>^IUSZ[4-9][123468].*</regex>
<regex>^IUSZ[0-9][123468].*</regex>
<regex>^IUSY4[123468].*</regex>
</requestPatterns>

8
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
View file

@ -349,6 +349,14 @@
value="com.raytheon.uf.common.dataplugin.gfe.request.CheckPermissionsRequest" />
<constructor-arg ref="CheckPermissionsRequestHandler" />
</bean>
<bean id="NcCheckRequestHandler"
class="com.raytheon.edex.plugin.gfe.server.handler.svcbu.NcCheckRequestHandler" />
<bean factory-bean="handlerRegistry" factory-method="register">
<constructor-arg
value="com.raytheon.uf.common.dataplugin.gfe.request.NcCheckRequest" />
<constructor-arg ref="NcCheckRequestHandler" />
</bean>
<bean id="ExportConfRequestHandler"
class="com.raytheon.edex.plugin.gfe.server.handler.svcbu.ExportConfRequestHandler" />

45
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java → edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/svcbu/NcCheckRequestHandler.java
View file

@ -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
*
* <pre>
*
@ -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
*
* </pre>
*
* @author njensen
* @author jdynina
* @version 1.0
*/
public class UnitConvertingDataSource implements DataSource {
public class NcCheckRequestHandler implements IRequestHandler<NcCheckRequest>{
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<String> sr = new ServerResponse<String>();
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();
}
}

10
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
View file

@ -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
*
* </pre>
*
@ -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;
}
}

24
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/ecmwf.xml
View file

@ -2,26 +2,46 @@
<gribParamInfo xmlns:ns2="group">
<valtimeMINUSreftime>
<fcst>0</fcst>
<fcst>21600</fcst>
<fcst>43200</fcst>
<fcst>64800</fcst>
<fcst>86400</fcst>
<fcst>108000</fcst>
<fcst>129600</fcst>
<fcst>151200</fcst>
<fcst>172800</fcst>
<fcst>194400</fcst>
<fcst>216000</fcst>
<fcst>237600</fcst>
<fcst>259200</fcst>
<fcst>280800</fcst>
<fcst>302400</fcst>
<fcst>324000</fcst>
<fcst>345600</fcst>
<fcst>367200</fcst>
<fcst>388800</fcst>
<fcst>410400</fcst>
<fcst>432000</fcst>
<fcst>453600</fcst>
<fcst>475200</fcst>
<fcst>496800</fcst>
<fcst>518400</fcst>
<fcst>540000</fcst>
<fcst>561600</fcst>
<fcst>583200</fcst>
<fcst>604800</fcst>
<fcst>626400</fcst>
<fcst>648000</fcst>
<fcst>669600</fcst>
<fcst>691200</fcst>
<fcst>712800</fcst>
<fcst>734400</fcst>
<fcst>756000</fcst>
<fcst>777600</fcst>
<fcst>799200</fcst>
<fcst>820800</fcst>
<fcst>864000</fcst>
<fcst>842400</fcst>
<fcst>864000</fcst>
</valtimeMINUSreftime>
<gribParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
<short_name>staticXspacing</short_name>
@ -90,7 +110,7 @@
</levels>
</gribParameterInfo>
<gribParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
<short_name>tp_ecmwf</short_name>
<short_name>tp6hr</short_name>
<long_name>total precipitation</long_name>
<units>mm</units>
<udunits>millimeter</udunits>

2
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpc_qpf218.xml
View file

@ -16,7 +16,7 @@
<fcst>259200</fcst>
</valtimeMINUSreftime>
<gribParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
<short_name>tp_HPC</short_name>
<short_name>tpHPC</short_name>
<long_name>6 hr Total Precip</long_name>
<units>mm</units>
<udunits>millimeter</udunits>

4
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
View file

@ -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.
* </pre>
*
* @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);

2
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java
View file

@ -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;

47
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java Normal file
View file

@ -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
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Nov 14, 2012 jdynina Initial creation
*
* </pre>
*
* @author jdynina
* @version 1.0
*/
@DynamicSerialize
public class NcCheckRequest extends AbstractGfeRequest {
public NcCheckRequest() {
}
}

18
edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/CompositeReflectivityProduct.java
View file

@ -65,12 +65,14 @@ import com.raytheon.uf.edex.core.EDEXUtil;
* <pre>
* 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).
*
* </pre>
*
@ -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) {

12
edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/DigitalMesoCycloneTabularProduct.java
View file

@ -55,8 +55,11 @@ import com.raytheon.uf.edex.core.EDEXUtil;
* <pre>
* 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).
*
*
* </pre>
*
@ -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) {

19
edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/MesoCycloneTabularProduct.java
View file

@ -55,13 +55,14 @@ import com.vividsolutions.jts.geom.Coordinate;
* <pre>
* 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).
*
* </pre>
*
* @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();
}
}

10
edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/TVSTabularProduct.java
View file

@ -49,8 +49,10 @@ import com.raytheon.uf.edex.core.EDEXUtil;
* <pre>
* 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).
*
* </pre>
*
@ -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();
}
}

2
edexOsgi/com.raytheon.uf.edex.plugin.vaa/utility/common_static/base/purge/vaaPurgeRules.xml
View file

@ -2,7 +2,5 @@
<purgeRuleSet>
<defaultRule>
<versionsToKeep>24</versionsToKeep>
<delta>=00-01:00:00</delta>
<round>00-01:00:00</round>
</defaultRule>
</purgeRuleSet>

49
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/export_grids
View file

@ -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

11
nativeLib/.project Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>nativeLib</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>

18
ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribPathProvider.java
View file

@ -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();

2
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/plugin.xml
View file

@ -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">
</page>
</extension>
</plugin>

2
rpms/awips2.core/Installer.ldm/component.spec
View file

@ -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

1
rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.gum
View file

@ -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\.?$ .*

1
rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.hfo
View file

@ -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\.?$ .*

1
rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.pbp
View file

@ -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\.?$ .*

2
rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.vrh
View file

@ -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\.?$ .*

36
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
View file

@ -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