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

menu changes and grid names

Browse source 
Former-commit-id: 9149863d10b6ddbbf64451edcfd5c79837399851 [formerly b089ea25f508301e99397abae541aa51d123b414] [formerly 7b419a2fd1 [formerly aac1cde7c4]]
Former-commit-id: 7b419a2fd1
Former-commit-id: 81a569898b
This commit is contained in:
AWIPS User 2015-07-22 17:24:11 -06:00
parent ea2729b8d4
commit 91c4c62031
17 changed files with 1154 additions and 338 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/util/HeightOfRequestableData.java
View file

@ -191,7 +191,7 @@ public class HeightOfRequestableData extends AbstractRequestableData {
constraints.put(GridConstants.PARAMETER_ABBREVIATION,
new RequestConstraint("GH"));
constraints.put(GridConstants.DATASET_ID, new RequestConstraint(
"GFS212"));
"GFS-40km"));
constraints.put(GridConstants.MASTER_LEVEL_NAME, new RequestConstraint(
level.getMasterLevel().getName()));
constraints.put(GridConstants.LEVEL_ONE, new RequestConstraint(level

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

@ -298,7 +298,7 @@
<constraint constraintValue="250.0" constraintType="IN" />
</mapping>
<mapping key="info.datasetId">
<constraint constraintValue="CMC-REG"
<constraint constraintValue="CMC"
constraintType="EQUALS" />
</mapping>
</metadataMap>

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

@ -298,7 +298,7 @@
<constraint constraintValue="500.0" constraintType="IN" />
</mapping>
<mapping key="info.datasetId">
<constraint constraintValue="CMC-REG"
<constraint constraintValue="CMC"
constraintType="EQUALS" />
</mapping>
</metadataMap>

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

@ -298,7 +298,7 @@
<constraint constraintValue="850.0" constraintType="IN" />
</mapping>
<mapping key="info.datasetId">
<constraint constraintValue="CMC-REG"
<constraint constraintValue="CMC"
constraintType="EQUALS" />
</mapping>
</metadataMap>

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

@ -235,7 +235,7 @@
<constraint constraintValue="grid" constraintType="EQUALS"/>
</mapping>
<mapping key="info.datasetId">
<constraint constraintValue="CMC-REG" constraintType="EQUALS"/>
<constraint constraintValue="CMC" constraintType="EQUALS"/>
</mapping>
<mapping key="info.level.masterLevel.name">
<constraint constraintValue="SFC" constraintType="EQUALS"/>

1396
cave/com.raytheon.viz.volumebrowser/localization/menus/volume/ModelFamilies.xml
View file

File diff suppressed because it is too large Load diff

8
cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFamilies.xml
View file

@ -75,8 +75,8 @@
<substitute key="frameCount" value="41"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/PrecipMSLP.xml"
menuText="CMC GEM" id="CMC" useReferenceTime="true">
<substitute key="modelName" value="CMC-REG"/>
menuText="CMC" id="CMC" useReferenceTime="true">
<substitute key="modelName" value="CMC"/>
<substitute key="TP" value="TP"/>
<substitute key="frameCount" value="12"/>
</contribute>
@ -161,8 +161,8 @@
<substitute key="frameCount" value="41"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
menuText="CMC GEM" id="CMC" useReferenceTime="true">
<substitute key="modelName" value="CMC-REG"/>
menuText="CMC" id="CMC" useReferenceTime="true">
<substitute key="modelName" value="CMC"/>
<substitute key="TP" value="TP"/>
<substitute key="frameCount" value="12"/>
</contribute>

6
cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml
View file

@ -30,12 +30,6 @@
<substitute key="RAP13model" value="RAP-13km" />
<substitute key="RAPmodel" value="RAP-40km" />
<substitute key="RAP20model" value="RAP-20km" />
<include installTo="menu:models"
fileName="menus/volume/baseFamilies.xml">
</include>
<include subMenu="Surface Wind / Temperature" installTo="menu:models"
fileName="menus/volume/baseSurfaceFamilies.xml">
</include>
<include installTo="menu:models"
fileName="menus/volume/ModelFamilies.xml">
</include>

8
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/volume.xml
View file

@ -22,19 +22,19 @@
<vbSource key="DGEX" category="Volume" />
<vbSource key="GFS" category="Volume" />
<vbSource key="GFS201" category="Volume" />
<vbSource key="GFS212" category="Volume" />
<vbSource key="GFS-40km" category="Volume" />
<vbSource key="GFSGuide" category="Volume" />
<vbSource key="ENSEMBLE" category="Volume" views="PLANVIEW TIMESERIES" />
<vbSource key="HiResW-ARW-East" category="Volume" />
<vbSource key="HiResW-ARW-West" category="Volume" />
<vbSource key="HiResW-NMM-East" category="Volume" />
<vbSource key="HiResW-NMM-West" category="Volume" />
<vbSource key="CMC-REG" category="Volume" />
<vbSource key="CMC" category="Volume" />
<vbSource key="HRRR" category="Volume" />
<vbSource key="NAM-4km" category="Volume" />
<vbSource key="NAM-12km" category="Volume" />
<vbSource key="NAM-40km" category="Volume" />
<vbSource key="NamDNG" category="Volume" />
<vbSource key="NamDNG5" category="Volume" />
<vbSource key="NAVGEM" category="Volume" />
<vbSource key="NDFD" category="Volume" />
<vbSource key="FNMOC-FAROP" category="Volume" />
@ -45,10 +45,8 @@
<vbSource key="COAMPS-WA" category="Volume" />
<vbSource key="URMA25" category="Volume" />
<vbSource key="RTMA" category="Volume" />
<vbSource key="RTMA-5km" category="Volume" />
<vbSource key="RAP-13km" category="Volume" />
<vbSource key="RAP-20km" category="Volume" />
<vbSource key="RAP-40km" category="Volume" />
<vbSource key="GFS254" category="Volume" />
<vbSource key="SREF-40km" category="Volume" views="PLANVIEW TIMESERIES" />
<vbSource key="GWW233" category="Volume" />

12
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
View file

@ -80,22 +80,21 @@
<alias base="WNAWAVE238">wnaWave238</alias>
<alias base="mesoEta216">mesoEta216</alias>
<alias base="mesoEta217">mesoEta217</alias>
<alias base="ETA218">eta218</alias>
<alias base="ETA242">eta242</alias>
<alias base="NAM-12km">nam12</alias>
<alias base="AK-NAM-11km">eta242</alias>
<alias base="ENPWAVE253">enpWave253</alias>
<alias base="HurWind226">TPCtcm226</alias>
<alias base="HurWind175">TCPtcm175</alias>
<alias base="HurWind250">TPCtpm250</alias>
<alias base="NICICE">nic218</alias>
<alias base="AK-NICICE">nic242</alias>
<alias base="DGEX185">dgex185</alias>
<alias base="DGEX186">dgex186</alias>
<alias base="GFS212">gfs212</alias>
<alias base="DGEX">dgex</alias>
<alias base="GFS-40km">gfs212</alias>
<alias base="GFS160">gfs160</alias>
<alias base="GFS254">gfs254</alias>
<alias base="GFS161">gfs161</alias>
<alias base="GFS199">gfs161</alias>
<alias base="RUC130">ruc130</alias>
<alias base="RAP-13km">ruc130</alias>
<alias base="RTMA">rtmaNDFD</alias>
<alias base="URMA25">urmaNDFD</alias>
<alias base="RTMA-Mosaic">rtmaNDFD</alias>
@ -143,6 +142,7 @@
<alias base="RTGSST">RTGSST235</alias>
<alias base="GFSGuide">gfsGuide232</alias>
<alias base="RTMA">rtmaNDFD</alias>
<alias base="RTMA-5km">rtmaNDFD</alias>
<alias base="RTMA-Mosaic">rtmaNDFD</alias>
<alias base="AK-RTMA">aKrtmaNDFD</alias>
<alias base="AK-RTMA3">aKrtmaNDFD</alias>

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

@ -1240,13 +1240,13 @@ elif SID == "GUM":
#CONUS sites
elif SID in CONUS_EAST_SITES:
D2DMODELS = [('GFS212', 'GFS40'),
D2DMODELS = [('GFS-40km', 'GFS40'),
('AVN211', 'GFS80'),
('ETA', 'NAM80'),
('NAM-80km', 'NAM80'),
('HRRR', 'HRRR'),
('NGM', 'NGM80'),
('MRF', 'gfsLR'),
('RUC130', 'RUC13'),
('RAP-13km', 'RUC13'),
('RUC', 'RUC80'),
('mesoEta212', 'NAM40'),
('mesoEta215', 'NAM20'),
@ -1269,8 +1269,8 @@ elif SID in CONUS_EAST_SITES:
'WNAwave10',
'WNAwave4',
'HurWind226',
('DGEX185', 'DGEX'),
('ETA218', 'NAM12'),
('DGEX', 'DGEX'),
('NAM-12km', 'NAM12'),
'HPCGuide',
('OPCWave180', 'OPCTAFBE'),
('OPCWave181', 'OPCTAFBNW'),
@ -1347,7 +1347,7 @@ else: #######DCS3501 WEST_CONUS
'AKWAVE',
'HurWind226',
('DGEX185', 'DGEX'),
('ETA218', 'NAM12'),
('NAM-12km', 'NAM12'),
'HPCGuide',
('OPCWave180', 'OPCTAFBE'),
('OPCWave181', 'OPCTAFBNW'),

6
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/dataset/alias/grib.xml
View file

@ -19,8 +19,8 @@
further_licensing_information.
-->
<aliasList namespace="grib">
<alias base="GFS212">GribModel:7:0:96:212</alias>
<alias base="GFS212">GribModel:7:0:81:212</alias>
<alias base="GFS212">GribModel:7:0:77:212</alias>
<alias base="GFS-40km">GribModel:7:0:96:212</alias>
<alias base="GFS-40km">GribModel:7:0:81:212</alias>
<alias base="GFS-40km">GribModel:7:0:77:212</alias>
<alias base="EKDMOS">GribModel:7:14:114</alias>
</aliasList>

4
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
View file

@ -859,7 +859,7 @@
</model>
<model>
<name>NAM-5km</name>
<name>NAM-4km</name>
<center>7</center>
<subcenter>0</subcenter>
<grid>227</grid>
@ -1030,7 +1030,7 @@
</model>
<model>
<name>GFS212</name>
<name>GFS-40km</name>
<center>7</center>
<subcenter>0</subcenter>
<grid>212</grid>

4
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RSMC-54.xml
View file

@ -94,7 +94,7 @@
</model>
<model>
<name>CMC-REG</name>
<name>CMC</name>
<center>54</center>
<subcenter>0</subcenter>
<grid>493399</grid>
@ -106,7 +106,7 @@
</model>
<model>
<name>CMC-REG</name>
<name>CMC</name>
<center>54</center>
<subcenter>0</subcenter>
<grid>245190</grid>

8
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
View file

@ -49,7 +49,7 @@
post processor. These models may have some parameters which are incorrectly
labeled Celsius vs. Kelvin. The list of parameters to correct is in temperatureCorrectionParameters.xml -->
<postProcessedModel>
<modelName>ETA218|GFS212|GFS213|ETA242|RTOFS-.*</modelName>
<modelName>NAM-12km|GFS-40km|GFS213|ETA242|RTOFS-.*</modelName>
<processorName>TemperatureCorrectionPostProcessor</processorName>
</postProcessedModel>
@ -79,7 +79,7 @@
<!-- Post processor definition for the RUC236 model -->
<postProcessedModel>
<modelName>RUC236</modelName>
<modelName>RAP-40km</modelName>
<processorName>RUC236GribPostProcessor</processorName>
</postProcessedModel>
@ -96,7 +96,7 @@
</postProcessedModel>
<postProcessedModel>
<modelName>Canadian-Reg</modelName>
<modelName>CMC-REG</modelName>
<processorName>CanadianRegPostProcessor</processorName>
</postProcessedModel>
@ -108,7 +108,7 @@
<!-- Post processor definition for the RUC130 model -->
<postProcessedModel>
<modelName>RUC130</modelName>
<modelName>RAP-13km</modelName>
<processorName>RUC130GribPostProcessor</processorName>
</postProcessedModel>

8
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
View file

@ -2269,15 +2269,15 @@
<styleRule>
<paramLevelMatches>
<parameter>NBE</parameter>
<creatingEntity>ETA</creatingEntity>
<creatingEntity>NAM-4km</creatingEntity>
<creatingEntity>mesoEta212</creatingEntity>
<creatingEntity>ETA207</creatingEntity>
<creatingEntity>mesoEta216</creatingEntity>
<creatingEntity>mesoEta217</creatingEntity>
<creatingEntity>ETA218</creatingEntity>
<creatingEntity>ETA242</creatingEntity>
<creatingEntity>NAM-12km</creatingEntity>
<creatingEntity>NAM-40km</creatingEntity>
<creatingEntity>GFS213</creatingEntity>
<creatingEntity>GFS212</creatingEntity>
<creatingEntity>GFS-40km</creatingEntity>
</paramLevelMatches>
<imageStyle>
<!-- filterLow="true" -->

10
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
View file

@ -11,7 +11,7 @@
<versionsToKeep>2</versionsToKeep>
</rule>
<rule>
<keyValue>CMC-REG</keyValue>
<keyValue>CMC</keyValue>
<versionsToKeep>2</versionsToKeep>
</rule>
<rule>
@ -91,7 +91,7 @@
<versionsToKeep>2</versionsToKeep>
</rule>
<rule>
<keyValue>GFS212</keyValue>
<keyValue>GFS-40km</keyValue>
<versionsToKeep>2</versionsToKeep>
</rule>
<rule>
@ -167,6 +167,10 @@
<keyValue>MOSGuide-AK</keyValue>
<versionsToKeep>2</versionsToKeep>
</rule>
<rule>
<keyValue>NAM-4km</keyValue>
<versionsToKeep>2</versionsToKeep>
</rule>
<rule>
<keyValue>NAM-12km</keyValue>
<versionsToKeep>2</versionsToKeep>
@ -200,7 +204,7 @@
<versionsToKeep>2</versionsToKeep>
</rule>
<rule>
<keyValue>RTMA-2p5km</keyValue>
<keyValue>RTMA-5km</keyValue>
<versionsToKeep>2</versionsToKeep>
</rule>
<rule>