Convert yvarID struct member to array component.

src/cdf_write.c

@@ -590,7 +590,7 @@ int cdfDefVar(stream_t *streamptr, int varID)
   else if ( gridtype == GRID_LONLAT && xid == CDI_UNDEFID && yid == CDI_UNDEFID && gridsize == 1 )
     {
       int ncxvarID = streamptr->ncgrid[gridindex].ncIDs[CDF_VARID_X];
-      int ncyvarID = streamptr->ncgrid[gridindex].yvarID;
+      int ncyvarID = streamptr->ncgrid[gridindex].ncIDs[CDF_VARID_Y];
       if ( ncyvarID != CDI_UNDEFID )
         {
           size_t len = strlen(coordinates);
@@ -608,7 +608,7 @@ int cdfDefVar(stream_t *streamptr, int varID)
     {
       char cellarea[CDI_MAX_NAME] = "area: ";
       int ncxvarID = streamptr->ncgrid[gridindex].ncIDs[CDF_VARID_X];
-      int ncyvarID = streamptr->ncgrid[gridindex].yvarID;
+      int ncyvarID = streamptr->ncgrid[gridindex].ncIDs[CDF_VARID_Y];
       int ncavarID = streamptr->ncgrid[gridindex].avarID;
       if ( ncyvarID != CDI_UNDEFID )
         {

src/cdi_int.h

@@ -221,12 +221,12 @@ enum {
   CDF_DIMID_X,
   CDF_DIMID_Y,
   CDF_VARID_X,
+  CDF_VARID_Y,
   CDF_SIZE_ncIDs,
 };
 typedef struct {
   int gridID;
   int ncIDs[CDF_SIZE_ncIDs];
-  int yvarID;
   int avarID;
 }
 ncgrid_t;

src/stream.c

@@ -894,7 +894,6 @@ void streamDefaultValue ( stream_t * streamptr )
       streamptr->ncgrid[i].gridID = CDI_UNDEFID;
       for (size_t j = 0; j < CDF_SIZE_ncIDs; ++j)
         streamptr->ncgrid[i].ncIDs[j] = CDI_UNDEFID;
-      streamptr->ncgrid[i].yvarID = CDI_UNDEFID;
       streamptr->ncgrid[i].avarID = CDI_UNDEFID;
     }
 

src/stream_cdf_o.c

@@ -769,12 +769,8 @@ cdfDefAxisCommon(stream_t *streamptr, int gridID, int gridindex, int ndims,
       if ( gen_bounds ) Free(pbounds);
 
       if ( ndims == 0 )
-        {
-          if ( dimKey == CDI_KEY_XDIMNAME )
-            ncgrid[gridindex].ncIDs[CDF_VARID_X] = ncvarid;
-          else
-            ncgrid[gridindex].yvarID = ncvarid;
-        }
+        ncgrid[gridindex].ncIDs[dimKey == CDI_KEY_XDIMNAME
+                                ? CDF_VARID_X : CDF_VARID_Y] = ncvarid;
     }
 
   ncgrid[gridindex].gridID = gridID;
@@ -855,7 +851,7 @@ void cdfDefCurvilinear(stream_t *streamptr, int gridID, int gridindex)
                     xdimID = ncgrid[index].ncIDs[CDF_DIMID_X];
                     ydimID = ncgrid[index].ncIDs[CDF_DIMID_Y];
                     ncxvarid = ncgrid[index].ncIDs[CDF_VARID_X];
-                    ncyvarid = ncgrid[index].yvarID;
+                    ncyvarid = ncgrid[index].ncIDs[CDF_VARID_Y];
                     break;
                   }
             }
@@ -979,7 +975,7 @@ void cdfDefCurvilinear(stream_t *streamptr, int gridID, int gridindex)
   ncgrid[gridindex].ncIDs[CDF_DIMID_X] = xdimID;
   ncgrid[gridindex].ncIDs[CDF_DIMID_Y] = ydimID;
   ncgrid[gridindex].ncIDs[CDF_VARID_X] = ncxvarid;
-  ncgrid[gridindex].yvarID = ncyvarid;
+  ncgrid[gridindex].ncIDs[CDF_VARID_Y] = ncyvarid;
   ncgrid[gridindex].avarID = ncavarid;
 }
 
@@ -1193,7 +1189,7 @@ void cdfDefUnstructured(stream_t *streamptr, int gridID, int gridindex)
 		  {
 		    dimID = ncgrid[index].ncIDs[CDF_DIMID_X];
                     ncxvarid = ncgrid[index].ncIDs[CDF_VARID_X];
-                    ncyvarid = ncgrid[index].yvarID;
+                    ncyvarid = ncgrid[index].ncIDs[CDF_VARID_Y];
                     ncavarid = ncgrid[index].avarID;
 		    break;
 		  }
@@ -1308,7 +1304,7 @@ void cdfDefUnstructured(stream_t *streamptr, int gridID, int gridindex)
   ncgrid[gridindex].gridID = gridID;
   ncgrid[gridindex].ncIDs[CDF_DIMID_X] = dimID;
   ncgrid[gridindex].ncIDs[CDF_VARID_X] = ncxvarid;
-  ncgrid[gridindex].yvarID = ncyvarid;
+  ncgrid[gridindex].ncIDs[CDF_VARID_Y] = ncyvarid;
   ncgrid[gridindex].avarID = ncavarid;
 }
 
@@ -2073,7 +2069,6 @@ void cdfDefVars(stream_t *streamptr)
       streamptr->ncgrid[index].gridID = CDI_UNDEFID;
       for (size_t i = 0; i < CDF_SIZE_ncIDs; ++i)
         streamptr->ncgrid[index].ncIDs[i] = CDI_UNDEFID;
-      streamptr->ncgrid[index].yvarID = CDI_UNDEFID;
       streamptr->ncgrid[index].avarID = CDI_UNDEFID;
     }