diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml index f7c94d1d60..5e5b239138 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml @@ -30,6 +30,8 @@ indentText="true" /> + + + 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 c65a44dd2f..0422a19046 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 @@ -139,6 +139,7 @@ rtmaNDFD rtmaNDFD aKrtmaNDFD + aKrtmaNDFD HIrtmaNDFD PRrtmaNDFD rtmaNDFD diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml index 04fc251b9b..c252ce8276 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml @@ -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 --> av @@ -23,6 +24,7 @@ dirsw dpd dpt + dpterranl ELEV emsp ept @@ -48,6 +50,7 @@ pmsl pot p + perranl pr prsvr prsigsv @@ -77,19 +80,24 @@ tp6hr tp t + terranl ustm uw vapp vis + viserranl vpt vstm vw wd + wderranl weasd wgh wgs windprob + wgserranl ws + wserranl wvdir wvhgt wvper 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 e5ea48091a..68b28bffa9 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 @@ -239,6 +239,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) @@ -1063,7 +1064,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'), @@ -1860,15 +1862,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), diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rtmaNDFD.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rtmaNDFD.xml index 768a3085f2..8a832a55da 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rtmaNDFD.xml +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rtmaNDFD.xml @@ -232,4 +232,109 @@ FHAG2 + + wgs + Wind Gust Speed + m/s + meter/sec + windGustSpeed + -150.0 + 150.0 + -99999.0 + 1 + FHAG 10 + + FHAG10 + + + + wgserranl + wind speed uncertainty + m/s + meter/sec + WGSerranlind + -150.0 + 150.0 + -99999.0 + 1 + FHAG 10 + + FHAG10 + + + + vis + visibility + m + meters + Vis + 0.0 + 100000.0 + -99999.0 + 1 + SFC + + SFC + + + + viserranl + visibility uncertainty + m + meters + Viserranlind + 0.0 + 100000.0 + -99999.0 + 1 + SFC + + SFC + + + + perranl + pressure uncertainty + Pa + pascal + atmPerranlind + 0.0 + 110000.0 + -99999.0 + 1 + SFC + + SFC + + + + p + pressure + Pa + pascal + atmP + 0.0 + 110000.0 + -99999.0 + 1 + SFC + + SFC + + + + gh + Geopotential height + m + meters + geoPotHt + -2000.0 + 20000.0 + -99999.0 + 1 + SFC + + SFC + + diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py index bb8c4fd59e..d8af2a5201 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py @@ -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 #-------------------------------------------------------------------------- diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/RTMA.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/RTMA.py index f4a261af67..ca55afcf6a 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/RTMA.py +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/RTMA.py @@ -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 ##------------------------------------------------------------------------- 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 4843b954ee..a6f9874bd9 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 @@ -371,6 +371,11 @@ AK-RTMA
1
+ + AK-RTMA3 + AK-RTMA3 +
1
+ NamDNG5 NamDNG5 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 196f505517..a38f81fc1b 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 @@ -3182,7 +3182,7 @@ - AK-RTMA-HR + AK-RTMA3
7
4 1023 diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml index a141e0eb5f..9b14561cc1 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml @@ -588,7 +588,7 @@ DpTerranl - F + °R -4 20 diff --git a/edexOsgi/com.raytheon.uf.common.parameter/utility/common_static/base/parameter/definition/parameters.xml b/edexOsgi/com.raytheon.uf.common.parameter/utility/common_static/base/parameter/definition/parameters.xml old mode 100644 new mode 100755 index d0a278163e..0540f5efb0 --- a/edexOsgi/com.raytheon.uf.common.parameter/utility/common_static/base/parameter/definition/parameters.xml +++ b/edexOsgi/com.raytheon.uf.common.parameter/utility/common_static/base/parameter/definition/parameters.xml @@ -109,6 +109,11 @@ DpT K + + Dew Point Temperature Error Analysis + DpTerranl + K + Direction of Wind Waves WVDIR @@ -234,6 +239,11 @@ P Pa + + Pressure Error Analysis + Perranl + Pa + Pressure Reduced to MSL PMSL @@ -364,6 +374,11 @@ T K + + Temperature Error Analysis + Terranl + K + Total Cloud Cover TCC @@ -464,6 +479,11 @@ Vis m + + Visibility Error Analysis + Viserranl + m + Virtual Potential Temperature VPT @@ -484,6 +504,11 @@ WD deg + + Wind Direction Error Analysis + WDerranl + deg + Wind Mixing Energy WMIXE @@ -494,11 +519,21 @@ WS m/s + + Wind Speed Error Analysis + WSerranl + m/s + Wind Gust Speed WGS m/s + + Wind Gust Speed Error Analysis + WGSerranl + m/s + Montgomery Stream Function MSG 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 3fe72e673e..ad5d21c515 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 @@ -517,6 +517,12 @@ 24 00-00:15:00 + + + AK-RTMA3 + 24 + 00-00:15:00 + SREF212 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 ac30b43bf4..6ebdddc605 100644 --- a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template +++ b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template @@ -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