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

VLab Issue #4154 - DR_14068, DCS_53 Add 3 RTMA parms, add AK RTMA 3km; closes #4154

Browse source 
Change-Id: If6af5c54b31911a954295ce4ae60c9d9449d4b55

Former-commit-id: 53b72f2fd8 [formerly 9670521c07] [formerly c10b50d0b2] [formerly 53b72f2fd8 [formerly 9670521c07] [formerly c10b50d0b2] [formerly 088ebd2ca2 [formerly c10b50d0b2 [formerly 9c3460d34513dd2f54643b87cb8afd122d94ea9c]]]]
Former-commit-id: 088ebd2ca2
Former-commit-id: aaaaeedef9 [formerly 5a764dff66] [formerly ad7e3ffa1b2fc1c7437851259989b79129848438 [formerly 752bc11851]]
Former-commit-id: ef2e493f9412fcf09cbbc3350571fb84dcf7d786 [formerly 0eb194e2bb]
Former-commit-id: 462749040d
This commit is contained in:
Ana Rivera 2014-07-21 21:40:11 +00:00
parent 1bbbdc9c62
commit 1323571625
14 changed files with 202 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
View file

@ -30,6 +30,8 @@
indentText="true" />
<contribute xsi:type="menuItem" menuText="Pressure" key="P"
indentText="true" />
<contribute xsi:type="menuItem" menuText="Pres Anl Uncertainty"
key="Perranl" indentText="true" />
<contribute xsi:type="menuItem" menuText="MSL Press" key="msl-P"
indentText="true" />
<contribute xsi:type="menuItem" menuText="MSL Press (2)"
@ -316,6 +318,8 @@
indentText="false" />
<contribute xsi:type="menuItem" menuText="Visibility" key="Vis"
indentText="false" />
<contribute xsi:type="menuItem" menuText="Vsby Anl Uncertainty"
key="Viserranl" indentText="false" />
<contribute xsi:type="menuItem" menuText="Altimeter" key="MSLSA"
indentText="false" />
<contribute xsi:type="menuItem" menuText="Fire Danger"

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

@ -58,6 +58,7 @@
<vbSource key="AK-NamDNG5" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="AK-NICICE" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="AK-RTMA" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="AK-RTMA3" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="AKWAVE239" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="AKwave10" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="AKwave4" category="SfcGrid" views="PLANVIEW TIMESERIES" />

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

@ -139,6 +139,7 @@
<alias base="RTMA">rtmaNDFD</alias>
<alias base="RTMA-Mosaic">rtmaNDFD</alias>
<alias base="AK-RTMA">aKrtmaNDFD</alias>
<alias base="AK-RTMA3">aKrtmaNDFD</alias>
<alias base="HI-RTMA">HIrtmaNDFD</alias>
<alias base="PR-RTMA">PRrtmaNDFD</alias>
<alias base="Guam-RTMA">rtmaNDFD</alias>

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

@ -6,6 +6,7 @@
Changed TP_XXX to tpXXX for RFC total precip
Jul 03, 2013 #2044 randerso Removed mappings from tpXXX to tp_XXX for RFCQPF
Mar 31, 2014 #2934 dgilling Updated params for pSurge2.0/PHISH data.
Jul 03, 2014 DR 14068 mfoster Added parameters for 3km AK-RTMA
-->
<aliasList caseSensitive="true" namespace="gfeParamName">
<alias base="AV">av</alias>
@ -23,6 +24,7 @@
<alias base="DIRSW">dirsw</alias>
<alias base="DpD">dpd</alias>
<alias base="DpT">dpt</alias>
<alias base="DpTerranl">dpterranl</alias>
<alias base="ELEV">ELEV</alias>
<alias base="EMSP">emsp</alias>
<alias base="EPT">ept</alias>
@ -48,6 +50,7 @@
<alias base="PMSL">pmsl</alias>
<alias base="PoT">pot</alias>
<alias base="P">p</alias>
<alias base="Perranl">perranl</alias>
<alias base="PR">pr</alias>
<alias base="PRSVR">prsvr</alias>
<alias base="PRSIGSV">prsigsv</alias>
@ -77,19 +80,24 @@
<alias base="TP6hr">tp6hr</alias>
<alias base="TP">tp</alias>
<alias base="T">t</alias>
<alias base="Terranl">terranl</alias>
<alias base="USTM">ustm</alias>
<alias base="uW">uw</alias>
<alias base="VAPP">vapp</alias>
<alias base="Vis">vis</alias>
<alias base="Viserranl">viserranl</alias>
<alias base="VPT">vpt</alias>
<alias base="VSTM">vstm</alias>
<alias base="vW">vw</alias>
<alias base="WD">wd</alias>
<alias base="WDerranl">wderranl</alias>
<alias base="WEASD">weasd</alias>
<alias base="WGH">wgh</alias>
<alias base="WGS">wgs</alias>
<alias base="WINDPROB">windprob</alias>
<alias base="WGSerranl">wgserranl</alias>
<alias base="WS">ws</alias>
<alias base="WSerranl">wserranl</alias>
<alias base="WVDIR">wvdir</alias>
<alias base="WVHGT">wvhgt</alias>
<alias base="WVPER">wvper</alias>

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

