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

Merge branch 'master_14.4.1' of github.com:Unidata/awips2 into master_14.4.1

Browse source 
Former-commit-id: fd3804c3b1 [formerly 3e0fb0afef] [formerly 7b0626eba0fda5183936cddcbffa12542b452a5f [formerly a7deb12f92]]
Former-commit-id: fadf0aa296757f38fe07453beb2f25fdb8c57172 [formerly 74cdf99acc]
Former-commit-id: b61e7ff4ec
This commit is contained in:
mjames-upc 2015-05-11 13:43:57 -06:00
commit 81f7b95389
10 changed files with 487 additions and 488 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

File diff suppressed because it is too large Load diff

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

@ -27,14 +27,14 @@
<substitute key="frameCount" value="41"/> <substitute key="frameCount" value="41"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
menuText="GFS 40km" id="GFS-40km" useReferenceTime="true"> menuText="GFS 40km" id="gfs40" useReferenceTime="true">
<substitute key="modelName" value="GFS212"/> <substitute key="modelName" value="GFS-40km"/>
<substitute key="TP" value="TP"/> <substitute key="TP" value="TP"/>
<substitute key="frameCount" value="41"/> <substitute key="frameCount" value="41"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
menuText="DGEX" id="DGEX" useReferenceTime="true"> menuText="DGEX" id="DGEX" useReferenceTime="true">
<substitute key="modelName" value="DGEX185"/> <substitute key="modelName" value="DGEX"/>
<substitute key="TP" value="TP"/> <substitute key="TP" value="TP"/>
<substitute key="frameCount" value="41"/> <substitute key="frameCount" value="41"/>
</contribute> </contribute>
@ -69,7 +69,7 @@
<substitute key="frameCount" value="16"/> <substitute key="frameCount" value="16"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
menuText="FNMOC - NAVGEM" id="NAVGEM" useReferenceTime="true"> menuText="NAVGEM" id="NAVGEM" useReferenceTime="true">
<substitute key="modelName" value="NAVGEM"/> <substitute key="modelName" value="NAVGEM"/>
<substitute key="TP" value="TP"/> <substitute key="TP" value="TP"/>
<substitute key="frameCount" value="41"/> <substitute key="frameCount" value="41"/>
@ -87,11 +87,11 @@
<substitute key="frameCount" value="16"/> <substitute key="frameCount" value="16"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
menuText="UKMET-MODEL1" id="UKMET-MODEL1" useReferenceTime="true"> menuText="URMA" id="URMA" useReferenceTime="true">
<substitute key="modelName" value="UKMET-MODEL1"/> <substitute key="modelName" value="URMA25"/>
<substitute key="TP" value="TP"/> <substitute key="TP" value="TP1hr"/>
<substitute key="frameCount" value="13"/> <substitute key="frameCount" value="16"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
menuText="NDFD" id="NDFD" useReferenceTime="true"> menuText="NDFD" id="NDFD" useReferenceTime="true">
<substitute key="modelName" value="NDFD"/> <substitute key="modelName" value="NDFD"/>

50
cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFourPanelFamilies.xml
View file

