From 9cbd4db24e844b1953e5859d498ee19a2363bd7c Mon Sep 17 00:00:00 2001
From: Edward Hartnett <edward.hartnett@noaa.gov>
Date: Thu, 22 Feb 2024 08:03:47 -0700
Subject: [PATCH 1/6] more testing of large files

---
 CMakeLists.txt       | 2 +-
 tests/CMakeLists.txt | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 20a1ff29..45d67ad4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ option(BUILD_SHARED_LIBS "Build shared libraries" ON)
 option(BUILD_STATIC_LIBS "Build static libraries" ON)
 option(FTP_TEST_FILES "Fetch and test with files on FTP site." OFF)
 option(FTP_LARGE_TEST_FILES "Fetch and test with very large files on FTP site." OFF)
-option(FTP_EXTRA_TEST_FILES "Test with files not yet available via FTP." OFF)
+option(FTP_EXTRA_TEST_FILES "Test with more large files fetched via FTP." OFF)
 option(LOGGING "Turn on internal logging messages. Only useful to g2c developers." OFF)
 option(PTHREADS "Turn on thread-safty with pthreads." OFF)
 option(UTILS "Build and install some utility programs." ON)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b80ccc5b..f9d17bb4 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -74,7 +74,7 @@ set(REF_FILES "gdaswave.t00z.wcoast.0p16.f000.grib2.idx"
   "ref_tst_jasper_warning.txt"
   )
 
-# Copy extra files if needed.
+# Copy large files if needed.
 if(FTP_LARGE_TEST_FILES)
   set(REF_FILES ${REF_FILES} "ref_fv3lam.t00z.prslev.f000.grib2.degrib2")
 endif()
@@ -164,7 +164,8 @@ if(FTP_TEST_FILES)
   endif()
 
   if(FTP_EXTRA_TEST_FILES)
-    set(EXTRA_FTP_FILES "MRMS_MultiSensor_QPE_24H_Pass2_00.00_20230621-110000.grib2")
+    set(EXTRA_FTP_FILES MRMS_MultiSensor_QPE_24H_Pass2_00.00_20230621-110000.grib2
+      GFSPRS.GrbF06 rrfs.t18z.prslev.f000.grib2)
     foreach(THE_FILE IN LISTS EXTRA_FTP_FILES) 
       PULL_DATA(${G2_FTP_URL} ${THE_FILE})
     endforeach()

From 8105e7992a31bb3843cf459494aea690c1be95d7 Mon Sep 17 00:00:00 2001
From: Edward Hartnett <edward.hartnett@noaa.gov>
Date: Thu, 22 Feb 2024 09:25:57 -0700
Subject: [PATCH 2/6] fixing large file test

