From 89050d575da830a732b8bc2ccba305db5fa6dad0 Mon Sep 17 00:00:00 2001
From: ucar-tmeyer <tiffanym@ucar.edu>
Date: Tue, 31 Jan 2023 16:57:00 +0000
Subject: [PATCH] Updated the model names in the volume browser to the names
 EDEX uses

---
 .../volumebrowser/VbSources/sfcGrid.xml       | 237 +++++++-----------
 .../volumebrowser/VbSources/volume.xml        | 124 +++------
 2 files changed, 126 insertions(+), 235 deletions(-)

diff --git a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
index cf92af357b..4152b5784a 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
@@ -1,178 +1,119 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8"?>
     <!--
         This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
         pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-
+        
         U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
         This_software_product_contains_export-restricted_data_whose
         export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
         to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
         an_export_license_or_other_authorization.
-
+        
         Contractor_Name:________Raytheon_Company
         Contractor_Address:_____6825_Pine_Street,_Suite_340
         ________________________Mail_Stop_B8
         ________________________Omaha,_NE_68106
         ________________________402.291.0100
-
+        
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
-    <!--
-        This is an incremental override file, indicating that the files
-        at different localization levels will be combined.
-    -->
 <vbSourceList>
-    <vbSource key="MOSGuide-AK" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HPCGuide-AK" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="AK-NamDNG3" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="AK-NICICE" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="AK-RTMA" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="AK-RTMA3" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="AKWAVE239" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="AKwave10" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="AKwave4" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="AKHwave10" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="AKHwave4" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="BHPE" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="CPCoutlook211" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="DHM" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="ECMWF-wave-guidance" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="ENPWAVE253" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="EPwave10" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="estofsAK" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="estofsEP" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="estofsHI" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="estofsPR" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="estofsUS" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="ETSS" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="ETSS-HiRes" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="ETSS-AK" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="CPCoutlook211" category="SfcGrid"
+        views="PLANVIEW TIMESERIES" />
+    <vbSource key="ESTOFS" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="GFE" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="GFS199" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="GFSGuide" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="GFSLAMPGrid" name="GFSLAMPGrid" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="GLERL" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="GLWN" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="GlobalWave" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="GLOBHwave" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="GRLKwave" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="MOSGuide" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HurWind175" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="Guam-RTMA" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="GWW233" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="GFSLAMP" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="LAMP2p5" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="WaveWatch" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="WaveWatch-WNA-Hurr" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="WaveWatch-ENP-Hurr" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="HurWind250" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="MOSGuide-HI" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HI-NamDNG5" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HI-RTMA" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="HurWind226" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="MOSGuide" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="MOSGuideExtended" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="HPCqpfNDFD" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="WaveWatch-WNA" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="WaveWatch-AK" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="WaveWatch-ENP" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="HPCGuide" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HPCqpf" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="HPE" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="MPE-Local" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="MSAS" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="namdng25" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="ETA212" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="NAHwave15" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="NAHwave10" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="NAHwave4" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="NationalBlend" category="SfcGrid/NationalBlend" views="PLANVIEW TIMESERIES" />
-    <vbSource key="NationalBlendAK" category="SfcGrid/NationalBlend" views="PLANVIEW TIMESERIES" />
-    <vbSource key="NationalBlendHI" category="SfcGrid/NationalBlend" views="PLANVIEW TIMESERIES" />
-    <vbSource key="NationalBlendPR" category="SfcGrid/NationalBlend" views="PLANVIEW TIMESERIES" />
-    <vbSource key="NationalBlendOC" category="SfcGrid/NationalBlend" views="PLANVIEW TIMESERIES" />
-    <vbSource key="NICICE" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="NPHwave15" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="NPHwave10" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="NPHwave4" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="OPCWave181" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="OPCWave182" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="OPCWave180" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="PR-NamDNG5" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="PR-RTMA" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="rfcMPE" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="NamDNG" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="NAM5" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="NAM12" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="NationalBlend" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="NAM40" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="RFCqpf" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="RTGSST" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="RTGSSTHR" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTMA25" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-GulfMexico" category="SfcGrid/RTOFS/forecast" subCategory="Atlantic"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-GulfStream" category="SfcGrid/RTOFS/forecast" subCategory="Atlantic"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-GulfMaine" category="SfcGrid/RTOFS/forecast" subCategory="Atlantic"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Atlantic" category="SfcGrid/RTOFS/forecast" subCategory="Atlantic"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Alaska" category="SfcGrid/RTOFS/forecast" subCategory="Global"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Arctic" category="SfcGrid/RTOFS/forecast" subCategory="Global"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Bering" category="SfcGrid/RTOFS/forecast" subCategory="Global"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Guam" category="SfcGrid/RTOFS/forecast" subCategory="Global"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-GulfAlaska" category="SfcGrid/RTOFS/forecast" subCategory="Global"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Honolulu" category="SfcGrid/RTOFS/forecast" subCategory="Global"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-HudsonBaffin" category="SfcGrid/RTOFS/forecast" subCategory="Global"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Samoa" category="SfcGrid/RTOFS/forecast" subCategory="Global"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-TropPaciLowres" category="SfcGrid/RTOFS/forecast" subCategory="Global"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-WestAtl" category="SfcGrid/RTOFS/forecast" subCategory="Global"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-WestConus" category="SfcGrid/RTOFS/forecast" subCategory="Global"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Now-GulfMexico" category="SfcGrid/RTOFS/nowcast" subCategory="Atlantic"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Now-GulfStream" category="SfcGrid/RTOFS/nowcast" subCategory="Atlantic"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Now-GulfMaine" category="SfcGrid/RTOFS/nowcast" subCategory="Atlantic"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Now-Atlantic" category="SfcGrid/RTOFS/nowcast" subCategory="Atlantic"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Now-Alaska" category="SfcGrid/RTOFS/nowcast" subCategory="Global"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Now-Arctic" category="SfcGrid/RTOFS/nowcast" subCategory="Global"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Now-Bering" category="SfcGrid/RTOFS/nowcast" subCategory="Global"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Now-Guam" category="SfcGrid/RTOFS/nowcast" subCategory="Global"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Now-GulfAlaska" category="SfcGrid/RTOFS/nowcast" subCategory="Global"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Now-Honolulu" category="SfcGrid/RTOFS/nowcast" subCategory="Global"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Now-HudsonBaffin" category="SfcGrid/RTOFS/nowcast" subCategory="Global"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Now-Samoa" category="SfcGrid/RTOFS/nowcast" subCategory="Global"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Now-TropPaciLowres" category="SfcGrid/RTOFS/nowcast" subCategory="Global"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Now-WestAtl" category="SfcGrid/RTOFS/nowcast" subCategory="Global"
-        views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Now-WestConus" category="SfcGrid/RTOFS/nowcast" subCategory="Global"
-        views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTMA" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-GulfMexico" category="SfcGrid/RTOFS/forecast"
+        subCategory="Atlantic" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-GulfStream" category="SfcGrid/RTOFS/forecast"
+        subCategory="Atlantic" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-GulfMaine" category="SfcGrid/RTOFS/forecast"
+        subCategory="Atlantic" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-Atlantic" category="SfcGrid/RTOFS/forecast"
+        subCategory="Atlantic" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-Alaska" category="SfcGrid/RTOFS/forecast"
+        subCategory="Global" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-Arctic" category="SfcGrid/RTOFS/forecast"
+        subCategory="Global" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-Bering" category="SfcGrid/RTOFS/forecast"
+        subCategory="Global" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-Guam" category="SfcGrid/RTOFS/forecast"
+        subCategory="Global" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-GulfAlaska" category="SfcGrid/RTOFS/forecast"
+        subCategory="Global" views="PLANVIEW TIMESERIES" />
+    <vbSource  key="RTOFS-Honolulu" category="SfcGrid/RTOFS/forecast"
+        subCategory="Global" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-HudsonBaffin" category="SfcGrid/RTOFS/forecast"
+        subCategory="Global" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-Samoa" category="SfcGrid/RTOFS/forecast"
+        subCategory="Global" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-TropPaciLowres" category="SfcGrid/RTOFS/forecast"
+        subCategory="Global" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-WestAtl" category="SfcGrid/RTOFS/forecast"
+        subCategory="Global" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-WestConus" category="SfcGrid/RTOFS/forecast"
+        subCategory="Global" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-Now-GulfMexico" category="SfcGrid/RTOFS/nowcast"
+        subCategory="Atlantic" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-Now-GulfStream" category="SfcGrid/RTOFS/nowcast"
+        subCategory="Atlantic" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-Now-GulfMaine" category="SfcGrid/RTOFS/nowcast"
+        subCategory="Atlantic" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-Now-Atlantic" category="SfcGrid/RTOFS/nowcast"
+        subCategory="Atlantic" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-Now-Alaska" category="SfcGrid/RTOFS/nowcast"
+        subCategory="Global" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-Now-Arctic" category="SfcGrid/RTOFS/nowcast"
+        subCategory="Global" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-Now-Bering" category="SfcGrid/RTOFS/nowcast"
+        subCategory="Global" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-Now-Guam" category="SfcGrid/RTOFS/nowcast"
+        subCategory="Global" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-Now-GulfAlaska" category="SfcGrid/RTOFS/nowcast"
+        subCategory="Global" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-Now-Honolulu" category="SfcGrid/RTOFS/nowcast"
+        subCategory="Global" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-Now-HudsonBaffin" category="SfcGrid/RTOFS/nowcast"
+        subCategory="Global" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-Now-Samoa" category="SfcGrid/RTOFS/nowcast"
+        subCategory="Global" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-Now-TropPaciLowres" category="SfcGrid/RTOFS/nowcast"
+        subCategory="Global" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-Now-WestAtl" category="SfcGrid/RTOFS/nowcast"
+        subCategory="Global" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTOFS-Now-WestConus" category="SfcGrid/RTOFS/nowcast"
+        subCategory="Global" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTMA" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="SeaIce" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="SPCGuide" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HurWind226" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="TPCSurgeProb" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="P-ETSS" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="PHISH" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="TPCWindProb" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="TPCWindProb_Prelim" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="FNMOC-WW3" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="FNMOC-NCODA" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="FNMOC-FAROP" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="URMA25" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="URMA25-EP" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="URMA25-SJU" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="WCwave10" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="WCwave4" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="WNAWAVE238" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="WNAwave10" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="WNAwave4" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="WPHwave10" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="PGBlended" category="SfcGrid/NOS" views="PLANVIEW TIMESERIES" />
-    <vbSource key="PGBlended-Night" category="SfcGrid/NOS" views="PLANVIEW TIMESERIES" />
-    <vbSource key="PWPF" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-</vbSourceList>
\ No newline at end of file
+</vbSourceList>
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/volume.xml b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/volume.xml
index ab51554dc9..2049823786 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/volume.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/volume.xml
@@ -1,107 +1,57 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8"?>
     <!--
         This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
         pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-