@ -21,60 +21,56 @@
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
menuText="DGEX" id="dgex4panel" useReferenceTime="true"> menuText="DGEX" id="dgex4panel" useReferenceTime="true">
<substitute key="modelName" value="DGEX185"/> <substitute key="modelName" value="DGEX"/>
<substitute key="TP" value="TP6hr"/>
<substitute key="frameCount" value="18"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/ECMWFHiResFourPanel.xml"
menuText="ECMWF-HiRes" id="ecmwf4panel" useReferenceTime="true">
<substitute key="frameCount" value="41"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
menuText="GFS40" id="gfs404panel" useReferenceTime="true">
<substitute key="modelName" value="GFS212"/>
<substitute key="TP" value="TP"/> <substitute key="TP" value="TP"/>
<substitute key="frameCount" value="41"/> <substitute key="frameCount" value="41"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
menuText="GFS" id="gfs4panel" useReferenceTime="true"> menuText="GFS" id="gfs4panel" useReferenceTime="true">
<substitute key="modelName" value="${GFSmodel}"/> <substitute key="modelName" value="GFS"/>
<substitute key="TP" value="TP"/>
<substitute key="frameCount" value="41"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
menuText="GFS 40km" id="gfs404panel" useReferenceTime="true">
<substitute key="modelName" value="GFS-40km"/>
<substitute key="TP" value="TP6hr"/> <substitute key="TP" value="TP6hr"/>
<substitute key="frameCount" value="41"/> <substitute key="frameCount" value="41"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
menuText="NAM12" id="nam124panel" useReferenceTime="true"> menuText="NAM 12km" id="nam124panel" useReferenceTime="true">
<substitute key="modelName" value="${NAM12model}"/> <substitute key="modelName" value="NAM-12km"/>
<substitute key="TP" value="TP3hr"/> <substitute key="TP" value="TP3hr"/>
<substitute key="frameCount" value="29"/> <substitute key="frameCount" value="29"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
menuText="NAM40" id="nam404panel" useReferenceTime="true"> menuText="NAM 40km" id="nam404panel" useReferenceTime="true">
<substitute key="modelName" value="${NAM40model}"/> <substitute key="modelName" value="NAM-40km"/>
<substitute key="TP" value="TP3hr"/> <substitute key="TP" value="TP3hr"/>
<substitute key="frameCount" value="29"/> <substitute key="frameCount" value="29"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
menuText="NAM80" id="nam804panel" useReferenceTime="true"> menuText="NamDNG" id="namDng4panel" useReferenceTime="true">
<substitute key="modelName" value="ETA"/> <substitute key="modelName" value="NamDNG"/>
<substitute key="TP" value="TP6hr"/> <substitute key="TP" value="TP6hr"/>
<substitute key="frameCount" value="15"/> <substitute key="frameCount" value="15"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
menuText="RAP13" id="rap134panel" useReferenceTime="true"> menuText="RAP 13km" id="rap134panel" useReferenceTime="true">
<substitute key="modelName" value="${RAP13model}"/> <substitute key="modelName" value="RAP-13km"/>
<substitute key="TP" value="TP3hr"/> <substitute key="TP" value="TP3hr"/>
<substitute key="frameCount" value="19"/> <substitute key="frameCount" value="19"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
menuText="RAP" id="rap4panel" useReferenceTime="true"> menuText="HRRR" id="rap4panel" useReferenceTime="true">
<substitute key="modelName" value="${RAPmodel}"/> <substitute key="modelName" value="HRRR"/>
<substitute key="TP" value="TP3hr"/> <substitute key="TP" value="TP3hr"/>
<substitute key="frameCount" value="9"/> <substitute key="frameCount" value="9"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/UKMETFourPanel.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
menuText="UKMET" id="ukmet4panel" useReferenceTime="true"> menuText="NAVGEM" id="navgem4panel" useReferenceTime="true">
<substitute key="modelName" value="UKMET-NorthernHemisphere"/> <substitute key="modelName" value="NAVGEM"/>
<substitute key="TP" value="TP6hr"/> <substitute key="TP" value="TP3hr"/>
<substitute key="frameCount" value="15"/> <substitute key="frameCount" value="15"/>
</contribute> </contribute>
</menuTemplate> </menuTemplate>

66
cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseStdEnvPackage.xml
View file

@ -22,36 +22,40 @@
<contribute xsi:type="titleItem" titleText="------ Std Env Data Package ------" <contribute xsi:type="titleItem" titleText="------ Std Env Data Package ------"
id="StdEnvPackageLine" /> id="StdEnvPackageLine" />
<contribute xsi:type="subMenu" menuText="Std Env Data Package"> <contribute xsi:type="subMenu" menuText="Std Env Data Package">
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
menuText="LAPS" id="lapsstdenv" useReferenceTime="true"> menuText="GFS" id="gfsstdenv" useReferenceTime="true">
<substitute key="modelName" value="LAPS"/> <substitute key="modelName" value="GFS"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
menuText="NAM40" id="nam40stdenv" useReferenceTime="true"> menuText="GFS 40km" id="gfs40stdenv" useReferenceTime="true">
<substitute key="modelName" value="${NAM40model}"/> <substitute key="modelName" value="GFS-40km"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
menuText="RAP40" id="rap40stdenv" useReferenceTime="true"> menuText="DGEX" id="dgexstdenv" useReferenceTime="true">
<substitute key="modelName" value="${RAPmodel}"/> <substitute key="modelName" value="DGEX"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
menuText="HRRR" id="hrrrstdenv" useReferenceTime="true"> menuText="HRRR" id="hrrrstdenv" useReferenceTime="true">
<substitute key="modelName" value="${HRRRmodel}"/> <substitute key="modelName" value="HRRR"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
menuText="NAM12" id="nam12stdenv" useReferenceTime="true"> menuText="NAM 12km" id="nam12stdenv" useReferenceTime="true">
<substitute key="modelName" value="${NAM12model}"/> <substitute key="modelName" value="NAM-12km"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
menuText="GFS40" id="gfs40stdenv" useReferenceTime="true"> menuText="NAM 40km" id="nam40stdenv" useReferenceTime="true">
<substitute key="modelName" value="GFS212"/> <substitute key="modelName" value="NAM-40km"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
menuText="RAP13" id="rap13stdenv" useReferenceTime="true"> menuText="NamDNG" id="namDngstdenv" useReferenceTime="true">
<substitute key="modelName" value="${RAP13model}"/> <substitute key="modelName" value="NamDNG"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/RaobStdEnv.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
menuText="RaobOA" id="raoboastdenv" useReferenceTime="true"> menuText="RAP 13km" id="rap13stdenv" useReferenceTime="true">
</contribute> <substitute key="modelName" value="RAP-13km"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/RaobStdEnv.xml"
menuText="RaobOA" id="raoboastdenv" useReferenceTime="true">
</contribute>
</contribute> </contribute>
</menuTemplate> </menuTemplate>

