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

Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1

Browse source 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: ff79e4fdaf62c76f39b0e1948d33e0b84df77011
This commit is contained in:
Fay.Liang 2015-04-09 10:18:40 -04:00
commit 1561ee6439
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,6 +48,9 @@
# 01/08/2015 #15035 lshi add site WNJ
# 12/03/2014 #3866 rferrel Added GFS20
# 03/30/2015 #17206 yteng Changed some parameters that are not rate parameters
# 04/03/2015 #4367 dgilling Change WindGust's time constraints back to TC1
# for Fcst/Official.
#
########################################################################
#----------------------------------------------------------------------------
@ -1933,10 +1936,10 @@ MOS_MODEL = [([Temp, Td, Wind, Weather, Sky], TC1),
# Fcst and official database parameter groupings
OFFICIALDBS = [([Temp, Td, Wind, NWPSwind, Weather, Sky, FzLevel, SnowLevel], TC1),
([HeatIndex, WindChill, RH, SnowAmt, CWR, QPF], TC1),
([PoP, Ttrend, RHtrend, Wind20ft], TC1),
([PoP, Ttrend, RHtrend, Wind20ft, WindGust], TC1),
([MinT], MinTTC), ([MaxT], MaxTTC),
([MinRH], MinRHTC), ([MaxRH], MaxRHTC),
([WaveHeight, SurfHeight, WindGust, Swell, Swell2, Period], TC3NG),
([WaveHeight, SurfHeight, Swell, Swell2, Period], TC3NG),
([WindWaveHeight, SwanSwell, Wave1, Wave2, Wave3, Wave4, Wave5, Wave6, Wave7, Wave8, Wave9, Period1, Period2, Period3, Period4, Period5, Period6, Period7, Period8, Period9], TC3NG),
([VentRate, LAL, Haines, MixHgt, FreeWind, TransWind], TC1),
([DSI, Stability, MarineLayer], TC1),

4
edexOsgi/com.raytheon.uf.tools.gfesuite/nwps/bin/runManualNWPS_OutsideAWIPS.sh
View file

@ -100,8 +100,8 @@ fi
### CHECK FOR GFECRON USER RUNNING THIS SCRIPT:
ID=$(id -u)
if [[ $ID -ne 104 ]]
USER_ID=$(id --user --name)
if [[ "$USER_ID" != "gfecron" ]]
then
logit "ONLY GFECRON USER IS ALLOWED TO RUN THIS SCRIPT."
logit "Exiting ..."