stream_cdf::cdfInqContents: check units of hybrid levels

ChangeLog

+2011-10-05  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
+
+	* stream_cdf::cdfInqContents: check units of hybrid levels
+
 2011-10-02  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
 
 	* deflate compression with netCDF4 doesn't work (bug fix) [report: Geert Jan van Oldenborgh]

configure

@@ -809,7 +809,6 @@ enable_dependency_tracking
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
-with_gnu_ld
 enable_largefile
 with_threads
 with_zlib
@@ -839,25 +838,16 @@ LDFLAGS
 LIBS
 CPPFLAGS
 CPP
-CPPFLAGS
 FC
 FCFLAGS
-LDFLAGS
-LIBS
 FPP
 FPPFLAGS
 F77
 FFLAGS
-LDFLAGS
-LIBS
 CXX
 CXXFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
 CCC
 CXXCPP
-CPPFLAGS
 FCMODEXT'

src/stream_cdf.c

@@ -4809,7 +4809,7 @@ void verify_coordinate_vars_1(int ndims, ncdim_t *ncdims, ncvar_t *ncvars, int t
 		{
 		  ncvars[ncvarid].zaxistype = ZAXIS_PRESSURE;
 		}
-	      else if ( strcmp(ncvars[ncvarid].units, "level") == 0 )
+	      else if ( strcmp(ncvars[ncvarid].units, "level") == 0 || strcmp(ncvars[ncvarid].units, "1") == 0 )
 		{
 		  if      ( strcmp(ncvars[ncvarid].longname, "hybrid level at layer midpoints") == 0 )
 		    ncvars[ncvarid].zaxistype = ZAXIS_HYBRID;
@@ -4890,7 +4890,7 @@ void verify_coordinate_vars_2(int nvars, ncvar_t *ncvars)
 		  ncvars[ncvarid].zaxistype = ZAXIS_PRESSURE;
 		  continue;
 		}
-	      else if ( strcmp(ncvars[ncvarid].units, "level") == 0 )
+	      else if ( strcmp(ncvars[ncvarid].units, "level") == 0 || strcmp(ncvars[ncvarid].units, "1") == 0 )
 		{
 		  if      ( strcmp(ncvars[ncvarid].longname, "hybrid level at layer midpoints") == 0 )
 		    ncvars[ncvarid].zaxistype = ZAXIS_HYBRID;