24
cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseSurfaceFamilies.xml
View file

@ -20,8 +20,8 @@
--> -->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultSurface.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultSurface.xml"
menuText="GFS40" id="gfs40surface" useReferenceTime="true"> menuText="GFS" id="gfssurface" useReferenceTime="true">
<substitute key="modelName" value="GFS212"/> <substitute key="modelName" value="GFS"/>
<substitute key="TP" value="TP"/> <substitute key="TP" value="TP"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultSurface.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultSurface.xml"
@ -47,27 +47,23 @@
<contribute xsi:type="bundleItem" file="bundles/volume/HRRR.xml" <contribute xsi:type="bundleItem" file="bundles/volume/HRRR.xml"
menuText="HRRR" id="hrrrsurface" useReferenceTime="true"> menuText="HRRR" id="hrrrsurface" useReferenceTime="true">
<substitute key="modelName" value="HRRR"/> <substitute key="modelName" value="HRRR"/>
<substitute key="TP" value="TP"/> <substitute key="TP" value="TP1hr"/>
<substitute key="frameCount" value="16"/> <substitute key="frameCount" value="16"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultSurface.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultSurface.xml"
menuText="NAM12" id="nam12surface" useReferenceTime="true"> menuText="NAM 12km" id="nam12surface" useReferenceTime="true">
<substitute key="modelName" value="${NAM12model}"/> <substitute key="modelName" value="NAM-12km"/>
<substitute key="TP" value="TP3hr"/> <substitute key="TP" value="TP3hr"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultSurface.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultSurface.xml"
menuText="NAM40" id="nam40surface" useReferenceTime="true"> menuText="NAM 40km" id="nam40surface" useReferenceTime="true">
<substitute key="modelName" value="${NAM40model}"/> <substitute key="modelName" value="NAM-40km"/>
<substitute key="TP" value="TP3hr"/> <substitute key="TP" value="TP3hr"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultSurface.xml" <contribute xsi:type="bundleItem" file="bundles/volume/DefaultSurface.xml"
menuText="RAP13" id="rap13surface" useReferenceTime="true"> menuText="RAP 13km" id="rap13surface" useReferenceTime="true">
<substitute key="modelName" value="${RAP13model}"/> <substitute key="modelName" value="RAP-13km"/>
<substitute key="TP" value="TP3hr"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultSurface.xml"
menuText="RAP" id="rapsurface" useReferenceTime="true">
<substitute key="modelName" value="${RAPmodel}"/>
<substitute key="TP" value="TP3hr"/> <substitute key="TP" value="TP3hr"/>
</contribute> </contribute>
</menuTemplate> </menuTemplate>

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