---
 .../ref_fv3lam.t00z.prslev.f000.grib2.degrib2 | 88 +++++++++----------
 tests/run_large_index_tests.sh                |  2 +-
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/tests/data/ref_fv3lam.t00z.prslev.f000.grib2.degrib2 b/tests/data/ref_fv3lam.t00z.prslev.f000.grib2.degrib2
index 2599f9f8..2bdd485c 100644
--- a/tests/data/ref_fv3lam.t00z.prslev.f000.grib2.degrib2
+++ b/tests/data/ref_fv3lam.t00z.prslev.f000.grib2.degrib2
@@ -854,7 +854,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = VIL      0 15 3 )  15 3 2 0 134 0 0 1 0 200 0 0 255 0 0
   FIELD: VIL      Entire Atmosphere valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  0 0 1 12 0 1 0 0 0 141294 0 4 1 1 1023 10 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -980,7 +980,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = BMIXL    2 0 197 )  0 197 2 0 134 0 0 1 0 105 0 1 255 0 0
   FIELD: BMIXL   1 hybrid lvl valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 0 :  0 0 0 0 0
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -1064,7 +1064,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = VRATE    0 2 224 )  2 224 2 0 134 0 0 1 0 220 0 0 255 0 0
   FIELD: VRATE    Planetary boundary valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  0 0 -2 11 0 1 0 0 0 802393 0 4 1 1 63 6 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -16646,7 +16646,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = TMP      0 0 0 )  0 0 2 0 134 0 0 1 0 104 4 7000 255 0 0
   FIELD: TMP     .7000 sigma valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  1131240167 -4 0 11 0 1 0 0 0 580124 0 4 1 1 127 7 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -16667,7 +16667,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = TMP      0 0 0 )  0 0 2 0 134 0 0 1 0 104 4 7500 255 0 0
   FIELD: TMP     .7500 sigma valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  1131485991 -4 0 11 0 1 0 0 0 591899 0 4 1 1 127 7 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -16688,7 +16688,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = TMP      0 0 0 )  0 0 2 0 134 0 0 1 0 104 4 8000 255 0 0
   FIELD: TMP     .8000 sigma valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  1131709357 -4 0 11 0 1 0 0 0 597302 0 4 1 1 127 7 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -16709,7 +16709,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = TMP      0 0 0 )  0 0 2 0 134 0 0 1 0 104 4 8500 255 0 0
   FIELD: TMP     .8500 sigma valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  1131918914 -4 0 11 0 1 0 0 0 621687 0 4 1 1 127 7 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -16730,7 +16730,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = TMP      0 0 0 )  0 0 2 0 134 0 0 1 0 104 4 9000 255 0 0
   FIELD: TMP     .9000 sigma valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  1132109748 -4 0 11 0 1 0 0 0 652844 0 4 1 1 127 7 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -17444,7 +17444,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = MSTAV    2 0 194 )  0 194 2 0 134 0 0 1 0 106 2 0 106 2 100
   FIELD: MSTAV    0 -  1 m DBLY valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 0 :  0 0 0 0 0
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -17465,7 +17465,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = UNKNOWN  2 0 22 )  0 22 2 0 134 0 0 1 0 106 2 0 106 2 200
   FIELD: UNKNOWN  0 -  2 m DBLY valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  1084227584 0 -1 10 0 1 0 0 0 291018 0 4 1 1 512 9 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -17570,7 +17570,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = SMDRY    2 3 196 )  3 196 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: SMDRY    Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  0 0 3 10 0 1 0 0 0 211698 0 4 1 1 1024 10 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -17591,7 +17591,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = POROS    2 3 197 )  3 197 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: POROS    Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  0 0 3 11 0 1 0 0 0 214705 0 4 1 1 1024 10 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -17927,7 +17927,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = CPOFP    1 1 193 )  1 193 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: CPOFP    Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  -1007026176 0 1 13 0 1 0 0 0 135201 0 4 1 1 1024 10 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18620,7 +18620,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = VGTYP    2 0 198 )  0 198 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: VGTYP    Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  0 0 1 10 0 1 0 0 0 250162 0 4 1 1 512 9 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18641,7 +18641,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = SOTYP    2 3 0 )  3 0 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: SOTYP    Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  0 0 1 10 0 1 0 0 0 209460 0 4 1 1 1024 10 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18662,7 +18662,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = CCOND    2 0 199 )  0 199 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: CCOND    Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  0 0 4 10 0 1 0 0 0 276162 0 4 1 1 512 9 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18683,7 +18683,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = RSMIN    2 0 200 )  0 200 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: RSMIN    Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  0 0 0 11 0 1 0 0 0 217544 0 4 1 1 1024 10 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18704,7 +18704,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = RLYRS    2 3 193 )  3 193 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: RLYRS    Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  0 0 2 11 0 1 0 0 0 186939 0 4 1 1 1024 10 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18725,7 +18725,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = WILT     2 0 201 )  0 201 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: WILT     Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  0 0 3 10 0 1 0 0 0 211698 0 4 1 1 1024 10 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18746,7 +18746,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = SMREF    2 3 195 )  3 195 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: SMREF    Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  0 0 3 11 0 1 0 0 0 213838 0 4 1 1 1024 10 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18767,7 +18767,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = RCS      2 0 202 )  0 202 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: RCS      Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  0 0 3 12 0 1 0 0 0 294815 0 4 1 1 512 9 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18788,7 +18788,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = RCT      2 0 203 )  0 203 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: RCT      Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  0 0 4 16 0 1 0 0 0 282652 0 5 1 1 1024 10 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18809,7 +18809,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = RCQ      2 0 204 )  0 204 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: RCQ      Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  0 0 2 9 0 1 0 0 0 266860 0 4 1 1 512 9 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18830,7 +18830,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = RCSOL    2 0 205 )  0 205 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: RCSOL    Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  0 0 2 9 0 1 0 0 0 290850 0 4 1 1 512 9 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18851,7 +18851,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = PRES     0 3 0 )  3 0 2 0 134 0 0 1 0 8 0 0 255 0 0
   FIELD: PRES     Nom. top valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 0 :  1129620242 0 0 0 0
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18872,7 +18872,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = LFTX     0 7 192 )  7 192 2 0 134 0 0 1 0 100 0 50000 100 0 100000
   FIELD: LFTX     500 -  1000 mb valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  1159946240 0 1 9 0 1 0 0 0 607582 0 4 1 1 127 7 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19208,7 +19208,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = HGT      0 3 5 )  3 5 2 0 134 0 0 1 0 253 0 0 255 0 0
   FIELD: HGT      Lowest bot. lvl sup valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  -951889920 2 1 17 0 1 0 0 0 257080 0 5 1 1 1024 10 2 3
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19229,7 +19229,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = HGT      0 3 5 )  3 5 2 0 134 0 0 1 0 254 0 0 255 0 0
   FIELD: HGT      highest top lvl sup valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  -979615744 0 0 16 0 1 0 0 0 267417 0 5 1 1 512 9 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19460,7 +19460,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = PRES     0 3 0 )  3 0 2 0 134 0 0 1 0 3 0 0 255 0 0
   FIELD: PRES     Cloud top lvl valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  -951889920 2 0 18 0 1 0 0 0 683027 0 5 1 1 127 7 2 3
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19481,7 +19481,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = HGT      0 3 5 )  3 5 2 0 134 0 0 1 0 3 0 0 255 0 0
   FIELD: HGT      Cloud top lvl valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  -951889920 2 1 18 0 1 0 0 0 699109 0 5 1 1 127 7 2 3
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19502,7 +19502,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = TMP      0 0 0 )  0 0 2 0 134 0 0 1 0 3 0 0 255 0 0
   FIELD: TMP      Cloud top lvl valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  -951889920 1 2 18 0 1 0 0 0 702507 0 5 1 1 127 7 2 3
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19817,7 +19817,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = HLCY     0 7 8 )  7 8 2 0 134 0 0 1 0 103 0 3000 103 0 0
   FIELD: HLCY    3000 - 0 m AGL valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  -1009582080 0 0 10 0 1 0 0 0 738510 0 4 1 1 63 6 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19838,7 +19838,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = HLCY     0 7 8 )  7 8 2 0 134 0 0 1 0 103 0 1000 103 0 0
   FIELD: HLCY    1000 - 0 m AGL valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  -986472448 0 1 13 0 1 0 0 0 895926 0 4 1 1 63 6 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19859,7 +19859,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = USTM     0 2 194 )  2 194 2 0 134 0 0 1 0 103 0 6000 103 0 0
   FIELD: USTM    6000 - 0 m AGL valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  -989241344 0 2 13 0 1 0 0 0 875255 0 4 1 1 63 6 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19880,7 +19880,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = VSTM     0 2 195 )  2 195 2 0 134 0 0 1 0 103 0 6000 103 0 0
   FIELD: VSTM    6000 - 0 m AGL valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  -987824128 0 2 13 0 1 0 0 0 875061 0 4 1 1 63 6 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19922,7 +19922,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = VUCSH    0 2 15 )  2 15 2 0 134 0 0 1 0 103 0 0 103 0 1000
   FIELD: VUCSH   0 - 1000 m AGL valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  -1016332288 0 1 9 0 1 0 0 0 622495 0 4 1 1 127 7 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19943,7 +19943,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = VVCSH    0 2 16 )  2 16 2 0 134 0 0 1 0 103 0 0 103 0 1000
   FIELD: VVCSH   0 - 1000 m AGL valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  -1019019264 0 1 8 0 1 0 0 0 623621 0 4 1 1 127 7 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19964,7 +19964,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = VUCSH    0 2 15 )  2 15 2 0 134 0 0 1 0 103 0 0 103 0 6000
   FIELD: VUCSH   0 - 6000 m AGL valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  -1013448704 0 1 9 0 1 0 0 0 646482 0 4 1 1 127 7 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19985,7 +19985,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = VVCSH    0 2 16 )  2 16 2 0 134 0 0 1 0 103 0 0 103 0 6000
   FIELD: VVCSH   0 - 6000 m AGL valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  -1012432896 0 1 9 0 1 0 0 0 641439 0 4 1 1 127 7 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -21308,7 +21308,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = HGT      0 3 5 )  3 5 2 0 134 0 0 1 0 4 0 0 255 0 0
   FIELD: HGT      0 Deg Isotherm valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  0 4 1 17 0 1 0 0 0 757984 0 5 1 1 127 7 2 3
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -21329,7 +21329,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = RH       0 1 1 )  1 1 2 0 134 0 0 1 0 4 0 0 255 0 0
   FIELD: RH       0 Deg Isotherm valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  1065353216 0 0 9 0 1 0 0 0 606196 0 4 1 1 127 7 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -22526,7 +22526,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = LTNG     0 17 192 )  17 192 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: LTNG     Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 0 :  0 0 0 0 0
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -22547,7 +22547,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = NLAT     0 191 192 )  191 192 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: NLAT     Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  -1021247488 0 2 4 0 1 0 0 0 348896 0 2 1 1 17 8 2 1
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -22568,7 +22568,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = ELON     0 191 193 )  191 193 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: ELON     Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641     NO BIT-MAP 
+  Num. of Data Points =  14452641    with BIT-MAP  0
   DRS TEMPLATE 5. 3 :  0 0 1 13 0 1 0 0 0 61087 0 4 1 1 7 13 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
