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

VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129

Browse source 
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840

Former-commit-id: cfce2a5f633a7312b9ad64dafb559c834b0ceddf
This commit is contained in:
Joshua Watson 2014-12-11 11:38:46 -05:00
parent 0a4f817d28
commit a8f5bb480b
10 changed files with 102 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
View file

@ -52,6 +52,7 @@
<vbSource key="Guam-RTMA" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="GWW233" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="HurWind250" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="HI-MOSGuide" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="HI-NamDNG5" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="HI-RTMA" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="HPCqpfNDFD" category="SfcGrid" views="PLANVIEW TIMESERIES" />
@ -152,4 +153,4 @@
<vbSource key="WNAwave10" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="WNAwave4" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="WPHwave10" category="SfcGrid" views="PLANVIEW TIMESERIES" />
</vbSourceList>
</vbSourceList>

1
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<aliasList caseSensitive="true" namespace="gfeParamInfo">
<alias base="MOSGuide-HI">mosGuideNDFD</alias>
<alias base="estofsUS">ESTOFS</alias>
<alias base="estofsPR">ESTOFS</alias>
<alias base="GLERL">glerl</alias>

2
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
View file

@ -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

5
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml
View file

@ -891,6 +891,11 @@
<datasetId>MOSGuide-AK</datasetId>
<dt>3</dt>
</info>
<info>
<title>HI-GriddedMOS</title>
<datasetId>MOSGuide-HI</datasetId>
<dt>3</dt>
</info>
<info>
<title>GFSLAMP-Grid</title>
<datasetId>GFSLAMPTstorm</datasetId>

3
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
View file

@ -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

37
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid625561001.xml Executable file
View file

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<mercatorGridCoverage>
<name>625561001</name>
<description>NDGD grid over - Hawaii (Mercator)</description>
<la1>14.3515</la1>
<lo1>-164.9695</lo1>
<firstGridPointCorner>LowerLeft</firstGridPointCorner>
<nx>625</nx>
<ny>561</ny>
<dx>2.5</dx>
<dy>2.5</dy>
<spacingUnit>km</spacingUnit>
<minorAxis>6371200.0</minorAxis>
<majorAxis>6371200.0</majorAxis>
<latin>20.0</latin>
<la2>26.8605</la2>
<lo2>-150.0402</lo2>
</mercatorGridCoverage>

12
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
View file

@ -3107,7 +3107,7 @@
<name>MOSGuide</name>
<center>7</center>
<subcenter>14</subcenter>
<grid>197</grid>
<grid>184</grid>
<process>
<id>96</id>
</process>
@ -3133,6 +3133,16 @@
</process>
</model>
<model>
<name>MOSGuide-HI</name>
<center>7</center>
<subcenter>14</subcenter>
<grid>625561001</grid>
<process>
<id>96</id>
</process>
</model>
<model>
<name>GFSLAMPTstorm</name>
<center>7</center>

8
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/subgrids/mosGuideClip.xml
View file

@ -20,11 +20,11 @@
-->
<subGridDef>
<modelNames>MOSGuide</modelNames>
<referenceGrid>197</referenceGrid>
<nx>350</nx>
<ny>350</ny>
<referenceGrid>184</referenceGrid>
<nx>700</nx>
<ny>700</ny>
<!--
<centerLatitude>46.0</centerLatitude>
<centerLongitude>-95.5</centerLongitude>
-->
</subGridDef>
</subGridDef>

6
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
View file

@ -642,6 +642,12 @@
<keyValue>HI_RTMA</keyValue>
<versionsToKeep>24</versionsToKeep>
</rule>
<!-- Purge rule for the Hawaii 2.5km MOSGuide model -->
<rule>
<keyValue>MOSGuide-HI</keyValue>
<versionsToKeep>2</versionsToKeep>
<modTimeToWait>00-00:15:00</modTimeToWait>
</rule>
<!-- Purge rule for the HiResW-ARW-East (HiResW-ARW-East) model -->
<rule>
<keyValue>HiRes-ARW-East</keyValue>

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

@ -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})/([^/]*)