cdoDefineGrid: first call gridFromH5file() for HDF tags

ChangeLog

 2013-12-04 Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
 
 	* gridFromH5file: set fclose degree to H5F_CLOSE_STRONG [Bug #4272]
+	* cdoDefineGrid: first call gridFromH5file() for HDF tags
 
 2013-11-29 Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
 

src/griddes.c

@@ -1798,8 +1798,8 @@ int cdoDefineGrid(const char *gridfile)
 	{
 	  if ( cmpstr(buffer+1, "HDF", len) == 0 )
 	    {
-	      if ( cdoDebug ) cdoPrint("Grid from netCDF4 file");
-	      gridID = gridFromNCfile(gridfile);
+	      if ( cdoDebug ) cdoPrint("Grid from HDF5 file");
+	      gridID = gridFromH5file(gridfile);
 	    }
 	}
 
@@ -1807,8 +1807,8 @@ int cdoDefineGrid(const char *gridfile)
 	{
 	  if ( cmpstr(buffer+1, "HDF", len) == 0 )
 	    {
-	      if ( cdoDebug ) cdoPrint("Grid from HDF5 file");
-	      gridID = gridFromH5file(gridfile);
+	      if ( cdoDebug ) cdoPrint("Grid from netCDF4 file");
+	      gridID = gridFromNCfile(gridfile);
 	    }
 	}
 

src/griddes_h5.c

@@ -340,7 +340,7 @@ int gridFromH5file(const char *gridfile)
 
       if ( rank != 2 )
 	{
-	  if ( cdoVerbose ) cdoWarning("Unexpected rank = %d!", rank);
+	  //if ( cdoVerbose ) cdoWarning("Unexpected rank = %d!", rank);
 	  goto RETURN;
 	}
       /*
@@ -467,7 +467,7 @@ int gridFromH5file(const char *gridfile)
 
 	  if ( rank != 2 )
 	    {
-	      if ( cdoVerbose ) cdoWarning("Unexpected rank = %d!", rank);
+	      //if ( cdoVerbose ) cdoWarning("Unexpected rank = %d!", rank);
 	      goto RETURN;
 	    }
 	  /*