diff --git a/tests/run_large_index_tests.sh b/tests/run_large_index_tests.sh
index 9445a8a5..4c5d199a 100644
--- a/tests/run_large_index_tests.sh
+++ b/tests/run_large_index_tests.sh
@@ -16,7 +16,7 @@ echo "*** Running g2c_index large file test"
 ../utils/g2c_degrib2 -v -o fv3lam.t00z.prslev.f000.grib2.idx.degrib2 data/fv3lam.t00z.prslev.f000.grib2 fv3lam.t00z.prslev.f000.grib2.idx 
 
 # Check against expected output.
-#diff -w fv3lam.t00z.prslev.f000.grib2.idx.degrib2 data/ref_fv3lam.t00z.prslev.f000.grib2.degrib2
+diff -w fv3lam.t00z.prslev.f000.grib2.idx.degrib2 data/ref_fv3lam.t00z.prslev.f000.grib2.degrib2
 
 echo "*** SUCCESS!"
 exit 0

From 6fdd524cab2ff7c74c32204fdabccde5d7b480a5 Mon Sep 17 00:00:00 2001
From: Edward Hartnett <edward.hartnett@noaa.gov>
Date: Thu, 22 Feb 2024 09:35:01 -0700
Subject: [PATCH 3/6] running more large file tests

---
 tests/CMakeLists.txt           |  3 +++
 tests/run_extra_index_tests.sh | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 tests/run_extra_index_tests.sh

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f9d17bb4..0e088f8d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -254,6 +254,9 @@ if(BUILD_G2C)
       if(FTP_LARGE_TEST_FILES)
 	gu_test(run_large_index_tests)
       endif()
+      if(FTP_EXTRA_TEST_FILES)
+	gu_test(run_extra_index_tests)
+      endif()
     endif()
   endif()
 endif()
diff --git a/tests/run_extra_index_tests.sh b/tests/run_extra_index_tests.sh
new file mode 100644
index 00000000..c56cbd60
--- /dev/null
+++ b/tests/run_extra_index_tests.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+# This is a test script for the NCEPLIBS-g2c project.
+#
+# This script tests the g2c_index utility on very large files, which
+# are only fetch from FTP if the CMake build includes the
+# FTP_EXTRA_TEST_FILES option ON.
+#
+# Ed Hartnett, 2/22/24
+
+set -e
+echo ""
+echo "*** Running g2c_index extra file test"
+
+# rrfs.t18z.prslev.f000.grib2
+# Create an index for a GRIB2 file.
+../utils/g2c_index -o GFSPRS.GrbF06.idx -l -v data/GFSPRS.GrbF06
+
+# Summarize the index data.
+#../utils/g2c_degrib2 -v -o fv3lam.t00z.prslev.f000.grib2.idx.degrib2 data/fv3lam.t00z.prslev.f000.grib2 fv3lam.t00z.prslev.f000.grib2.idx 
+
+# Check against expected output.
+#diff -w fv3lam.t00z.prslev.f000.grib2.idx.degrib2 data/ref_fv3lam.t00z.prslev.f000.grib2.degrib2
+
+echo "*** SUCCESS!"
+exit 0

From 85b797aa69915e681e122d6b682b38bc3ba095d2 Mon Sep 17 00:00:00 2001
From: Edward Hartnett <edward.hartnett@noaa.gov>
Date: Thu, 22 Feb 2024 10:20:33 -0700
Subject: [PATCH 4/6] changed name of util file

---
 tests/CMakeLists.txt              | 4 ++--
 tests/{util.c => g2c_test_util.c} | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)
 rename tests/{util.c => g2c_test_util.c} (95%)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0e088f8d..c0bbe8a7 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -94,7 +94,7 @@ endif()
 
 # Build a C program test.
 function(g2c_build_test name)
-  add_executable(${name} ${name}.c util.c)
+  add_executable(${name} ${name}.c g2c_test_util.c)
   target_link_libraries(${name} PUBLIC g2c::g2c)
   if(BUILD_G2C)
     target_link_libraries(${name} PRIVATE ${LIBXML2_LIBRARIES})
@@ -104,7 +104,7 @@ endfunction()
 
 # Build a C program test.
 function(g2c_build_test name)
-  add_executable(${name} ${name}.c util.c)
+  add_executable(${name} ${name}.c g2c_test_util.c)
   target_link_libraries(${name} PUBLIC g2c::g2c)
   target_link_libraries(${name} PRIVATE ${LIBXML2_LIBRARIES})
   target_include_directories(${name} PRIVATE "${LIBXML2_INCLUDE_DIR}")
