stream_cdf::isLatAxis() and isLonAxis(): added support for stdname latitude and longitude

9e72feb6 · Uwe Schulzweida · 993e1b3d · 9e72feb6 · 9e72feb6
Commit 9e72feb6 authored Oct 17, 2013 by Uwe Schulzweida
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

ChangeLog ChangeLog +4 -0

src/stream_cdf.c src/stream_cdf.c +6 -6

No files found.
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 	* Version 1.6.2 released
 	* using CGRIBEX library version 1.6.2

+2013-10-17  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
+
+	* stream_cdf::isLatAxis() and isLonAxis(): added support for stdname latitude and longitude
+
 2013-10-15  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>

 	* added support for GRIB2 key typeOfGeneratingProcess

--- a/src/stream_cdf.c
+++ b/src/stream_cdf.c
@@ -4292,15 +4292,15 @@ int isLonAxis(const char *units, const char *stdname)

  if ( memcmp(degree_units, "degree", 6) == 0 )
    {
-      int ioff = 6; 
+      int ioff = 6;
      if ( degree_units[ioff] == 's' ) ioff++;
      if ( degree_units[ioff] == '_' ) ioff++;
      if ( degree_units[ioff] == 'e' ) status = TRUE;
    }

  if ( status == TRUE ||
-       (memcmp(units, "degree", 6) == 0 && memcmp(stdname, "grid_longitude", 14) == 0) ||
-       (memcmp(units, "radian", 6) == 0 && memcmp(stdname, "grid_longitude", 14) == 0) )
+       ((memcmp(units, "degree", 6) == 0 ||memcmp(units, "radian", 6) == 0) &&
+        (memcmp(stdname, "grid_longitude", 14) == 0 || memcmp(stdname, "longitude", 9) == 0)) )
    {
      status = TRUE;
    }
@@ -4320,15 +4320,15 @@ int isLatAxis(const char *units, const char *stdname)

  if ( memcmp(degree_units, "degree", 6) == 0 )
    {
-      int ioff = 6; 
+      int ioff = 6;
      if ( degree_units[ioff] == 's' ) ioff++;
      if ( degree_units[ioff] == '_' ) ioff++;
      if ( degree_units[ioff] == 'n' ) status = TRUE;
    }

  if ( status == TRUE ||
-       (memcmp(units, "degree", 6) == 0 && memcmp(stdname, "grid_latitude", 13) == 0) ||
-       (memcmp(units, "radian", 6) == 0 && memcmp(stdname, "grid_latitude", 13) == 0) )
+       ((memcmp(units, "degree", 6) == 0 || memcmp(units, "radian", 6) == 0) &&
+        (memcmp(stdname, "grid_latitude", 13) == 0 || memcmp(stdname, "latitude", 8) == 0)) )
    {
      status = TRUE;
    }