diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf.priority b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf.priority index 6395b63724..ab83701110 100644 --- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf.priority +++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf.priority @@ -18,6 +18,11 @@ # 20230321 20.3.2 Update WW3 regex lines so we get the data # 20231004 20.3.2 Add RAWS data # Add additioanl NBM data +# 20231109 20.3.2 Add HREF/HiResW model +# Update National Blended model entries, including adding standard deviations +# Update RTOFS entry +# Update SPCGuide gridded products to include Fire Weather and Dry Thunderstorm grids +# Update level3 radar product entry # USPLN LIGHTNING USPLN1EX FILE -close -edex /awips2/data_store/lightning/%Y%m%d%H%M.uspln @@ -219,7 +224,7 @@ FNEXRAD ^rad/NEXRCOMP/(...)/(...)_(........)_(....) # # NEXRAD3 site products # -NEXRAD3|HDS ^SDUS[235678]. (....) (..)(..)(..).*/p(...)(...) +NEXRAD3|HDS ^SDUS[2345678]. (....) (..)(..)(..).*/p(...)(...) FILE -overwrite -close -edex /awips2/data_store/radar/(\2:yyyy)(\2:mm)\2//\3/\6/\6_\5_(\2:yyyy)(\2:mm)\2_\3\4 ## ## BUFR @@ -749,15 +754,12 @@ FNMOC ^US058.*0110_0240_(.*)_(.*)_(.*)-(.*) # # SPC Outlook Grids - http://www.nws.noaa.gov/datamgmt/doc/spc.html # -# Day 1 -HDS ^LDIZ1[1-7] KWNS (..)(..)(..) - FILE -edex -log -close - /awips2/data_store/spc/(\1:yyyy)(\1:mm)(\1:dd)(\1:hh).day1_outlook.grib2 -# -# Day 4 -HDS ^LDIZ48 KWNS (..)(..)(..) - FILE -edex -log -close - /awips2/data_store/spc/(\1:yyyy)(\1:mm)(\1:dd)(\1:hh).day4_outlook.grib2 +# Prob of Severe Thunderstorm Grids +ANY ^(LDIZ[1-9][1-9]) (KWNS) (..)(..)(..) + FILE -edex -log -close /awips2/data_store/spc/(\2:yyyy)(\2:mm)(\2:dd)(\2:hh)_\1_svr_outlook.grib2 +# Joint Fire Weather and Dry Thunderstorm Grids +HDS ANY ^(Y[YZ]U[D-I]3[3-8]) (KWNS) (..)(..)(..) + FILE -edex -log -close /awips2/data_store/spc/(\2:yyyy)(\2:mm)(\2:dd)(\2:hh)_\1_fw_outlook.grib2 # UKMET # #HDS ^H..... EGRR ......[^!]*!grib/ukmet/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) @@ -995,7 +997,7 @@ HDS ^OENA88 KWBM.*ncep/ICE_120/#219/(............)/F(...)/([^/]*)/ # # Real-Time Ocean Forecast System (RTOFS) for CONUS # -NGRID ^E[HSTUV][CK][B-T]01 KWBW ......[^!]*!grib.*/[^/]*/[^/]*/#[^/]*/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) +NGRID ^E[HSTUV][CJK][B-T]01 KWBW ......[^!]*!grib.*/[^/]*/[^/]*/#[^/]*/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) FILE -edex -close /awips2/data_store/grid/RTOFS/RTOFS_\1_\2_\3_\4-(seq)-concat-%Y%m%d_%H%M.grib2 # @@ -1081,5 +1083,20 @@ NGRID ^OUTA98 KWNB (......)[^!]*!grib2 # # National Blend of Models # -NGRID|HDS ^(Y.A...) (KWE[ABGIHLO]) (..)(..)(..) +NGRID|HDS ^(Y.[A-O]...) (KWE[ABGIHLO]) (..)(..)(..) FILE -close /awips2/data_store/grid/(\3:yyyy)(\3:mm)\3/\4/NationalBlend/staging/NationalBlend_\3\4\5-concat-%Y%m%d_%H%M.grib2 +#Standard Deviations +NGRID|HDS ^(Y[A-Z]S[A-R][0-2][0-9]) (KWEA) (..)(..)(..) + FILE -close /awips2/data_store/grid/(\3:yyyy)(\3:mm)\3/\4/NationalBlend/staging/NationalBlend_Std\3\4\5-concat-%Y%m%d_%H%M.grib2 + +#HREF v3 +NGRID ^(Y[B-Z][CDEM][B-S,Z][0-9][0-9]) (KWBH) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{2})[0-9]{2}F[0-9]{3}/[^/]* + FILE -overwrite -close -edex -log /awips2/data_store/grid/(\3:yyyy)(\3:mm)\3/\4/HREF/\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +NGRID ^(Y[B-Z][CDEM][RS][0-9][0-9]) (KWBH) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/FHRS/([^/]*) + FILE -overwrite -log -close -edex /awips2/data_store/grid/(\3:yyyy)(\3:mm)\3/\4/HREF/FHRS/\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +#HiResW ARW/FV3 (HiResW v8) +ANY ^([YZ].[CDEFM].{1,3}) (KWBS) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /awips2/data_store/grid/(\3:yyyy)(\3:mm)\3/\4/HiResW/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.grids b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.grids index 39dc5008bb..0e3438bba6 100644 --- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.grids +++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.grids @@ -17,6 +17,11 @@ # CIRA RGB GOES Satellite products added # 20230321 20.3.2 Update WW3 regex lines so we get the data # 20231004 20.3.2 Add additioanl NBM data +# 20231109 20.3.2 Add HREF/HiResW model +# Update National Blended model entries, including adding standard deviations +# Update RTOFS entry +# Update SPCGuide gridded products to include Fire Weather and Dry Thunderstorm grids + # # ------------------------------------------ # - Global Ensemble Forecast System (GEFS) - @@ -419,15 +424,13 @@ FNMOC ^US058.*0110_0240_(.*)_(.*)_(.*)-(.*) # # SPC Outlook Grids - http://www.nws.noaa.gov/datamgmt/doc/spc.html # -# Day 1 -HDS ^LDIZ1[1-7] KWNS (..)(..)(..) - FILE -edex -log -close - /awips2/data_store/spc/(\1:yyyy)(\1:mm)(\1:dd)(\1:hh).day1_outlook.grib2 -# -# Day 4 -HDS ^LDIZ48 KWNS (..)(..)(..) - FILE -edex -log -close - /awips2/data_store/spc/(\1:yyyy)(\1:mm)(\1:dd)(\1:hh).day4_outlook.grib2 +# Prob of Severe Thunderstorm Grids +ANY ^(LDIZ[1-9][1-9]) (KWNS) (..)(..)(..) + FILE -edex -log -close /awips2/data_store/spc/(\2:yyyy)(\2:mm)(\2:dd)(\2:hh)_\1_svr_outlook.grib2 +# Joint Fire Weather and Dry Thunderstorm Grids +HDS ANY ^(Y[YZ]U[D-I]3[3-8]) (KWNS) (..)(..)(..) + FILE -edex -log -close /awips2/data_store/spc/(\2:yyyy)(\2:mm)(\2:dd)(\2:hh)_\1_fw_outlook.grib2 + # UKMET # #HDS ^H..... EGRR ......[^!]*!grib/ukmet/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) @@ -665,7 +668,7 @@ HDS ^OENA88 KWBM.*ncep/ICE_120/#219/(............)/F(...)/([^/]*)/ # # Real-Time Ocean Forecast System (RTOFS) for CONUS # -NGRID ^E[HSTUV][CK][B-T]01 KWBW ......[^!]*!grib.*/[^/]*/[^/]*/#[^/]*/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) +NGRID ^E[HSTUV][CJK][B-T]01 KWBW ......[^!]*!grib.*/[^/]*/[^/]*/#[^/]*/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) FILE -edex -close /awips2/data_store/grid/RTOFS/RTOFS_\1_\2_\3_\4-(seq)-concat-%Y%m%d_%H%M.grib2 # @@ -751,5 +754,19 @@ NGRID ^OUTA98 KWNB (......)[^!]*!grib2 # # National Blend of Models # -NGRID|HDS ^(Y.A...) (KWE[ABGIHLO]) (..)(..)(..) +NGRID|HDS ^(Y.[A-O]...) (KWE[ABGIHLO]) (..)(..)(..) FILE -close /awips2/data_store/grid/(\3:yyyy)(\3:mm)\3/\4/NationalBlend/staging/NationalBlend_\3\4\5-concat-%Y%m%d_%H%M.grib2 +#Standard Deviations +NGRID|HDS ^(Y[A-Z]S[A-R][0-2][0-9]) (KWEA) (..)(..)(..) + FILE -close /awips2/data_store/grid/(\3:yyyy)(\3:mm)\3/\4/NationalBlend/staging/NationalBlend_Std\3\4\5-concat-%Y%m%d_%H%M.grib2 + +#HREF v3 +NGRID ^(Y[B-Z][CDEM][B-S,Z][0-9][0-9]) (KWBH) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{2})[0-9]{2}F[0-9]{3}/[^/]* + FILE -overwrite -close -edex -log /awips2/data_store/grid/(\3:yyyy)(\3:mm)\3/\4/HREF/\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +NGRID ^(Y[B-Z][CDEM][RS][0-9][0-9]) (KWBH) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/FHRS/([^/]*) + FILE -overwrite -log -close -edex /awips2/data_store/grid/(\3:yyyy)(\3:mm)\3/\4/HREF/FHRS/\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +#HiResW ARW/FV3 (HiResW v8) +ANY ^([YZ].[CDEFM].{1,3}) (KWBS) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /awips2/data_store/grid/(\3:yyyy)(\3:mm)\3/\4/HiResW/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.main b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.main index ac3424b4d9..a10adb3e46 100644 --- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.main +++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.main @@ -17,6 +17,10 @@ # CIRA RGB GOES Satellite products added # 20230321 20.3.2 Update WW3 regex lines so we get the data # 20231004 20.3.2 Add RAWS data +# 20231109 20.3.2 Add HREF/HiResW model +# Update National Blended model entries, including adding standard deviations +# Update RTOFS entry +# Update SPCGuide gridded products to include Fire Weather and Dry Thunderstorm grids # USPLN LIGHTNING USPLN1EX @@ -936,7 +940,7 @@ HDS ^OENA88 KWBM.*ncep/ICE_120/#219/(............)/F(...)/([^/]*)/ # # Real-Time Ocean Forecast System (RTOFS) for CONUS # -NGRID ^E[HSTUV][CK][B-T]01 KWBW ......[^!]*!grib.*/[^/]*/[^/]*/#[^/]*/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) +NGRID ^E[HSTUV][CJK][B-T]01 KWBW ......[^!]*!grib.*/[^/]*/[^/]*/#[^/]*/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) FILE -edex -close /awips2/data_store/grid/RTOFS/RTOFS_\1_\2_\3_\4-(seq)-concat-%Y%m%d_%H%M.grib2 # @@ -1022,5 +1026,19 @@ NGRID ^OUTA98 KWNB (......)[^!]*!grib2 # # National Blend of Models # -NGRID|HDS ^(Y.A...) (KWE[AB]) (..)(..)(..) +NGRID|HDS ^(Y.[A-O]...) (KWE[ABGIHLO]) (..)(..)(..) FILE -close /awips2/data_store/grid/(\3:yyyy)(\3:mm)\3/\4/NationalBlend/staging/NationalBlend_\3\4\5-concat-%Y%m%d_%H%M.grib2 +#Standard Deviations +NGRID|HDS ^(Y[A-Z]S[A-R][0-2][0-9]) (KWEA) (..)(..)(..) + FILE -close /awips2/data_store/grid/(\3:yyyy)(\3:mm)\3/\4/NationalBlend/staging/NationalBlend_Std\3\4\5-concat-%Y%m%d_%H%M.grib2 + +#HREF v3 +NGRID ^(Y[B-Z][CDEM][B-S,Z][0-9][0-9]) (KWBH) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{2})[0-9]{2}F[0-9]{3}/[^/]* + FILE -overwrite -close -edex -log /awips2/data_store/grid/(\3:yyyy)(\3:mm)\3/\4/HREF/\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +NGRID ^(Y[B-Z][CDEM][RS][0-9][0-9]) (KWBH) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/FHRS/([^/]*) + FILE -overwrite -log -close -edex /awips2/data_store/grid/(\3:yyyy)(\3:mm)\3/\4/HREF/FHRS/\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +#HiResW ARW/FV3 (HiResW v8) +ANY ^([YZ].[CDEFM].{1,3}) (KWBS) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /awips2/data_store/grid/(\3:yyyy)(\3:mm)\3/\4/HiResW/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.radar b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.radar index 71edf1cfd2..9ddaf32260 100644 --- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.radar +++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.radar @@ -1,5 +1,5 @@ # # NEXRAD3 site products # -NEXRAD3|HDS ^SDUS[235678]. (....) (..)(..)(..).*/p(...)(...) +NEXRAD3|HDS ^SDUS[2345678]. (....) (..)(..)(..).*/p(...)(...) FILE -overwrite -close -edex /awips2/data_store/radar/(\2:yyyy)(\2:mm)\2//\3/\6/\6_\5_(\2:yyyy)(\2:mm)\2_\3\4