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 f3e2c619a2..f9734eb489 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 @@ -97,9 +97,8 @@ gfs161 gfs161 ruc130 - rtmaNDFD + rtmaNDFD urmaNDFD - rtmaNDFD aKrtmaNDFD NamDNG5 GlobalWave @@ -143,8 +142,6 @@ sref243 RTGSST235 gfsGuide232 - rtmaNDFD - rtmaNDFD aKrtmaNDFD aKrtmaNDFD HIrtmaNDFD 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 37660c460b..d1329c5e28 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 @@ -333,6 +333,7 @@ tp6c6 tp6c7 tp6c8 + tccerranl tpmean6 tpsprd6 tpecmwf 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 500cbcbe19..0c0c79238b 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 @@ -65,7 +65,7 @@ # being off # being off # 04/20/2015 #4414 dgilling Add missing NWPSTrkngCG0 weather elements. -# +# 05/12/2015 #17144 bhunder Added RTMA model ######################################################################## #---------------------------------------------------------------------------- @@ -316,6 +316,8 @@ VisUnc = ("VisUnc", SCALAR, "SM", "Vsby Anl Uncertainty", 10.0, 0.0, 2, NO) PressUnc = ("PressUnc", SCALAR, "Pa", "Press Anl Uncertainty", 110000.0, 0.0, 2, NO) Pressure = ("Pressure", SCALAR, "Pa", "Pressure", 110000.0, 0.0, 2, NO) WGustUnc = ("WGustUnc", SCALAR, "kts", "WGust Anl Uncertainty", 12.0, 0.0, 0, NO) +# DR 17144 +SkyUnc = ("SkyUnc", SCALAR, "%", "Sky Uncertainty", 100.0, 0.0, 0, NO) # NamDNG5 parms QPF3 = ("QPF3", SCALAR, "in", "3HR QPF", 3.0, 0.0, 2, YES) @@ -1307,7 +1309,8 @@ elif SID in CONUS_EAST_SITES: ('nwpsCG1', 'nwpsCG1'), ('nwpsTrkngCG0', 'nwpsTrkngCG0'), 'MOSGuide', - 'RTMA', + ##############DR17144 + ('RTMA25', 'RTMA'), 'NamDNG5', ('TPCWindProb','TPCProb'), ('SREF212', 'SREF'), @@ -1384,7 +1387,8 @@ else: #######DCS3501 WEST_CONUS ('nwpsCG1', 'nwpsCG1'), ('nwpsTrkngCG0', 'nwpsTrkngCG0'), 'MOSGuide', - 'RTMA', + #######DR17144 + ('RTMA25', 'RTMA'), 'NamDNG5', ('TPCWindProb','TPCProb'), ('SREF212', 'SREF'), @@ -2065,17 +2069,17 @@ TPCTCM_MODEL = [([HiWind], TC3)] # RTMA database parameter groupings #if SID in ALASKA_SITES: - not sure if this is right -# DCS17288 +# DCS17288/DR17144 if SID in ALASKA_SITES or SID in ["HFO", "SJU"]: RTMAPARMS = [([Temp,Td,RH,Wind,Vis,Pressure,WindGust],TC1), ([MinT],MinTTC), ([MaxT],MaxTTC), ([MinRH],MinRHTC), ([MaxRH],MaxRHTC), - ([TUnc,TdUnc,WSpdUnc,WDirUnc,VisUnc,PressUnc,WGustUnc],TC1)] + ([TUnc,TdUnc,WSpdUnc,WDirUnc,VisUnc,PressUnc,WGustUnc,SkyUnc],TC1)] else: RTMAPARMS = [([Temp,Td,RH,Wind,QPE,Sky,Vis,Pressure,WindGust],TC1), ([MinT],MinTTC), ([MaxT],MaxTTC), ([MinRH],MinRHTC), ([MaxRH],MaxRHTC), - ([TUnc,TdUnc,WSpdUnc,WDirUnc,VisUnc,PressUnc,WGustUnc],TC1)] + ([TUnc,TdUnc,WSpdUnc,WDirUnc,VisUnc,PressUnc,WGustUnc,SkyUnc],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 8a832a55da..6aec41fd6a 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 @@ -100,6 +100,21 @@ EA + + tccerranl + Total Cloud Cover error analysis + % + percent + ErrorAnalysisCloud + 0.0 + 100.0 + -99999.0 + 0 + EA + + EA + + tp total precipitation 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 f709309b83..0de064b338 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 @@ -52,6 +52,12 @@ class RTMAForecaster(Forecaster): grid = tcc_EA return clip(grid, 0, 100) ##-------------------------------------------------------------------------- +## Sky Analysis Uncertainty +##-------------------------------------------------------------------------- + def calcSkyUnc(self, tccerranl_EA): + grid = tccerranl_EA + return clip(grid, 0, 100) +##-------------------------------------------------------------------------- ## T - change K to F ##-------------------------------------------------------------------------- def calcT(self, t_FHAG2):