+        
         U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
         This_software_product_contains_export-restricted_data_whose
         export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
         to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
         an_export_license_or_other_authorization.
-
+        
         Contractor_Name:________Raytheon_Company
         Contractor_Address:_____6825_Pine_Street,_Suite_340
         ________________________Mail_Stop_B8
         ________________________Omaha,_NE_68106
         ________________________402.291.0100
-
+        
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
-    <!--
-        This is an incremental override file, indicating that the files
-        at different localization levels will be combined.
-    -->
 <vbSourceList>
-    <vbSource key="GFS160" category="Volume" />
-    <vbSource key="ETA242" category="Volume" />
-    <vbSource key="mesoEta216" category="Volume" />
-    <vbSource key="SREF216" category="Volume" />
-    <vbSource key="Aviation" category="Volume" views="PLANVIEW TIMESERIES" />
-    <vbSource key="ECMWF-HiRes" category="Volume" />
-    <vbSource key="ECMF-NorthernHemisphere" category="Volume" />
-    <vbSource key="AVN211" category="Volume" />
-    <!-- Old version being replaced by GFS229
-    <vbSource key="AVN225" category="Volume" />
-    <vbSource key="GFS213" category="Volume" />
-    <vbSource key="MRF204" category="Volume" />
-    <vbSource key="MRF205" category="Volume" />
-    -->
-    <vbSource key="GFS229" category="Volume" />
-    <!-- Old version being replaced by GFS229
-    <vbSource key="AVN203" category="Volume" />
-    -->
-    <vbSource key="GFS217" category="Volume/GFS20" />
-    <vbSource key="GFS215" category="Volume/GFS20" />
-    <vbSource key="GFS20-PAC" category="Volume/GFS20" />
-    <vbSource key="GFS20-PRICO" category="Volume/GFS20" />
+    <vbSource key="CMC" category="Volume" />
+    <vbSource key="GFS" category="Volume" />
+    <vbSource key="GFS0p5" category="Volume" />
+    <vbSource key="GFS1p0" category="Volume" />
+    <vbSource key="GFS20" category="Volume" />
+    <vbSource key="GFS40" category="Volume" />
+    <vbSource key="GFSGuide" category="Volume" />
+    <vbSource key="ECMF-Global" category="Volume" />
     <vbSource key="ENSEMBLE" category="Volume" views="PLANVIEW TIMESERIES" />
