use 'number_of_grid_used' only for undefined grid types

ChangeLog

@@ -2,6 +2,10 @@
 
 	* Version 1.6.1 released
 
+2013-06-06  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
+
+	* use 'number_of_grid_used' only for undefined grid types
+
 2013-06-03  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
 
 	* added patch from Florian Prill: Lesen von 'number_of_grid_used', GRID_REFERENCE (bug fix)

src/stream_cdf.c

@@ -5674,7 +5674,8 @@ void define_all_grids(stream_t *streamptr, int vlistID, ncdim_t *ncdims, int nva
 		}
 	    }
 
-	  if ( number_of_grid_used != UNDEFID )
+	  if ( number_of_grid_used != UNDEFID &&
+               (grid.type == UNDEFID || grid.type == GRID_GENERIC) )
 	    {
 	      grid.type   = GRID_REFERENCE;
 	      grid.number = number_of_grid_used;