gridInqXinc: bug fix

ChangeLog

@@ -4,6 +4,7 @@
 	* add support for GRID type LCC2 (LCC PROJ.4 version)
 	* grbDefTime: define tunit also for absolute time [report: Pruek Pongprueksa]
 	* change default calendar to CALENDAR_PROLEPTIC
+	* gridInqXinc: bug fix
 	* grid_check_cyclic: support for curvilinear grids without bounds
 	* streamOpenAppen: set ncmode to 2 (bug fix)
 	* Version 1.3.0 released

src/grid.c

@@ -1769,9 +1769,9 @@ double gridInqXinc(int gridID)
       if ( xsize > 1 )
 	{
 	  int i;
-	  xinc = fabs(xvals[0] - xvals[1]);
+	  xinc = fabs(xvals[xsize-1] - xvals[0])/(xsize-1);
 	  for ( i = 2; i < xsize; i++ )
-	    if ( fabs(fabs(xvals[i-1] - xvals[i]) - xinc) > (xinc/1000) ) break;
+	    if ( fabs(fabs(xvals[i-1] - xvals[i]) - xinc) > 0.01*xinc ) break;
 		  
 	  if ( i < xsize ) xinc = 0;
 	}

src/stream_cdf.c

@@ -3070,11 +3070,11 @@ int cdfReadVarSliceDP(int streamID, int varID, int levelID, double *data, int *n
 	{
 	  char name[256];
 	  vlistInqVarName(vlistID, varID, name);
-	  Error(func, "Unsupported array structure for %s\n", name);
+	  Error(func, "Unsupported array structure for: %s", name);
 	}
     }
 
-  if ( yid != UNDEFID && xid != UNDEFID )
+  if ( swapyz == FALSE && yid != UNDEFID && xid != UNDEFID )
     {
       if ( xid == dimids[ndimsp-1] && yid == dimids[ndimsp-2] )
 	swapxy = FALSE;
@@ -3084,7 +3084,7 @@ int cdfReadVarSliceDP(int streamID, int varID, int levelID, double *data, int *n
 	{
 	  char name[256];
 	  vlistInqVarName(vlistID, varID, name);
-	  Error(func, "Unsupported array structure for %s\n", name);
+	  Error(func, "Unsupported array structure for: %s", name);
 	}
     }