Replaced gridDefXname()/gridDefYname() by cdiDefKeyString() with CDI_KEY_NAME.

examples/cdi_write_curv_rll.c

@@ -31,8 +31,9 @@ int main(void)
     gridDefYsize(gridID, nlat);
     gridDefXvals(gridID, lons2D);
     gridDefYvals(gridID, lats2D);
-    gridDefXname(gridID, "lon");
-    gridDefYname(gridID, "lat");
+
+    cdiDefKeyString(gridID, CDI_XAXIS, CDI_KEY_NAME, "lon");
+    cdiDefKeyString(gridID, CDI_YAXIS, CDI_KEY_NAME, "lat");
   }
 
   // Create a rotated lon/lat grid
@@ -45,8 +46,10 @@ int main(void)
     gridDefYsize(projID, nlat);
     gridDefXvals(projID, rlons);
     gridDefYvals(projID, rlats);
-    gridDefXname(projID, "rlon");
-    gridDefYname(projID, "rlat");
+
+    cdiDefKeyString(projID, CDI_XAXIS, CDI_KEY_NAME, "rlon");
+    cdiDefKeyString(projID, CDI_YAXIS, CDI_KEY_NAME, "rlat");
+
     gridDefParamRLL(projID, -162., 39.25, 0);
 
     gridDefProj(gridID, projID);

examples/cdi_write_rll.c

@@ -22,8 +22,9 @@ int main(void)
   gridDefYsize(gridID, nlat);
   gridDefXvals(gridID, lons);
   gridDefYvals(gridID, lats);
-  gridDefXname(gridID, "rlon");
-  gridDefYname(gridID, "rlat");
+
+  cdiDefKeyString(gridID, CDI_XAXIS, CDI_KEY_NAME, "rlon");
+  cdiDefKeyString(gridID, CDI_YAXIS, CDI_KEY_NAME, "rlat");
 
   // Create a surface level Z-axis
   int zaxisID1 = zaxisCreate(ZAXIS_SURFACE, 1);

examples/pio/compareResourcesArray.c

@@ -36,7 +36,7 @@ static int defineGrid()
   double area_vec[nlon*nlat];
   const double * ap = &area_vec[0];
   int i;
-  
+
   gridID = gridCreate(GRID_LONLAT, nlon*nlat);
   gridDefXsize(gridID, nlon);
   gridDefYsize(gridID, nlat);
@@ -51,12 +51,14 @@ static int defineGrid()
   for ( i = 0; i < nlon*nlat; i++ )
     mask_vec[i] = 1;
   gridDefMask ( gridID, mp );
-  gridDefXname ( gridID, "myXname" );
-  gridDefXlongname ( gridID, "myXlongname" );
-  gridDefXunits ( gridID, "myXunits" );
-  gridDefYname ( gridID, "myYname" );
-  gridDefYlongname ( gridID, "myYlongname" );
-  gridDefYunits ( gridID, "myYunits" );
+
+  cdiDefKeyString(gridID, CDI_XAXIS, CDI_KEY_NAME, "myXname");
+  cdiDefKeyString(gridID, CDI_YAXIS, CDI_KEY_NAME, "myYname");
+  cdiDefKeyString(gridID, CDI_XAXIS, CDI_KEY_LONGNAME, "myXlongname");
+  cdiDefKeyString(gridID, CDI_YAXIS, CDI_KEY_LONGNAME, "myYlongname");
+  cdiDefKeyString(gridID, CDI_XAXIS, CDI_KEY_UNITS, "myXunits");
+  cdiDefKeyString(gridID, CDI_YAXIS, CDI_KEY_UNITS, "myYunits");
+
   gridDefDatatype ( gridID, DOUBLE_PRECISION );
   gridDefTrunc ( gridID, 1 );
   gridDefNumber ( gridID, 6 );

tests/test_resource_copy.c

@@ -54,12 +54,14 @@ static int defineGrid (void)
   for ( i = 0; i < nlon*nlat; i++ )
     mask_vec[i] = 1;
   gridDefMask ( gridID, mp );
-  gridDefXname ( gridID, "myXname" );
-  gridDefXlongname ( gridID, "myXlongname" );
-  gridDefXunits ( gridID, "myXunits" );
-  gridDefYname ( gridID, "myYname" );
-  gridDefYlongname ( gridID, "myYlongname" );
-  gridDefYunits ( gridID, "myYunits" );
+
+  cdiDefKeyString(gridID, CDI_XAXIS, CDI_KEY_NAME, "myXname");
+  cdiDefKeyString(gridID, CDI_YAXIS, CDI_KEY_NAME, "myYname");
+  cdiDefKeyString(gridID, CDI_XAXIS, CDI_KEY_LONGNAME, "myXlongname");
+  cdiDefKeyString(gridID, CDI_YAXIS, CDI_KEY_LONGNAME, "myYlongname");
+  cdiDefKeyString(gridID, CDI_XAXIS, CDI_KEY_UNITS, "myXunits");
+  cdiDefKeyString(gridID, CDI_YAXIS, CDI_KEY_UNITS, "myYunits");
+
   gridDefDatatype ( gridID, DOUBLE_PRECISION );
   gridDefTrunc ( gridID, 1 );
   gridDefParamGME ( gridID, 2, 3, 4, 5 );