@ -19,7 +19,7 @@
further_licensing_information. further_licensing_information.
--> -->
<menuContributionFile> <menuContributionFile>
<substitute key="GFSmodel" value="GFS" /> <substitute key="GFSmodel" value="GFS 40km" />
<substitute key="NAM12model" value="NAM-12km" /> <substitute key="NAM12model" value="NAM-12km" />
<substitute key="NAM40model" value="NAM-40km" /> <substitute key="NAM40model" value="NAM-40km" />
<substitute key="ARWmodel1" value="HiResW-ARW-East" /> <substitute key="ARWmodel1" value="HiResW-ARW-East" />
@ -27,7 +27,7 @@
<substitute key="MMMmodel1" value="HiResW-NMM-East" /> <substitute key="MMMmodel1" value="HiResW-NMM-East" />
<substitute key="MMMmodel2" value="HiResW-NMM-West" /> <substitute key="MMMmodel2" value="HiResW-NMM-West" />
<substitute key="HRRRmodel" value="HRRR" /> <substitute key="HRRRmodel" value="HRRR" />
<substitute key="RAP13" value="RAP-13km" /> <substitute key="RAP13model" value="RAP-13km" />
<substitute key="RAPmodel" value="RAP-40km" /> <substitute key="RAPmodel" value="RAP-40km" />
<substitute key="RAP20model" value="RAP-20km" /> <substitute key="RAP20model" value="RAP-20km" />
<include installTo="menu:models" <include installTo="menu:models"

4
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2D.xml
View file

@ -95,8 +95,8 @@
fileName="menus/volumebrowser/fields/planview-timeseries/sfc2d/PHISHAboveGround.xml" /> fileName="menus/volumebrowser/fields/planview-timeseries/sfc2d/PHISHAboveGround.xml" />
</contribute> </contribute>
<contribute xsi:type="toolbarSubMenu" menuText="NAM DNG 5km"> <contribute xsi:type="toolbarSubMenu" menuText="NamDNG">
<contribute xsi:type="subinclude" <contribute xsi:type="subinclude"
fileName="menus/volumebrowser/fields/planview-timeseries/sfc2d/NAMDNG5km.xml" /> fileName="menus/volumebrowser/fields/planview-timeseries/sfc2d/NAMDNG5km.xml" />
</contribute> </contribute>
</menuTemplate> </menuTemplate>

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

@ -19,7 +19,7 @@
further_licensing_information. further_licensing_information.
--> -->
<vbSourceList> <vbSourceList>
<vbSource key="DGEX185" category="Volume" /> <vbSource key="DGEX" category="Volume" />
<vbSource key="GFS" category="Volume" /> <vbSource key="GFS" category="Volume" />
<vbSource key="GFS201" category="Volume" /> <vbSource key="GFS201" category="Volume" />
<vbSource key="GFS212" category="Volume" /> <vbSource key="GFS212" category="Volume" />
@ -41,13 +41,12 @@
<vbSource key="FNMOC-NCODA" category="Volume" /> <vbSource key="FNMOC-NCODA" category="Volume" />
<vbSource key="COAMPS-EU" category="Volume" /> <vbSource key="COAMPS-EU" category="Volume" />
<vbSource key="COAMPS-WA" category="Volume" /> <vbSource key="COAMPS-WA" category="Volume" />
<vbSource key="URMA25" category="Volume" /> <vbSource key="URMA25" category="Volume" />
<vbSource key="RTMA" category="Volume" /> <vbSource key="RTMA" category="Volume" />
<vbSource key="RTMA-5km" category="Volume" /> <vbSource key="RTMA-5km" category="Volume" />
<vbSource key="RAP-13km" category="Volume" /> <vbSource key="RAP-13km" category="Volume" />
<vbSource key="RAP-20km" category="Volume" /> <vbSource key="RAP-20km" category="Volume" />
<vbSource key="RAP-40km" category="Volume" /> <vbSource key="RAP-40km" category="Volume" />
<vbSource key="GFS254" category="Volume" /> <vbSource key="GFS254" category="Volume" />
<vbSource key="URMA25" category="Volume" /> <vbSource key="SREF-40km" category="Volume" views="PLANVIEW TIMESERIES" />
<vbSource key="SREF212" category="Volume" views="PLANVIEW TIMESERIES" /> </vbSourceList>
</vbSourceList>

2
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/GribModels_FNMO-58.xml → edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_FNMO-58.xml
View file

@ -254,4 +254,4 @@
<!-- END SUBCENTER 20 --> <!-- END SUBCENTER 20 -->
</gribModelSet> </gribModelSet>

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

@ -1010,7 +1010,7 @@
</model> </model>
<model> <model>
<name>DGEX185</name> <name>DGEX</name>
<center>7</center> <center>7</center>
<subcenter>0</subcenter> <subcenter>0</subcenter>
<grid>185</grid> <grid>185</grid>
@ -1719,7 +1719,7 @@
</model> </model>
<model> <model>
<name>GFS</name> <name>GFS-1p0</name>
<center>7</center> <center>7</center>
<subcenter>0</subcenter> <subcenter>0</subcenter>
<grid>229</grid> <grid>229</grid>