From c9425837e1db6ad4b9698286d6f989b1c7120627 Mon Sep 17 00:00:00 2001
From: mjames-upc <mjames@unidata.ucar.edu>
Date: Tue, 19 Sep 2017 12:36:16 -0600
Subject: [PATCH] NationalBlend grid size has increased; consolodate NCEP
 gribModels defn files

---
 .../localization/menus/volume/index.xml       |  37 ------
 .../common_static/base/grib/grids/gridNBM.xml |   6 +-
 .../models/NCEP/gribModels_NCEP-7_ETSS.xml    |  42 -------
 .../models/NCEP/gribModels_NCEP-7_GEFS.xml    |  27 -----
 .../NCEP/gribModels_NCEP-7_NationalBlend.xml  |  77 ------------
 .../models/NCEP/gribModels_NCEP-7_URMA.xml    |  33 ------
 .../base/grib/models/gribModels_NCEP-7.xml    | 110 ++++++++++++++++++
 7 files changed, 113 insertions(+), 219 deletions(-)
 delete mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/NCEP/gribModels_NCEP-7_ETSS.xml
 delete mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/NCEP/gribModels_NCEP-7_GEFS.xml
 delete mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/NCEP/gribModels_NCEP-7_NationalBlend.xml
 delete mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/NCEP/gribModels_NCEP-7_URMA.xml

diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml
index 8957fde650..ea85ab3087 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml
@@ -29,34 +29,6 @@
 	<substitute key="RAP13model" value="RAP13" />
 	<substitute key="RAPmodel" value="RAP40" />
 	<substitute key="SREFmodel" value="SREF212" />
-<!-- 	<substitute key="HRRRmodel" value="HRRR-CR" />
-	<substitute key="GEMNHmodel" value="Canadian-NH" />
-	<substitute key="GEMRegmodel" value="Canadian-Reg" />
-	<substitute key="ARXLAPSmodel" value="ARXLAPS" />
-	<substitute key="HRRRmodel" value="HRRR-CR" />
-	<substitute key="NAMNestmodel" value="CR-NAMNest" /> -->
-<!-- #
-# Configuration area for bundles that call radar mosaics. Replace the radar1-12 variables below
-# with radars that build your mosaic. 
-# -->
-<!-- 	<substitute key="radar1" value="karx" />
-    	<substitute key="radar2" value="kmpx"/>
-		<substitute key="radar3" value="kdlh"/>
-		<substitute key="radar4" value="kgrb"/>
-		<substitute key="radar5" value="kmkx"/>
-		<substitute key="radar6" value="kabr"/>
-		<substitute key="radar7" value="kfsd"/>
-		<substitute key="radar8" value="kdvn"/>
-		<substitute key="radar9" value="kdmx"/>
-		<substitute key="radar10" value="kabr"/>
-   	    <substitute key="radar11" value="koax"/>
-		<substitute key="radar12" value="kmvx"/> -->
-<!-- #
-# Configure the color map/table for the mosaic radar reflectivity
-# -->
-<!-- 	<substitute key="localReflectivityColorMap" value="Radar/Ref/ARX-Radar-Mosaic-clear"/> -->
-<!-- # end config section		 -->
-	
 	
     <include installTo="menu:volume?after=VolumeBundles" 
              fileName="menus/volume/baseFamilies.xml">
@@ -65,20 +37,11 @@
    <include subMenu="4-PanelFamilies" installTo="menu:volume" 
              fileName="menus/volume/baseFourPanelFamilies.xml">
     </include>
- <!--    <include subMenu="Aviation: Model Family" installTo="menu:volume" 
-             fileName="menus/volume/aviationFamily.xml">
-    </include> -->
-    
-<!--     Have placed the architecture for Comparisons, but they are not live, could not test them. db -->
-<!--     <include subMenu="Comparison Families" installTo="menu:volume" 
-             fileName="menus/volume/baseComparisonFamilies.xml">
-    </include>  -->
     
     <include subMenu="Convect Families" installTo="menu:volume" 
              fileName="menus/volume/ConvectModelFamilies.xml">
     </include>
  
