Commit f1391134 authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Eliminate data dependency in is{Lon|Lat}Axis.

parent a636b8f4
...@@ -189,9 +189,9 @@ bool is_lon_axis(const char *units, const char *stdname) ...@@ -189,9 +189,9 @@ bool is_lon_axis(const char *units, const char *stdname)
{ {
status = true; status = true;
} }
else if ( str_is_equal(lc_units, "degree")
if ( status == false && str_is_equal(lc_units, "degree") && && !str_is_equal(stdname, "grid_latitude")
!str_is_equal(stdname, "grid_latitude") && !str_is_equal(stdname, "latitude") ) && !str_is_equal(stdname, "latitude") )
{ {
int ioff = 6; int ioff = 6;
if ( lc_units[ioff] == 's' ) ioff++; if ( lc_units[ioff] == 's' ) ioff++;
...@@ -217,9 +217,9 @@ bool is_lat_axis(const char *units, const char *stdname) ...@@ -217,9 +217,9 @@ bool is_lat_axis(const char *units, const char *stdname)
{ {
status = true; status = true;
} }
else if ( str_is_equal(lc_units, "degree")
if ( status == false && str_is_equal(lc_units, "degree") && && !str_is_equal(stdname, "grid_longitude")
!str_is_equal(stdname, "grid_longitude") && !str_is_equal(stdname, "longitude") ) && !str_is_equal(stdname, "longitude") )
{ {
int ioff = 6; int ioff = 6;
if ( lc_units[ioff] == 's' ) ioff++; if ( lc_units[ioff] == 's' ) ioff++;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment