diff --git a/cave/com.raytheon.uf.viz.d2d.ui/localization/styleRules/d2dContourStyleRules.xml b/cave/com.raytheon.uf.viz.d2d.ui/localization/styleRules/d2dContourStyleRules.xml index bab5801554..f2ce099803 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/localization/styleRules/d2dContourStyleRules.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui/localization/styleRules/d2dContourStyleRules.xml @@ -456,7 +456,7 @@ F | 1.8 |0| 4 | | |..|8000F0FF| | 0 | 1 DpTerranl - F + °R 1 @@ -1639,6 +1639,7 @@ in | 39.37 | 0 | 4 | | |..|8000F0FF| | 16 | \ TOTSN + TOTSN6hr @@ -4084,6 +4085,78 @@ in | .03937 | 0 | 4 | | |..|8000F0FF| | 16 | \ + + + PVV + HiResW-NMM-East + HiResW-NMM-West + HiResW-ARW-East + HiResW-ARW-West + HiResW-NMM-AK + HiResW-NMM-PR + HiResW-NMM-SJU + HiResW-ARW-AK + HiResW-ARW-PR + HiResW-ARW-SJU + + + (Pa/s)*-0.1 + + -400 -300 -200 -100 -50 -10 10 50 100 200 300 400 + + + + + + HiResW-NMM-East + HiResW-NMM-West + HiResW-ARW-East + HiResW-ARW-West + HiResW-NMM-AK + HiResW-NMM-PR + HiResW-NMM-SJU + HiResW-ARW-AK + HiResW-ARW-PR + HiResW-ARW-SJU + AV + RV + geoVort + + + /s*1.0E5 + 100 + + 8 + + + + + + + HiResW-NMM-East + HiResW-NMM-West + HiResW-ARW-East + HiResW-ARW-West + HiResW-NMM-AK + HiResW-NMM-PR + HiResW-NMM-SJU + HiResW-ARW-AK + HiResW-ARW-PR + HiResW-ARW-SJU + VAdv + dVAdv + PIVA + + + /s*1.0E9 + + -500 -200 -100 -50 -10 10 50 100 200 500 + + + + Wind diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/HAILPROB.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/HAILPROB.xml new file mode 100644 index 0000000000..75cb185f2e --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/HAILPROB.xml @@ -0,0 +1,22 @@ + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/PRSIGSV.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/PRSIGSV.xml new file mode 100644 index 0000000000..80c841fb5e --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/PRSIGSV.xml @@ -0,0 +1,22 @@ + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/PRSVR.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/PRSVR.xml new file mode 100644 index 0000000000..5441810779 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/PRSVR.xml @@ -0,0 +1,22 @@ + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SIGHAILPROB.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SIGHAILPROB.xml new file mode 100644 index 0000000000..51e6ef7f88 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SIGHAILPROB.xml @@ -0,0 +1,22 @@ + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SIGTRNDPROB.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SIGTRNDPROB.xml new file mode 100644 index 0000000000..5840b8cb97 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SIGTRNDPROB.xml @@ -0,0 +1,22 @@ + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SIGWINDPROB.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SIGWINDPROB.xml new file mode 100644 index 0000000000..9f84e73c50 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SIGWINDPROB.xml @@ -0,0 +1,22 @@ + + + + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/WINDPROB.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/WINDPROB.xml new file mode 100644 index 0000000000..41628acdb6 --- /dev/null +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/WINDPROB.xml @@ -0,0 +1,22 @@ + + + + diff --git a/cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml b/cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml index 1a43b114d0..aa9439a960 100644 --- a/cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml +++ b/cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml @@ -2346,6 +2346,7 @@ TOTSN + TOTSN6hr @@ -4713,20 +4714,132 @@ C - - - PTvA - - - K/hPa/s*1.0E-5 - - - - - Mmag - - - g*m/(kg*s) - - + + + CC + + + + -328 + 12000 + + ft + false + Grid/warm to cold + + + + + + + + + + + + PTvA + + + K/hPa/s*1.0E-5 + + + + + Mmag + + + g*m/(kg*s) + + + + + + PVV + HiResW-NMM-East + HiResW-NMM-West + HiResW-ARW-East + HiResW-ARW-West + HiResW-NMM-AK + HiResW-NMM-PR + HiResW-NMM-SJU + HiResW-ARW-AK + HiResW-ARW-PR + HiResW-ARW-SJU + + + (Pa/s)*-0.1 + + 10 + 350 + + Grid/gridded data + + 0 10 25 50 100 200 300 + + + + + + HiResW-NMM-East + HiResW-NMM-West + HiResW-ARW-East + HiResW-ARW-West + HiResW-NMM-AK + HiResW-NMM-PR + HiResW-NMM-SJU + HiResW-ARW-AK + HiResW-ARW-PR + HiResW-ARW-SJU + AV + Tdef + geoVort + + + /s*1.0E5 + + 5 + 300 + + Grid/gridded data + + 10 + + + + + + + + ER-SPORT-SST + T + + + false + F + + 25 + 100 + + Grid/gridded data + + 32 40 50 60 70 80 90 + + + + + + LATE + + + + 0 + 17 + + Grid/gridded data + + 1 3 5 7 9 11 13 15 17 + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml index b57792b62d..6446a43fcf 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml @@ -386,8 +386,24 @@ - + + + + + + + + + + - @@ -512,9 +528,9 @@ + key="ThP" indentText="false" /> + key="CTSTM" indentText="false" /> @@ -525,7 +541,19 @@ + key="TCC" indentText="false" /> + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/edex_static/base/smartinit/SPC.py b/edexOsgi/build.edex/esb/data/utility/edex_static/base/smartinit/SPC.py new file mode 100644 index 0000000000..d88891821a --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/edex_static/base/smartinit/SPC.py @@ -0,0 +1,26 @@ +from Init import * +#import LogStream + +##-------------------------------------------------------------------------- +## Module that calculates surface weather elements from SPC model +## output. +## +##-------------------------------------------------------------------------- +class SPCForecaster(Forecaster): + def __init__(self): + Forecaster.__init__(self, "SPC", "SPC") + +##------------------------------------------------------------------------- +## Returns the SPC Tornado Probability grids +##-------------------------------------------------------------------------- + def calcPTOR(self, ptor_SFC): + return ptor_SFC + + def calcPRSVR(self, prsvr_SFC): + return prsvr_SFC + + def calcPRSIGSV(self, prsigsv_SFC): + return prsigsv_SFC + +def main(): + SPCForecaster().run() diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/spcGuideNDFD.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/spcGuideNDFD.xml index a34c596033..5c63bc010f 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/spcGuideNDFD.xml +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/spcGuideNDFD.xml @@ -26,23 +26,74 @@ 79200 82800 86400 + 90000 + 93600 + 97200 + 100800 + 104400 + 108000 + 111600 + 115200 + 118800 + 122400 + 126000 + 129600 + 133200 + 136800 + 140400 + 144000 + 147600 + 151200 + 154800 + 158400 + 162000 + 165600 + 169200 + 172800 + 176400 + 180000 + 183600 + 187200 + 190800 + 194400 + 198000 + 201600 + 205200 + 208800 + 212400 + 216000 + 219600 + 223200 + 226800 + 230400 + 234000 + 237600 + 241200 + 244800 + 248400 + 252000 + 255600 + 259200 staticTopo Topography - meters + meters + m 9.99999993382e+36 + 0 staticSpacing Grid spacing - meters + meters + m -99999.0 staticCoriolis Coriolis parameter - /second + s^-1 -99999.0 @@ -59,4 +110,103 @@ SFC + + hailprob + Hail Probability + % + percent + hailprob + 0.0 + 100.0 + -99999.0 + SFC + + SFC + + + + windprob + Damaging Wind Probability + % + percent + windprob + 0.0 + 100.0 + -99999.0 + SFC + + SFC + + + + sigtrndprob + Extreme Tornado Probability + % + percent + sigtrndprob + 0.0 + 100.0 + -99999.0 + SFC + + SFC + + + + sighailprob + Extreme Hail Probability + % + percent + sighailprob + 0.0 + 100.0 + -99999.0 + SFC + + SFC + + + + sigwindprob + Extreme Damaging Wind Probability + % + percent + sigwindprob + 0.0 + 100.0 + -99999.0 + SFC + + SFC + + + + prsvr + Combined Severe Probability + % + percent + prsvr + 0.0 + 100.0 + -99999.0 + SFC + + SFC + + + + prsigsv + Combined Extreme Severe Probability + % + percent + prsigsv + 0.0 + 100.0 + -99999.0 + 0 + SFC + + SFC + + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt index 5d74fba9f2..3563498d3d 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt @@ -190,3 +190,12 @@ PPFFG_75600-0 PPFFG PPFFG_108000-0 PPFFG PPFFG_172800-0 PPFFG PPFFG_259200-0 PPFFG + +# SPC +SIGTRNDPROB_254E3 SIGTRNDPROB +HAILPROB_254E3 HAILPROB +SIGHAILPROB_254E3 SIGHAILPROB +WINDPROB_254E3 WINDPROB +SIGWINDPROB_254E3 SIGWINDPROB +PRSVR_254E3 PRSVR +PRSIGSV_254E3 PRSIGSV diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.txt b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.txt index ae96f585d8..d55e60ab1e 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.txt +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.txt @@ -77,4 +77,7 @@ Canadian-Reg:com.raytheon.edex.plugin.grib.decoderpostprocessors.CanadianRegPost Canadian-NH:com.raytheon.edex.plugin.grib.decoderpostprocessors.CanadianNHPostProcessor # RUC236 PostProcessor -RUC236:com.raytheon.edex.plugin.grib.decoderpostprocessors.RUC236GribPostProcessor \ No newline at end of file +RUC236:com.raytheon.edex.plugin.grib.decoderpostprocessors.RUC236GribPostProcessor + +# SPC +SPCGuide:com.raytheon.edex.plugin.grib.decoderpostprocessors.OverwriteGribPostProcessor \ No newline at end of file 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 b2d94215af..278262db09 100755 --- a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template +++ b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template @@ -320,8 +320,10 @@ ANY ^(LGXP[0-9][0-9]) KNHC (..)(..)(..) #ANY ^(LDIZ1[1-9]|LDIZ2[7-9]|LDIZ3[0789]|LDIZ4[0-1]) (KWNS) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/[^/]*/#([^/]*)/([^/]*) # FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/SPC/GRID\7/\4\5Z-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H -ANY ^(LDIZ1[1-9]|LDIZ2[7-9]|LDIZ3[0789]|LDIZ4[0-1]) (KWNS) (..)(..)(..)[^!]*!(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/SPC/GRID\7/\9Z_\(10)_\(11)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H +#ANY ^(LDIZ1[1-9]|LDIZ2[7-9]|LDIZ3[0789]|LDIZ4[0-1]) (KWNS) (..)(..)(..)[^!]*!(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/SPC/GRID\7/\9Z_\(10)_\(11)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H +ANY ^(LDIZ1[1-9]|LDIZ2[7-9]|LDIZ3[01789]|LDIZ4[0-1]) (KWNS) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/[^/]*/#([^/]*)/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/GRID\7/SPC/\9Z_\(10)_\(11)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H # AWIPS1: GRID ^ZETA98.(KTUA|PACR|KSTR|KRSA|KORN|KRHA|KKRF|KMSR|KTAR|KPTR|KTIR|KALR|KFWR) /Grid/SBN/HydroRaw # ZETA98 KTAR 012300 /mNWS_160 !grib/nws/NWS_160/#255/201102012200/F001/APCP/sfc/