diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/GFSLAMPGridded.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/GFSLAMPGridded.xml index 730632dce7..a28ae1b6b3 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/GFSLAMPGridded.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/GFSLAMPGridded.xml @@ -21,7 +21,7 @@ - contribute xsi:type="menuItem" menuText="Temp Anl Uncertainty" + 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 774d429d85..2debb5cca5 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 @@ -391,7 +391,7 @@ AstroTide = ("AstroTide", SCALAR, "ft", "Astro Tide", 20.0, -8.0, 1, NO) StormSurge = ("StormSurge", SCALAR, "ft", "Storm Surge", 30.0, -5.0, 1, NO) # Parm for Aviation/GFSLAMPGrid -ClgHgt=("ClgHgt",SCALAR,"ft","Ceiling Height",25000.0,-100.0,0,NO) +CigHgt=("CigHgt",SCALAR,"ft","Ceiling Height",25000.0,-100.0,0,NO) #--------------------------------------------------------------------------- # @@ -2055,7 +2055,7 @@ ENPwave_parms = [([WindWaveHeight, WaveHeight, SurfHeight, Wind], TC6), ([Swell, Swell2, Period, Period2], TC6)] # GFSLAMPGrid -GFSLAMPGridPARMS=[([Temp, Td, Vis, ClgHgt],TC1)] +GFSLAMPGridPARMS=[([Temp, Td, Vis, CigHgt],TC1)] #--------------------------------------------------------------------------- # Databases for a site. diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/GFSLAMPGrid.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/GFSLAMPGrid.py index f5a1128746..2472317bc1 100755 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/GFSLAMPGrid.py +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/GFSLAMPGrid.py @@ -8,17 +8,17 @@ ################################################################################ # Import existing model database initialization parameters from Init import * -class GFSLAMPForecaster(Forecaster): +class GFSLAMPGridForecaster(Forecaster): def __init__(self): - Forecaster.__init__(self, "GFSLAMP","GFSLAMP") + Forecaster.__init__(self, "GFSLAMPGrid","GFSLAMPGrid") - def calcClgHgt(self, cc_CLG): - ceil = cc_CLG * 3.280839 + def calcCigHgt(self, cc_CLG): + ceil = cc_CLG / 0.3048 ceil = where(less(cc_CLG, 0), -99., ceil) return ceil def calcVis(self, vis_SFC): - return (vis_SFC * 3.2808) / 5279.85564 + return (vis_SFC / 0.3048 / 5280.0) def calcT(self, t_FHAG2): return self.KtoF(t_FHAG2) @@ -30,4 +30,4 @@ class GFSLAMPForecaster(Forecaster): # Set this file up to run with SmartInitialization def main(): - GFSLAMPForecaster().run() + GFSLAMPGridForecaster().run() 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 dde5cceab9..dc85a93ddf 100644 --- a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template +++ b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template @@ -221,7 +221,7 @@ HDS ^([LM].[ABCDEFGHMNRST].{1,3}) (KWB.) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([ # that edit also removed the HPCGuide data. Josh Watson NGRID ^([LM][ABCDFGH]U...) (KWBN) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) - FLE -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 + 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 # DR 17426 # 2.5km CONUS GMOS @@ -283,7 +283,7 @@ NGRID ^([LM].[EF].{1,3}) (KWBD) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([ # The noaaportIngester does not yet read a grib2 SBN file with more than one message. NGRID ^(L...[0-9][0-9]) (KMDL) (..)(..)(..) FILE -overwrite -log -close -edex /data_store/grib2/(\3:yyyy)(\3:mm)\3/\4/LAMP/GRID184/\1_\2_\3\4\5_(seq).grib2.%Y%m%d%H -NGRID ^(L[CDEF]U[0-9][0-9]) (KWNO) (..)(..)(..) +NGRID ^(L[CDEF]U.[0-9][0-9]) (KWNO) (..)(..)(..) FILE -overwrite -log -close -edex /data_store/grib2/(\3:yyyy)(\3:mm)\3/\4/LAMP/GRID184/\1_\2_\3\4\5_(seq).grib2.%Y%m%d%H # AWIPS1: GRID ^L[UV]I.*KWBJ* /Grid/SBN/rawGrib2