Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
libcdi
Commits
00c53007
Commit
00c53007
authored
Oct 07, 2013
by
Uwe Schulzweida
Browse files
stream_cdf::isLonAxis/isLatAxis: case sensitive units check
parent
8cdd6a63
Changes
2
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
00c53007
...
...
@@ -3,6 +3,10 @@
* Version 1.6.2 released
* using CGRIBEX library version 1.6.2
2013-10-07 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* stream_cdf::isLonAxis/isLatAxis: case sensitive units check
2013-09-02 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* streamCopyRecord: allow mixed netCDF file types
...
...
src/stream_cdf.c
View file @
00c53007
...
...
@@ -4284,18 +4284,23 @@ static
int
isLonAxis
(
const
char
*
units
,
const
char
*
stdname
)
{
int
status
=
FALSE
;
char
degree_units
[
16
];
if
(
memcmp
(
units
,
"degrees_east"
,
12
)
==
0
||
memcmp
(
units
,
"degree_east"
,
11
)
==
0
||
memcmp
(
units
,
"degree_E"
,
8
)
==
0
||
memcmp
(
units
,
"degrees_E"
,
9
)
==
0
||
memcmp
(
units
,
"degreeE"
,
7
)
==
0
||
memcmp
(
units
,
"degreesE"
,
8
)
==
0
||
memcmp
(
stdname
,
"longitude"
,
9
)
==
0
||
(
memcmp
(
units
,
"degree"
,
6
)
==
0
&&
memcmp
(
stdname
,
"grid_longitude"
,
14
)
==
0
)
||
(
memcmp
(
units
,
"radian"
,
6
)
==
0
&&
memcmp
(
stdname
,
"grid_longitude"
,
14
)
==
0
)
)
memcpy
(
degree_units
,
units
,
16
);
degree_units
[
15
]
=
0
;
strtolower
(
degree_units
);
if
(
memcmp
(
degree_units
,
"degree"
,
6
)
==
0
)
{
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
)
)
{
status
=
TRUE
;
}
...
...
@@ -4307,18 +4312,23 @@ static
int
isLatAxis
(
const
char
*
units
,
const
char
*
stdname
)
{
int
status
=
FALSE
;
char
degree_units
[
16
];
memcpy
(
degree_units
,
units
,
16
);
degree_units
[
15
]
=
0
;
strtolower
(
degree_units
);
if
(
memcmp
(
degree_units
,
"degree"
,
6
)
==
0
)
{
int
ioff
=
6
;
if
(
degree_units
[
ioff
]
==
's'
)
ioff
++
;
if
(
degree_units
[
ioff
]
==
'_'
)
ioff
++
;
if
(
degree_units
[
ioff
]
==
'n'
)
status
=
TRUE
;
}
if
(
memcmp
(
units
,
"degrees_north"
,
13
)
==
0
||
memcmp
(
units
,
"degree_north"
,
12
)
==
0
||
memcmp
(
units
,
"degree_N"
,
8
)
==
0
||
memcmp
(
units
,
"degrees_N"
,
9
)
==
0
||
memcmp
(
units
,
"degreeN"
,
7
)
==
0
||
memcmp
(
units
,
"degreesN"
,
8
)
==
0
||
memcmp
(
stdname
,
"latitude"
,
8
)
==
0
||
(
memcmp
(
units
,
"degree"
,
6
)
==
0
&&
memcmp
(
stdname
,
"grid_latitude"
,
13
)
==
0
)
||
(
memcmp
(
units
,
"radian"
,
6
)
==
0
&&
memcmp
(
stdname
,
"grid_latitude"
,
13
)
==
0
)
)
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
)
)
{
status
=
TRUE
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment