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

Merge branch 'field_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into int_15.1.1

Browse source 
Former-commit-id: f2b3a2fc2c1a5362673fed5b4841cd6d5d86ea5d
This commit is contained in:
Fay.Liang 2015-05-29 15:43:59 -04:00
commit 27043f6fb7
5 changed files with 49 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/aviation.xml
View file

@ -19,15 +19,9 @@
further_licensing_information.
-->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="menuItem" menuText="Cloud Cover" key="CCP" indentText="false" />
<contribute xsi:type="menuItem" menuText="Cloud Cover Anl Uncertainty" key="CCPerranl" indentText="false" />
<contribute xsi:type="menuItem" menuText="Visibility" key="Vis" indentText="false" />
<contribute xsi:type="menuItem" menuText="Visibility Anl Uncertainty" key="Viserranl" indentText="false" />
<contribute xsi:type="menuItem" menuText="Turbulence" key="TURB" indentText="false" />
<contribute xsi:type="menuItem" menuText="Turbulence Index" key="TPFI" indentText="false" />
<contribute xsi:type="menuItem" menuText="Icing Probability" key="ICPRB" indentText="false" />
<contribute xsi:type="menuItem" menuText="Icing Potential" key="ICNG" indentText="false" />
<contribute xsi:type="menuItem" menuText="Icing Severity" key="ICSEV" indentText="false" />
<contribute xsi:type="menuItem" menuText="Supercooled Large Droplet Threat" key="SIPD" indentText="false" />
<contribute xsi:type="menuItem" menuText="Supercooled Large Droplet (SLD) Probability" key="SLDP" indentText="true" />
<contribute xsi:type="menuItem" menuText="Prob Visibility &lt; 1 mile" key="Visc1" indentText="false" />
<contribute xsi:type="menuItem" menuText="Prob Visibility &lt; 3 miles" key="Visc2" indentText="false" />
<contribute xsi:type="menuItem" menuText="Prob Ceiling Hgt &lt; 500 ft" key="Cigc1" indentText="false" />
<contribute xsi:type="menuItem" menuText="Prob Ceiling Hgt &lt; 1000 ft" key="Cigc2" indentText="false" />
<contribute xsi:type="menuItem" menuText="Prob Ceiling Hgt &lt; 3000 ft" key="Cigc3" indentText="false" />
</menuTemplate>

24
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/aviation.xml
View file

@ -19,15 +19,15 @@
further_licensing_information.
-->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="menuItem" menuText="Cloud Cover" key="CCP" indentText="false" />
<contribute xsi:type="menuItem" menuText="Cloud Cover Anl Uncertainty" key="CCPerranl" indentText="false" />
<contribute xsi:type="menuItem" menuText="Visibility" key="Vis" indentText="false" />
<contribute xsi:type="menuItem" menuText="Visibility Anl Uncertainty" key="Viserranl" indentText="false" />
<contribute xsi:type="menuItem" menuText="Turbulence" key="TURB" indentText="false" />
<contribute xsi:type="menuItem" menuText="Turbulence Index" key="TPFI" indentText="false" />
<contribute xsi:type="menuItem" menuText="Icing Probability" key="ICPRB" indentText="false" />
<contribute xsi:type="menuItem" menuText="Icing Potential" key="ICNG" indentText="false" />
<contribute xsi:type="menuItem" menuText="Icing Severity" key="ICSEV" indentText="false" />
<contribute xsi:type="menuItem" menuText="Supercooled Large Droplet Threat" key="SIPD" indentText="false" />
<contribute xsi:type="menuItem" menuText="Supercooled Large Droplet (SLD) Probability" key="SLDP" indentText="true" />
</menuTemplate>
<contribute xsi:type="menuItem" menuText="Cloud Cover" key="CCP" indentText="false" />
<contribute xsi:type="menuItem" menuText="Cloud Cover Anl Uncertainty" key="CCPerranl" indentText="false" />
<contribute xsi:type="menuItem" menuText="Visibility" key="Vis" indentText="false" />
<contribute xsi:type="menuItem" menuText="Visibility Anl Uncertainty" key="Viserranl" indentText="false" />
<contribute xsi:type="menuItem" menuText="Turbulence" key="TURB" indentText="false" />
<contribute xsi:type="menuItem" menuText="Turbulence Index" key="TPFI" indentText="false" />
<contribute xsi:type="menuItem" menuText="Icing Probability" key="ICPRB" indentText="false" />
<contribute xsi:type="menuItem" menuText="Icing Potential" key="ICNG" indentText="false" />
<contribute xsi:type="menuItem" menuText="Icing Severity" key="ICSEV" indentText="false" />
<contribute xsi:type="menuItem" menuText="Supercooled Large Droplet Threat" key="SIPD" indentText="false" />
<contribute xsi:type="menuItem" menuText="Supercooled Large Droplet (SLD) Probability" key="SLDP" indentText="false" />
</menuTemplate>