-
     <include subMenu="Surface Families" installTo="menu:volume" 
              fileName="menus/volume/baseSurfaceFamilies.xml">
     </include>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/grids/gridNBM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/grids/gridNBM.xml
index ea95d5ba91..f5ddaf836c 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/grids/gridNBM.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/grids/gridNBM.xml
@@ -21,10 +21,10 @@
 <lambertConformalGridCoverage>
     <name>NBM</name>
     <description> National Blend Grid over CONUS - (2.54 km)</description>
-    <la1>20.191999</la1>
-    <lo1>-121.554</lo1>
+    <la1>19.229000</la1>
+    <lo1>-233.723400</lo1>
     <firstGridPointCorner>LowerLeft</firstGridPointCorner>
-    <nx>2145</nx>
+    <nx>2345</nx>
     <ny>1597</ny>
     <dx>2.539703</dx>
     <dy>2.539703</dy>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/NCEP/gribModels_NCEP-7_ETSS.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/NCEP/gribModels_NCEP-7_ETSS.xml
deleted file mode 100644
index 255603e33e..0000000000
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/NCEP/gribModels_NCEP-7_ETSS.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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.
--->
-
-<gribModelSet>
-	<model>
-		<name>ETSS</name>
-		<center>7</center>
-		<subcenter>14</subcenter>
-		<grid>184</grid>
-		<process>
-			<id>12</id>
-		</process>
-	</model>
-
-	<model>
-		<name>ETSS-${REGION}</name>
-		<center>7</center>
-		<subcenter>14</subcenter>
-		<grid>1023</grid>
-		<process>
-			<id>12</id>
-		</process>
-	</model>
-</gribModelSet>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/NCEP/gribModels_NCEP-7_GEFS.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/NCEP/gribModels_NCEP-7_GEFS.xml
deleted file mode 100644
index fb259d47d9..0000000000
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/NCEP/gribModels_NCEP-7_GEFS.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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. -->
-
-
-<gribModelSet>
-	<model>
-		<name>GEFS</name>
-		<center>7</center>
-		<subcenter>2</subcenter>
-		<grids>
-            <id>2</id>
-            <id>3</id>
-            <id>361181001</id>
-            <id>372</id>
-            <id>375</id>
-        </grids>
-		<process>
-			<id>107</id>
-		</process>
-	</model>
-</gribModelSet>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/NCEP/gribModels_NCEP-7_NationalBlend.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/NCEP/gribModels_NCEP-7_NationalBlend.xml
deleted file mode 100644
index be178127e1..0000000000
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/NCEP/gribModels_NCEP-7_NationalBlend.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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.
--->
-
-<gribModelSet>
-    <model>
-        <name>NationalBlend</name>
-        <center>7</center>
-        <subcenter>14</subcenter>
-        <grid>NBM</grid>
-        <process>
-            <id>104</id>
-        </process>
-    </model>
-
-    <!--Alaska-->
-    <model>
-        <name>NationalBlendAK</name>
-        <center>7</center>
-        <subcenter>14</subcenter>
-        <grid>1023</grid>
-        <process>
-            <id>104</id>
-        </process>
-    </model>
-
-    <!--Hawaii-->
-    <model>
-        <name>NationalBlendHI</name>
-        <center>7</center>
-        <subcenter>14</subcenter>
-        <grid>625561001</grid>
-        <process>
-            <id>104</id>
-        </process>
-    </model>
-
-    <!--Puerto Rico-->
-    <model>
-        <name>NationalBlendPR</name>
-        <center>7</center>
-        <subcenter>14</subcenter>
-        <grid>NBM_PR</grid>
-        <process>
-            <id>104</id>
-        </process>
-    </model>
-    
-        <!--Oceanic-->
-    <model>
-        <name>NationalBlendOC</name>
-        <center>7</center>
-        <subcenter>14</subcenter>
-        <grid>NBM_OC</grid>
-        <process>
-            <id>104</id>
-        </process>
-    </model>
-    
-</gribModelSet>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/NCEP/gribModels_NCEP-7_URMA.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/NCEP/gribModels_NCEP-7_URMA.xml
deleted file mode 100644
index e770686029..0000000000
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/NCEP/gribModels_NCEP-7_URMA.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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. -->
-
-
-<gribModelSet>
-  <!-- Most of the URMA fields  -->
-  <model>
-    <name>URMA25</name>
-    <center>7</center>
-    <subcenter>0</subcenter>
-    <grid>184</grid>
-    <process>
-        <id>118</id>
-    </process>
-  </model>
-  
-  <!-- Precipitation analysis -->
-  <model>
-      <name>URMA25</name>
-      <center>7</center>
-      <subcenter>4</subcenter>
-      <grid>184</grid>
-      <process>
-          <id>118</id>
-      </process>
-  </model>
-</gribModelSet>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/gribModels_NCEP-7.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/gribModels_NCEP-7.xml
index 6e4f3cecc4..de3bb26af6 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/gribModels_NCEP-7.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grib/models/gribModels_NCEP-7.xml
@@ -1817,6 +1817,28 @@
             <id>109</id>
         </process>
     </model>