@ -238,6 +238,7 @@ else:
TdUnc = ("TdUnc", SCALAR, "F", "Dewpoint Anl Uncertainty", 15.0, 0.0, 0, NO)
WSpdUnc = ("WSpdUnc", SCALAR, "kts", "WSpd Anl Uncertainty", 12.0, 0.0, 0, NO)
WDirUnc = ("WDirUnc", SCALAR, "deg", "WDir Anl Uncertainty", 10.0, 0.0, 0, NO)
VisUnc = ("VisUnc", SCALAR, "SM", "Vsby Anl Uncertainty", 10.0, 0.0, 2, NO)
# NamDNG5 parms
QPF3 = ("QPF3", SCALAR, "in", "3HR QPF", 3.0, 0.0, 2, YES)
@ -1062,7 +1063,8 @@ if SID in ALASKA_SITES:
'AKwave10',
'AKwave4',
'GlobalWave',
('AK-RTMA','RTMA'),
# ('AK-RTMA','RTMA'),
('AK-RTMA3','RTMA'), # Only have one RTMA
('AK-NamDNG5','NamDNG5'),
('MOSGuide-AK', 'MOSGuide'),
('HiResW-ARW-AK', 'HIRESWarw'),
@ -1859,15 +1861,15 @@ TPCTCM_MODEL = [([HiWind], TC3)]
# RTMA database parameter groupings
#if SID in ALASKA_SITES: - not sure if this is right
if SID in ALASKA_SITES or SID in ["HFO", "SJU"]:
RTMAPARMS = [([Temp,Td,RH,Wind],TC1),
RTMAPARMS = [([Temp,Td,RH,Wind,Vis],TC1),
([MinT],MinTTC), ([MaxT],MaxTTC),
([MinRH],MinRHTC), ([MaxRH],MaxRHTC),
([TUnc,TdUnc,WSpdUnc,WDirUnc],TC1)]
([TUnc,TdUnc,WSpdUnc,WDirUnc,VisUnc],TC1)]
else:
RTMAPARMS = [([Temp,Td,RH,Wind,QPE,Sky],TC1),
RTMAPARMS = [([Temp,Td,RH,Wind,QPE,Sky,Vis],TC1),
([MinT],MinTTC), ([MaxT],MaxTTC),
([MinRH],MinRHTC), ([MaxRH],MaxRHTC),
([TUnc,TdUnc,WSpdUnc,WDirUnc],TC1)]
([TUnc,TdUnc,WSpdUnc,WDirUnc,VisUnc],TC1)]
# NamDNG5 database parameter groupings
NamDNG5PARMS = [([Temp, Td, RH, Wind, Sky, WindGust, Vis], TC3),

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

@ -232,4 +232,109 @@
<level>FHAG2</level>
</levels>
</gridParameterInfo>
<gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
<short_name>wgs</short_name>
<long_name>Wind Gust Speed</long_name>
<units>m/s</units>
<udunits>meter/sec</udunits>
<uiname>windGustSpeed</uiname>
<valid_range>-150.0</valid_range>
<valid_range>150.0</valid_range>
<fillValue>-99999.0</fillValue>
<n3D>1</n3D>
<levelsDesc>FHAG 10</levelsDesc>
<levels>
<level>FHAG10</level>
</levels>
</gridParameterInfo>
<gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
<short_name>wgserranl</short_name>
<long_name>wind speed uncertainty</long_name>
<units>m/s</units>
<udunits>meter/sec</udunits>
<uiname>WGSerranlind</uiname>
<valid_range>-150.0</valid_range>
<valid_range>150.0</valid_range>
<fillValue>-99999.0</fillValue>
<n3D>1</n3D>
<levelsDesc>FHAG 10</levelsDesc>
<levels>
<level>FHAG10</level>
</levels>
</gridParameterInfo>
<gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
<short_name>vis</short_name>
<long_name>visibility</long_name>
<units>m</units>
<udunits>meters</udunits>
<uiname>Vis</uiname>
<valid_range>0.0</valid_range>
<valid_range>100000.0</valid_range>
<fillValue>-99999.0</fillValue>
<n3D>1</n3D>
<levelsDesc>SFC</levelsDesc>
<levels>
<level>SFC</level>
</levels>
</gridParameterInfo>
<gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
<short_name>viserranl</short_name>
<long_name>visibility uncertainty</long_name>
<units>m</units>
<udunits>meters</udunits>
<uiname>Viserranlind</uiname>
<valid_range>0.0</valid_range>
<valid_range>100000.0</valid_range>
<fillValue>-99999.0</fillValue>
<n3D>1</n3D>
<levelsDesc>SFC</levelsDesc>
<levels>
<level>SFC</level>
</levels>
</gridParameterInfo>
<gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
<short_name>perranl</short_name>
<long_name>pressure uncertainty</long_name>
<units>Pa</units>
<udunits>pascal</udunits>
<uiname>atmPerranlind</uiname>
<valid_range>0.0</valid_range>
<valid_range>110000.0</valid_range>
<fillValue>-99999.0</fillValue>
<n3D>1</n3D>
<levelsDesc>SFC</levelsDesc>
<levels>
<level>SFC</level>
</levels>
</gridParameterInfo>
<gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
<short_name>p</short_name>
<long_name>pressure</long_name>
<units>Pa</units>
<udunits>pascal</udunits>
<uiname>atmP</uiname>
<valid_range>0.0</valid_range>
<valid_range>110000.0</valid_range>
<fillValue>-99999.0</fillValue>
<n3D>1</n3D>
<levelsDesc>SFC</levelsDesc>
<levels>
<level>SFC</level>
</levels>
</gridParameterInfo>
<gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
<short_name>gh</short_name>
<long_name>Geopotential height</long_name>
<units>m</units>
<udunits>meters</udunits>
<uiname>geoPotHt</uiname>
<valid_range>-2000.0</valid_range>
<valid_range>20000.0</valid_range>
<fillValue>-99999.0</fillValue>
<n3D>1</n3D>
<levelsDesc>SFC</levelsDesc>
<levels>
<level>SFC</level>
</levels>
</gridParameterInfo>
</gridParamInfo>

6
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py
View file

@ -402,7 +402,11 @@ class Forecaster(GridUtilities):
#--------------------------------------------------------------------------
def convertKtoF(self, t):
return self.KtoF(t)
#--------------------------------------------------------------------------
# Converts the value from meters to statute miles
#--------------------------------------------------------------------------
def convertMtoSM(self, d):
return d * 0.00062
#--------------------------------------------------------------------------
# Calculates the saturation vapor pressure give the temperature in K
#--------------------------------------------------------------------------

27
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/RTMA.py
View file

@ -1,19 +1,19 @@
##
# 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
# 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
#
# 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.
##
@ -114,6 +114,15 @@ class RTMAForecaster(Forecaster):
def calcWDirUnc(self, wderranl_FHAG10):
return wderranl_FHAG10
##--------------------------------------------------------------------------
## Visibility
##--------------------------------------------------------------------------
def calcVis(self, vis_SFC):
return self.convertMtoSM(vis_SFC)
def calcVisUnc(self, viserranl_SFC):
return self.convertMtoSM(viserranl_SFC)
##-------------------------------------------------------------------------
## TdAft and TdMrn - simply calculate from MaxT/MinRH and MinT/MaxRH
##-------------------------------------------------------------------------

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

@ -366,6 +366,11 @@
<datasetId>AK-RTMA</datasetId>
<dt>1</dt>
</info>
<info>
<title>AK-RTMA3</title>
<datasetId>AK-RTMA3</datasetId>
<dt>1</dt>
</info>
<info>
<title>NamDNG5</title>
<datasetId>NamDNG5</datasetId>

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

@ -3183,7 +3183,7 @@
</model>
<model>
<name>AK-RTMA-HR</name>
<name>AK-RTMA3</name>
<center>7</center>
<subcenter>4</subcenter>
<grid>1023</grid>

2
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
View file

@ -588,7 +588,7 @@
<parameter>DpTerranl</parameter>
</paramLevelMatches>
<imageStyle>
<displayUnits>F</displayUnits>
<displayUnits label="F">°R</displayUnits>
<range scale="LINEAR">
<minValue>-4</minValue>
<maxValue>20</maxValue>

35
edexOsgi/com.raytheon.uf.common.parameter/utility/common_static/base/parameter/definition/parameters.xml Normal file → Executable file
View file

@ -109,6 +109,11 @@
<abbreviation>DpT</abbreviation>
<unit>K</unit>
</parameter>
<parameter>
<name>Dew Point Temperature Error Analysis</name>
<abbreviation>DpTerranl</abbreviation>
<unit>K</unit>
</parameter>
<parameter>
<name>Direction of Wind Waves</name>
<abbreviation>WVDIR</abbreviation>
@ -234,6 +239,11 @@
<abbreviation>P</abbreviation>
<unit>Pa</unit>
</parameter>
<parameter>
<name>Pressure Error Analysis</name>
<abbreviation>Perranl</abbreviation>
<unit>Pa</unit>
</parameter>
<parameter>
<name>Pressure Reduced to MSL</name>
<abbreviation>PMSL</abbreviation>
@ -364,6 +374,11 @@
<abbreviation>T</abbreviation>
<unit>K</unit>
</parameter>
<parameter>
<name>Temperature Error Analysis</name>
<abbreviation>Terranl</abbreviation>
<unit>K</unit>
</parameter>
<parameter>
<name>Total Cloud Cover</name>
<abbreviation>TCC</abbreviation>
@ -464,6 +479,11 @@
<abbreviation>Vis</abbreviation>
<unit>m</unit>
</parameter>
<parameter>
<name>Visibility Error Analysis</name>
<abbreviation>Viserranl</abbreviation>
<unit>m</unit>
</parameter>
<parameter>
<name>Virtual Potential Temperature</name>
<abbreviation>VPT</abbreviation>
@ -484,6 +504,11 @@
<abbreviation>WD</abbreviation>
<unit>deg</unit>
</parameter>
<parameter>
<name>Wind Direction Error Analysis</name>
<abbreviation>WDerranl</abbreviation>
<unit>deg</unit>
</parameter>
<parameter>
<name>Wind Mixing Energy</name>
<abbreviation>WMIXE</abbreviation>
@ -494,11 +519,21 @@
<abbreviation>WS</abbreviation>
<unit>m/s</unit>
</parameter>
<parameter>
<name>Wind Speed Error Analysis</name>
<abbreviation>WSerranl</abbreviation>
<unit>m/s</unit>
</parameter>
<parameter>
<name>Wind Gust Speed</name>
<abbreviation>WGS</abbreviation>
<unit>m/s</unit>
</parameter>
<parameter>
<name>Wind Gust Speed Error Analysis</name>
<abbreviation>WGSerranl</abbreviation>
<unit>m/s</unit>
</parameter>
<parameter>
<name>Montgomery Stream Function</name>
<abbreviation>MSG</abbreviation>

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

@ -517,6 +517,12 @@
<versionsToKeep>24</versionsToKeep>
<modTimeToWait>00-00:15:00</modTimeToWait>
</rule>
<!-- Purge rule for AK-RTMA-3KM analysis -->
<rule>
<keyValue>AK-RTMA3</keyValue>
<versionsToKeep>24</versionsToKeep>
<modTimeToWait>00-00:15:00</modTimeToWait>
</rule>
<!-- Purge rule for the SREF (SREF212) model -->
<rule>
<keyValue>SREF212</keyValue>

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

@ -356,7 +356,11 @@ HRS ^(YA)([WX])(A..) (KKCI) (..)(..)(..).*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/(
HRS ^(ZV)(W)([ADGJM]..) (KKCI) (..)(..)(..).*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})
FILE -overwrite -log -close -edex /data_store/\8/(\5:yyyy)(\5:mm)\5/\6/\9/GRID\(10)/\(12)Z_\(13)-\1\2\3_\4_\5\6\7_(seq).\8.%Y%m%d%H
#
# Addition for 3KM Alaska RTMA
#
NGRID ^(L[HKNPRTUV]KA98) (KWBR) (..)(..)(..)[^!]*!(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: POINT .*IUPT(0[1-4]).*|.*IUPT40.* /ispan/bufr/profiler
# IUPT01 KBOU 020300