-    <vbSource key="AVN-NorthernHemisphere" category="Volume" />
-    <vbSource key="HFR-EAST_6KM" category="Volume/HFR" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HFR-US_EAST_DELAWARE_1KM" category="Volume/HFR" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HFR-US_EAST_FLORIDA_2KM" category="Volume/HFR" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HFR-US_EAST_NORTH_2KM" category="Volume/HFR" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HFR-US_EAST_SOUTH_2KM" category="Volume/HFR" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HFR-US_EAST_VIRGINIA_1KM" category="Volume/HFR" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HFR-US_HAWAII_1KM" category="Volume/HFR" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HFR-US_HAWAII_2KM" category="Volume/HFR" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HFR-WEST_6KM" category="Volume/HFR" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HFR-US_WEST_CENCAL_2KM" category="Volume/HFR" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HFR-US_WEST_NORTH_2KM" category="Volume/HFR" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HFR-US_WEST_SANFRAN_1KM" category="Volume/HFR" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HFR-US_WEST_SOCAL_2KM" category="Volume/HFR" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HFR-US_WEST_LOSANGELES_1KM" category="Volume/HFR" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HFR-US_WEST_LOSOSOS_1KM" category="Volume/HFR" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HiResW-ARW-AK" category="Volume/HiResW" />
-    <vbSource key="HiResW-ARW-East" category="Volume/HiResW" />
-    <vbSource key="HiResW-ARW-GU" category="Volume/HiResW" />
-    <vbSource key="HiResW-ARW-HI" category="Volume/HiResW" />
-    <vbSource key="HiResW-ARW-SJU" category="Volume/HiResW" />
-    <vbSource key="HiResW-ARW-West" category="Volume/HiResW" />
-    <vbSource key="HiResW-NMM-AK" category="Volume/HiResW" />
-    <vbSource key="HiResW-NMM-East" category="Volume/HiResW" />
-    <vbSource key="HiResW-NMM-GU" category="Volume/HiResW" />
-    <vbSource key="HiResW-NMM-HI" category="Volume/HiResW" />
-    <vbSource key="HiResW-NMM-SJU" category="Volume/HiResW" />
-    <vbSource key="HiResW-NMM-West" category="Volume/HiResW" />
     <vbSource key="HRRR" category="Volume" />
