Merge branch 'develop' into as_png

Author: AlysonStahl-NOAA

tests/run_wgrib2_netcdf4_tests.sh

@@ -3,7 +3,7 @@
 #
 # Alyson Stahl, 4/22/24
 
-set -e 
+set -ex
 
 echo "*** Testing converting from grib to netcdf to grib"
 # make template
@@ -36,5 +36,11 @@ ncdump -h tablenc.nc > tablenc.txt
 touch tablenc.txt
 diff -w tablenc.txt data/ref_tablenc.gdas.t12z.pgrb2.1p00.anl.75r.grib2.txt
 
+echo "*** Testing nc_time" 
+../wgrib2/wgrib2 data/gdas.t12z.pgrb2.1p00.anl.75r.grib2 -match ":UGRD:" -nc_time 20200101000000 -netcdf test_time.nc
+if [ `ncdump test_time.nc | grep -c "time = 1577836800,"` -ne 1 ] ; then
+  exit 1
+fi
+
 echo "*** SUCCESS!"
-exit 0
+exit 0

wgrib2/Netcdf_sup.c

@@ -299,6 +299,7 @@ int f_nc_table(ARG1)
   g2nc_conv * old_nct;
   char *tptr;
   float min, max, range, ftmp;
+  int search_lev;
 
   if (mode == -1)
   {
@@ -533,42 +534,53 @@ wgib2_name:wgrib2_level|*:nc_name|ignore[:ignore|no|float|deflate{0-9}|[short|by
 
           for (i=0; i < nc_table->nlev; i++)
           {
-            search_lev: ir = strcspn(prd,"+-.0123456789");
-            itmp = strcspn(prd,"#"); /* inline comment */
-            if ( ir < 0 || ir >= strlen(prd) || itmp < ir )
-            { /* read next line */
-              prd = fgets(input, _MAX_PATH, fl);
-              if (prd == NULL )
+            search_lev = 1;
+            while (search_lev == 1) {
+              // search_lev: ir = strcspn(prd,"+-.0123456789");
+              ir = strcspn(prd,"+-.0123456789");
+              itmp = strcspn(prd,"#"); /* inline comment */
+              if ( ir < 0 || ir >= strlen(prd) || itmp < ir )
+              { /* read next line */
+                prd = fgets(input, _MAX_PATH, fl);
+                if (prd == NULL )
+                {
+                  fprintf(stderr,"nc_table: error reading multy line $levs \n");
+                  ierr = -7;
+                  search_lev = 1;
+                  continue;
+                }
+                continue;
+              }
+              itmp = strcspn(prd,":"); /* second important fields separator before number */
+              if (itmp <= ir )
               {
-                fprintf(stderr,"nc_table: error reading multy line $levs \n");
-                ierr = -7;
-                break;
+                fprintf(stderr,"nc_table: error entering $levs, check that there are $nlev values defined\n");
+                ierr = -8;
+                search_lev = 1;
+                continue;
               }
-              goto search_lev;
-            }
-            itmp = strcspn(prd,":"); /* second important fields separator before number */
-            if (itmp <= ir )
-            {
-              fprintf(stderr,"nc_table: error entering $levs, check that there are $nlev values defined\n");
-              ierr = -8;
-              break;
-            }
-            prd += ir;
-            ir = sscanf(prd,"%g",&nc_table->lv[i]);
-            if ( ir < 1 )
-            {
-              fprintf(stderr,"nc_table: $levs formatted input error\n");
-              ierr = -9;
-              break;
-            }
-            ir = strcspn(prd," ,;:\n");
-            if(ir <= strlen(prd) ) prd += ir;
-            else
-            {
-              fprintf(stderr,"nc_table: $levs parsing error, do no found fields separator\n");
-              ierr = -10;
-              break;
+              prd += ir;
+              ir = sscanf(prd,"%g",&nc_table->lv[i]);
+              if ( ir < 1 )
+              {
+                fprintf(stderr,"nc_table: $levs formatted input error\n");
+                ierr = -9;
+                search_lev = 1;
+                continue;
+              }
+              ir = strcspn(prd," ,;:\n");
+              if(ir <= strlen(prd) ) prd += ir;
+              else
+              {
+                fprintf(stderr,"nc_table: $levs parsing error, do no found fields separator\n");
+                ierr = -10;
+                search_lev = 1;
+                continue;
+              }
+              search_lev = 0;
             }
+            /* end of search lev */
+            if (ierr) break;
           }
           if ( ierr ) break;
         }
@@ -881,6 +893,7 @@ int f_nc_time(ARG1)
   const char *p;
   int year,month,day,hour,minute,second,dt_val,dt_conv,err_code;
   char dt_type[25];
+  int skip_date;
 
   if (mode == -1)
   {
@@ -890,54 +903,56 @@ int f_nc_time(ARG1)
     nc_date0_type = 0;
     nc_date0 = 0;
     nc_dt = 0;
+    skip_date = 0;
 
     sscanf(arg1,"%c",&chr);
 
     p=arg1;
     if (chr==':')
     { /* separator symbol is first, time step only, any long string*/
       p++;
-      goto get_time_step;
+      skip_date = 1;
     }
     if (strlen(p) < 14)
     { /* time step only */
-      goto get_time_step;
+      skip_date = 1;
     }
-    /* include date */
-    nc_date0_type = 1;    /*absolute */
-    if (chr=='-')
-    {
-      p++;
-      nc_date0_type = -1; /* relative*/
-    }
-    else if (chr == '+')
-    {
-      p++;
-    }
-    if (sscanf(p,"%4d%2d%2d%2d%2d%2d",&year,&month,&day,&hour,&minute,&second) != 6)
-      fatal_error("nc_time: bad format of yyyymmddhhnnss value in nc_time: %s", arg1);
+    if (skip_date == 0) {
+      /* include date */
+      nc_date0_type = 1;    /*absolute */
+      if (chr=='-')
+      {
+        p++;
+        nc_date0_type = -1; /* relative*/
+      }
+      else if (chr == '+')
+      {
+        p++;
+      }
+      if (sscanf(p,"%4d%2d%2d%2d%2d%2d",&year,&month,&day,&hour,&minute,&second) != 6)
+        fatal_error("nc_time: bad format of yyyymmddhhnnss value in nc_time: %s", arg1);
 
-    if(year<0 || year>9999 || month<1 || month>12 || day<1 || day>31 ||
-       hour <0 || hour>23 || minute < 0 || minute >59 || second < 0 || second >59)
-      fatal_error("nc_time: bad value of yyyymmddhhnnss value in nc_time: %s", arg1);
+      if(year<0 || year>9999 || month<1 || month>12 || day<1 || day>31 ||
+         hour <0 || hour>23 || minute < 0 || minute >59 || second < 0 || second >59)
+         fatal_error("nc_time: bad value of yyyymmddhhnnss value in nc_time: %s", arg1);
 
 #ifdef DEBUG_NC
 printf("nc_time: date0_type=%d date0=%d.%d.%d %d:%d:%d\n",nc_date0_type,year,month,day,hour,minute,second);
 #endif
-    nc_date0 = get_unixtime(year, month, day, hour, minute, second, &err_code);
-    if(err_code)
-      fatal_error("nc_time: time [sec] is out of range for this OS","");
+      nc_date0 = get_unixtime(year, month, day, hour, minute, second, &err_code);
+      if(err_code)
+        fatal_error("nc_time: time [sec] is out of range for this OS","");
 
-    p+=14;
-    if (strlen(p) <= 1)
-    {
-      if (nc_date0_type > 0) return 0;
-      fatal_error("nc_time: negative yyyymmddhhnnss (relative date) need time step in -nc_time option: %s", arg1);
+      p+=14;
+      if (strlen(p) <= 1)
+      {
+        if (nc_date0_type > 0) return 0;
+        fatal_error("nc_time: negative yyyymmddhhnnss (relative date) need time step in -nc_time option: %s", arg1);
+      }
+      p++; /*pass separator symbol ':' or other*/
     }
-    p++; /*pass separator symbol ':' or other*/
-
-get_time_step:
-
+ 
+    /* now for the time step */ 
     if (sscanf(p,"%d%s",&dt_val,dt_type) != 2)
       fatal_error("nc_time: bad time step in nc_time: %s", p);