15
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/nwpsCG1.py
View file

@ -17,8 +17,21 @@ class nwpsCG1Forecaster(Forecaster):
def main():
nwpsCG1Forecaster().run()
chkfile = "/tmp/nwps/CG1"
chkfiledir = "/tmp/nwps"
try:
os.makedirs(chkfiledir)
except OSError:
pass
if not os.path.isfile(chkfile):
open(chkfile, 'a').close()
os.system('/awips2/GFESuite/bin/sendGfeMessage -s -m "SWAN WAVE GRIDS ARE NOW IN GFE"')
filemodtime = os.stat(chkfile).st_mtime
twominutesago = time.time() - 120
if (twominutesago - filemodtime) > 0:
os.utime(chkfile, None)
os.system('/awips2/GFESuite/bin/sendGfeMessage -s -m "SWAN WAVE GRIDS ARE NOW IN GFE"')
os.system('/awips2/GFESuite/bin/sendGfeMessage -s -m "SWAN WAVE GRIDS ARE NOW IN GFE"')
if __name__ == "__main__":
main()

16
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/nwpsTrkngCG0.py
View file

@ -57,8 +57,20 @@ class nwpsTrkngCG0Forecaster(Forecaster):
def main():
nwpsTrkngCG0Forecaster().run()
os.system('/awips2/GFESuite/bin/sendGfeMessage -s -m "TRACKING WAVE GRIDS ARE NOW IN GFE"')
chkfile = "/tmp/nwps/CGTrack"
chkfiledir = "/tmp/nwps"
try:
os.makedirs(chkfiledir)
except OSError:
pass
if not os.path.isfile(chkfile):
open(chkfile, 'a').close()
os.system('/awips2/GFESuite/bin/sendGfeMessage -s -m "TRACKING WAVE GRIDS ARE NOW IN GFE"')
filemodtime = os.stat(chkfile).st_mtime
twominutesago = time.time() - 120
if (twominutesago - filemodtime) > 0:
os.utime(chkfile, None)
os.system('/awips2/GFESuite/bin/sendGfeMessage -s -m "TRACKING WAVE GRIDS ARE NOW IN GFE"')
if __name__ == "__main__":
main()

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

@ -796,8 +796,8 @@ NGRID ^(Y.C[A-MZ][05789][0-9]) (KWBY) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]
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
# MRMS
NGRID ^(YAU[CDLMPQS][0-2][0-9]) (KWNR) (..)(..)(..)[^!]*!(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
#NGRID ^(YAU[CDLMPQS][0-2][0-9]) (KWNR) (..)(..)(..)[^!]*!(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
# RTMA 2.5km
NGRID ^(L.IA98) (KWBR) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
@ -810,6 +810,7 @@ NGRID ^(MHU...) (KNHC) (..)(..)(..)
# ETSS-AK
NGRID ^(MHR...) (KNHC) (..)(..)(..)
FILE -overwrite -log -close -edex /data_store/grib2/(\3:yyyy)(\3:mm)\3/\4/ETSS/NDFD-AK/\1_\2_\3\4\5_(seq).grib2.%Y%m%d%H
#NGRID ^(YAU[CDLMPQS][0-2][0-9]) (KWNR) (..)(..)(..)[^!]*!(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
@ -820,3 +821,4 @@ NGRID ^(MHR...) (KNHC) (..)(..)(..)
NGRID ^([YZ][BCE-HMO-Y][BEFN][A-Z][0-9][0-9]) KWBC (..)(..)(..) [^!]*!(grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
FILE -overwrite -log -close -edex /data_store/grib2/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)_\1_KWBC_\2\3\4_(seq).\5.%Y%m%d%H