correct netCDF dimension order of unstructured grids (bug fix)

e0ec5c5a · Uwe Schulzweida · 4896e3e1 · e0ec5c5a · e0ec5c5a
Commit e0ec5c5a authored Sep 21, 2011 by Uwe Schulzweida
Hide whitespace changes
Inline Side-by-side

Showing with 25 additions and 7 deletions

ChangeLog ChangeLog +4 -0

src/stream_cdf.c src/stream_cdf.c +21 -7

No files found.
--- a/ChangeLog
+++ b/ChangeLog
+2011-09-21  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
+
+	* correct netCDF dimension order of unstructured grids (bug fix) [report: Ralf Mueller]
+
 2011-08-25  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>

 	* using CGRIBEX library version 1.5.1

--- a/src/stream_cdf.c
+++ b/src/stream_cdf.c
@@ -5788,14 +5788,28 @@ void define_all_vars(int fileID, int streamID, int vlistID, int instID, int mode

      if ( ncvars[ncvarid].timeID == TIME_VARIABLE ) iodim++;

-      for ( int idim = iodim; idim < ndims; idim++ )
+      if ( gridInqType(gridID) == GRID_UNSTRUCTURED && ndims-iodim <= 2 && ydimid == xdimid )
        {
-          if      ( xdimid == ncvars[ncvarid].dimids[idim] )
-            ixyz += 1*ipow10[(ndims-idim-1)];
-          else if ( ydimid == ncvars[ncvarid].dimids[idim] )
-            ixyz += 2*ipow10[(ndims-idim-1)];
-          else if ( zdimid == ncvars[ncvarid].dimids[idim] )
-            ixyz += 3*ipow10[(ndims-idim-1)];
+          if ( xdimid == ncvars[ncvarid].dimids[ndims-1] )
+            {
+              ixyz = 321;
+            }
+          else
+            {
+              ixyz = 213;
+            }
+        }
+      else
+        {
+          for ( int idim = iodim; idim < ndims; idim++ )
+            {
+              if      ( xdimid == ncvars[ncvarid].dimids[idim] )
+                ixyz += 1*ipow10[ndims-idim-1];
+              else if ( ydimid == ncvars[ncvarid].dimids[idim] )
+                ixyz += 2*ipow10[ndims-idim-1];
+              else if ( zdimid == ncvars[ncvarid].dimids[idim] )
+                ixyz += 3*ipow10[ndims-idim-1];
+            }
        }

      vlistDefVarXYZ(vlistID, varID, ixyz);