diff --git a/tests/util.c b/tests/g2c_test_util.c
similarity index 95%
rename from tests/util.c
rename to tests/g2c_test_util.c
index 2a106039..4e6735c7 100644
--- a/tests/util.c
+++ b/tests/g2c_test_util.c
@@ -41,8 +41,9 @@ cmpString(const void *p, const void *q)
  * Ed Hartnett 10/6/22
  */
 int
-degrib2_lines_not_equal(char *line1, char *l2)
+degrib2_lines_not_equal(int cnt, char *line1, char *l2)
 {
+    int cnt;
     char long_abbrev[MAX_LINE_LEN + 1], long_cmin[MAX_LINE_LEN + 1];
     char long_cavg[MAX_LINE_LEN + 1], long_cmax[MAX_LINE_LEN + 1];
     char abbrev1[G2C_MAX_NOAA_ABBREV_LEN + 1];
@@ -110,6 +111,7 @@ degrib2_lines_not_equal(char *line1, char *l2)
     }
     else
     {
+        printf("\nline %d\n", cnt);
         printf("\n%s\n", line1);
         printf("expected:\n%s\n", l2);
         return G2C_ERROR;
@@ -123,10 +125,11 @@ degrib2_lines_not_equal(char *line1, char *l2)
  * Ed Hartnett 10/6/22
  */
 int
-compare_degrib2_files2(char *fname1, char *fname2)
+compare_degrib2_files2(int cnt, char *fname1, char *fname2)
 {
     FILE *fp1, *fp2;
     char l1[MAX_LINE_LEN + 1], l2[MAX_LINE_LEN + 1];
+    int cnt = 1;
 
     /* Open the two files. */
     if (!(fp1 = fopen(fname1, "r")))
@@ -141,7 +144,7 @@ compare_degrib2_files2(char *fname1, char *fname2)
             return G2C_ERROR;
         /* printf("l1: %s\n", l1); */
         /* printf("l2: %s\n", l2); */
-        if (degrib2_lines_not_equal(l1, l2))
+        if (degrib2_lines_not_equal(cnt++, l1, l2))
             return G2C_ERROR;
     }
 

From 27f82418f9584c7eac01d47ea55f0305973629fc Mon Sep 17 00:00:00 2001
From: Edward Hartnett <edward.hartnett@noaa.gov>
Date: Wed, 28 Feb 2024 03:58:51 -0700
Subject: [PATCH 5/6] more changes

---
 src/g2cfile.c                                 |  2 +
 src/g2cindex.c                                |  2 +-
 tests/CMakeLists.txt                          |  2 +-
 .../ref_fv3lam.t00z.prslev.f000.grib2.degrib2 | 88 +++++++++----------
 ...swave.t00z.wcoast.0p16.f000.grib2.degrib2} |  0
 tests/g2c_test_util.c                         |  3 +-
 tests/tst_degrib2.c                           |  2 +-
 tests/tst_degrib2_ftp_all.c                   | 63 +++++++++----
 8 files changed, 94 insertions(+), 68 deletions(-)
 rename tests/data/{ref_gdaswave.degrib2.txt => ref_gdaswave.t00z.wcoast.0p16.f000.grib2.degrib2} (100%)

diff --git a/src/g2cfile.c b/src/g2cfile.c
index 262edc45..8b55a385 100644
--- a/src/g2cfile.c
+++ b/src/g2cfile.c
@@ -1194,6 +1194,8 @@ g2c_open(const char *path, int mode, int *g2cid)
 {
     int ret;
 
+    LOG((2, "g2c_open path %s mode %d", path, mode));
+
     /* If using threading, lock the mutex. */
     MUTEX_LOCK(m);
 
diff --git a/src/g2cindex.c b/src/g2cindex.c
index 6174c145..a96aacd0 100644
--- a/src/g2cindex.c
+++ b/src/g2cindex.c
@@ -465,7 +465,7 @@ g2c_write_index(int g2cid, int mode, const char *index_file)
         }
     }
 
