diff --git a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml index 6dd685674f..37e3162366 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml @@ -52,6 +52,7 @@ + @@ -152,4 +153,4 @@ - \ No newline at end of file + diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml index 216e71da02..5848ff0f50 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml @@ -1,5 +1,6 @@ + mosGuideNDFD ESTOFS ESTOFS glerl diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py index 173f412765..2aa79fb36c 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py @@ -1104,6 +1104,7 @@ elif SID == "HFO": 'WPHwave10', 'NPHwave4', 'GLOBHwave', + ('MOSGuide-HI', 'MOSGuide'), ] # San Juan OCONUS @@ -1424,6 +1425,7 @@ elif SID == "HFO": # "gfsLR" : ["gfsLR"], "RTMA": ['RTMA'], "NamDNG5" : ["NamDNG5"], + "MOSGuide" : ['MOSGuide'], } # San Juan OCONUS diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml index 5e6552f288..ba8dba3a7e 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml @@ -891,6 +891,11 @@ MOSGuide-AK
3
+ + HI-GriddedMOS + MOSGuide-HI +
3
+ GFSLAMP-Grid GFSLAMPTstorm 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 c8cbdec2c1..5db019dee3 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 @@ -58,6 +58,9 @@ TP0.254mm_T170L42A-NCEP-MDL_2145x1377_43200-0 POP12hr // MOSGuide Alaska TP0.254mm_T170L42A-NCEP-MDL_1649x1105_21600-0 POP6hr TP0.254mm_T170L42A-NCEP-MDL_1649x1105_43200-0 POP12hr +// MOSGuide Hawaii +TP0.254mm_T170L42A-NCEP-MDL_625x561_21600-0 POP6hr +TP0.254mm_T170L42A-NCEP-MDL_625x561_43200-0 POP12hr // TPCWindProb wind speed probabilities WS17.491m/s Prob34 WS25.722m/s Prob50 diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid625561001.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid625561001.xml new file mode 100755 index 0000000000..f8ed70c119 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid625561001.xml @@ -0,0 +1,37 @@ + + + + 625561001 + NDGD grid over - Hawaii (Mercator) + 14.3515 + -164.9695 + LowerLeft + 625 + 561 + 2.5 + 2.5 + km + 6371200.0 + 6371200.0 + 20.0 + 26.8605 + -150.0402 + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml index 1162c04358..e3f341d82b 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml @@ -3107,7 +3107,7 @@ MOSGuide
7
14 - 197 + 184 96 @@ -3133,6 +3133,16 @@ + + MOSGuide-HI +
7
+ 14 + 625561001 + + 96 + + + GFSLAMPTstorm
7
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/subgrids/mosGuideClip.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/subgrids/mosGuideClip.xml index 233318eab1..9410f6ceb8 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/subgrids/mosGuideClip.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/subgrids/mosGuideClip.xml @@ -20,11 +20,11 @@ --> MOSGuide - 197 - 350 - 350 + 184 + 700 + 700 - \ No newline at end of file + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml index 6d7ed8af00..cf3245ed02 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml @@ -642,6 +642,12 @@ HI_RTMA 24 + + + MOSGuide-HI + 2 + 00-00:15:00 + HiRes-ARW-East 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 10142de325..b5befca64e 100644 --- a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template +++ b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template @@ -203,18 +203,46 @@ HDS ^(YVW[ABCDGJM][0-9][0-9]) KKCI (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/ # 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 +# DR 17426 'U' removed from second bracket set to remove 5km CONUS MOSGuide data Josh Watson -NGRID ^([LM].[ABCDGHMNORSTUVX].{1,3}) (KWB.) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) +NGRID ^([LM].[ABCDGHMNORSTVX].{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... # OCONUS: Added CEFG -HDS ^([LM].[ABCDEFGHMNRSTU].{1,3}) (KWB.) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) +# DR 17426 'U' removed from second bracket set to remove 5km CONUS MOSGuide data. Josh Watson + +HDS ^([LM].[ABCDEFGHMNRST].{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 +# DR 17426 New pattern for HPCGuide added because an edit was made to pqact to remove 5km CONUS MOSGuide data and +# that edit also removed the HPCGuide data. Josh Watson + +NGRID ^([LM][ABCDFGH]U...) (KWBN) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) + FLE -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 + +# DR 17426 +# 2.5km CONUS GMOS +# Pattern added by Josh Watson +# The noaaportIngester does not yet read a grib2 SBN file with more than one message. + +NGRID ^(Y.UZ9[0-9]) (KWB.) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/grib2/(\3:yyyy)(\3:mm)\3/\4/GMOS/GRID184/\1_\2_\3\4\5_(seq).grib2.%Y%m%d%H + +# DR 17426 +# 2.5km Hawaii GMOS +# Pattern added by Josh Watson +# The noaaportIngester does not yet read a grib2 SBN file with more than one message. +# Commented out by default since the domain is limited to Hawaii. Sites wishing to +# ingest these data will need to +# 1. add the two lines below to dx1:/usr/local/ldm/etc/pqact.conf.xyz +# 2. On dx1 as root, run /data/fxa/sdc/config_awips2.sh ldm XYZ +#NGRID ^(L[B-HRUW]S.[0-9][0-9]) (KWBQ) (..)(..)(..) +# FILE -overwrite -log -close -edex /data_store/grib2/(\3:yyyy)(\3:mm)\3/\4/GMOS/GRID255/\1_\2_\3\4\5_(seq).grib2.%Y%m%d%H + +# AWIPS1: GRID ^[LM].[MN].98.*KWNH /Grid/SBN/rawGrib2 # LEMG98 KWNH 020600 !grib2/ncep/NCEP_QPF/#001/201102020600F036/P06M/0 - NONE NGRID ^([LM].[MN].98) (KWNH) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)