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

VLab Issue #13176 - DCS18161 NBM version 2; fixes #13176

Browse source 
Change-Id: I80f9a22475e6847e41747a70de38535cb05ccff8

Former-commit-id: 15aecaf4625b83950d19d222062f0d63c249529d
This commit is contained in:
Wen Kwock 2016-02-23 16:20:06 +00:00
parent af411b7b07
commit 86c6fe8830
3 changed files with 62 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -74,6 +74,7 @@
# 10/13/2015 #4961 randerso Updated NewTerrain/BaseTerrain database definitions
# 10/30/2015 #17940 jendrowski Responded to Code Review. Mostly syntactical changes.
# 1/28/2016 #13910 amoore Wave model data should be available in 3-hrly timesteps
# 02/22/2016 #18161 wkwock Add NationalBlend model for AK, PR, HW
####################################################################################################
#----------------------------------------------------------------------------
@ -2162,6 +2163,7 @@ if SID in groups['ALASKA_SITES']:
'PGBlended',
'PGBlended-Night',
('NCOM-ALASKA', 'NCOM'),
('NationalBlend-AK','NationalBlend'),
]
# Hawaii OCONUS
@ -2192,6 +2194,7 @@ elif SID == "HFO":
'PGBlended',
'PGBlended-Night',
('NCOM-HAWAII', 'NCOM'),
('NationalBlend-HI','NationalBlend'),
]
# San Juan OCONUS
@ -2226,6 +2229,7 @@ elif SID == "SJU":
'PGBlended',
'PGBlended-Night',
('NCOM-AMSEAS', 'NCOMAMSEAS'),
('NationalBlend-PR','NationalBlend'),
]
# Guam OCONUS
@ -3087,11 +3091,11 @@ DATABASES = [
# Intersite coordination database parameter groupings, based on
# OFFICIALDBS, but time constraint is always TC1
ISCPARMS = []
if type(officeType) != str:
raise TypeError, "Office type not a str: " + `officeType`
else:
if officeType not in VALID_OFFICE_TYPES:
raise ValueError, "Office type: " + str(officeType) + " does not match any of the following: [" + (', '.join(VALID_OFFICE_TYPES)) + "]"
if type(officeType) != str:
raise TypeError, "Office type not a str: " + `officeType`
else:
if officeType not in VALID_OFFICE_TYPES:
raise ValueError, "Office type: " + str(officeType) + " does not match any of the following: [" + (', '.join(VALID_OFFICE_TYPES)) + "]"
#

19
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridNBM_PR.xml Normal file
View file

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<mercatorGridCoverage>
<name>NBM_PR</name>
<description> National Blend Grid over Puerto Rico - (1.25 km)</description>
<la1>16.9775</la1>
<lo1>-68.0278</lo1>
<firstGridPointCorner>LowerLeft</firstGridPointCorner>
<nx>339</nx>
<ny>225</ny>
<dx>1.25</dx>
<dy>1.25</dy>
<la2>19.3750032477232</la2>
<lo2>-63.984399999999994</lo2>
<latin>20</latin>
<spacingUnit>km</spacingUnit>
<minorAxis>6371200</minorAxis>
<majorAxis>6371200</majorAxis>
</mercatorGridCoverage>

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

@ -29,4 +29,37 @@
<id>104</id>
</process>
</model>
</gribModelSet>
<!--Alaska-->
<model>
<name>NationalBlend-AK</name>
<center>7</center>
<subcenter>14</subcenter>
<grid>1023</grid>
<process>
<id>104</id>
</process>
</model>
<!--Hawaii-->
<model>
<name>NationalBlend-HI</name>
<center>7</center>
<subcenter>14</subcenter>
<grid>625561001</grid>
<process>
<id>104</id>
</process>
</model>
<!--Puerto Rico-->
<model>
<name>NationalBlend-PR</name>
<center>7</center>
<subcenter>14</subcenter>
<grid>NBM_PR</grid>
<process>
<id>104</id>
</process>
</model>
</gribModelSet>