-    <vbSource key="HWRF" category="Volume" />
-    <vbSource key="LAMPQPF" category="Volume" />
-    <vbSource key="LAPS" category="Volume" />
-    <vbSource key="ETA218" category="Volume" />
-    <vbSource key="mesoEta212" category="Volume" />
-    <vbSource key="ETA" category="Volume" />
-    <vbSource key="ETA207" category="Volume" />
-    <vbSource key="nogaps" name="NAVGEM" category="Volume" />
-    <vbSource key="RUC130" category="Volume" />
-    <vbSource key="RAP200" category="Volume" />
-    <vbSource key="RUC236" category="Volume" />
-    <vbSource key="GFS254" category="Volume" />
-    <vbSource key="SREF243" category="Volume" />
-    <vbSource key="RSM" category="Volume" />
-    <vbSource key="GFS161" category="Volume" />
-    <vbSource key="SREF212" category="Volume" views="PLANVIEW TIMESERIES" />
-    <vbSource key="UKMET-NorthernHemisphere" category="Volume" />
-    <vbSource key="GEFS" category="Volume" />
-    <vbSource key="NCOM-ALASKA" category="Volume/NCOM" views="PLANVIEW TIMESERIES" />
-    <vbSource key="NCOM-AMSEAS" category="Volume/NCOM" views="PLANVIEW TIMESERIES" />
-    <vbSource key="NCOM-HAWAII" category="Volume/NCOM" views="PLANVIEW TIMESERIES" />
-    <vbSource key="NCOM-SOCAL" category="Volume/NCOM" views="PLANVIEW TIMESERIES" />
-    <vbSource key="NCOM-USEAST" category="Volume/NCOM" views="PLANVIEW TIMESERIES" />
-    <vbSource key="GEFS" name="GEFS" category="Ensemble" views="PLANVIEW TIMESERIES" />
-    <vbSource key="SREF212" name="SREF" category="Ensemble" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HREF-US" name="HREF-CONUS" category="Ensemble/HREF" views="PLANVIEW TIMESERIES"/>
-    <vbSource key="HREF-AK" category="Ensemble/HREF" views="PLANVIEW TIMESERIES"/>
-    <vbSource key="HREF-HI" category="Ensemble/HREF" views="PLANVIEW TIMESERIES"/>
-    <vbSource key="HREF-SJU" category="Ensemble/HREF" views="PLANVIEW TIMESERIES"/>
+    <vbSource key="HRRRX" category="Volume" />
+    <vbSource key="NAM5" category="Volume" />
+    <vbSource key="NAM12" category="Volume" />
+    <vbSource key="NAM20" category="Volume" />
+    <vbSource key="NAM40" category="Volume" />
+    <vbSource key="NamDNG" category="Volume" />
+    <vbSource key="NAVGEM" category="Volume" />
+    <vbSource key="NDFD" category="Volume" />
+    <vbSource key="NationalBlend" category="Volume" />
+    <vbSource key="RTMA" category="Volume" />
+    <vbSource key="URMA25" category="Volume" />    
+    <vbSource key="RAP13" category="Volume" />
+    <vbSource key="RAP20" category="Volume" />
+    <vbSource key="RAP40" category="Volume" />
+    <vbSource key="NOHRSC-SNOW" category="Volume" />
+    <vbSource key="FNMOC-FAROP" category="Volume" />
+    <vbSource key="FNMOC-NCODA" category="Volume" />
+    <vbSource key="FNMOC-WW3" category="Volume" />
+    <vbSource key="WaveWatch" category="Volume" />
+    <vbSource key="GLERL" category="Volume" />
+    <vbSource key="WaveWatch-WNA-Hurr" category="Volume" />
+    <vbSource key="WaveWatch-ENP-Hurr" category="Volume" />
+    <vbSource key="WaveWatch-WNA" category="Volume" />
+    <vbSource key="WaveWatch-ENP" category="Volume" />
+    <vbSource key="WaveWatch-AK" category="Volume" />
 </vbSourceList>