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

13.3.1-5 baseline

Browse source 
Former-commit-id: a89221c75b [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]
Former-commit-id: e26f7eb151
Former-commit-id: a40c9136fe
This commit is contained in:
Steve Harris 2013-03-05 10:47:06 -06:00
parent 0df35cc5ec
commit 1f98e01c57
7 changed files with 40 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/TableUtil.java
View file

@ -49,6 +49,7 @@ import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants;
* Dec. 3, 2009 3424 zhao Initial creation.
* Jan 25, 2010 4281 wkwock/Zhao Added history-table-row-data related modules
* May 23, 2012 14410 zhao Modified getCellTypeForBlizWarn and getCellTypeForHsnowWarn modules
* Feb 28, 2013 14410 zhao Modified getCellTypeForBlizWarn
*
* </pre>
*
@ -752,13 +753,26 @@ public final class TableUtil {
String presentWx = report.getPresentWx();
CellType windSpeed = tm.getThresholdValueCellType(DataUsageKey.DISPLAY, zone, MonitorConfigConstants.SnowDisplay.SNOW_DISP_PROD_BLIZZ_WIND_SPEED.getXmlKey(), report.getWindSpeed());
CellType windSpeed = CellType.NotAvailable;
if ( report.getWindSpeed() != ObConst.MISSING ) {
windSpeed = tm.getThresholdValueCellType(DataUsageKey.DISPLAY, zone, MonitorConfigConstants.SnowDisplay.SNOW_DISP_PROD_BLIZZ_WIND_SPEED.getXmlKey(), report.getWindSpeed());
}
CellType peakWind = tm.getThresholdValueCellType(DataUsageKey.DISPLAY, zone, MonitorConfigConstants.SnowDisplay.SNOW_DISP_PROD_BLIZZ_PEAK_WIND.getXmlKey(), report.getMaxWindSpeed());
CellType peakWind = CellType.NotAvailable;
if ( report.getMaxWindSpeed() != ObConst.MISSING ) {
peakWind = tm.getThresholdValueCellType(DataUsageKey.DISPLAY, zone, MonitorConfigConstants.SnowDisplay.SNOW_DISP_PROD_BLIZZ_PEAK_WIND.getXmlKey(), report.getMaxWindSpeed());
}
CellType windGust = tm.getThresholdValueCellType(DataUsageKey.DISPLAY, zone, MonitorConfigConstants.SnowDisplay.SNOW_DISP_PROD_BLIZZ_GUST_SPEED.getXmlKey(), report.getWindGust());
CellType windGust = CellType.NotAvailable;
if ( report.getWindGust() != ObConst.MISSING ) {
windGust = tm.getThresholdValueCellType(DataUsageKey.DISPLAY, zone, MonitorConfigConstants.SnowDisplay.SNOW_DISP_PROD_BLIZZ_GUST_SPEED.getXmlKey(), report.getWindGust());
}
CellType visibility = tm.getThresholdValueCellType(DataUsageKey.DISPLAY, zone, MonitorConfigConstants.SnowDisplay.SNOW_DISP_PROD_BLIZZ_VIS.getXmlKey(), report.getVisibility());
CellType visibility = CellType.NotAvailable;
if ( report.getVisibility() != ObConst.MISSING ) {
// vis in units of "miles/16" is used to compare with Red/Yellow threshold values
visibility = tm.getThresholdValueCellType(DataUsageKey.DISPLAY, zone, MonitorConfigConstants.SnowDisplay.SNOW_DISP_PROD_BLIZZ_VIS.getXmlKey(), report.getVisibility()*16.0f);
}
if ( presentWx.contains("SN") || presentWx.contains("BLSN") ) {
// snow or blowing snow observed

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

@ -50,6 +50,7 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
* 26 Nov 2012 #15554 lbousaidi used obstime instead of system time in isNear12Z
* routine.
* 4 Dec 2012 #15569 lbousaidi fixed daily pp value when token is set to USE_REVCODE
* 02 Feb 2012 #15845 lbousaidi added check for data that comes in as -999
* </pre>
*
* @author mnash
@ -309,6 +310,13 @@ public class GagePP {
+ MISSING_PRECIP);
value = MISSING_PRECIP;
}
/* This was added for KRF site that was getting missing values -999
*
*/
if (value ==-99900.0) {
value = MISSING_PRECIP;
}
/*
* Make certain that the value is properly rounded. This will

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: 30
Release: 31
Group: AWIPSII
BuildRoot: /tmp
URL: N/A

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

@ -130,12 +130,12 @@ EXEC "readnoaaport -m 224.0.1.5 -n -u 7 -t mhs -r 1"
# The LDM will NOT start if the entry is commented-out.
ALLOW ANY ^((localhost|loopback)|(127\.0\.0\.1\.?$)) .*
ALLOW NEXRAD3 ^.* SDUS...PGUM|SDUS...PHFO|NXUS6..PGUM|NXUS6..PHFO|SDUS4..KWBC
ALLOW NGRID ^.* .* [LM].[GHRT]....KWBC|[LM].C....KWBE|[LM].V....KWBL|[LM].D....KWBG|E.[BH]....KWBJ|[LM].[BEFS]....KWB.|Y.W....KWBG|[YZ].Q....KWBG|[YZ].[JKLNOPT]|[YZ].[BS]....KWBE|[LM].R.*KWBE|[LMYZ].D.*|E.P....KWBJ
ALLOW NIMAGE ^.* .* TIT[EQ].*
ALLOW HDS ^.* .* [IJ]UTX0[0-689].*|JUSX4[0-689].*
ALLOW NGRID ^.* .* [LMYZ].[GHIJQRT]....KWBC|[LMYZ].[IJL]....KWBH|[LMYZ].[ABCJKMNRQSUVYZ]....KWBE|[LM].[VR]....KWBL|[LM].D....KWBG|E.[BEFHI]....KWBJ|O.[MN]....KWBJ|[LM].[ABCE]....KWBS|Y.W....KWBG|[LM].[ABCDIJKMNP]....KWBR|O.N....KWBM|[LM].[EF]....KWBD|L......KWBQ|L.U....KMDL|[YZ]......KKCI|[LM].U....KWNO
ALLOW NIMAGE ^.* .* TIT[EQ].*|TIG[ABENPQ].*|TIC[EQ].*
ALLOW HDS ^.* .* [IJ]UTX0[0-689].*|JUSX4[0-689].*|[YZ]......K(WBD|WNO|WBG|KCI|ALR|FWR|KRF|MSR|ORN|PTR|RHA|RSA|STR|TAR|TIR|TUA|WNH)|[LMYZ].[ABCJKMNRQSUVYZ]....KWBE|[YZ].[HIJQ]....KWBC|[YZ].[IJL]....KWBH|O.[MN]....KWBJ
ALLOW EXP ^.* .*
ALLOW IDS|DDPLUS ^.* .* SXUS2[03-9].KWOH|SXUS[3-9].KWOH|SXUS8[0-3].KWOH|SRUS[2-8].KWOH
ALLOW NOTHER ^.* .*
ALLOW NOTHER ^.* .* TIPB.*
#
# Give permission to the Unidata Program Center
ALLOW ANY ^[a-z].*\.unidata\.ucar\.edu\.?$ .*

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

@ -130,12 +130,12 @@ EXEC "readnoaaport -m 224.0.1.5 -n -u 7 -t mhs -r 1"
# The LDM will NOT start if the entry is commented-out.
ALLOW ANY ^((localhost|loopback)|(127\.0\.0\.1\.?$)) .*
ALLOW NEXRAD3 ^.* SDUS...PGUM|SDUS...PHFO|NXUS6..PGUM|NXUS6..PHFO|SDUS4..KWBC
ALLOW NGRID ^.* .* [LM].[GHRT]....KWBC|[LM].C....KWBE|[LM].V....KWBL|[LM].D....KWBG|E.[BH]....KWBJ|[LM].[BEFS]....KWB.|Y.W....KWBG|[YZ].Q....KWBG|[YZ].[JKLNOPT]|[YZ].[BS]....KWBE|[LM].R.*KWBE|[LMYZ].D.*|E.P....KWBJ
ALLOW NIMAGE ^.* .* TIT[EQ].*
ALLOW HDS ^.* .* [IJ]UTX0[0-689].*|JUSX4[0-689].*
ALLOW NGRID ^.* .* [LMYZ].[GHIJQRT]....KWBC|[LMYZ].[IJL]....KWBH|[LMYZ].[ABCJKMNRQSUVYZ]....KWBE|[LM].[VR]....KWBL|[LM].D....KWBG|E.[BEFHI]....KWBJ|O.[MN]....KWBJ|[LM].[ABCE]....KWBS|Y.W....KWBG|[LM].[ABCDIJKMNP]....KWBR|O.N....KWBM|[LM].[EF]....KWBD|L......KWBQ|L.U....KMDL|[YZ]......KKCI|[LM].U....KWNO
ALLOW NIMAGE ^.* .* TIT[EQ].*|TIG[ABENPQ].*|TIC[EQ].*
ALLOW HDS ^.* .* [IJ]UTX0[0-689].*|JUSX4[0-689].*|[YZ]......K(WBD|WNO|WBG|KCI|ALR|FWR|KRF|MSR|ORN|PTR|RHA|RSA|STR|TAR|TIR|TUA|WNH)|[LMYZ].[ABCJKMNRQSUVYZ]....KWBE|[YZ].[HIJQ]....KWBC|[YZ].[IJL]....KWBH|O.[MN]....KWBJ
ALLOW EXP ^.* .*
ALLOW IDS|DDPLUS ^.* .* SXUS2[03-9].KWOH|SXUS[3-9].KWOH|SXUS8[0-3].KWOH|SRUS[2-8].KWOH
ALLOW NOTHER ^.* .*
ALLOW NOTHER ^.* .* TIPB.*
#
# Give permission to the Unidata Program Center
ALLOW ANY ^[a-z].*\.unidata\.ucar\.edu\.?$ .*

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

@ -130,12 +130,12 @@ EXEC "readnoaaport -m 224.0.1.5 -n -u 7 -t mhs -r 1"
# The LDM will NOT start if the entry is commented-out.
ALLOW ANY ^((localhost|loopback)|(127\.0\.0\.1\.?$)) .*
ALLOW NEXRAD3 ^.* SDUS...PGUM|SDUS...PHFO|NXUS6..PGUM|NXUS6..PHFO|SDUS4..KWBC
ALLOW NGRID ^.* .* [LM].[GHRT]....KWBC|[LM].C....KWBE|[LM].V....KWBL|[LM].D....KWBG|E.[BH]....KWBJ|[LM].[BEFS]....KWB.|Y.W....KWBG|[YZ].Q....KWBG|[YZ].[JKLNOPT]|[YZ].[BS]....KWBE|[LM].R.*KWBE|[LMYZ].D.*|E.P....KWBJ
ALLOW NIMAGE ^.* .* TIT[EQ].*
ALLOW HDS ^.* .* [IJ]UTX0[0-689].*|JUSX4[0-689].*
ALLOW NGRID ^.* .* [LMYZ].[GHIJQRT]....KWBC|[LMYZ].[IJL]....KWBH|[LMYZ].[ABCJKMNRQSUVYZ]....KWBE|[LM].[VR]....KWBL|[LM].D....KWBG|E.[BEFHI]....KWBJ|O.[MN]....KWBJ|[LM].[ABCE]....KWBS|Y.W....KWBG|[LM].[ABCDIJKMNP]....KWBR|O.N....KWBM|[LM].[EF]....KWBD|L......KWBQ|L.U....KMDL|[YZ]......KKCI|[LM].U....KWNO
ALLOW NIMAGE ^.* .* TIT[EQ].*|TIG[ABENPQ].*|TIC[EQ].*
ALLOW HDS ^.* .* [IJ]UTX0[0-689].*|JUSX4[0-689].*|[YZ]......K(WBD|WNO|WBG|KCI|ALR|FWR|KRF|MSR|ORN|PTR|RHA|RSA|STR|TAR|TIR|TUA|WNH)|[LMYZ].[ABCJKMNRQSUVYZ]....KWBE|[YZ].[HIJQ]....KWBC|[YZ].[IJL]....KWBH|O.[MN]....KWBJ
ALLOW EXP ^.* .*
ALLOW IDS|DDPLUS ^.* .* SXUS2[03-9].KWOH|SXUS[3-9].KWOH|SXUS8[0-3].KWOH|SRUS[2-8].KWOH
ALLOW NOTHER ^.* .*
ALLOW NOTHER ^.* .* TIPB.*
#
# Give permission to the Unidata Program Center
ALLOW ANY ^[a-z].*\.unidata\.ucar\.edu\.?$ .*

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

@ -300,7 +300,7 @@ NGRID ^(E.[ABCDEFGHI].{1,3}) (KWBJ) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)
# AWIPS1 OCONUS: GRID ^[LM].[ABCDE].*KWBS* /Grid/SBN/rawGrib2
# LMDA98 KWBS 160000 !grib2/ncep/WRF_EM/#130/201012160000F000/WXTZ/0 - NONE
ANY ^([LM].[ABCDE].{1,3}) (KWBS) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
ANY ^([LM].[ABCDEF].{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