Merge pull request #517 from NOAA-EMC/delayed_error

issue #513 delayed error

Author: AlysonStahl-NOAA

src/Sec3.c

@@ -44,6 +44,12 @@ extern enum output_order_type output_order;
 /** New line character. */
 extern char *nl;
 
+/** used by delayed error */
+extern unsigned int last_message;
+
+extern int decode;                             /**< Decode grib file flag */
+
+
 static void print_stagger(int scan, char *inv_out);
 
 /** Number of variable dimensions. */
@@ -283,8 +289,13 @@ int get_nxny_(unsigned char **sec, unsigned int *nx, unsigned int *ny, unsigned
 
 
     if ((*nx != 0 || *ny != 0) && GB2_Sec3_npts(sec) != npoints && GDS_Scan_staggered_storage(*scan) == 0) {
-        fprintf(stderr,"two values for number of points %u (GDS) %u (calculated)\n",
-                      GB2_Sec3_npts(sec), npoints);
+        if (decode) {
+            fatal_error("two values for number of points %u (GDS-octet 7-10) and %u (thinned grid calculation)",
+               GB2_Sec3_npts(sec), npoints);
+        }
+        fprintf(stdout,"FATAL ERROR (delayed): two values for number of points %u (GDS-octet 7-10) and %u (thinned grid calculation)\n",
+             GB2_Sec3_npts(sec), npoints);
+        last_message |= DELAYED_GRID_SIZE_ERR;
     }
 
 /*

src/wgrib2.c

@@ -499,7 +499,7 @@ int wgrib2(int argc, const char **argv) {
                         (GB2_ParmNum(sec) >= 192 && GB2_ParmNum(sec) <= 254) ||
                         (GB2_ParmCat(sec) >= 192 && GB2_ParmCat(sec) <= 254) ||
                         (GB2_Discipline(sec) >= 192 && GB2_Discipline(sec) <= 255) ) {
-                fprintf(stderr,"\n*** DELATED FATAL ERROR, local grib table=255, replaced by 1 in %s\n", in_file.filename);
+                fprintf(stderr,"\n*** FATAL ERROR (delayed), local grib table=255, replaced by 1 in %s\n", in_file.filename);
                 GB2_LocalTable(sec) = 1;
                 last_message |= DELAYED_LOCAL_GRIBTABLE_ERR;
             }

tests/CMakeLists.txt

@@ -116,6 +116,7 @@ copy_test_data(ref_new_grid_gdt_32769.grib2)
 copy_test_data(png_4bits.png)
 copy_test_data(large_png.grb2)
 copy_test_data(ref_c3_overflow.grib2)
+copy_test_data(delayed_error.grib2)
 
 # Run these shell tests.
 shell_test(run_wgrib2_tests)
@@ -124,6 +125,7 @@ shell_test(run_wgrib2_update_table_tests)
 
 shell_test(run_wgrib2_png_tests)
 shell_test(run_gmerge_tests)
+shell_test(run_wgrib2_delayed_err_tests)
 
 if (USE_NETCDF)
   shell_test(run_wgrib2_netcdf4_tests)
@@ -256,4 +258,4 @@ if (FTP_TEST_FILES)
     copy_test_data(ref_rrfs.t18z.prslev.f000.grib2.inv)
     shell_test(run_ftp_extra_large_tests)
   endif()
-endif()
+endif()

tests/data/delayed_error.grib2

@@ -0,0 +1,35 @@
+#!/bin/sh
+# This script tests delayed errors 
+#
+# 1. badly encoded GDS for thinned grids
+#
+# w. ebisuzaki 5/2026
+
+set -ex
+echo ""
+echo "*** Running wgrib2 delayed error tests"
+wgrib2='../src/wgrib2'
+# wgrib2=wgrib2
+
+file='data/delayed_error.grib2'
+
+# check if fatal error 
+set +e
+$wgrib2 $file
+err=$?
+if [ "$err" -ne 1 ] ; then
+  echo "failed test 1a"
+  exit 1
+fi
+
+# echo check if reset_delayed_error works
+set -e
+$wgrib2 $file -reset_delayed_error 
+err=$?
+if [ "$err" -ne 0 ] ; then
+  echo "failed test 1b"
+  exit 1
+fi
+
+echo "*** SUCCESS!"
+exit 0