Fix HRRR table registration.

Unidata · Feb 23, 2021 · e29613d · e29613d
1 parent bd88f9b
commit e29613d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/grib/src/main/java/ucar/nc2/grib/grib2/table/FslLocalTables.java b/grib/src/main/java/ucar/nc2/grib/grib2/table/FslLocalTables.java
@@ -73,7 +73,7 @@ static private String getPath(Grib2Table grib2Table) {
     if (grib2Table.getId().genProcessId == 125)
       return fimTable;
     else
-      return hrrrTable;
+      return grib2Table.getPath();
   }
 
   private FslLocalTables(Grib2Table grib2Table) {
@@ -172,8 +172,8 @@ public String getStatisticNameShort(int id) {
   }
 
   protected void initLocalTable(Formatter f) {
-    if (grib2Table.getPath().equals(hrrrTable))
-      local = readCsv(hrrrTable, f);
+    if (grib2Table.getPath().contains("hrrr"))
+      local = readCsv(grib2Table.getPath(), f);
     else
       local = readFim(fimTable, f);
   }
@@ -206,7 +206,7 @@ private static Grib2Parameter parseVersion4(String[] flds, Formatter f) {
           VerticalLevels, Units);
     }
 
-    String name = !WGrib2Name.equals("var") ? WGrib2Name : FieldType;
+    String name = !NCLName.equals("var") ? NCLName : FieldType;
     return new Grib2Parameter(disciplineNumber, categoryNumber, parameterNumber, name, Units, null, FieldType);
   }
 

diff --git a/grib/src/main/resources/resources/grib2/standardTableMap.txt b/grib/src/main/resources/resources/grib2/standardTableMap.txt
@@ -7,8 +7,8 @@
 54;    -1; -1; -1; -1;    ncep; canadian met
 #
 # FSL HRRR
-59;     0;  2;  1;  -1;   gsd; FSL HRRR;  resources/grib2/noaa_gsd/Fsl-hrrr4.csv
-59;    -1; -1; -1; 125;   gsd; fsl hrrr
+59;     0;  2;  1;  -1;   gsd; fsl hrrr;  resources/grib2/noaa_gsd/Fsl-hrrr4.csv
+59;    -1; -1; -1; 125;   gsd; fsl hrrr;  resources/grib2/noaa_gsd/Fsl-hrrr2.csv
 #
 # center 8, subcenter 0 and -9999 use ndfd table
 8;      0; -1; -1; -1;    ndfd; ndfd