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

Merge branch 'ops_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1

Browse source 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 5879ba157369936274e88800e4f178e67567de95
This commit is contained in:
Fay.Liang 2015-03-19 12:45:22 -04:00
commit 009fd8a059
4 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
View file

@ -8,6 +8,7 @@
Mar 31, 2014 #2934 dgilling Updated params for pSurge2.0/PHISH data.
Jul 03, 2014 DR 14068 mfoster Added parameters for 3km AK-RTMA
Dec 15, 2014 DR 14024 jwatson Added parameters for 2.5km GFSLAMPGrid
Feb 24, 2015 DR 16671 byin Added HPBL for RUC13
-->
<aliasList caseSensitive="true" namespace="gfeParamName">
<alias base="AV">av</alias>
@ -36,6 +37,7 @@
<alias base="HAILPROB">hailprob</alias>
<alias base="Heli">heli</alias>
<alias base="HIdx">hidx</alias>
<alias base="HPBL">hpbl</alias>
<alias base="HTSGW">htsgw</alias>
<alias base="KI">ki</alias>
<alias base="LgSP3hr">lgsp3hr</alias>

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

@ -51,6 +51,8 @@
# Added Topo to ISCPARMS
# 01/19/2015 #4014 dgilling Added ETSS.
# 02/11/2015 #4053 rferrel Added GLWN and moved GLERL to display only for Great Lakes sites..
# 01/19/2015 #4014 dgilling Added ETSS.
# 02/24/2015 #16692 byin Added RTMA. Removed gfsLR and GWW233
########################################################################
#----------------------------------------------------------------------------
@ -1231,14 +1233,13 @@ elif SID == "SJU":
# Guam OCONUS
elif SID == "GUM":
D2DMODELS = [('MRF204', 'gfsLR'),
('AVN225', 'GFS75'),
'GWW233',
D2DMODELS = [('AVN225', 'GFS75'),
'GlobalWave',
('TPCWindProb', 'TPCProb'),
'RTOFS-Guam',
'WPHwave10',
'GLOBHwave',
('Guam-RTMA','RTMA'),
('nwpsCG1', 'nwpsCG1'),
('nwpsTrkngCG0', 'nwpsTrkngCG0'),
('GFS20-PAC', 'GFS20'),

16
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ruc130.xml
View file

@ -2,6 +2,7 @@
<!--
Mar 20, 2013 #1774 randerso Added forecast hours out to 18
Jun 19, 2013 #2044 randerso Updated to match model
Feb 24 20153 DCS14537 byin Added HPBL for RUC13
-->
<gridParamInfo xmlns:ns2="group">
<valtimeMINUSreftime>
@ -729,4 +730,19 @@
<level>FHAG06000</level>
</levels>
</gridParameterInfo>
<gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
<short_name>hpbl</short_name>
<long_name>Height of Planetary Boundary Layer</long_name>
<units>m</units>
<udunits>meter</udunits>
<uiname>HPBL</uiname>
<valid_range>0.0</valid_range>
<valid_range>4000.0</valid_range>
<fillValue>-99999.0</fillValue>
<n3D>0</n3D>
<levelsDesc>SFC</levelsDesc>
<levels>
<level>SFC</level>
</levels>
</gridParameterInfo>
</gridParamInfo>

7
edexOsgi/com.raytheon.uf.common.parameter/utility/common_static/base/parameter/definition/parameters.xml
View file

@ -154,6 +154,11 @@
<abbreviation>HCDC</abbreviation>
<unit>%</unit>
</parameter>
<parameter>
<name>Height of Planetary Boundary Layer</name>
<abbreviation>HPBL</abbreviation>
<unit>m</unit>
</parameter>
<parameter>
<name>Humidity Mixing Ratio</name>
<abbreviation>MIXR</abbreviation>
@ -579,4 +584,4 @@
<abbreviation>DIRC</abbreviation>
<unit>degree</unit>
</parameter>
</parameterList>
</parameterList>