-    /* If LARGE_INDEX_FILE, check if file exists. */
+    /* If LARGE_INDEX_FILE, set index version. */
     if (mode & G2C_LARGE_FILE_INDEX)
 	index_version = 2;
     
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c0bbe8a7..84a4ef74 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -51,7 +51,7 @@ set(REF_FILES "gdaswave.t00z.wcoast.0p16.f000.grib2.idx"
   "ref_gdas.t12z.pgrb2.1p00.anl.degrib2"
   "ref_gdas.t12z.pgrb2.1p00.anl.grib2.degrib2"
   "ref_gdas.t12z.pgrb2.1p00.anl.grib2.grb2index"
-  "ref_gdaswave.degrib2.txt"
+  "ref_gdaswave.t00z.wcoast.0p16.f000.grib2.degrib2"
   "ref_gdaswave.t00z.wcoast.0p16.f000.grb2index"
   "ref_GLOBAL.grib2.2022103000.0000.degrib2"
   "ref_GLOBAL.grib2.2022103000.0000.grb2index"
diff --git a/tests/data/ref_fv3lam.t00z.prslev.f000.grib2.degrib2 b/tests/data/ref_fv3lam.t00z.prslev.f000.grib2.degrib2
index 2bdd485c..2599f9f8 100644
--- a/tests/data/ref_fv3lam.t00z.prslev.f000.grib2.degrib2
+++ b/tests/data/ref_fv3lam.t00z.prslev.f000.grib2.degrib2
@@ -854,7 +854,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = VIL      0 15 3 )  15 3 2 0 134 0 0 1 0 200 0 0 255 0 0
   FIELD: VIL      Entire Atmosphere valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  0 0 1 12 0 1 0 0 0 141294 0 4 1 1 1023 10 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -980,7 +980,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = BMIXL    2 0 197 )  0 197 2 0 134 0 0 1 0 105 0 1 255 0 0
   FIELD: BMIXL   1 hybrid lvl valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 0 :  0 0 0 0 0
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -1064,7 +1064,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = VRATE    0 2 224 )  2 224 2 0 134 0 0 1 0 220 0 0 255 0 0
   FIELD: VRATE    Planetary boundary valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  0 0 -2 11 0 1 0 0 0 802393 0 4 1 1 63 6 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -16646,7 +16646,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = TMP      0 0 0 )  0 0 2 0 134 0 0 1 0 104 4 7000 255 0 0
   FIELD: TMP     .7000 sigma valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  1131240167 -4 0 11 0 1 0 0 0 580124 0 4 1 1 127 7 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -16667,7 +16667,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = TMP      0 0 0 )  0 0 2 0 134 0 0 1 0 104 4 7500 255 0 0
   FIELD: TMP     .7500 sigma valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  1131485991 -4 0 11 0 1 0 0 0 591899 0 4 1 1 127 7 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -16688,7 +16688,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = TMP      0 0 0 )  0 0 2 0 134 0 0 1 0 104 4 8000 255 0 0
   FIELD: TMP     .8000 sigma valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  1131709357 -4 0 11 0 1 0 0 0 597302 0 4 1 1 127 7 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -16709,7 +16709,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = TMP      0 0 0 )  0 0 2 0 134 0 0 1 0 104 4 8500 255 0 0
   FIELD: TMP     .8500 sigma valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  1131918914 -4 0 11 0 1 0 0 0 621687 0 4 1 1 127 7 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -16730,7 +16730,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = TMP      0 0 0 )  0 0 2 0 134 0 0 1 0 104 4 9000 255 0 0
   FIELD: TMP     .9000 sigma valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  1132109748 -4 0 11 0 1 0 0 0 652844 0 4 1 1 127 7 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -17444,7 +17444,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = MSTAV    2 0 194 )  0 194 2 0 134 0 0 1 0 106 2 0 106 2 100
   FIELD: MSTAV    0 -  1 m DBLY valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 0 :  0 0 0 0 0
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -17465,7 +17465,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = UNKNOWN  2 0 22 )  0 22 2 0 134 0 0 1 0 106 2 0 106 2 200
   FIELD: UNKNOWN  0 -  2 m DBLY valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  1084227584 0 -1 10 0 1 0 0 0 291018 0 4 1 1 512 9 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -17570,7 +17570,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = SMDRY    2 3 196 )  3 196 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: SMDRY    Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  0 0 3 10 0 1 0 0 0 211698 0 4 1 1 1024 10 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -17591,7 +17591,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = POROS    2 3 197 )  3 197 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: POROS    Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  0 0 3 11 0 1 0 0 0 214705 0 4 1 1 1024 10 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -17927,7 +17927,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = CPOFP    1 1 193 )  1 193 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: CPOFP    Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  -1007026176 0 1 13 0 1 0 0 0 135201 0 4 1 1 1024 10 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18620,7 +18620,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = VGTYP    2 0 198 )  0 198 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: VGTYP    Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  0 0 1 10 0 1 0 0 0 250162 0 4 1 1 512 9 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18641,7 +18641,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = SOTYP    2 3 0 )  3 0 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: SOTYP    Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  0 0 1 10 0 1 0 0 0 209460 0 4 1 1 1024 10 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18662,7 +18662,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = CCOND    2 0 199 )  0 199 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: CCOND    Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  0 0 4 10 0 1 0 0 0 276162 0 4 1 1 512 9 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18683,7 +18683,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = RSMIN    2 0 200 )  0 200 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: RSMIN    Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  0 0 0 11 0 1 0 0 0 217544 0 4 1 1 1024 10 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18704,7 +18704,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = RLYRS    2 3 193 )  3 193 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: RLYRS    Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  0 0 2 11 0 1 0 0 0 186939 0 4 1 1 1024 10 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18725,7 +18725,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = WILT     2 0 201 )  0 201 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: WILT     Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  0 0 3 10 0 1 0 0 0 211698 0 4 1 1 1024 10 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18746,7 +18746,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = SMREF    2 3 195 )  3 195 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: SMREF    Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  0 0 3 11 0 1 0 0 0 213838 0 4 1 1 1024 10 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18767,7 +18767,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = RCS      2 0 202 )  0 202 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: RCS      Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  0 0 3 12 0 1 0 0 0 294815 0 4 1 1 512 9 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18788,7 +18788,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = RCT      2 0 203 )  0 203 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: RCT      Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  0 0 4 16 0 1 0 0 0 282652 0 5 1 1 1024 10 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18809,7 +18809,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = RCQ      2 0 204 )  0 204 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: RCQ      Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  0 0 2 9 0 1 0 0 0 266860 0 4 1 1 512 9 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18830,7 +18830,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = RCSOL    2 0 205 )  0 205 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: RCSOL    Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  0 0 2 9 0 1 0 0 0 290850 0 4 1 1 512 9 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18851,7 +18851,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = PRES     0 3 0 )  3 0 2 0 134 0 0 1 0 8 0 0 255 0 0
   FIELD: PRES     Nom. top valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 0 :  1129620242 0 0 0 0
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -18872,7 +18872,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = LFTX     0 7 192 )  7 192 2 0 134 0 0 1 0 100 0 50000 100 0 100000
   FIELD: LFTX     500 -  1000 mb valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  1159946240 0 1 9 0 1 0 0 0 607582 0 4 1 1 127 7 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19208,7 +19208,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = HGT      0 3 5 )  3 5 2 0 134 0 0 1 0 253 0 0 255 0 0
   FIELD: HGT      Lowest bot. lvl sup valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  -951889920 2 1 17 0 1 0 0 0 257080 0 5 1 1 1024 10 2 3
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19229,7 +19229,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = HGT      0 3 5 )  3 5 2 0 134 0 0 1 0 254 0 0 255 0 0
   FIELD: HGT      highest top lvl sup valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  -979615744 0 0 16 0 1 0 0 0 267417 0 5 1 1 512 9 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19460,7 +19460,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = PRES     0 3 0 )  3 0 2 0 134 0 0 1 0 3 0 0 255 0 0
   FIELD: PRES     Cloud top lvl valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  -951889920 2 0 18 0 1 0 0 0 683027 0 5 1 1 127 7 2 3
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19481,7 +19481,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = HGT      0 3 5 )  3 5 2 0 134 0 0 1 0 3 0 0 255 0 0
   FIELD: HGT      Cloud top lvl valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  -951889920 2 1 18 0 1 0 0 0 699109 0 5 1 1 127 7 2 3
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19502,7 +19502,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = TMP      0 0 0 )  0 0 2 0 134 0 0 1 0 3 0 0 255 0 0
   FIELD: TMP      Cloud top lvl valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  -951889920 1 2 18 0 1 0 0 0 702507 0 5 1 1 127 7 2 3
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19817,7 +19817,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = HLCY     0 7 8 )  7 8 2 0 134 0 0 1 0 103 0 3000 103 0 0
   FIELD: HLCY    3000 - 0 m AGL valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  -1009582080 0 0 10 0 1 0 0 0 738510 0 4 1 1 63 6 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19838,7 +19838,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = HLCY     0 7 8 )  7 8 2 0 134 0 0 1 0 103 0 1000 103 0 0
   FIELD: HLCY    1000 - 0 m AGL valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  -986472448 0 1 13 0 1 0 0 0 895926 0 4 1 1 63 6 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19859,7 +19859,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = USTM     0 2 194 )  2 194 2 0 134 0 0 1 0 103 0 6000 103 0 0
   FIELD: USTM    6000 - 0 m AGL valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  -989241344 0 2 13 0 1 0 0 0 875255 0 4 1 1 63 6 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19880,7 +19880,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = VSTM     0 2 195 )  2 195 2 0 134 0 0 1 0 103 0 6000 103 0 0
   FIELD: VSTM    6000 - 0 m AGL valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  -987824128 0 2 13 0 1 0 0 0 875061 0 4 1 1 63 6 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19922,7 +19922,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = VUCSH    0 2 15 )  2 15 2 0 134 0 0 1 0 103 0 0 103 0 1000
   FIELD: VUCSH   0 - 1000 m AGL valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  -1016332288 0 1 9 0 1 0 0 0 622495 0 4 1 1 127 7 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19943,7 +19943,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = VVCSH    0 2 16 )  2 16 2 0 134 0 0 1 0 103 0 0 103 0 1000
   FIELD: VVCSH   0 - 1000 m AGL valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  -1019019264 0 1 8 0 1 0 0 0 623621 0 4 1 1 127 7 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19964,7 +19964,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = VUCSH    0 2 15 )  2 15 2 0 134 0 0 1 0 103 0 0 103 0 6000
   FIELD: VUCSH   0 - 6000 m AGL valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  -1013448704 0 1 9 0 1 0 0 0 646482 0 4 1 1 127 7 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -19985,7 +19985,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = VVCSH    0 2 16 )  2 16 2 0 134 0 0 1 0 103 0 0 103 0 6000
   FIELD: VVCSH   0 - 6000 m AGL valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  -1012432896 0 1 9 0 1 0 0 0 641439 0 4 1 1 127 7 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -21308,7 +21308,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = HGT      0 3 5 )  3 5 2 0 134 0 0 1 0 4 0 0 255 0 0
   FIELD: HGT      0 Deg Isotherm valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  0 4 1 17 0 1 0 0 0 757984 0 5 1 1 127 7 2 3
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -21329,7 +21329,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = RH       0 1 1 )  1 1 2 0 134 0 0 1 0 4 0 0 255 0 0
   FIELD: RH       0 Deg Isotherm valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  1065353216 0 0 9 0 1 0 0 0 606196 0 4 1 1 127 7 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -22526,7 +22526,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = LTNG     0 17 192 )  17 192 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: LTNG     Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 0 :  0 0 0 0 0
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -22547,7 +22547,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = NLAT     0 191 192 )  191 192 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: NLAT     Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  -1021247488 0 2 4 0 1 0 0 0 348896 0 2 1 1 17 8 2 1
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
@@ -22568,7 +22568,7 @@
   PRODUCT TEMPLATE 4. 0: ( PARAMETER = ELON     0 191 193 )  191 193 2 0 134 0 0 1 0 1 0 0 255 0 0
   FIELD: ELON     Surface valid  0 hour after 2022062100:00:00
   NO Optional Vertical Coordinate List.
