Renamed netCDF attribute grid_type to CDI_grid_type.

src/cdf_write.c

@@ -619,7 +619,7 @@ int cdfDefVar(stream_t *streamptr, int varID)
     {
       size_t len = strlen(gridNamePtr(gridtype));
       if ( len > 0 )
-        cdf_put_att_text(fileID, ncvarid, "grid_type", len, gridNamePtr(gridtype));
+        cdf_put_att_text(fileID, ncvarid, "CDI_grid_type", len, gridNamePtr(gridtype));
     }
 
   char gmapvarname[CDI_MAX_NAME]; gmapvarname[0] = 0;

src/stream_cdf_i.c

@@ -1226,7 +1226,7 @@ void cdf_scan_var_attr(int nvars, ncvar_t *ncvars, ncdim_t *ncdims, int timedimi
               if ( memcmp(attstring, "Triangular", attlen) == 0 )
                 ncvars[ncvarid].gridtype = GRID_SPECTRAL;
             }
-          else if ( strcmp(attname, "grid_type") == 0 && xtypeIsText(atttype) )
+          else if ( (strcmp(attname, "grid_type") == 0 || strcmp(attname, "CDI_grid_type") == 0) && xtypeIsText(atttype) )
             {
               cdfGetAttText(ncid, ncvarid, attname, attstringlen, attstring);
               str_tolower(attstring);