+  
+    <!-- Most of the URMA fields  -->
+    <model>
+        <name>URMA25</name>
+        <center>7</center>
+        <subcenter>0</subcenter>
+        <grid>184</grid>
+        <process>
+            <id>118</id>
+        </process>
+    </model>
+  
+    <!-- Precipitation analysis -->
+    <model>
+        <name>URMA25</name>
+        <center>7</center>
+        <subcenter>4</subcenter>
+        <grid>184</grid>
+        <process>
+            <id>118</id>
+        </process>
+    </model>
 
     <model>
         <name>RTGSSTHR</name>
@@ -2412,6 +2434,59 @@
         </process>
     </model>
 
+    <model>
+        <name>NationalBlend</name>
+        <center>7</center>
+        <subcenter>14</subcenter>
+        <grid>NBM</grid>
+        <process>
+            <id>104</id>
+        </process>
+    </model>
+
+    <!--Alaska-->
+    <model>
+        <name>NationalBlendAK</name>
+        <center>7</center>
+        <subcenter>14</subcenter>
+        <grid>1023</grid>
+        <process>
+            <id>104</id>
+        </process>
+    </model>
+
+    <!--Hawaii-->
+    <model>
+        <name>NationalBlendHI</name>
+        <center>7</center>
+        <subcenter>14</subcenter>
+        <grid>625561001</grid>
+        <process>
+            <id>104</id>
+        </process>
+    </model>
+
+    <!--Puerto Rico-->
+    <model>
+        <name>NationalBlendPR</name>
+        <center>7</center>
+        <subcenter>14</subcenter>
+        <grid>NBM_PR</grid>
+        <process>
+            <id>104</id>
+        </process>
+    </model>
+    
+        <!--Oceanic-->
+    <model>
+        <name>NationalBlendOC</name>
+        <center>7</center>
+        <subcenter>14</subcenter>
+        <grid>NBM_OC</grid>
+        <process>
+            <id>104</id>
+        </process>
+    </model>
 
     <!-- END SUBCENTER 14: NWS METEOROLOGICAL DEVELOPMENT LABORATORY -->
 
@@ -2501,4 +2576,39 @@
 
     <!-- END SUBCENTER 16: SPACE WEATHER PREDICTION CENTER -->
 
+	<model>
+		<name>ETSS</name>
+		<center>7</center>
+		<subcenter>14</subcenter>
+		<grid>184</grid>
+		<process>
+			<id>12</id>
+		</process>
+	</model>
+
+	<model>
+		<name>ETSS-${REGION}</name>
+		<center>7</center>
+		<subcenter>14</subcenter>
+		<grid>1023</grid>
+		<process>
+			<id>12</id>
+		</process>
+	</model>
+
+	<model>
+		<name>GEFS</name>
+		<center>7</center>
+		<subcenter>2</subcenter>
+		<grids>
+                     <id>2</id>
+                     <id>3</id>
+                     <id>361181001</id>
+                     <id>372</id>
+                     <id>375</id>
+                </grids>
+		<process>
+		     <id>107</id>
+		</process>
+	</model>
 </gribModelSet>