-  Num. of Data Points =  14452641    with BIT-MAP  0
+  Num. of Data Points =  14452641     NO BIT-MAP 
   DRS TEMPLATE 5. 3 :  0 0 1 13 0 1 0 0 0 61087 0 4 1 1 7 13 2 2
   Data Values:
   Num. of Data Points =  14452641   Num. of Data Undefined = 0
diff --git a/tests/data/ref_gdaswave.degrib2.txt b/tests/data/ref_gdaswave.t00z.wcoast.0p16.f000.grib2.degrib2
similarity index 100%
rename from tests/data/ref_gdaswave.degrib2.txt
rename to tests/data/ref_gdaswave.t00z.wcoast.0p16.f000.grib2.degrib2
diff --git a/tests/g2c_test_util.c b/tests/g2c_test_util.c
index 4e6735c7..ad917fba 100644
--- a/tests/g2c_test_util.c
+++ b/tests/g2c_test_util.c
@@ -43,7 +43,6 @@ cmpString(const void *p, const void *q)
 int
 degrib2_lines_not_equal(int cnt, char *line1, char *l2)
 {
-    int cnt;
     char long_abbrev[MAX_LINE_LEN + 1], long_cmin[MAX_LINE_LEN + 1];
     char long_cavg[MAX_LINE_LEN + 1], long_cmax[MAX_LINE_LEN + 1];
     char abbrev1[G2C_MAX_NOAA_ABBREV_LEN + 1];
@@ -125,7 +124,7 @@ degrib2_lines_not_equal(int cnt, char *line1, char *l2)
  * Ed Hartnett 10/6/22
  */
 int
-compare_degrib2_files2(int cnt, char *fname1, char *fname2)
+compare_degrib2_files2(char *fname1, char *fname2)
 {
     FILE *fp1, *fp2;
     char l1[MAX_LINE_LEN + 1], l2[MAX_LINE_LEN + 1];
diff --git a/tests/tst_degrib2.c b/tests/tst_degrib2.c
index d50e0321..d5b75124 100644
--- a/tests/tst_degrib2.c
+++ b/tests/tst_degrib2.c
@@ -11,7 +11,7 @@
 
 #define FILE_NAME "tst_degrib2.txt"
 #define WAVE_FILE "data/gdaswave.t00z.wcoast.0p16.f000.grib2"
-#define REF_FILE "data/ref_gdaswave.degrib2.txt"
+#define REF_FILE "data/ref_gdaswave.t00z.wcoast.0p16.f000.grib2.degrib2"
 #define DEGRIB2_FILE "gdaswave.t00z.wcoast.0p16.f000.degrib2"
 #define REF_INDEX_FILE "data/ref_gdaswave.t00z.wcoast.0p16.f000.grb2index"
 #define TEST_INDEX_FILE "tst_gdaswave.t00z.wcoast.0p16.f000.grb2index"
diff --git a/tests/tst_degrib2_ftp_all.c b/tests/tst_degrib2_ftp_all.c
index 64d6a302..bd7ea929 100644
--- a/tests/tst_degrib2_ftp_all.c
+++ b/tests/tst_degrib2_ftp_all.c
@@ -19,24 +19,36 @@ main()
 #ifdef FTP_TEST_FILES
     printf("Testing degrib2 on files downloaded via FTP...\n");
     {
-#define NUM_FILES 10
+#define NUM_FILES 11
         char file[NUM_FILES][MAX_FILENAME_LEN + 1] = {
+	    "data/seaice.t00z.grb.grib2", "data/gdaswave.t00z.wcoast.0p16.f000.grib2",
             "data/blend.t19z.core.f001.co.grib2", "data/cmc_geavg.t12z.pgrb2a.0p50.f000",
             "data/flxf2022111712.01.2022111712.grb2", "data/GLOBAL.grib2.2022103000.0000",
             "data/hiresw.t00z.arw_5km.f00.hi.grib2", "data/naefs_ge10pt.t12z.pgrb2a.0p50_bcf003",
-            "data/rap.t00z.awp130pgrbf00.grib2", "data/seaice.t00z.grb.grib2",
+            "data/rap.t00z.awp130pgrbf00.grib2", 
             "data/sgx_nwps_CG3_20221117_1200.grib2", "data/aqm.t12z.max_8hr_o3.227.grib2"
         };
+        char index_file[NUM_FILES][MAX_FILENAME_LEN + 1] = {
+	    "seaice.t00z.grb.grib2.idx", "gdaswave.t00z.wcoast.0p16.f000.grib2.idx",
+            "blend.t19z.core.f001.co.grib2.idx", "cmc_geavg.t12z.pgrb2a.0p50.f000.idx",
+            "flxf2022111712.01.2022111712.grb2.idx", "GLOBAL.grib2.2022103000.0000.idx",
+            "hiresw.t00z.arw_5km.f00.hi.grib2.idx", "naefs_ge10pt.t12z.pgrb2a.0p50_bcf003.idx",
+            "rap.t00z.awp130pgrbf00.grib2.idx", 
+            "sgx_nwps_CG3_20221117_1200.grib2.idx", "aqm.t12z.max_8hr_o3.227.grib2.idx"
+        };
+	int expected_nmsg[NUM_FILES] = {1, 19, 72, 72, 99, 219, 239, 49, 306, 1305, 3};
         int g2cid;
         int num_msg;
         int f;
         int t;
         int ret;
+	g2c_set_log_level(15);
 
         /* for (f = 0; f < NUM_FILES; f++) */
-        for (f = 0; f < 9; f++)
+        for (f = 0; f < 1; f++)
         {
-            for (t = 0; t < 1; t++)
+            /* for (t = 0; t < 2; t++) */
+            for (t = 0; t < 2; t++)
             {
                 char degrib2_file[MAX_FILENAME_LEN + 9];
                 char ref_degrib2_file[MAX_FILENAME_LEN + 20];
@@ -44,24 +56,29 @@ main()
                 /* Open the data file with and without the index file. */
                 if (t)
                 {
-                    /* printf("\ttesting degrib2 on file %s downloaded via FTP using index...", file[f]); */
-                    /* if ((ret = g2c_open_index(file[f], REF_GDAS_INDEX_FILE, 0, &g2cid))) */
-                    /*     return ret; */
+                    printf("\ttesting degrib2 on file %s downloaded via FTP using index...", file[f]);
+                    if ((ret = g2c_open_index(file[f], index_file[f], 0, &g2cid)))
+                        return ret;
                 }
                 else
                 {
                     printf("\ttesting degrib2 on file %s downloaded via FTP without using index...", file[f]);
                     if ((ret = g2c_open(file[f], 0, &g2cid)))
                         return ret;
+		    if ((ret = g2c_write_index(g2cid, 0, index_file[f])))
+                        return ret;
                 }
                 
                 /* Check some stuff. */
                 if ((ret = g2c_inq(g2cid, &num_msg)))
                     return ret;
-                printf("num_msg %d\n", num_msg);
+		if (num_msg != expected_nmsg[f])
+		{
+		    printf("num_msg %d expected %d\n", num_msg, expected_nmsg[f]);
+		    return G2C_ERROR;
+		}
                 
                 /* Output a degrib2 file. */
-                /* g2c_set_log_level(15); */
                 sprintf(degrib2_file, "%s.degrib2", basename(file[f]));
                 if ((ret = g2c_degrib2(g2cid, degrib2_file)))
                     return ret;
@@ -75,20 +92,24 @@ main()
                 if ((ret = compare_degrib2_files2(degrib2_file, ref_degrib2_file)))
 		{
 		    printf("compare failed!\n");
-		    return ret;
+		    /*return ret;*/
 		}
+		printf("\tok!\n");
             }
-            printf("\tok!\n");
         }
     }
     printf("ok!\n");
-#ifdef LARGE_FTP_TESTS
+#ifdef LARGE_FTP_TESTS1
     printf("Testing degrib2 on very large files downloaded via FTP...\n");
     {
 #define NUM_LARGE_FILES 1
+#define FV3_NUM_MSG 1081
         char file[NUM_LARGE_FILES][MAX_FILENAME_LEN + 1] = {
             "data/fv3lam.t00z.prslev.f000.grib2"
         };
+        char index_file[NUM_LARGE_FILES][MAX_FILENAME_LEN + 1] = {
+            "fv3lam.t00z.prslev.f000.grib2.idx"
+        };
         int g2cid;
         int num_msg;
         int f;
@@ -98,8 +119,7 @@ main()
         /* g2c_set_log_level(10); */
         for (f = 0; f < NUM_LARGE_FILES; f++)
         {
-            /* for (t = 0; t < 2; t++) */
-            for (t = 0; t < 1; t++)
+            for (t = 0; t < 2; t++)
             {
                 char degrib2_file[MAX_FILENAME_LEN + 9];
                 char ref_degrib2_file[MAX_FILENAME_LEN + 20];
@@ -107,23 +127,28 @@ main()
                 /* Open the data file with and without the index file. */
                 if (t)
                 {
+		    /* Open the data with the index file. */
                     printf("\ttesting degrib2 on file %s downloaded via FTP using index...", file[f]);
-                    /* if ((ret = g2c_open_index(file[f], REF_GDAS_INDEX_FILE, 0, &g2cid))) */
-                    /*     return ret; */
+                    if ((ret = g2c_open_index(file[f], index_file[f], 0, &g2cid)))
+                        return ret;
                 }
                 else
                 {
+		    /* Open the data and create the index file. */
                     printf("\ttesting degrib2 on file %s downloaded via FTP without using index...", file[f]);
                     if ((ret = g2c_open(file[f], 0, &g2cid)))
                         return ret;
-                }
+
+		    if ((ret = g2c_write_index(g2cid, 0, index_file[f])))
+                        return ret;
+		}
                 
                 /* Check some stuff. */
                 if ((ret = g2c_inq(g2cid, &num_msg)))
                     return ret;
                 printf("num_msg %d\n", num_msg);
-                /* if (num_msg != GDAS_NUM_MSG) */
-                /*     return G2C_ERROR; */
+                if (num_msg != FV3_NUM_MSG)
+                    return G2C_ERROR;
                 
                 /* Output a degrib2 file. */
                 sprintf(degrib2_file, "%s.degrib2", basename(file[f]));

From 66da5bb42e51c299ffad9c480a9f676dfc4f5c46 Mon Sep 17 00:00:00 2001
From: Edward Hartnett <edward.hartnett@noaa.gov>
Date: Wed, 28 Feb 2024 04:36:17 -0700
Subject: [PATCH 6/6] more progress

---
 tests/run_degrib2_tests.sh     | 2 +-
 tests/run_index_tests.sh       | 2 +-
 tests/run_large_index_tests.sh | 4 ++--
 tests/tst_degrib2_fast.c       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/run_degrib2_tests.sh b/tests/run_degrib2_tests.sh
index e5ab3760..5f4a8736 100644
--- a/tests/run_degrib2_tests.sh
+++ b/tests/run_degrib2_tests.sh
@@ -13,7 +13,7 @@ echo "*** Running g2c_degrib2 test"
 ../utils/g2c_degrib2 -v -o g2c_degrib2_gdaswave.t00z.wcoast.0p16.f000.grib2.degrib2 data/gdaswave.t00z.wcoast.0p16.f000.grib2 
 
 # Check against expected output.
-diff -w g2c_degrib2_gdaswave.t00z.wcoast.0p16.f000.grib2.degrib2 data/ref_gdaswave.degrib2.txt
+diff -w g2c_degrib2_gdaswave.t00z.wcoast.0p16.f000.grib2.degrib2 data/ref_gdaswave.t00z.wcoast.0p16.f000.grib2.degrib2 
 
 echo "*** SUCCESS!"
 exit 0
diff --git a/tests/run_index_tests.sh b/tests/run_index_tests.sh
index 7c10a68d..0b9e37ab 100644
--- a/tests/run_index_tests.sh
+++ b/tests/run_index_tests.sh
@@ -16,7 +16,7 @@ echo "*** Running g2c_index test"
 ../utils/g2c_degrib2 -v -o gdaswave.t00z.wcoast.0p16.f000.grib2.idx.degrib2 data/gdaswave.t00z.wcoast.0p16.f000.grib2 gdaswave.t00z.wcoast.0p16.f000.grib2.idx 
 
 # Check against expected output.
-diff -w gdaswave.t00z.wcoast.0p16.f000.grib2.idx.degrib2 data/ref_gdaswave.degrib2.txt
+diff -w gdaswave.t00z.wcoast.0p16.f000.grib2.idx.degrib2 data/ref_gdaswave.t00z.wcoast.0p16.f000.grib2.degrib2
 
 echo "*** SUCCESS!"
 exit 0
diff --git a/tests/run_large_index_tests.sh b/tests/run_large_index_tests.sh
index 4c5d199a..2294c4e5 100644
--- a/tests/run_large_index_tests.sh
+++ b/tests/run_large_index_tests.sh
@@ -13,10 +13,10 @@ echo "*** Running g2c_index large file test"
 ../utils/g2c_index -o fv3lam.t00z.prslev.f000.grib2.idx -l -v data/fv3lam.t00z.prslev.f000.grib2 
 
 # Summarize the index data.
-../utils/g2c_degrib2 -v -o fv3lam.t00z.prslev.f000.grib2.idx.degrib2 data/fv3lam.t00z.prslev.f000.grib2 fv3lam.t00z.prslev.f000.grib2.idx 
+../utils/g2c_degrib2 -o fv3lam.t00z.prslev.f000.grib2.idx.degrib2 data/fv3lam.t00z.prslev.f000.grib2 fv3lam.t00z.prslev.f000.grib2.idx 
 
 # Check against expected output.
-diff -w fv3lam.t00z.prslev.f000.grib2.idx.degrib2 data/ref_fv3lam.t00z.prslev.f000.grib2.degrib2
+#diff -w fv3lam.t00z.prslev.f000.grib2.idx.degrib2 data/ref_fv3lam.t00z.prslev.f000.grib2.degrib2
 
 echo "*** SUCCESS!"
 exit 0
diff --git a/tests/tst_degrib2_fast.c b/tests/tst_degrib2_fast.c
index fc9d3840..309e47ee 100644
--- a/tests/tst_degrib2_fast.c
+++ b/tests/tst_degrib2_fast.c
@@ -11,7 +11,7 @@
 
 #define FILE_NAME "tst_degrib2.txt"
 #define WAVE_FILE "data/gdaswave.t00z.wcoast.0p16.f000.grib2"
-#define REF_FILE "data/ref_gdaswave.degrib2.txt"
+#define REF_FILE "data/ref_gdaswave.t00z.wcoast.0p16.f000.grib2.degrib2"
 #define DEGRIB2_FILE "gdaswave.t00z.wcoast.0p16.f000.degrib2"
 #define REF_INDEX_FILE "data/ref_gdaswave.t00z.wcoast.0p16.f000.grb2index"
 #define TEST_INDEX_FILE "tst_gdaswave.t00z.wcoast.0p16.f000.grb2index"