From d51109857e5cf8fd4b1ebcea6c1b0cdfab427976 Mon Sep 17 00:00:00 2001 From: "Rici.Yu" Date: Thu, 28 May 2015 13:31:36 -0400 Subject: [PATCH 1/2] ASM #17496 - check in changes proposed in MFR TT688921 and authorized by gov Change-Id: Ie85827ac4a248a7f5696ed407cfc2855a682e958 Former-commit-id: 1db748040b3a51c781668420cb018974f0b50535 --- .../base/config/gfe/serverConfig.py | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) 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 8a71fab0bb..f90c4762e7 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 @@ -214,12 +214,12 @@ Wave_9 = ("Wave_9", VECTOR, "ft", "Wave_9", 50.0, 0.0, 2, NO) Wave_10 = ("Wave_10", VECTOR, "ft", "Wave_10", 50.0, 0.0, 2, NO) #Fcst Grids - for partitioned wave groups -Wave1 = ("Wave1", VECTOR, "ft", "WAVE1", 50.0, 0.0, 1, NO) -Wave2 = ("Wave2", VECTOR, "ft", "WAVE2", 50.0, 0.0, 1, NO) -Wave3 = ("Wave3", VECTOR, "ft", "WAVE3", 50.0, 0.0, 1, NO) -Wave4 = ("Wave4", VECTOR, "ft", "WAVE4", 50.0, 0.0, 1, NO) -Wave5 = ("Wave5", VECTOR, "ft", "WAVE5", 50.0, 0.0, 1, NO) -Wave6 = ("Wave6", VECTOR, "ft", "WAVE6", 50.0, 0.0, 1, NO) +Wave1 = ("Wave1", VECTOR, "ft", "WAVE1", 50.0, 0.0, 0, NO) +Wave2 = ("Wave2", VECTOR, "ft", "WAVE2", 50.0, 0.0, 0, NO) +Wave3 = ("Wave3", VECTOR, "ft", "WAVE3", 50.0, 0.0, 0, NO) +Wave4 = ("Wave4", VECTOR, "ft", "WAVE4", 50.0, 0.0, 0, NO) +Wave5 = ("Wave5", VECTOR, "ft", "WAVE5", 50.0, 0.0, 0, NO) +Wave6 = ("Wave6", VECTOR, "ft", "WAVE6", 50.0, 0.0, 0, NO) Wave7 = ("Wave7", VECTOR, "ft", "Wave7", 50.0, 0.0, 0, NO) Wave8 = ("Wave8", VECTOR, "ft", "Wave8", 35.0, 0.0, 0, NO) Wave9 = ("Wave9", VECTOR, "ft", "Wave9", 35.0, 0.0, 0, NO) @@ -238,16 +238,16 @@ Period_9 = ("Period_9", SCALAR, "sec", "Period_9", 30.0, 0.0, 0, NO) Period_10 = ("Period_10", SCALAR, "sec", "Period_10", 30.0, 0.0, 0, NO) #Fcst Grids - for partitioned wave groups -Period1 = ("Period1", SCALAR, "sec", "Period1", 25.0, 0.0, 1, NO) -Period2 = ("Period2", SCALAR, "sec", "Period2", 25.0, 0.0, 1, NO) -Period3 = ("Period3", SCALAR, "sec", "Period3", 25.0, 0.0, 1, NO) -Period4 = ("Period4", SCALAR, "sec", "Period4", 25.0, 0.0, 1, NO) -Period5 = ("Period5", SCALAR, "sec", "Period5", 25.0, 0.0, 1, NO) -Period6 = ("Period6", SCALAR, "sec", "Period6", 25.0, 0.0, 1, NO) -Period7 = ("Period7", SCALAR, "sec", "Period7", 25.0, 0.0, 0, NO) -Period8 = ("Period8", SCALAR, "sec", "Period8", 25.0, 0.0, 0, NO) -Period9 = ("Period9", SCALAR, "sec", "Period9", 25.0, 0.0, 0, NO) -Period10 = ("Period10", SCALAR, "sec", "Period10", 25.0, 0.0, 0, NO) +Period1 = ("Period1", SCALAR, "sec", "Period1", 30.0, 0.0, 0, NO) +Period2 = ("Period2", SCALAR, "sec", "Period2", 30.0, 0.0, 0, NO) +Period3 = ("Period3", SCALAR, "sec", "Period3", 30.0, 0.0, 0, NO) +Period4 = ("Period4", SCALAR, "sec", "Period4", 30.0, 0.0, 0, NO) +Period5 = ("Period5", SCALAR, "sec", "Period5", 30.0, 0.0, 0, NO) +Period6 = ("Period6", SCALAR, "sec", "Period6", 30.0, 0.0, 0, NO) +Period7 = ("Period7", SCALAR, "sec", "Period7", 30.0, 0.0, 0, NO) +Period8 = ("Period8", SCALAR, "sec", "Period8", 30.0, 0.0, 0, NO) +Period9 = ("Period9", SCALAR, "sec", "Period9", 30.0, 0.0, 0, NO) +Period10 = ("Period10", SCALAR, "sec", "Period10", 30.0, 0.0, 0, NO) # Fire Weather Weather Elements LAL = ("LAL", SCALAR, "cat", "Lightning Activity Level", 6.0, 1.0, 0, NO) From 1627eb1a42299de868d0a2482269b47380b19b83 Mon Sep 17 00:00:00 2001 From: "Rici.Yu" Date: Fri, 29 May 2015 09:36:31 -0400 Subject: [PATCH 2/2] ASM #17496 - Additional missed changes for Wave8-10 Change-Id: I030ecd872f98b2e12b7739c38d31739c56323188 Former-commit-id: 975455c7a98e8b21f1bcd3def6db04d2f6b1e67d --- .../utility/edex_static/base/config/gfe/serverConfig.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 f90c4762e7..4e96710bf9 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 @@ -54,6 +54,7 @@ # being off # being off # 04/20/2015 #4414 dgilling Add missing NWPSTrkngCG0 weather elements. +# 05/29/2015 17496 ryu Changed parm definitions for Wave1-10 and Period1-10. # ######################################################################## @@ -221,9 +222,9 @@ Wave4 = ("Wave4", VECTOR, "ft", "WAVE4", 50.0, 0.0, 0, NO) Wave5 = ("Wave5", VECTOR, "ft", "WAVE5", 50.0, 0.0, 0, NO) Wave6 = ("Wave6", VECTOR, "ft", "WAVE6", 50.0, 0.0, 0, NO) Wave7 = ("Wave7", VECTOR, "ft", "Wave7", 50.0, 0.0, 0, NO) -Wave8 = ("Wave8", VECTOR, "ft", "Wave8", 35.0, 0.0, 0, NO) -Wave9 = ("Wave9", VECTOR, "ft", "Wave9", 35.0, 0.0, 0, NO) -Wave10 = ("Wave10", VECTOR, "ft", "Wave10", 35.0, 0.0, 0, NO) +Wave8 = ("Wave8", VECTOR, "ft", "Wave8", 50.0, 0.0, 0, NO) +Wave9 = ("Wave9", VECTOR, "ft", "Wave9", 50.0, 0.0, 0, NO) +Wave10 = ("Wave10", VECTOR, "ft", "Wave10", 50.0, 0.0, 0, NO) #Smart Init Grids - for partitioned wave groups Period_1 = ("Period_1", SCALAR, "sec", "Period_1", 30.0, 1.0, 0, NO)