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

naming/formatting for ImageBlinkDialog; UKMET-Global naming

Browse source
This commit is contained in:
mjames-upc 2016-05-03 18:13:23 -05:00
parent 4373760eaf
commit 9e3e5ad2a5
6 changed files with 110 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/ImageBlinkDialog.java
View file

@ -250,7 +250,7 @@ public class ImageBlinkDialog extends CaveSWTDialog implements
buttonComp.setLayoutData(gd); buttonComp.setLayoutData(gd);
Button b = new Button(buttonComp, SWT.PUSH); Button b = new Button(buttonComp, SWT.PUSH);
b.setText("Enable Range"); b.setText("Enable");
b.addSelectionListener(new SelectionAdapter() { b.addSelectionListener(new SelectionAdapter() {
@Override @Override
public void widgetSelected(SelectionEvent e) { public void widgetSelected(SelectionEvent e) {
@ -262,7 +262,7 @@ public class ImageBlinkDialog extends CaveSWTDialog implements
b.setLayoutData(gd); b.setLayoutData(gd);
b = new Button(buttonComp, SWT.PUSH); b = new Button(buttonComp, SWT.PUSH);
b.setText("Disable Range"); b.setText("Disable");
b.addSelectionListener(new SelectionAdapter() { b.addSelectionListener(new SelectionAdapter() {
@Override @Override
public void widgetSelected(SelectionEvent e) { public void widgetSelected(SelectionEvent e) {

4
cave/com.raytheon.viz.gfe/help/getNotify.html
View file

@ -244,7 +244,7 @@ AFC_GRID_Prac_Fcst_00000000_0000, AFC_GRID__LAPS_00000000_0000, AFC_GRID__AKWAVE
AFC_GRID__AKWAVE_20120113_0600, AFC_GRID__MOSGuide_20120112_1200,<br> AFC_GRID__AKWAVE_20120113_0600, AFC_GRID__MOSGuide_20120112_1200,<br>
AFC_GRID__MOSGuide_20120113_0000, AFC_GRID__NAM12_20120113_0000, AFC_GRID__NAM12_20120113_0600,<br> AFC_GRID__MOSGuide_20120113_0000, AFC_GRID__NAM12_20120113_0000, AFC_GRID__NAM12_20120113_0600,<br>
AFC_GRID__NamDNG5_20120113_0000, AFC_GRID__NamDNG5_20120113_0600,<br> AFC_GRID__NamDNG5_20120113_0000, AFC_GRID__NamDNG5_20120113_0600,<br>
AFC_GRID_D2D_NAM40_20120113_1200, AFC_GRID_D2D_UKMET-NorthernHemisphere_20120113_1200,<br> AFC_GRID_D2D_NAM40_20120113_1200, AFC_GRID_D2D_UKMET-Global_20120113_1200,<br>
AFC_GRID_D2D_TPCProb_20120113_1200, AFC_GRID_D2D_AKWAVE_20120113_0000,<br> AFC_GRID_D2D_TPCProb_20120113_1200, AFC_GRID_D2D_AKWAVE_20120113_0000,<br>
AFC_GRID_D2D_OPCTAFBNW_20120111_0000, AFC_GRID_D2D_NAM20_20120113_1200,<br> AFC_GRID_D2D_OPCTAFBNW_20120111_0000, AFC_GRID_D2D_NAM20_20120113_1200,<br>
AFC_GRID_D2D_ENSEMBLE_20120113_0000, AFC_GRID_D2D_NAM95_20120113_0000,<br> AFC_GRID_D2D_ENSEMBLE_20120113_0000, AFC_GRID_D2D_NAM95_20120113_0000,<br>
@ -264,7 +264,7 @@ AFC_GRID_D2D_NamDNG5_20120113_0600, AFC_GRID_D2D_gfsLR_20120111_0000,<br>
AFC_GRID_D2D_OPCTAFBNW_20120111_1200, AFC_GRID_D2D_NAM12_20120113_1200,<br> AFC_GRID_D2D_OPCTAFBNW_20120111_1200, AFC_GRID_D2D_NAM12_20120113_1200,<br>
AFC_GRID_D2D_OPCTAFBNW_20120112_1200, AFC_GRID_D2D_OPCTAFBNW_20120112_0000,<br> AFC_GRID_D2D_OPCTAFBNW_20120112_1200, AFC_GRID_D2D_OPCTAFBNW_20120112_0000,<br>
AFC_GRID_D2D_OPCTAFBNW_20120108_1200, AFC_GRID_D2D_TPCProb_20120113_0600,<br> AFC_GRID_D2D_OPCTAFBNW_20120108_1200, AFC_GRID_D2D_TPCProb_20120113_0600,<br>
AFC_GRID_D2D_OPCTAFBNW_20120109_0000, AFC_GRID_D2D_UKMET-NorthernHemisphere_20120113_0600,<br> AFC_GRID_D2D_OPCTAFBNW_20120109_0000, AFC_GRID_D2D_UKMET-Global_20120113_0600,<br>
AFC_GRID_EditTopo_Topo_00000000_0000, AFC_GRID_D2D_PRISMClimo_00000000_0000,<br> AFC_GRID_EditTopo_Topo_00000000_0000, AFC_GRID_D2D_PRISMClimo_00000000_0000,<br>
AFC_GRID_D2D_NCDCClimo_00000000_0000, AFC_GRID_D2D_CRMTopo_00000000_0000,<br> AFC_GRID_D2D_NCDCClimo_00000000_0000, AFC_GRID_D2D_CRMTopo_00000000_0000,<br>
AFC_GRID_D2D_NED_00000000_0000, AFC_GRID_D2D_AKWAVE_20120113_1200]<br> AFC_GRID_D2D_NED_00000000_0000, AFC_GRID_D2D_AKWAVE_20120113_1200]<br>

2
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/500Height.xml
View file

@ -166,7 +166,7 @@
<constraint constraintValue="GH" constraintType="EQUALS" /> <constraint constraintValue="GH" constraintType="EQUALS" />
</mapping> </mapping>
<mapping key="info.datasetId"> <mapping key="info.datasetId">
<constraint constraintValue="UKMET-NorthernHemisphere" constraintType="EQUALS" /> <constraint constraintValue="UKMET-Global" constraintType="EQUALS" />
</mapping> </mapping>
<mapping key="info.level.leveltwovalue"> <mapping key="info.level.leveltwovalue">
<constraint constraintValue="-999999" constraintType="EQUALS" /> <constraint constraintValue="-999999" constraintType="EQUALS" />

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

@ -1081,60 +1081,59 @@ Restore = ('Restore', GRID, '', YES, NO, 1, 24)
Test = ('Test', GRID, 'test', NO, NO, 1, 0) Test = ('Test', GRID, 'test', NO, NO, 1, 0)
Official = ('Official', GRID, '', YES, YES, 1, 24) Official = ('Official', GRID, '', YES, YES, 1, 24)
ISC = ('ISC', GRID, '', YES, NO, 1, 12) ISC = ('ISC', GRID, '', YES, NO, 1, 12)
LAPS = ('LAPS', GRID, '', YES, NO, 1, 30) #LAPS = ('LAPS', GRID, '', YES, NO, 1, 30)
SAT = ('SAT', GRID, '', YES, NO, 1, 12) #SAT = ('SAT', GRID, '', YES, NO, 1, 12)
ESTOFS = ('ESTOFS', GRID, '', NO, NO, 2, 0) ESTOFS = ('ESTOFS', GRID, '', NO, NO, 2, 0)
nwpsTrkngCG0 = ('nwpsTrkngCG0',GRID, '', NO, NO, 2, 0) #nwpsTrkngCG0 = ('nwpsTrkngCG0',GRID, '', NO, NO, 2, 0)
nwpsCG1 = ('nwpsCG1', GRID, '', NO, NO, 2, 0) #nwpsCG1 = ('nwpsCG1', GRID, '', NO, NO, 2, 0)
HPCGuide = ('HPCGuide', GRID, '', NO, NO, 2, 0) HPCGuide = ('HPCGuide', GRID, '', NO, NO, 2, 0)
NAM12 = ('NAM12', GRID, '', NO, NO, 2, 0) NAM12 = ('NAM12', GRID, '', NO, NO, 2, 0)
NAM40 = ('NAM40', GRID, '', NO, NO, 2, 0) NAM40 = ('NAM40', GRID, '', NO, NO, 2, 0)
NAM80 = ('NAM80', GRID, '', NO, NO, 2, 0) #NAM80 = ('NAM80', GRID, '', NO, NO, 2, 0)
NAM95 = ('NAM95', GRID, '', NO, NO, 2, 0) #NAM95 = ('NAM95', GRID, '', NO, NO, 2, 0)
NGM80 = ('NGM80', GRID, '', NO, NO, 2, 0) #NGM80 = ('NGM80', GRID, '', NO, NO, 2, 0)
NGM95 = ('NGM95', GRID, '', NO, NO, 2, 0) #NGM95 = ('NGM95', GRID, '', NO, NO, 2, 0)
GFS40 = ('GFS40', GRID, '', NO, NO, 2, 0) GFS40 = ('GFS40', GRID, '', NO, NO, 2, 0)
GFS80 = ('GFS80', GRID, '', NO, NO, 2, 0) #GFS80 = ('GFS80', GRID, '', NO, NO, 2, 0)
GFS190 = ('GFS190', GRID, '', NO, NO, 2, 0) #GFS190 = ('GFS190', GRID, '', NO, NO, 2, 0)
GFS75 = ('GFS75', GRID, '', NO, NO, 2, 0) #GFS75 = ('GFS75', GRID, '', NO, NO, 2, 0)
gfsLR = ('gfsLR', GRID, '', NO, NO, 2, 0) #gfsLR = ('gfsLR', GRID, '', NO, NO, 2, 0)
RUC13 = ('RUC13', GRID, '', NO, NO, 2, 0) RUC13 = ('RUC13', GRID, '', NO, NO, 2, 0)
RUC80 = ('RUC80', GRID, '', NO, NO, 2, 0)
HPCGrid = ('HPCGRID', GRID, '', NO, NO, 2, 0) HPCGrid = ('HPCGRID', GRID, '', NO, NO, 2, 0)
AKwave10 = ('AKwave10', GRID, '', NO, NO, 2, 0) #AKwave10 = ('AKwave10', GRID, '', NO, NO, 2, 0)
AKwave4 = ('AKwave4', GRID, '', NO, NO, 2, 0) #AKwave4 = ('AKwave4', GRID, '', NO, NO, 2, 0)
EPwave10 = ('EPwave10', GRID, '', NO, NO, 2, 0) #EPwave10 = ('EPwave10', GRID, '', NO, NO, 2, 0)
GlobalWave = ('GlobalWave', GRID, '', NO, NO, 2, 0) #GlobalWave = ('GlobalWave', GRID, '', NO, NO, 2, 0)
GLWM = ('GLWM', GRID, '', NO, NO, 2, 0)##########DCS3499 #GLWM = ('GLWM', GRID, '', NO, NO, 2, 0)##########DCS3499
HIRESWarw = ('HIRESWarw', GRID, '', NO, NO, 2, 0)##########DCS3501 #HIRESWarw = ('HIRESWarw', GRID, '', NO, NO, 2, 0)##########DCS3501
HIRESWnmm = ('HIRESWnmm', GRID, '', NO, NO, 2, 0) #HIRESWnmm = ('HIRESWnmm', GRID, '', NO, NO, 2, 0)
HRRR = ("HRRR", GRID, '', NO, NO, 3, 0) HRRR = ("HRRR", GRID, '', NO, NO, 3, 0)
#### SPC = ('SPC', GRID, '', NO, NO, 2, 0)###DR20634 #### SPC = ('SPC', GRID, '', NO, NO, 2, 0)###DR20634
WCwave10 = ('WCwave10', GRID, '', NO, NO, 2, 0) #WCwave10 = ('WCwave10', GRID, '', NO, NO, 2, 0)
WCwave4 = ('WCwave4', GRID, '', NO, NO, 2, 0) #WCwave4 = ('WCwave4', GRID, '', NO, NO, 2, 0)
WNAwave10 = ('WNAwave10', GRID, '', NO, NO, 2, 0) #WNAwave10 = ('WNAwave10', GRID, '', NO, NO, 2, 0)
WNAwave4 = ('WNAwave4', GRID, '', NO, NO, 2, 0) #WNAwave4 = ('WNAwave4', GRID, '', NO, NO, 2, 0)
GWW = ('GWW', GRID, '', NO, NO, 2, 0) #GWW = ('GWW', GRID, '', NO, NO, 2, 0)
HPCQPF = ('HPCQPF', GRID, '', NO, NO, 4, 0) #HPCQPF = ('HPCQPF', GRID, '', NO, NO, 4, 0)
RFCQPF = ('RFCQPF', GRID, '', NO, NO, 4, 0) #RFCQPF = ('RFCQPF', GRID, '', NO, NO, 4, 0)
#DR3511 HPCDelta = ('HPCdelta', GRID, '', NO, NO, 2, 0) #DR3511 HPCDelta = ('HPCdelta', GRID, '', NO, NO, 2, 0)
TPCTCM = ('TPCtcm', GRID, '', NO, NO, 2, 0) #TPCTCM = ('TPCtcm', GRID, '', NO, NO, 2, 0)
MSAS = ('MSAS', GRID, '', YES, NO, 1, 36) #MSAS = ('MSAS', GRID, '', YES, NO, 1, 36)
GLERL = ('GLERL', GRID, '', NO, NO, 2, 0) #GLERL = ('GLERL', GRID, '', NO, NO, 2, 0)
AKWAVE = ('AKWAVE', GRID, '', NO, NO, 2, 0) #AKWAVE = ('AKWAVE', GRID, '', NO, NO, 2, 0)
WNAWAVE = ('WNAWAVE', GRID, '', NO, NO, 2, 0) #WNAWAVE = ('WNAWAVE', GRID, '', NO, NO, 2, 0)
DGEX = ('DGEX', GRID, '', NO, NO, 2, 0) #DGEX = ('DGEX', GRID, '', NO, NO, 2, 0)
OPCTAFBE = ('OPCTAFBE', GRID, '', NO, NO, 2, 0) #OPCTAFBE = ('OPCTAFBE', GRID, '', NO, NO, 2, 0)
OPCTAFBNW = ('OPCTAFBNW', GRID, '', NO, NO, 2, 0) #OPCTAFBNW = ('OPCTAFBNW', GRID, '', NO, NO, 2, 0)
OPCTAFBSW = ('OPCTAFBSW', GRID, '', NO, NO, 2, 0) #OPCTAFBSW = ('OPCTAFBSW', GRID, '', NO, NO, 2, 0)
MOSGuide = ('MOSGuide', GRID, '', NO, NO, 2, 0) MOSGuide = ('MOSGuide', GRID, '', NO, NO, 2, 0)
RTMA = ('RTMA', GRID, '', YES, NO, 1, 36) RTMA = ('RTMA', GRID, '', YES, NO, 1, 36)
URMA25 = ('URMA25', GRID, '', YES, NO, 1, 36) ####DR17144 URMA25 = ('URMA25', GRID, '', YES, NO, 1, 36) ####DR17144
NamDNG5 = ('NamDNG5', GRID, '', NO, NO, 2, 0) #NamDNG5 = ('NamDNG5', GRID, '', NO, NO, 2, 0)
TPCProb = ('TPCProb', GRID, '', NO, NO, 30, 0) #TPCProb = ('TPCProb', GRID, '', NO, NO, 30, 0)
SREF = ('SREF', GRID, '', NO, NO, 3, 0) #SREF = ('SREF', GRID, '', NO, NO, 3, 0)
ENPwave = ('ENPwave', GRID, '', NO, NO, 2, 0) #ENPwave = ('ENPwave', GRID, '', NO, NO, 2, 0)
ETSS = ('ETSS', GRID, '', NO, NO, 2, 0) #ETSS = ('ETSS', GRID, '', NO, NO, 2, 0)
GFSLAMPGrid = ('GFSLAMPGrid', GRID, '', NO, NO, 3, 0) GFSLAMPGrid = ('GFSLAMPGrid', GRID, '', NO, NO, 3, 0)
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# #
@ -1172,7 +1171,7 @@ if SID in ALASKA_SITES:
'GWW233', 'GWW233',
('ETA242', 'NAM12'), ('ETA242', 'NAM12'),
'ECMWF-LowRes','ECMWF', 'ECMWF-LowRes','ECMWF',
'UKMET-NorthernHemisphere', 'UKMET', 'UKMET-Global', 'UKMET',
'ENSEMBLE', 'ENSEMBLE',
('DGEX186', 'DGEX'), ('DGEX186', 'DGEX'),
('OPCWave181', 'OPCTAFBNW'), ('OPCWave181', 'OPCTAFBNW'),
@ -1286,7 +1285,6 @@ elif SID in CONUS_EAST_SITES:
('NGM', 'NGM80'), ('NGM', 'NGM80'),
('MRF', 'gfsLR'), ('MRF', 'gfsLR'),
('RUC130', 'RUC13'), ('RUC130', 'RUC13'),
('RUC', 'RUC80'),
('mesoEta212', 'NAM40'), ('mesoEta212', 'NAM40'),
('mesoEta215', 'NAM20'), ('mesoEta215', 'NAM20'),
'MSAS', 'MSAS',
@ -1364,7 +1362,6 @@ else: #######DCS3501 WEST_CONUS
('NGM', 'NGM80'), ('NGM', 'NGM80'),
('MRF', 'gfsLR'), ('MRF', 'gfsLR'),
('RUC130', 'RUC13'), ('RUC130', 'RUC13'),
('RUC', 'RUC80'),
('mesoEta212', 'NAM40'), ('mesoEta212', 'NAM40'),
('mesoEta215', 'NAM20'), ('mesoEta215', 'NAM20'),
'MSAS', 'MSAS',
@ -1558,56 +1555,56 @@ if SID in RFC_SITES:
elif SID in ALASKA_SITES: elif SID in ALASKA_SITES:
INITMODULES = { INITMODULES = {
# "AKNAM40" : ["NAM40", "NAM20"], # "AKNAM40" : ["NAM40", "NAM20"],
"AKWAVE" : ['AKWAVE'], # "AKWAVE" : ['AKWAVE'],
# "AKwave4" : ['AKwave4'], # "AKwave4" : ['AKwave4'],
# "AKwave10" : ['AKwave10'], # "AKwave10" : ['AKwave10'],
# "GlobalWave" : ["GlobalWave"], # "GlobalWave" : ["GlobalWave"],
# "NAM95" : ["NAM95"], # "NAM95" : ["NAM95"],
# "NGM95" : ["NGM95"], # "NGM95" : ["NGM95"],
# "gfsLR" : ["gfsLR"], # "gfsLR" : ["gfsLR"],
"NAM12" : ["NAM12"], # "NAM12" : ["NAM12"],
"GFS80" : ["GFS80"], # "GFS80" : ["GFS80"],
# "GFS190" : ["GFS190"], # "GFS190" : ["GFS190"],
#DCS3501 #DCS3501
"HIRESWarw" : ["HIRESWarw"], # "HIRESWarw" : ["HIRESWarw"],
"HIRESWnmm" : ["HIRESWnmm"], # "HIRESWnmm" : ["HIRESWnmm"],
#DR20634 "SPC" : ["SPC"], #DR20634 "SPC" : ["SPC"],
"LAPS" : ["LAPS"], # "LAPS" : ["LAPS"],
"HPCQPF" : ['HPCQPF'], # "HPCQPF" : ['HPCQPF'],
"RFCQPF" : ['RFCQPF'], # "RFCQPF" : ['RFCQPF'],
"MSAS" : ['MSAS'], # "MSAS" : ['MSAS'],
# "HPCdelta" : ['HPCdelta'], # "HPCdelta" : ['HPCdelta'],
"SAT" : ['Satellite'], # "SAT" : ['Satellite'],
"DGEX" : ['DGEX'], # "DGEX" : ['DGEX'],
# "GWW" : ["GWW"], # "GWW" : ["GWW"],
# "OPCTAFBNW" : ['OPCTAFBNW'], # "OPCTAFBNW" : ['OPCTAFBNW'],
"nwpsCG1" : ['nwpsCG1'], # "nwpsCG1" : ['nwpsCG1'],
"nwpsTrkngCG0" : ['nwpsTrkngCG0'], # "nwpsTrkngCG0" : ['nwpsTrkngCG0'],
"RTMA" : ['RTMA'], # "RTMA" : ['RTMA'],
"NamDNG5" : ["NamDNG5"], # "NamDNG5" : ["NamDNG5"],
"AKMOSGuide" : ['MOSGuide'], # "AKMOSGuide" : ['MOSGuide'],
"ESTOFS" : ["ESTOFS"], # "ESTOFS" : ["ESTOFS"],
"ETSS" : ["ETSS"], # "ETSS" : ["ETSS"],
} }
# Hawaii OCONUS # Hawaii OCONUS
elif SID == "HFO": elif SID == "HFO":
INITMODULES= { INITMODULES= {
"GFS75" : ["GFS75"], # "GFS75" : ["GFS75"],
#####DCS3501 #####DCS3501
"HIRESWarw" : ["HIRESWarw"], # "HIRESWarw" : ["HIRESWarw"],
"HIRESWnmm" : ["HIRESWnmm"], # "HIRESWnmm" : ["HIRESWnmm"],
##DR20634 "SPC" : ["SPC"], ##DR20634 "SPC" : ["SPC"],
# "GlobalWave" : ["GlobalWave"], # "GlobalWave" : ["GlobalWave"],
# "EPwave10" : ["EPwEave10"], # "EPwave10" : ["EPwEave10"],
# "GWW" : ["GWW"], # "GWW" : ["GWW"],
# "gfsLR" : ["gfsLR"], # "gfsLR" : ["gfsLR"],
"RTMA" : ['RTMA'], # "RTMA" : ['RTMA'],
"NamDNG5" : ["NamDNG5"], # "NamDNG5" : ["NamDNG5"],
"MOSGuide" : ['MOSGuide'], # "MOSGuide" : ['MOSGuide'],
"ESTOFS" : ["ESTOFS"], # "ESTOFS" : ["ESTOFS"],
"nwpsCG1" : ['nwpsCG1'], # "nwpsCG1" : ['nwpsCG1'],
"nwpsTrkngCG0" : ['nwpsTrkngCG0'], # "nwpsTrkngCG0" : ['nwpsTrkngCG0'],
} }
# San Juan OCONUS # San Juan OCONUS
@ -1616,44 +1613,43 @@ elif SID == "SJU":
INITMODULES = { INITMODULES = {
# "NAM40" : ["NAM40", "NAM20"], # "NAM40" : ["NAM40", "NAM20"],
# "NAM80" : ["NAM80"], # "NAM80" : ["NAM80"],
"RUC13" : ["RUC13"], # "RUC13" : ["RUC13"],
"RUC80" : ["RUC80"],
# "gfsLR" : ["gfsLR"], # "gfsLR" : ["gfsLR"],
# "NGM80" : ["NGM80"], # "NGM80" : ["NGM80"],
"NAM12" : ["NAM12"], # "NAM12" : ["NAM12"],
"GFS80" : ["GFS80"], # "GFS80" : ["GFS80"],
"GFS40" : ["GFS40"], # "GFS40" : ["GFS40"],
#####DCS3501 #####DCS3501
"HIRESWarw" : ["HIRESWarw"], # "HIRESWarw" : ["HIRESWarw"],
"HIRESWnmm" : ["HIRESWnmm"], # "HIRESWnmm" : ["HIRESWnmm"],
#DR20634 "SPC" : ["SPC"], #DR20634 "SPC" : ["SPC"],
"LAPS" : ["LAPS"], # "LAPS" : ["LAPS"],
"HPCQPF" : ['HPCQPF'], # "HPCQPF" : ['HPCQPF'],
"RFCQPF" : ['RFCQPF'], # "RFCQPF" : ['RFCQPF'],
"MSAS" : ['MSAS'], # "MSAS" : ['MSAS'],
# "HPCdelta" : ['HPCdelta'], # "HPCdelta" : ['HPCdelta'],
"SAT" : ['Satellite'], # "SAT" : ['Satellite'],
# "GWW" : ["GWW"], # "GWW" : ["GWW"],
# "OPCTAFBE" : ['OPCTAFBE'], # "OPCTAFBE" : ['OPCTAFBE'],
# "GlobalWave" : ["GlobalWave"], # "GlobalWave" : ["GlobalWave"],
# "EPwave10" : ["EPwEave10"], # "EPwave10" : ["EPwEave10"],
"RTMA" : ['RTMA'], # "RTMA" : ['RTMA'],
"NamDNG5" : ["NamDNG5"], # "NamDNG5" : ["NamDNG5"],
"ESTOFS" : ["ESTOFS"], # "ESTOFS" : ["ESTOFS"],
"nwpsCG1" : ['nwpsCG1'], # "nwpsCG1" : ['nwpsCG1'],
"nwpsTrkngCG0" : ['nwpsTrkngCG0'], # "nwpsTrkngCG0" : ['nwpsTrkngCG0'],
} }
# Guam OCONUS # Guam OCONUS
elif SID == "GUM": elif SID == "GUM":
INITMODULES= { INITMODULES= {
"GFS75" : ["GFS75"], # "GFS75" : ["GFS75"],
# "GWW" : ["GWW"], # "GWW" : ["GWW"],
# "gfsLR" : ["gfsLR"], # "gfsLR" : ["gfsLR"],
# "GlobalWave" : ["GlobalWave"], # "GlobalWave" : ["GlobalWave"],
"RTMA" : ['RTMA'], # "RTMA" : ['RTMA'],
"nwpsCG1" : ['nwpsCG1'], # "nwpsCG1" : ['nwpsCG1'],
"nwpsTrkngCG0" : ['nwpsTrkngCG0'], # "nwpsTrkngCG0" : ['nwpsTrkngCG0'],
} }
#CONUS sites #CONUS sites
@ -1661,28 +1657,27 @@ else:
#initialization module to model mappings #initialization module to model mappings
INITMODULES = { INITMODULES = {
"RUC13" : ["RUC13"], "RUC13" : ["RUC13"],
"RUC80" : ["RUC80"],
"NAM12" : ["NAM12"], "NAM12" : ["NAM12"],
"GFS40" : ["GFS40"], "GFS40" : ["GFS40"],
"GFS80" : ["GFS80"], # "GFS80" : ["GFS80"],
"LAPS" : ["LAPS"], # "LAPS" : ["LAPS"],
"HPCQPF" : ['HPCQPF'], "HPCQPF" : ['HPCQPF'],
"RFCQPF" : ['RFCQPF'], "RFCQPF" : ['RFCQPF'],
"MSAS" : ['MSAS'], # "MSAS" : ['MSAS'],
"SAT" : ['Satellite'], # "SAT" : ['Satellite'],
"DGEX" : ['DGEX'], # "DGEX" : ['DGEX'],
"MOSGuide" : ['MOSGuide'], "MOSGuide" : ['MOSGuide'],
"HPCGuide" : ['HPCGuide'], "HPCGuide" : ['HPCGuide'],
"RTMA" : ['RTMA'], "RTMA" : ['RTMA'],
#######DR17144 #######DR17144
"URMA25" : ['URMA25'], "URMA25" : ['URMA25'],
"NamDNG5" : ["NamDNG5"], # "NamDNG5" : ["NamDNG5"],
"SREF" : ["SREF"], # "SREF" : ["SREF"],
"HRRR" : ['HRRR'], # "HRRR" : ['HRRR'],
#########DCS3501 #########DCS3501
"GLWM" : ["GLWM"], # "GLWM" : ["GLWM"],
"HIRESWarw" : ["HIRESWarw"], # "HIRESWarw" : ["HIRESWarw"],
"HIRESWnmm" : ["HIRESWnmm"], # "HIRESWnmm" : ["HIRESWnmm"],
#DR20634 "SPC" : ["SPC"], #DR20634 "SPC" : ["SPC"],
# "GlobalWave" : ["GlobalWave"], # "GlobalWave" : ["GlobalWave"],
# "EPwave10" : ["EPwave10"], # "EPwave10" : ["EPwave10"],
@ -1693,15 +1688,14 @@ else:
# "ENPwave": ["ENPwave"], # "ENPwave": ["ENPwave"],
"ESTOFS" : ["ESTOFS"], "ESTOFS" : ["ESTOFS"],
"ETSS" : ["ETSS"], "ETSS" : ["ETSS"],
"GFSLAMPGrid" : ["GFSLAMPGrid"], # "GFSLAMPGrid" : ["GFSLAMPGrid"],
"nwpsCG1" : ['nwpsCG1'], # "nwpsCG1" : ['nwpsCG1'],
"nwpsTrkngCG0" : ['nwpsTrkngCG0'], # "nwpsTrkngCG0" : ['nwpsTrkngCG0'],
} }
#initialization skip certain model runs #initialization skip certain model runs
INITSKIPS = { INITSKIPS = {
"RUC13" : [1,2,4,5,7,8,10,11,13,14,16,17,19,20,22,23], "RUC13" : [1,2,4,5,7,8,10,11,13,14,16,17,19,20,22,23],
"RUC80" : [1,2,4,5,7,8,10,11,13,14,16,17,19,20,22,23]
} }
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
@ -1729,7 +1723,6 @@ D2DAccumulativeElements= {
"NGM95": ["tp", "cp"], "NGM95": ["tp", "cp"],
"gfsLR": ["tp", "cp"], "gfsLR": ["tp", "cp"],
"RUC13": ["tp", "cp"], "RUC13": ["tp", "cp"],
"RUC80": ["tp", "cp"],
"MSAS": ["tp", "cp"], "MSAS": ["tp", "cp"],
"LAPS": ["pc"], "LAPS": ["pc"],
"DGEX": ["tp"], "DGEX": ["tp"],
@ -1817,7 +1810,7 @@ AUTO_CONFIGURE_NOTIFYTEXTPROD = 1 #0=off,1=on
# DO NOT CHANGE THE FOLLOWING SECTION # DO NOT CHANGE THE FOLLOWING SECTION
#------------------------------------ #------------------------------------
# import the local config file # import the local config file
localParms = localNAM12Parms = localRUC13Parms = localRUC80Parms = localNGM80Parms = [] localParms = localNAM12Parms = localRUC13Parms = localNGM80Parms = []
localGFS80Parms = localgfsLRParms = localNAM40Parms = localDBs = [] localGFS80Parms = localgfsLRParms = localNAM40Parms = localDBs = []
localOPCWavEParms = localOPCWavNWParms = localOPCWavSWParms = [] localOPCWavEParms = localOPCWavNWParms = localOPCWavSWParms = []
localMOSGuideParms = localGFS40Parms = [] localMOSGuideParms = localGFS40Parms = []
@ -1880,7 +1873,6 @@ if not BASELINE and siteImport('localConfig'):
localNAM80Parms = getattr(localConfig, 'parmsNAM80', localNAM80Parms) localNAM80Parms = getattr(localConfig, 'parmsNAM80', localNAM80Parms)
localNAM95Parms = getattr(localConfig, 'parmsNAM95', localNAM95Parms) localNAM95Parms = getattr(localConfig, 'parmsNAM95', localNAM95Parms)
localRUC13Parms = getattr(localConfig, 'parmsRUC13', localRUC13Parms) localRUC13Parms = getattr(localConfig, 'parmsRUC13', localRUC13Parms)
localRUC80Parms = getattr(localConfig, 'parmsRUC80', localRUC80Parms)
localNGM80Parms = getattr(localConfig, 'parmsNGM80', localNGM80Parms) localNGM80Parms = getattr(localConfig, 'parmsNGM80', localNGM80Parms)
localNGM95Parms = getattr(localConfig, 'parmsNGM95', localNGM95Parms) localNGM95Parms = getattr(localConfig, 'parmsNGM95', localNGM95Parms)
localGFS40Parms = getattr(localConfig, 'parmsGFS40', localGFS40Parms) localGFS40Parms = getattr(localConfig, 'parmsGFS40', localGFS40Parms)
@ -2149,7 +2141,6 @@ DATABASES = [(Official, OFFICIALDBS + localParms),
(NAM80, STD6_MODEL + localNAM80Parms), (NAM80, STD6_MODEL + localNAM80Parms),
(NAM95, STD6_MODEL + localNAM95Parms), (NAM95, STD6_MODEL + localNAM95Parms),
(RUC13, STD1_MODEL + localRUC13Parms), (RUC13, STD1_MODEL + localRUC13Parms),
(RUC80, STD1_MODEL + localRUC80Parms),
(NGM80, STD6_MODEL + localNGM80Parms), (NGM80, STD6_MODEL + localNGM80Parms),
(NGM95, STD6_MODEL + localNGM95Parms), (NGM95, STD6_MODEL + localNGM95Parms),
(GFS40, STD6_MODEL + localGFS40Parms), (GFS40, STD6_MODEL + localGFS40Parms),

2
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/RadarMenuUtil.java
View file

@ -218,7 +218,7 @@ public class RadarMenuUtil extends AbstractMenuUtil implements
radars = RadarsInUseUtil.getSite(getSite(), radars = RadarsInUseUtil.getSite(getSite(),
RadarsInUseUtil.TDWR_CONSTANT); RadarsInUseUtil.TDWR_CONSTANT);
// create MenuTemplateFile for the dialRadars.xml // create MenuTemplateFile for the dialRadars.xml
menuTemplateFile = new MenuTemplateFile(); menuTemplateFile = new MenuTemplateFile();
menuTemplateFile.contributions = new CommonIncludeMenuContribution[radars menuTemplateFile.contributions = new CommonIncludeMenuContribution[radars
.size()]; .size()];

2
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/AV.xml
View file

@ -19,7 +19,7 @@
further_licensing_information. further_licensing_information.
--> -->
<DerivedParameter abbreviation="AV" name="Vorticity" unit="/s"> <DerivedParameter abbreviation="AV" name="Vorticity" unit="/s">
<Method name="Vorticity.executeWrapX" models="UKMET-NorthernHemisphere AVN-NorthernHemisphere ECMF-NorthernHemisphere ECMWF-HiRes"> <Method name="Vorticity.executeWrapX" models="UKMET-Global ECMF-Global ECMWF-HiRes">
<Field abbreviation="uW"/> <Field abbreviation="uW"/>
<Field abbreviation="vW"/> <Field abbreviation="vW"/>
<Field abbreviation="coriolis"/> <Field abbreviation="coriolis"/>