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

Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1

Browse source 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java

Former-commit-id: 8cdd180b0a [formerly 8cdd180b0a [formerly fd4e0b9ada38ab93586088948809279e39a0374c]]
Former-commit-id: af8b95bb97
Former-commit-id: 8d5a9c2045
This commit is contained in:
Fay.Liang 2015-02-13 09:34:24 -05:00
commit 984091af0c
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/GFSLAMPGridded.xml
View file

@ -21,7 +21,7 @@
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="menuItem" menuText="Temperature" key="T"
indentText="false" />
contribute xsi:type="menuItem" menuText="Temp Anl Uncertainty"
<contribute xsi:type="menuItem" menuText="Temp Anl Uncertainty"
key="Terranl" indentText="true" />
<contribute xsi:type="menuItem" menuText="Dewpoint" key="DpT"
indentText="true" />

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

@ -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.

12
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/GFSLAMPGrid.py
View file

@ -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()

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

@ -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