stream_cdf::cdfDefCurvilinear: bug fix for CLM s,u,v grids

ChangeLog

+2012-02-02 Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
+
+	* stream_cdf::cdfDefCurvilinear: bug fix for CLM s,u,v grids [report: Hans-Jrgen Panitz]
+
 2012-01-30 Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
 
 	* Version 1.5.4 released

NEWS

@@ -5,7 +5,7 @@ Version 1.5.4 (30 January 2012):
 
    New features:
      * Added support for GRIB2 packing type grid_ieee
-     * Added suppport for GRIB2 level type 150
+     * Added support for GRIB2 level type 150
 
 Version 1.5.3 (17 October 2011):
 

src/stream_cdf.c

@@ -1665,11 +1665,19 @@ void cdfDefCurvilinear(int streamID, int gridID)
                     xdimID = streamptr->xdimID[index];
                     break;
                   }
+              dimlen0 = gridInqYsize(gridID0);
+              if ( ydimlen == dimlen0 )
+                if ( IS_EQUAL(gridInqYval(gridID0, 0), gridInqYval(gridID, 0)) &&
+                     IS_EQUAL(gridInqYval(gridID0, xdimlen-1), gridInqYval(gridID, xdimlen-1)) )
+                  {
+                    ydimID = streamptr->ydimID[index];
+                    break;
+                  }
             }
         }
     }
 
-  if ( xdimID == UNDEFID )
+  if ( xdimID == UNDEFID || ydimID == UNDEFID )
     {
       int status;
       status = checkGridName('V', xaxisname, fileID, vlistID, gridID, ngrids, 'X');
@@ -6536,7 +6544,7 @@ int cdfInqContents(int streamID)
 	    }
 	}
     }
-  
+
   if ( CDI_Debug ) printNCvars(ncvars, nvars);