Merge pull request #1216 from lesserwhirls/prer

GRIB table updates and logging cleanup

bufr/src/main/java/ucar/nc2/iosp/bufr/MessageUncompressedDataReader.java

@@ -233,8 +233,8 @@ private void readData(DebugOut out, BitReader reader, BitCounterUncompressed tab
 
         if (req.wantRow()) {
           int index = req.abb.addObjectToHeap(seq);
-          if (req.bb.position() >= req.bb.limit())
-            System.out.println("HEY");
+          //if (req.bb.position() >= req.bb.limit())
+          // todo: make logger System.out.println("HEY");
           req.bb.putInt(index); // an index into the Heap
         }
         continue;
@@ -358,8 +358,6 @@ private ArraySequence makeArraySequenceUncompressed(DebugOut out, BitReader read
     if (req.wantRow()) {
       Sequence seq = (Sequence) seqdd.refersTo;
 
-      if (seq == null)
-        System.out.println("HEY");
       assert seq != null;
 
       // for the obs structure

cdm/src/main/java/ucar/nc2/ft/fmrc/FmrcInv.java

@@ -279,7 +279,7 @@ public static double getOffsetInHours(CalendarDate base, CalendarDate forecast)
     double result =  diff / 1000.0 / 60.0 / 60.0;                // LOOK why convert to double? precision may be lost ??
     long testRoundoff = (long) ( result * 1000.0 * 60.0 * 60.0);
     if (diff != testRoundoff)
-      System.out.println("HEY");
+      log.debug("diff does not equal testRoundoff");
     return result;
   }
 

cdm/src/main/java/ucar/nc2/ft/point/standard/Table.java

@@ -1050,7 +1050,7 @@ public StructureDataIterator getStructureDataIterator(Cursor cursor, int bufferS
       StructureMembers.Member m = members.findMember(nestedTableName);
 
       if (m == null) {
-        System.out.println("HEY");
+        log.debug("Member is null");
       } else if (m.getDataType() == DataType.SEQUENCE) {
         ArraySequence seq = parentStruct.getArraySequence(m);
         return seq.getStructureDataIterator();

grib/src/main/java/ucar/nc2/grib/grib2/table/NcepLocalTables.java

@@ -59,7 +59,7 @@
  */
 public class NcepLocalTables extends LocalTables {
   static private final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(NcepLocalTables.class);
-  static private final String defaultResourcePath = "resources/grib2/ncep/v20.0.0/";
+  static private final String defaultResourcePath = "resources/grib2/ncep/v21.0.0/";
   private static NcepLocalTables single;
 
   public static Grib2Customizer getCust(Grib2Table table) {

grib/src/main/resources/resources/grib1/ncep/ncepTable3.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <table3>
   <title>NCEP GRIB-1 Table 3</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/on388/table3.html</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/on388/table3.html</source>
   <parameter code="1">
     <description>Ground or water surface</description>
     <abbrev>SFC</abbrev>

grib/src/main/resources/resources/grib1/ncep/ncepTableA.xml

@@ -12,7 +12,7 @@
     <description>NCEP/ARL Smoke Model</description>
   </parameter>
   <parameter code="5">
-    <description>Satellite Derived Precipitation and temperatures, from IR (See PDS Octet 41... for specific satellite ID)</description>
+    <description>Satellite Derived Precipitation and temperatures, from IR (See PDS Octet 41... dfor specific satellite ID)</description>
   </parameter>
   <parameter code="6">
     <description>NCEP/ARL Dust Model</description>
@@ -185,6 +185,9 @@
   <parameter code="99">
     <description>Miscellaneous Test ID</description>
   </parameter>
+  <parameter code="100">
+    <description>Miscellaneous Test ID</description>
+  </parameter>
   <parameter code="104">
     <description>National Blend GRIB</description>
   </parameter>

grib/src/main/resources/resources/grib1/ncep/readme.txt

@@ -66,3 +66,7 @@
 
 12/01/2017 sarms
   - updated ncep grib1 tables using ucar/nc2/grib/grib1/tables/NcepHtmlScraper.java
+
+02/11/2019 sarms
+  - updated ncep grib1 tables using grib\src\test\java\ucar\nc2\grib\grib1\table\NcepHtmlScraper.java
+    of 5.0 branch.

grib/src/main/resources/resources/grib2/ncep/readme.txt

@@ -827,4 +827,10 @@ Conflicts=0 extra=3 udunits=0
     Noticed a warning that "*** Cant parse 0-90 == 0-90 Elevation in increments of 100 m" on
     http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-216.shtml. Not sure how to interpret
     without an example file, so will leave out for now. Has been left out since 2015, when this
-    table appeared.
+    table appeared.
+
+02/11/2019 sarms
+  - updated ncep grib2 tables to v21.0.0 using grib\src\test\java\ucar\nc2\grib\grib2\table\NcepHtmlScraper.java
+    of 5.0 branch.
+    URL of NCEP GRIB2 docs changed (to https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/),
+    so updated that as well

grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.0.xml → grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.0.xml

@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.0</table>
   <title>Product Definition Template Number</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-0.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-0.shtml</source>
   <parameter code="0">
     <description>Analysis or forecast at a horizontal level or in a horizontal layer at a point in time. (see Template 4.0)</description>
   </parameter>
@@ -61,14 +61,17 @@
     <description>Satellite product (see Template 4.31)</description>
   </parameter>
   <parameter code="32">
-    <description>Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for simulate (synthetic) staellite data (see Template 4.32)</description>
+    <description>Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for simulate (synthetic) satellite data (see Template 4.32)</description>
   </parameter>
   <parameter code="33">
     <description>Individual Ensemble Forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for simulated (synthetic) satellite data (see Template 4.33)</description>
   </parameter>
   <parameter code="34">
     <description>Individual Ensemble Forecast, control and perturbed, at a horizontal level or in a horizontal layer, in a continuous or non-continuous interval for simulated (synthetic) satellite data(see Template 4.34)</description>
   </parameter>
+  <parameter code="35">
+    <description>Satellite product with or without associated quality values (see Template 4.35)</description>
+  </parameter>
   <parameter code="40">
     <description>Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for atmospheric chemical constituents. (see Template 4.40)</description>
   </parameter>

grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.1.xml → grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.1.xml

@@ -2,5 +2,5 @@
 <codeTable>
   <table>Table 4.1</table>
   <title>Parameter Category by Product Discipline</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-1.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-1.shtml</source>
 </codeTable>

grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.10.xml → grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.10.xml

@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.10</table>
   <title>Type of Statistical Processing</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-10.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-10.shtml</source>
   <parameter code="0">
     <description>Average</description>
   </parameter>

grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.11.xml → grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.11.xml

@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.11</table>
   <title>Type of Time Intervals</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-11.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-11.shtml</source>
   <parameter code="1">
     <description>Successive times processed have same forecast time, start time of forecast is incremented.</description>
   </parameter>

grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.12.xml → grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.12.xml

@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.12</table>
   <title>Operating Mode</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-12.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-12.shtml</source>
   <parameter code="0">
     <description>Maintenance Mode</description>
   </parameter>

grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.13.xml → grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.13.xml

@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.13</table>
   <title>Quality Control Indicator</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-13.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-13.shtml</source>
   <parameter code="0">
     <description>No Quality Control Applied</description>
   </parameter>

grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.14.xml → grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.14.xml

@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.14</table>
   <title>Clutter Filter Indicator</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-14.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-14.shtml</source>
   <parameter code="0">
     <description>No Clutter Filter Used</description>
   </parameter>

grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.15.xml → grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.15.xml

@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.15</table>
   <title>Type of Spatial Processing used to arrive at given</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-15.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-15.shtml</source>
   <parameter code="0">
     <description>Data is calculated directly from the source grid with no interpolation (see note 1)</description>
   </parameter>

grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.16.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<codeTable>
+  <table>Table 4.16</table>
+  <title>Quality Value Associated with Parameter</title>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-16.shtml</source>
+  <parameter code="0">
+    <description>Confidence index (see Note 2)</description>
+  </parameter>
+  <parameter code="1">
+    <description>Quality indicator (see Note 3 and see Code Table 244)</description>
+  </parameter>
+  <parameter code="2">
+    <description>Correlation of Product with used Calibration Product (see Note 4)</description>
+  </parameter>
+  <parameter code="3">
+    <description>Standard deviation (see Note 5)</description>
+  </parameter>
+  <parameter code="4">
+    <description>Random error (see Note 5)</description>
+  </parameter>
+  <parameter code="255">
+    <description>Missing</description>
+  </parameter>
+</codeTable>

grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.0.xml → grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.0.xml

@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.0</table>
   <title>Temperature</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-0.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-0.shtml</source>
   <parameter code="0">
     <shortName>TMP</shortName>
     <description>Temperature</description>

grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.1.xml → grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.1.xml

@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.1</table>
   <title>Moisture</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-1.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-1.shtml</source>
   <parameter code="0">
     <shortName>SPFH</shortName>
     <description>Specific Humidity</description>
@@ -783,6 +783,46 @@
     <description>Frozen Rain</description>
     <units>kg m-2</units>
   </parameter>
+  <parameter code="228">
+    <shortName>FICEAC</shortName>
+    <description>Flat Ice Accumulation (FRAM)</description>
+    <units>kg m-2</units>
+  </parameter>
+  <parameter code="229">
+    <shortName>LICEAC</shortName>
+    <description>Line Ice Accumulation (FRAM)</description>
+    <units>kg m-2</units>
+  </parameter>
+  <parameter code="230">
+    <shortName>SLACC</shortName>
+    <description>Sleet Accumulation</description>
+    <units>kg m-2</units>
+  </parameter>
+  <parameter code="231">
+    <shortName>PPINDX</shortName>
+    <description>Precipitation Potential Index</description>
+    <units>%</units>
+  </parameter>
+  <parameter code="232">
+    <shortName>PROBCIP</shortName>
+    <description>Probability Cloud Ice Present</description>
+    <units>%</units>
+  </parameter>
+  <parameter code="233">
+    <shortName>SNOWLR</shortName>
+    <description>Snow Liquid ratio</description>
+    <units>kg kg-1</units>
+  </parameter>
+  <parameter code="234">
+    <shortName>PCPDUR</shortName>
+    <description>Precipitation Duration</description>
+    <units>hour</units>
+  </parameter>
+  <parameter code="235">
+    <shortName>CLLMR</shortName>
+    <description>Cloud Liquid Mixing Ratio</description>
+    <units>kg kg-1</units>
+  </parameter>
   <parameter code="241">
     <shortName>TSNOW</shortName>
     <description>Total Snow</description>

grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.13.xml → grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.13.xml

@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.13</table>
   <title>Aerosols</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-13.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-13.shtml</source>
   <parameter code="0">
     <shortName>AEROT</shortName>
     <description>Aerosol Type</description>

grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.14.xml → grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.14.xml

@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.14</table>
   <title>Trace gases</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-14.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-14.shtml</source>
   <parameter code="0">
     <shortName>TOZNE</shortName>
     <description>Total Ozone</description>

grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.15.xml → grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.15.xml

@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.15</table>
   <title>Radar</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-15.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-15.shtml</source>
   <parameter code="0">
     <shortName>BSWID</shortName>
     <description>Base Spectrum Width</description>

grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.16.xml → grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.16.xml

@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.16</table>
   <title>Forecast Radar Imagery</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-16.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-16.shtml</source>
   <parameter code="0">
     <shortName>REFZR</shortName>
     <description>Equivalent radar reflectivity factor for rain</description>

grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.17.xml → grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.17.xml

@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.17</table>
   <title>Electrodynamics</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-17.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-17.shtml</source>
   <parameter code="0">
     <shortName>LTNGSD</shortName>
     <description>Lightning Strike Density</description>

grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.18.xml → grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.18.xml

@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.18</table>
   <title>Nuclear/radiology</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-18.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-18.shtml</source>
   <parameter code="0">
     <shortName>ACCES</shortName>
     <description>Air Concentration of Caesium 137</description>

grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.19.xml → grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.19.xml

@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.19</table>
   <title>Physical atmospheric Properties</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-19.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-19.shtml</source>
   <parameter code="0">
     <shortName>VIS</shortName>
     <description>Visibility</description>
@@ -358,4 +358,19 @@
     <description>Joint Fire Weather Probability</description>
     <units>%</units>
   </parameter>
+  <parameter code="236">
+    <shortName>SNOWLVL</shortName>
+    <description>Snow Level</description>
+    <units>m</units>
+  </parameter>
+  <parameter code="237">
+    <shortName>DRYTPROB</shortName>
+    <description>Dry Thunderstorm Probability</description>
+    <units>%</units>
+  </parameter>
+  <parameter code="238">
+    <shortName>ELLINX</shortName>
+    <description>Ellrod Index</description>
+    <units />
+  </parameter>
 </parameterMap>

grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.190.xml → grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.190.xml

@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.190</table>
   <title>CCITT IA5 string</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-190.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-190.shtml</source>
   <parameter code="0">
     <shortName>ATEXT</shortName>
     <description>Arbitrary Text String</description>

grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.191.xml → grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.191.xml

@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.191</table>
   <title>Miscellaneous</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-191.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-191.shtml</source>
   <parameter code="0">
     <shortName>TSEC</shortName>
     <description>Seconds prior to initial reference time (defined in Section 1)</description>

grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.192.xml → grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.192.xml

@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.192</table>
   <title>Covariance</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-192.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-192.shtml</source>
   <parameter code="1">
     <shortName>COVMZ</shortName>
     <description>Covariance between zonal and meridional components of the wind. Defined as [uv]-[u][v], where "[]" indicates the mean over the indicated time span.</description>